From 65e5e40963bbf7b737babaad390073657f76c096 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 10 Aug 2023 17:24:48 +0300 Subject: [PATCH 1/3] Fix python installation in server docker and single image --- hosting/single/Dockerfile | 2 +- packages/server/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosting/single/Dockerfile b/hosting/single/Dockerfile index 6fc1f96d28..9fdf2449d1 100644 --- a/hosting/single/Dockerfile +++ b/hosting/single/Dockerfile @@ -1,7 +1,7 @@ FROM node:18-slim as build # install node-gyp dependencies -RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends apt-utils cron g++ make python +RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends apt-utils cron g++ make python3 # add pin script WORKDIR / diff --git a/packages/server/Dockerfile b/packages/server/Dockerfile index 61f064ecfb..e1b3b208c7 100644 --- a/packages/server/Dockerfile +++ b/packages/server/Dockerfile @@ -18,7 +18,7 @@ ENV TOP_LEVEL_PATH=/ # handle node-gyp RUN apt-get update \ - && apt-get install -y --no-install-recommends g++ make python + && apt-get install -y --no-install-recommends g++ make python3 RUN yarn global add pm2 # Install client for oracle datasource From 5ff26ab2da925032946b9fc4715b083d10c3498c Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 10 Aug 2023 17:33:31 +0300 Subject: [PATCH 2/3] Do not build using affected --- .github/workflows/budibase_ci.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index a94c56407f..b754587d34 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -69,19 +69,11 @@ jobs: # Run build all the projects - name: Build run: | - if ${{ env.USE_NX_AFFECTED }}; then - yarn build --since=${{ env.NX_BASE_BRANCH }} - else - yarn build - fi + yarn build # Check the types of the projects built via esbuild - name: Check types run: | - if ${{ env.USE_NX_AFFECTED }}; then - yarn check:types --since=${{ env.NX_BASE_BRANCH }} - else - yarn check:types - fi + yarn check:types test-libraries: runs-on: ubuntu-latest From 393bdecd0dc963947dadc301a126f1a773acbdf2 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 10 Aug 2023 17:34:51 +0300 Subject: [PATCH 3/3] Check:types using affected --- .github/workflows/budibase_ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index b754587d34..6cdfba068b 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -73,7 +73,11 @@ jobs: # Check the types of the projects built via esbuild - name: Check types run: | - yarn check:types + if ${{ env.USE_NX_AFFECTED }}; then + yarn check:types --since=${{ env.NX_BASE_BRANCH }} + else + yarn check:types + fi test-libraries: runs-on: ubuntu-latest