From 2aa64e2068006383fac6e24ce8416c6e7c2768f2 Mon Sep 17 00:00:00 2001 From: Finn Bacall Date: Thu, 2 Jan 2025 15:48:24 +0000 Subject: [PATCH 1/3] Try Ubuntu 24 --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/deployment-checks.yml | 2 +- .github/workflows/docker-prod-test.yml | 2 +- .github/workflows/docker-test.yml | 2 +- .github/workflows/test.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 733572cd4..dab70e5fe 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -23,7 +23,7 @@ on: jobs: analyze: name: Analyze - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 permissions: actions: read contents: read diff --git a/.github/workflows/deployment-checks.yml b/.github/workflows/deployment-checks.yml index c52968dea..c4ece25d3 100644 --- a/.github/workflows/deployment-checks.yml +++ b/.github/workflows/deployment-checks.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: test: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 env: DB_HOST: localhost DB_NAME: tess diff --git a/.github/workflows/docker-prod-test.yml b/.github/workflows/docker-prod-test.yml index d60e16a42..f8296517e 100644 --- a/.github/workflows/docker-prod-test.yml +++ b/.github/workflows/docker-prod-test.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: test: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Check out code uses: actions/checkout@v4 diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml index 1cb8ede6f..504b8e435 100644 --- a/.github/workflows/docker-test.yml +++ b/.github/workflows/docker-test.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: test: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Check out code uses: actions/checkout@v4 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b9cb0bb66..7750b37b9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: test: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 env: DB_HOST: localhost DB_NAME: tess From 7817a64bd4185ad16aa3be19f26842a593b6c6e5 Mon Sep 17 00:00:00 2001 From: Finn Bacall Date: Thu, 2 Jan 2025 16:02:25 +0000 Subject: [PATCH 2/3] Install imagemagick --- .github/workflows/test.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7750b37b9..952c9e7de 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,6 +14,10 @@ jobs: RAILS_ENV: test REDIS_TEST_URL: redis://localhost:6456/0 steps: + - name: Install system dependencies + run: | + sudo apt-get update + sudo apt-get install imagemagick - name: Set up database uses: harmon758/postgresql-action@v1 with: From 24f7d7d967ad89f7cf88378e1e6e344dacaccc43 Mon Sep 17 00:00:00 2001 From: Finn Bacall Date: Fri, 3 Jan 2025 10:37:00 +0000 Subject: [PATCH 3/3] Revert "Try Ubuntu 24" This reverts commit 2aa64e2068006383fac6e24ce8416c6e7c2768f2. --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/deployment-checks.yml | 2 +- .github/workflows/docker-prod-test.yml | 2 +- .github/workflows/docker-test.yml | 2 +- .github/workflows/test.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index dab70e5fe..733572cd4 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -23,7 +23,7 @@ on: jobs: analyze: name: Analyze - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest permissions: actions: read contents: read diff --git a/.github/workflows/deployment-checks.yml b/.github/workflows/deployment-checks.yml index c4ece25d3..c52968dea 100644 --- a/.github/workflows/deployment-checks.yml +++ b/.github/workflows/deployment-checks.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: test: - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest env: DB_HOST: localhost DB_NAME: tess diff --git a/.github/workflows/docker-prod-test.yml b/.github/workflows/docker-prod-test.yml index f8296517e..d60e16a42 100644 --- a/.github/workflows/docker-prod-test.yml +++ b/.github/workflows/docker-prod-test.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: test: - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest steps: - name: Check out code uses: actions/checkout@v4 diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml index 504b8e435..1cb8ede6f 100644 --- a/.github/workflows/docker-test.yml +++ b/.github/workflows/docker-test.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: test: - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest steps: - name: Check out code uses: actions/checkout@v4 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 952c9e7de..0d1907383 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: test: - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest env: DB_HOST: localhost DB_NAME: tess