1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-21 09:38:01 +02:00

Tools: Also build Docker image using sequential build

This commit is contained in:
Laurent Cozic 2022-01-01 15:24:56 +01:00
parent 5d4ebc6e14
commit f2168d3bca
3 changed files with 6 additions and 1 deletions

View File

@ -37,6 +37,7 @@ echo "GITHUB_EVENT_NAME=$GITHUB_EVENT_NAME"
echo "GITHUB_REF=$GITHUB_REF" echo "GITHUB_REF=$GITHUB_REF"
echo "RUNNER_OS=$RUNNER_OS" echo "RUNNER_OS=$RUNNER_OS"
echo "GIT_TAG_NAME=$GIT_TAG_NAME" echo "GIT_TAG_NAME=$GIT_TAG_NAME"
echo "BUILD_SEQUENCIAL=$BUILD_SEQUENCIAL"
echo "IS_CONTINUOUS_INTEGRATION=$IS_CONTINUOUS_INTEGRATION" echo "IS_CONTINUOUS_INTEGRATION=$IS_CONTINUOUS_INTEGRATION"
echo "IS_PULL_REQUEST=$IS_PULL_REQUEST" echo "IS_PULL_REQUEST=$IS_PULL_REQUEST"

View File

@ -74,6 +74,7 @@ jobs:
CSC_LINK: ${{ secrets.APPLE_CSC_LINK }} CSC_LINK: ${{ secrets.APPLE_CSC_LINK }}
GH_TOKEN: ${{ secrets.GH_TOKEN }} GH_TOKEN: ${{ secrets.GH_TOKEN }}
IS_CONTINUOUS_INTEGRATION: 1 IS_CONTINUOUS_INTEGRATION: 1
BUILD_SEQUENCIAL: 1
run: | run: |
"${GITHUB_WORKSPACE}/.github/scripts/run_ci.sh" "${GITHUB_WORKSPACE}/.github/scripts/run_ci.sh"
@ -84,6 +85,7 @@ jobs:
CSC_LINK: ${{ secrets.WINDOWS_CSC_LINK }} CSC_LINK: ${{ secrets.WINDOWS_CSC_LINK }}
GH_TOKEN: ${{ secrets.GH_TOKEN }} GH_TOKEN: ${{ secrets.GH_TOKEN }}
IS_CONTINUOUS_INTEGRATION: 1 IS_CONTINUOUS_INTEGRATION: 1
BUILD_SEQUENCIAL: 1
run: | run: |
yarn install yarn install
cd packages/app-desktop cd packages/app-desktop
@ -122,6 +124,8 @@ jobs:
corepack enable corepack enable
- name: Build Docker Image - name: Build Docker Image
env:
BUILD_SEQUENCIAL: 1
run: | run: |
yarn install yarn install
yarn run buildServerDocker --tag-name server-v0.0.0 yarn run buildServerDocker --tag-name server-v0.0.0

View File

@ -29,7 +29,7 @@ const tasks = {
// sequencially. Locally we run it in parallel, which is much // sequencially. Locally we run it in parallel, which is much
// faster, especially when having to rebuild after adding a // faster, especially when having to rebuild after adding a
// dependency. // dependency.
if (process.env.IS_CONTINUOUS_INTEGRATION === '1') { if (process.env.BUILD_SEQUENCIAL === '1') {
await utils.execCommandVerbose('yarn', ['run', 'buildSequential']); await utils.execCommandVerbose('yarn', ['run', 'buildSequential']);
} else { } else {
await utils.execCommandVerbose('yarn', ['run', 'buildParallel']); await utils.execCommandVerbose('yarn', ['run', 'buildParallel']);