From f1365121843cf07aa489d2d9f4886e929999ccde Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 20 Oct 2023 14:03:43 +0200 Subject: [PATCH 1/5] Clean pipeline --- .github/workflows/deploy-qa.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/deploy-qa.yml b/.github/workflows/deploy-qa.yml index a3fff65f35..d850d289ff 100644 --- a/.github/workflows/deploy-qa.yml +++ b/.github/workflows/deploy-qa.yml @@ -4,7 +4,6 @@ on: push: branches: - master - - BUDI-7641/push_v2_images_to_qa workflow_dispatch: jobs: From 70f6f861d011bae826c6f10ebfd827dd51d740f5 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 20 Oct 2023 14:03:43 +0200 Subject: [PATCH 2/5] Clean pipeline --- .github/workflows/deploy-qa.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/deploy-qa.yml b/.github/workflows/deploy-qa.yml index a3fff65f35..d850d289ff 100644 --- a/.github/workflows/deploy-qa.yml +++ b/.github/workflows/deploy-qa.yml @@ -4,7 +4,6 @@ on: push: branches: - master - - BUDI-7641/push_v2_images_to_qa workflow_dispatch: jobs: From e5aefa83eccff6ee630b9aec3c7d571f36e7660c Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 20 Oct 2023 15:13:29 +0200 Subject: [PATCH 3/5] Fix single image dockerfile --- hosting/single/Dockerfile.v2 | 1 + 1 file changed, 1 insertion(+) diff --git a/hosting/single/Dockerfile.v2 b/hosting/single/Dockerfile.v2 index ad11545a22..a983f10044 100644 --- a/hosting/single/Dockerfile.v2 +++ b/hosting/single/Dockerfile.v2 @@ -26,6 +26,7 @@ RUN ./scripts/removeWorkspaceDependencies.sh packages/worker/package.json # We will never want to sync pro, but the script is still required RUN echo '' > scripts/syncProPackage.js RUN jq 'del(.scripts.postinstall)' package.json > temp.json && mv temp.json package.json +RUN ./scripts/removeWorkspaceDependencies.sh package.json RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn yarn install --production # copy the actual code From 36a33bc19299b3fdbb6e44670798b27d38449287 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 20 Oct 2023 15:15:52 +0200 Subject: [PATCH 4/5] Use nx affected on PRs --- .github/workflows/budibase_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index c73d013b78..77867c8617 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -18,7 +18,7 @@ env: BASE_BRANCH: ${{ github.event.pull_request.base.ref}} PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }} NX_BASE_BRANCH: origin/${{ github.base_ref }} - USE_NX_AFFECTED: ${{ github.event_name == 'pull_request' && github.base_ref != 'master'}} + USE_NX_AFFECTED: ${{ github.event_name == 'pull_request' }} jobs: lint: From 2d1e01998a320c9dfe048f228b0baf99d864caed Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 20 Oct 2023 15:16:48 +0200 Subject: [PATCH 5/5] Use nx affected on PRs --- .github/workflows/budibase_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index c73d013b78..77867c8617 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -18,7 +18,7 @@ env: BASE_BRANCH: ${{ github.event.pull_request.base.ref}} PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }} NX_BASE_BRANCH: origin/${{ github.base_ref }} - USE_NX_AFFECTED: ${{ github.event_name == 'pull_request' && github.base_ref != 'master'}} + USE_NX_AFFECTED: ${{ github.event_name == 'pull_request' }} jobs: lint: