From ae7ef9ddc455e628d423cd53c3b22efaa6a78d15 Mon Sep 17 00:00:00 2001 From: Miklos Bagi Date: Sun, 26 Jan 2025 19:47:33 +0100 Subject: [PATCH 1/4] Change ubuntu-latest to a specific version --- .github/workflows/debug.yml | 2 +- .github/workflows/pr-check.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml index c5e100e..b234258 100644 --- a/.github/workflows/debug.yml +++ b/.github/workflows/debug.yml @@ -35,7 +35,7 @@ jobs: custom-gluetun-version-check: if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.custom_gluetun_version != '' }} - runs-on: ubuntu-latest + runs-on: ubuntu-25.04 steps: - uses: actions/checkout@v3 - name: Build env and run tests diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index 2c7e123..80d0685 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -27,55 +27,55 @@ env: jobs: lint-docker: - runs-on: ubuntu-latest + runs-on: ubuntu-25.04 steps: - uses: actions/checkout@v3 - uses: hadolint/hadolint-action@v3.1.0 with: dockerfile: Dockerfile lint-sh: - runs-on: ubuntu-latest + runs-on: ubuntu-25.04 steps: - uses: actions/checkout@v3 - uses: ludeeus/action-shellcheck@2.0.0 pr-check-against-3-38: - runs-on: ubuntu-latest + runs-on: ubuntu-25.04 steps: - uses: actions/checkout@v3 - name: Test against Gluetun v3.38 run: make GLUETUN_VERSION=v3.38 pr-test pr-check-against-3-38-1: - runs-on: ubuntu-latest + runs-on: ubuntu-25.04 steps: - uses: actions/checkout@v3 - name: Test against Gluetun v3.38.1 run: make GLUETUN_VERSION=v3.38.1 pr-test pr-check-against-3-39: - runs-on: ubuntu-latest + runs-on: ubuntu-25.04 steps: - uses: actions/checkout@v3 - name: Test against Gluetun v3.39 run: make GLUETUN_VERSION=v3.39 pr-test pr-check-against-3-39-1: - runs-on: ubuntu-latest + runs-on: ubuntu-25.04 steps: - uses: actions/checkout@v3 - name: Test against Gluetun v3.39.1 run: make GLUETUN_VERSION=v3.39.1 pr-test pr-check-against-3-40-0: - runs-on: ubuntu-latest + runs-on: ubuntu-25.04 steps: - uses: actions/checkout@v3 - name: Test against Gluetun v3.40.0 run: make GLUETUN_VERSION=v3.40.0 pr-test pr-check-against-latest: - runs-on: ubuntu-latest + runs-on: ubuntu-25.04 steps: - uses: actions/checkout@v3 - name: Test against Gluetun latest From 65d341876bfeb64ae42caad44d4b2f7e8d341c7b Mon Sep 17 00:00:00 2001 From: Miklos Bagi Date: Sun, 26 Jan 2025 20:38:44 +0100 Subject: [PATCH 2/4] -: --- .github/workflows/pr-check.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index 80d0685..50dca2f 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -27,55 +27,55 @@ env: jobs: lint-docker: - runs-on: ubuntu-25.04 + runs-on: ubuntu:25.04 steps: - uses: actions/checkout@v3 - uses: hadolint/hadolint-action@v3.1.0 with: dockerfile: Dockerfile lint-sh: - runs-on: ubuntu-25.04 + runs-on: ubuntu:25.04 steps: - uses: actions/checkout@v3 - uses: ludeeus/action-shellcheck@2.0.0 pr-check-against-3-38: - runs-on: ubuntu-25.04 + runs-on: ubuntu:25.04 steps: - uses: actions/checkout@v3 - name: Test against Gluetun v3.38 run: make GLUETUN_VERSION=v3.38 pr-test pr-check-against-3-38-1: - runs-on: ubuntu-25.04 + runs-on: ubuntu:25.04 steps: - uses: actions/checkout@v3 - name: Test against Gluetun v3.38.1 run: make GLUETUN_VERSION=v3.38.1 pr-test pr-check-against-3-39: - runs-on: ubuntu-25.04 + runs-on: ubuntu:25.04 steps: - uses: actions/checkout@v3 - name: Test against Gluetun v3.39 run: make GLUETUN_VERSION=v3.39 pr-test pr-check-against-3-39-1: - runs-on: ubuntu-25.04 + runs-on: ubuntu:25.04 steps: - uses: actions/checkout@v3 - name: Test against Gluetun v3.39.1 run: make GLUETUN_VERSION=v3.39.1 pr-test pr-check-against-3-40-0: - runs-on: ubuntu-25.04 + runs-on: ubuntu:25.04 steps: - uses: actions/checkout@v3 - name: Test against Gluetun v3.40.0 run: make GLUETUN_VERSION=v3.40.0 pr-test pr-check-against-latest: - runs-on: ubuntu-25.04 + runs-on: ubuntu:25.04 steps: - uses: actions/checkout@v3 - name: Test against Gluetun latest From 32f8a5dfec094d19b7eaa5d1a40734fdd4be441a Mon Sep 17 00:00:00 2001 From: Miklos Bagi Date: Sun, 26 Jan 2025 20:46:23 +0100 Subject: [PATCH 3/4] Standardize tests against ubuntu 24.04 --- .github/workflows/debug.yml | 4 ++-- .github/workflows/pr-check.yml | 15 ++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml index b234258..3704a36 100644 --- a/.github/workflows/debug.yml +++ b/.github/workflows/debug.yml @@ -25,7 +25,7 @@ env: jobs: tmate-debug: if: ${{ github.event_name == 'workflow_dispatch' && github.actor == 'miklosbagi' && github.event.inputs.tmate_enabled == 'true' }} - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v3 - uses: mxschmitt/action-tmate@v3 @@ -35,7 +35,7 @@ jobs: custom-gluetun-version-check: if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.custom_gluetun_version != '' }} - runs-on: ubuntu-25.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v3 - name: Build env and run tests diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index 50dca2f..9baa796 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -27,34 +27,35 @@ env: jobs: lint-docker: - runs-on: ubuntu:25.04 + # https://github.com/actions/runner-images + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v3 - uses: hadolint/hadolint-action@v3.1.0 with: dockerfile: Dockerfile lint-sh: - runs-on: ubuntu:25.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v3 - uses: ludeeus/action-shellcheck@2.0.0 pr-check-against-3-38: - runs-on: ubuntu:25.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v3 - name: Test against Gluetun v3.38 run: make GLUETUN_VERSION=v3.38 pr-test pr-check-against-3-38-1: - runs-on: ubuntu:25.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v3 - name: Test against Gluetun v3.38.1 run: make GLUETUN_VERSION=v3.38.1 pr-test pr-check-against-3-39: - runs-on: ubuntu:25.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v3 - name: Test against Gluetun v3.39 @@ -68,14 +69,14 @@ jobs: run: make GLUETUN_VERSION=v3.39.1 pr-test pr-check-against-3-40-0: - runs-on: ubuntu:25.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v3 - name: Test against Gluetun v3.40.0 run: make GLUETUN_VERSION=v3.40.0 pr-test pr-check-against-latest: - runs-on: ubuntu:25.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v3 - name: Test against Gluetun latest From 06c0b0887f1fa308fd1b537ca3379cca315a07e6 Mon Sep 17 00:00:00 2001 From: Miklos Bagi Date: Sun, 26 Jan 2025 20:51:18 +0100 Subject: [PATCH 4/4] Fix typo --- .github/workflows/pr-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index 9baa796..14c980d 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -62,7 +62,7 @@ jobs: run: make GLUETUN_VERSION=v3.39 pr-test pr-check-against-3-39-1: - runs-on: ubuntu:25.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v3 - name: Test against Gluetun v3.39.1