From 6d7c76e441dde628b8c594e983de08234a7c9e60 Mon Sep 17 00:00:00 2001 From: Benoit Donneaux Date: Fri, 2 Feb 2024 23:28:35 +0100 Subject: [PATCH 1/3] Pin GitHub runner version for #177 Signed-off-by: Benoit Donneaux --- .github/workflows/integrate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml index 0d075f57..ddb1288f 100644 --- a/.github/workflows/integrate.yml +++ b/.github/workflows/integrate.yml @@ -35,7 +35,7 @@ jobs: timeout-minutes: 60 strategy: matrix: - os: [ubuntu-latest] + os: [ubuntu-22.04] steps: - name: Checkout repository uses: actions/checkout@v4 From 34ff97b2d4357e17ba4cc235f659fc22a4394f2c Mon Sep 17 00:00:00 2001 From: Benoit Donneaux Date: Mon, 5 Feb 2024 08:52:47 +0100 Subject: [PATCH 2/3] Avoid useless step and rename others Signed-off-by: Benoit Donneaux --- .github/workflows/deploy.yml | 5 +---- .github/workflows/integrate.yml | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 87e6c566..c66fa406 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -58,7 +58,7 @@ jobs: sudo adduser runner runner echo "_GID=$(grep -E "^runner:" /etc/group | cut -d: -f3)" >> $GITHUB_ENV - - name: Build image - if not cached + - name: Build image run: | repository=${{ github.repository }} # Verify the cache @@ -74,6 +74,3 @@ jobs: - name: Deploy package run: docker compose run --no-deps client npm run deploy - - - name: Stop containers - run: docker compose down diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml index ddb1288f..6b3da229 100644 --- a/.github/workflows/integrate.yml +++ b/.github/workflows/integrate.yml @@ -78,7 +78,7 @@ jobs: sudo adduser runner runner echo "_GID=$(grep -E "^runner:" /etc/group | cut -d: -f3)" >> $GITHUB_ENV - - name: Build images - if not cached + - name: Build images run: | repository=${{ github.repository }} # Verify the cache @@ -91,7 +91,7 @@ jobs: docker compose --progress plain -f docker-compose.yml -f docker-compose.e2e.yml --profile e2e \ build --build-arg uid=$(id -u) --build-arg gid=${_GID} - - name: Setup containers + - name: Prepare containers run: | docker compose run --rm --no-deps -e CI=true client npm clean-install docker compose run --rm --no-deps client ./scripts/setup.sh From fd7ecacd1a32386957d469766d686f94dd0641cf Mon Sep 17 00:00:00 2001 From: Benoit Donneaux Date: Mon, 5 Feb 2024 10:23:04 +0100 Subject: [PATCH 3/3] Pin the client-2e2 image too Signed-off-by: Benoit Donneaux --- client-e2e/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client-e2e/Dockerfile b/client-e2e/Dockerfile index bdd87d66..fe904eae 100644 --- a/client-e2e/Dockerfile +++ b/client-e2e/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16-alpine +FROM node:16-alpine3.18@sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 # Parameters for default user:group ARG uid=1000