From f2168d3bca820fd9889ad7bad3dcaf33fd9ce4a0 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Sat, 1 Jan 2022 15:24:56 +0100 Subject: [PATCH] Tools: Also build Docker image using sequential build --- .github/scripts/run_ci.sh | 1 + .github/workflows/github-actions-main.yml | 4 ++++ gulpfile.js | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/scripts/run_ci.sh b/.github/scripts/run_ci.sh index 5d5994d5d..820fcccb0 100755 --- a/.github/scripts/run_ci.sh +++ b/.github/scripts/run_ci.sh @@ -37,6 +37,7 @@ echo "GITHUB_EVENT_NAME=$GITHUB_EVENT_NAME" echo "GITHUB_REF=$GITHUB_REF" echo "RUNNER_OS=$RUNNER_OS" echo "GIT_TAG_NAME=$GIT_TAG_NAME" +echo "BUILD_SEQUENCIAL=$BUILD_SEQUENCIAL" echo "IS_CONTINUOUS_INTEGRATION=$IS_CONTINUOUS_INTEGRATION" echo "IS_PULL_REQUEST=$IS_PULL_REQUEST" diff --git a/.github/workflows/github-actions-main.yml b/.github/workflows/github-actions-main.yml index 78cb3278f..e9dac9352 100644 --- a/.github/workflows/github-actions-main.yml +++ b/.github/workflows/github-actions-main.yml @@ -74,6 +74,7 @@ jobs: CSC_LINK: ${{ secrets.APPLE_CSC_LINK }} GH_TOKEN: ${{ secrets.GH_TOKEN }} IS_CONTINUOUS_INTEGRATION: 1 + BUILD_SEQUENCIAL: 1 run: | "${GITHUB_WORKSPACE}/.github/scripts/run_ci.sh" @@ -84,6 +85,7 @@ jobs: CSC_LINK: ${{ secrets.WINDOWS_CSC_LINK }} GH_TOKEN: ${{ secrets.GH_TOKEN }} IS_CONTINUOUS_INTEGRATION: 1 + BUILD_SEQUENCIAL: 1 run: | yarn install cd packages/app-desktop @@ -122,6 +124,8 @@ jobs: corepack enable - name: Build Docker Image + env: + BUILD_SEQUENCIAL: 1 run: | yarn install yarn run buildServerDocker --tag-name server-v0.0.0 diff --git a/gulpfile.js b/gulpfile.js index 026d0dc1d..ab1f5d746 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -29,7 +29,7 @@ const tasks = { // sequencially. Locally we run it in parallel, which is much // faster, especially when having to rebuild after adding a // dependency. - if (process.env.IS_CONTINUOUS_INTEGRATION === '1') { + if (process.env.BUILD_SEQUENCIAL === '1') { await utils.execCommandVerbose('yarn', ['run', 'buildSequential']); } else { await utils.execCommandVerbose('yarn', ['run', 'buildParallel']);