From 1db96bb59b6b85cbfd801519c9b7cbccf9678524 Mon Sep 17 00:00:00 2001 From: Dmitry Patsura Date: Fri, 3 Mar 2023 00:37:01 +0300 Subject: [PATCH 1/3] chore: bump os --- .github/workflows/publish.yml | 2 +- .github/workflows/push.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e7b2d841a269c..b09bcca5b265f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -238,7 +238,7 @@ jobs: fail-fast: false matrix: include: - - os: ubuntu-20.04 + - os: ubuntu-22.04 target: x86_64-unknown-linux-gnu platforms: linux/amd64,linux/arm64 timeout-minutes: 30 diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index a4fb10a9b93a6..9e915c1e7385f 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -544,7 +544,7 @@ jobs: needs: [latest-tag-sha] if: (needs['latest-tag-sha'].outputs.sha != github.sha) name: Build & Test :dev for ${{ matrix.name }} without pushing - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 timeout-minutes: 60 services: registry: From 4b5f2c75d8742a24f8227e18014329c2728be016 Mon Sep 17 00:00:00 2001 From: Dmitry Patsura Date: Fri, 3 Mar 2023 00:51:05 +0300 Subject: [PATCH 2/3] chore: test --- packages/cubejs-docker/latest-alpine-jdk.Dockerfile | 2 +- packages/cubejs-docker/latest-alpine.Dockerfile | 2 +- packages/cubejs-docker/latest-debian-jdk.Dockerfile | 2 +- packages/cubejs-docker/latest.Dockerfile | 6 +++--- packages/cubejs-docker/local.Dockerfile | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/cubejs-docker/latest-alpine-jdk.Dockerfile b/packages/cubejs-docker/latest-alpine-jdk.Dockerfile index 6dbd2038d0a24..4413e08769cf0 100644 --- a/packages/cubejs-docker/latest-alpine-jdk.Dockerfile +++ b/packages/cubejs-docker/latest-alpine-jdk.Dockerfile @@ -17,7 +17,7 @@ ENV PATH "$JAVA_HOME/bin:${PATH}" # We are copying root yarn.lock file to the context folder during the Publish GH # action. So, a process will use the root lock file here. -RUN yarn install && yarn cache clean +RUN yarn install --production && yarn cache clean FROM node:16.19.1-alpine3.17 diff --git a/packages/cubejs-docker/latest-alpine.Dockerfile b/packages/cubejs-docker/latest-alpine.Dockerfile index 1df0751e87d88..bedf85f19c28d 100644 --- a/packages/cubejs-docker/latest-alpine.Dockerfile +++ b/packages/cubejs-docker/latest-alpine.Dockerfile @@ -14,7 +14,7 @@ RUN apk update \ # We are copying root yarn.lock file to the context folder during the Publish GH # action. So, a process will use the root lock file here. -RUN yarn install && yarn cache clean +RUN yarn install --production && yarn cache clean FROM node:16.19.1-alpine3.17 diff --git a/packages/cubejs-docker/latest-debian-jdk.Dockerfile b/packages/cubejs-docker/latest-debian-jdk.Dockerfile index 73d3201991dca..47ff876b08b56 100644 --- a/packages/cubejs-docker/latest-debian-jdk.Dockerfile +++ b/packages/cubejs-docker/latest-debian-jdk.Dockerfile @@ -15,7 +15,7 @@ RUN apt-get update \ # We are copying root yarn.lock file to the context folder during the Publish GH # action. So, a process will use the root lock file here. -RUN yarn install && yarn cache clean +RUN yarn install --production && yarn cache clean FROM node:16.19.1-bullseye-slim diff --git a/packages/cubejs-docker/latest.Dockerfile b/packages/cubejs-docker/latest.Dockerfile index 6655c0ddb604a..624eb090717ef 100644 --- a/packages/cubejs-docker/latest.Dockerfile +++ b/packages/cubejs-docker/latest.Dockerfile @@ -4,6 +4,8 @@ WORKDIR /cube COPY . . RUN yarn policies set-version v1.22.19 +# Yarn v1 uses aggressive timeouts with summing time spending on fs, https://github.com/yarnpkg/yarn/issues/4890 +RUN yarn config set network-timeout 120000 -g # Required for node-oracledb to buld on ARM64 RUN apt-get update \ @@ -12,9 +14,7 @@ RUN apt-get update \ # We are copying root yarn.lock file to the context folder during the Publish GH # action. So, a process will use the root lock file here. -RUN yarn install && yarn cache clean -# Yarn v1 uses aggressive timeouts with summing time spending on fs, https://github.com/yarnpkg/yarn/issues/4890 -RUN yarn config set network-timeout 120000 -g +RUN yarn install --production && yarn cache clean FROM node:16.19.1-bullseye-slim diff --git a/packages/cubejs-docker/local.Dockerfile b/packages/cubejs-docker/local.Dockerfile index 4796c24971b82..269b85afbcae2 100644 --- a/packages/cubejs-docker/local.Dockerfile +++ b/packages/cubejs-docker/local.Dockerfile @@ -35,7 +35,7 @@ RUN apt-get update \ # We are copying root yarn.lock file to the context folder during the Publish GH # action. So, a process will use the root lock file here. -RUN yarn install && yarn cache clean && yarn link:dev +RUN yarn install --production && yarn cache clean && yarn link:dev # By default Node dont search in parent directory from /cube/conf, @todo Reaserch a little bit more ENV NODE_PATH /cube/conf/node_modules:/cube/node_modules From 7389e78d5053755b67ff2abac91d8e9af2b79e75 Mon Sep 17 00:00:00 2001 From: Dmitry Patsura Date: Fri, 3 Mar 2023 01:13:41 +0300 Subject: [PATCH 3/3] chore: short --- packages/cubejs-docker/latest-alpine-jdk.Dockerfile | 2 +- packages/cubejs-docker/latest-alpine.Dockerfile | 2 +- packages/cubejs-docker/latest-debian-jdk.Dockerfile | 2 +- packages/cubejs-docker/latest.Dockerfile | 2 +- packages/cubejs-docker/local.Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/cubejs-docker/latest-alpine-jdk.Dockerfile b/packages/cubejs-docker/latest-alpine-jdk.Dockerfile index 4413e08769cf0..76029917b83ca 100644 --- a/packages/cubejs-docker/latest-alpine-jdk.Dockerfile +++ b/packages/cubejs-docker/latest-alpine-jdk.Dockerfile @@ -17,7 +17,7 @@ ENV PATH "$JAVA_HOME/bin:${PATH}" # We are copying root yarn.lock file to the context folder during the Publish GH # action. So, a process will use the root lock file here. -RUN yarn install --production && yarn cache clean +RUN yarn install --prod && yarn cache clean FROM node:16.19.1-alpine3.17 diff --git a/packages/cubejs-docker/latest-alpine.Dockerfile b/packages/cubejs-docker/latest-alpine.Dockerfile index bedf85f19c28d..35fb42db4cb08 100644 --- a/packages/cubejs-docker/latest-alpine.Dockerfile +++ b/packages/cubejs-docker/latest-alpine.Dockerfile @@ -14,7 +14,7 @@ RUN apk update \ # We are copying root yarn.lock file to the context folder during the Publish GH # action. So, a process will use the root lock file here. -RUN yarn install --production && yarn cache clean +RUN yarn install --prod && yarn cache clean FROM node:16.19.1-alpine3.17 diff --git a/packages/cubejs-docker/latest-debian-jdk.Dockerfile b/packages/cubejs-docker/latest-debian-jdk.Dockerfile index 47ff876b08b56..ae04af1058a10 100644 --- a/packages/cubejs-docker/latest-debian-jdk.Dockerfile +++ b/packages/cubejs-docker/latest-debian-jdk.Dockerfile @@ -15,7 +15,7 @@ RUN apt-get update \ # We are copying root yarn.lock file to the context folder during the Publish GH # action. So, a process will use the root lock file here. -RUN yarn install --production && yarn cache clean +RUN yarn install --prod && yarn cache clean FROM node:16.19.1-bullseye-slim diff --git a/packages/cubejs-docker/latest.Dockerfile b/packages/cubejs-docker/latest.Dockerfile index 624eb090717ef..451f75e716af8 100644 --- a/packages/cubejs-docker/latest.Dockerfile +++ b/packages/cubejs-docker/latest.Dockerfile @@ -14,7 +14,7 @@ RUN apt-get update \ # We are copying root yarn.lock file to the context folder during the Publish GH # action. So, a process will use the root lock file here. -RUN yarn install --production && yarn cache clean +RUN yarn install --prod && yarn cache clean FROM node:16.19.1-bullseye-slim diff --git a/packages/cubejs-docker/local.Dockerfile b/packages/cubejs-docker/local.Dockerfile index 269b85afbcae2..cec3509320cc5 100644 --- a/packages/cubejs-docker/local.Dockerfile +++ b/packages/cubejs-docker/local.Dockerfile @@ -35,7 +35,7 @@ RUN apt-get update \ # We are copying root yarn.lock file to the context folder during the Publish GH # action. So, a process will use the root lock file here. -RUN yarn install --production && yarn cache clean && yarn link:dev +RUN yarn install --prod && yarn cache clean && yarn link:dev # By default Node dont search in parent directory from /cube/conf, @todo Reaserch a little bit more ENV NODE_PATH /cube/conf/node_modules:/cube/node_modules