From 0e0bae35005fce1b0e1d9eb43fd18f0fe4338ee8 Mon Sep 17 00:00:00 2001
From: Matthew Baggett <matthew@baggett.me>
Date: Thu, 1 Aug 2024 18:44:27 +0200
Subject: [PATCH] Set a default for runs-on when not overriden by var.
---
.github/workflows/docker.build.yml | 2 +-
.github/workflows/docker.clean.yml | 4 ++--
.github/workflows/docker.release.yml | 2 +-
.github/workflows/docker.validate.yml | 6 +++---
.github/workflows/php.check.yml | 4 ++--
.github/workflows/tag.release.yml | 2 +-
.github/workflows/tests.yml | 4 ++--
.github/workflows/trunk.cache.yml | 2 +-
.github/workflows/trunk.check.yml | 2 +-
.github/workflows/trunk.upgrade.yml | 2 +-
10 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/.github/workflows/docker.build.yml b/.github/workflows/docker.build.yml
index 07bd80e..411a227 100644
--- a/.github/workflows/docker.build.yml
+++ b/.github/workflows/docker.build.yml
@@ -15,7 +15,7 @@ env:
jobs:
docker-build:
name: Build Swarm Load Balancer
- runs-on: ${{ vars.RUNS_ON }}
+ runs-on: ${{ vars.RUNS_ON || 'ubuntu-latest' }}
steps:
- uses: benzine-framework/action-setup-php@main
- uses: benzine-framework/action-get-datetime@main
diff --git a/.github/workflows/docker.clean.yml b/.github/workflows/docker.clean.yml
index 18cf19d..164d35e 100644
--- a/.github/workflows/docker.clean.yml
+++ b/.github/workflows/docker.clean.yml
@@ -15,7 +15,7 @@ on:
jobs:
cleanup-delete-candidate-image:
name: Delete candidate image
- runs-on: ${{ vars.RUNS_ON }}
+ runs-on: ${{ vars.RUNS_ON || 'ubuntu-latest' }}
steps:
- run: docker login ghcr.io -u ${{ github.repository_owner }} -p ${{ secrets.GITHUB_TOKEN }}
- uses: vlaurin/action-ghcr-prune@v0.6.0
@@ -30,7 +30,7 @@ jobs:
cleanup-untagged-images:
name: Delete untagged images
- runs-on: ${{ vars.RUNS_ON }}
+ runs-on: ${{ vars.RUNS_ON || 'ubuntu-latest' }}
steps:
- run: docker login ghcr.io -u ${{ github.repository_owner }} -p ${{ secrets.GITHUB_TOKEN }}
- uses: vlaurin/action-ghcr-prune@v0.6.0
diff --git a/.github/workflows/docker.release.yml b/.github/workflows/docker.release.yml
index dbec1e0..514851d 100644
--- a/.github/workflows/docker.release.yml
+++ b/.github/workflows/docker.release.yml
@@ -15,7 +15,7 @@ env:
jobs:
release-ghcr:
name: GitHub Container Registry
- runs-on: ${{ vars.RUNS_ON }}
+ runs-on: ${{ vars.RUNS_ON || 'ubuntu-latest' }}
steps:
- run: docker login ghcr.io -u ${{ vars.SERVICE_ACCOUNT_USERNAME }} -p ${{ secrets.SERVICE_ACCOUNT_TOKEN }}
- run: docker pull ${{ env.CANDIDATE_IMAGE }}
diff --git a/.github/workflows/docker.validate.yml b/.github/workflows/docker.validate.yml
index fd2789e..e6a6759 100644
--- a/.github/workflows/docker.validate.yml
+++ b/.github/workflows/docker.validate.yml
@@ -18,7 +18,7 @@ env:
jobs:
validate-install-report:
name: Run Install Report
- runs-on: ${{ vars.RUNS_ON }}
+ runs-on: ${{ vars.RUNS_ON || 'ubuntu-latest' }}
steps:
- run: docker login ghcr.io -u ${{ github.repository_owner }} -p ${{ secrets.GITHUB_TOKEN }}
- name: "Pull Candidate Image"
@@ -27,7 +27,7 @@ jobs:
run: docker run --rm ${{ env.CANDIDATE_IMAGE }} /usr/bin/install-report
validate-dive-report:
name: Run Dive
- runs-on: ${{ vars.RUNS_ON }}
+ runs-on: ${{ vars.RUNS_ON || 'ubuntu-latest' }}
steps:
- run: docker login ghcr.io -u ${{ github.repository_owner }} -p ${{ secrets.GITHUB_TOKEN }}
- name: "Pull Candidate Image"
@@ -48,7 +48,7 @@ jobs:
config-file: ${{ github.workspace }}/.dive-ci.yml
validate-vulnerability-report:
name: Run Trivy
- runs-on: ${{ vars.RUNS_ON }}
+ runs-on: ${{ vars.RUNS_ON || 'ubuntu-latest' }}
steps:
- run: docker login ghcr.io -u ${{ github.repository_owner }} -p ${{ secrets.GITHUB_TOKEN }}
- name: "Pull Candidate Image"
diff --git a/.github/workflows/php.check.yml b/.github/workflows/php.check.yml
index da71cf1..49e2536 100644
--- a/.github/workflows/php.check.yml
+++ b/.github/workflows/php.check.yml
@@ -10,7 +10,7 @@ on:
jobs:
php-stan:
name: PHPStan
- runs-on: ${{ vars.RUNS_ON }}
+ runs-on: ${{ vars.RUNS_ON || 'ubuntu-latest' }}
permissions:
checks: write # To post annotations
contents: read # For repo checkout
@@ -20,7 +20,7 @@ jobs:
php-cs-fixer:
name: PHP-CS-Fixer
- runs-on: ${{ vars.RUNS_ON }}
+ runs-on: ${{ vars.RUNS_ON || 'ubuntu-latest' }}
permissions:
checks: write # For trunk to post annotations
contents: read # For repo checkout
diff --git a/.github/workflows/tag.release.yml b/.github/workflows/tag.release.yml
index 1a26043..ba8a85a 100644
--- a/.github/workflows/tag.release.yml
+++ b/.github/workflows/tag.release.yml
@@ -17,7 +17,7 @@ env:
jobs:
build-tagged-release:
name: Build Swarm Load Balancer
- runs-on: ${{ vars.RUNS_ON }}
+ runs-on: ${{ vars.RUNS_ON || 'ubuntu-latest' }}
if: startsWith(github.ref, 'refs/tags/v')
steps:
- run: echo "Building Tagged Release ${{ env.TAG_IMAGE_GHCR }} & ${{ env.TAG_IMAGE_DOCKER }}"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 790466c..f575f66 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -10,7 +10,7 @@ on:
jobs:
test-integration:
name: Integration Tests
- runs-on: ${{ vars.RUNS_ON }}
+ runs-on: ${{ vars.RUNS_ON || 'ubuntu-latest' }}
steps:
- uses: actions/checkout@v4
- name: Start Loadbalancer
@@ -37,7 +37,7 @@ jobs:
shell: bash
run: |
set -xeu
- docker compose exec test-box curl -s -D - http://b.example.org 2>&1 > b.nossl.http
+ docker compose exec test-box curl -s -D - http://b.example.org 2>&1 > b.nossl.http
grep "HTTP/1.1 200 OK" b.nossl.http
grep "<h1>Website B</h1>" b.nossl.http
- name: SSL Connect to Web B
diff --git a/.github/workflows/trunk.cache.yml b/.github/workflows/trunk.cache.yml
index 8d25d9a..f5f7229 100644
--- a/.github/workflows/trunk.cache.yml
+++ b/.github/workflows/trunk.cache.yml
@@ -22,7 +22,7 @@ concurrency:
jobs:
trunk-cache:
name: Trunk Cache
- runs-on: ${{ vars.RUNS_ON }}
+ runs-on: ${{ vars.RUNS_ON || 'ubuntu-latest' }}
permissions:
actions: write
steps:
diff --git a/.github/workflows/trunk.check.yml b/.github/workflows/trunk.check.yml
index 5e72b8c..a31c104 100644
--- a/.github/workflows/trunk.check.yml
+++ b/.github/workflows/trunk.check.yml
@@ -10,7 +10,7 @@ on:
jobs:
trunk-check:
name: Trunk Check Runner
- runs-on: ${{ vars.RUNS_ON }}
+ runs-on: ${{ vars.RUNS_ON || 'ubuntu-latest' }}
permissions:
checks: write # For trunk to post annotations
contents: read # For repo checkout
diff --git a/.github/workflows/trunk.upgrade.yml b/.github/workflows/trunk.upgrade.yml
index a0f4dd4..bf495fe 100644
--- a/.github/workflows/trunk.upgrade.yml
+++ b/.github/workflows/trunk.upgrade.yml
@@ -20,7 +20,7 @@ concurrency:
jobs:
trunk-upgrade:
name: Upgrade Trunk
- runs-on: ${{ vars.RUNS_ON }}
+ runs-on: ${{ vars.RUNS_ON || 'ubuntu-latest' }}
permissions:
contents: write # For trunk to create PRs
pull-requests: write # For trunk to create PRs