From 5cdc5ddd98cf1959f95b9b7eac739652d1fa9d23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Pedro=20Vieira?= Date: Thu, 4 Sep 2025 08:58:49 +0100 Subject: [PATCH 1/2] Refactor shared workflows to use ubuntu-latest runner (#130) --- .github/workflows/shared-build-deploy-container.yml | 7 +++---- .../workflows/shared-deploy-container-kubernetes.yml | 11 ++--------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.github/workflows/shared-build-deploy-container.yml b/.github/workflows/shared-build-deploy-container.yml index 74fd26c8..eabf6597 100644 --- a/.github/workflows/shared-build-deploy-container.yml +++ b/.github/workflows/shared-build-deploy-container.yml @@ -54,7 +54,6 @@ jobs: runs-on: ubuntu-latest outputs: environment: ${{ steps.load-environment.outputs.environment }} - runnerName: ${{ steps.load-environment.outputs.runnerName }} tagPrefix: ${{ steps.load-environment.outputs.tagPrefix }} steps: - name: Checkout calling repo @@ -67,7 +66,7 @@ jobs: path: ./github-actions-shared-build-deploy-container ref: ${{ inputs.actionsRepoRef }} - - name: Load environment and runner + - name: Load environment id: load-environment uses: ./github-actions-shared-build-deploy-container/load-environment @@ -98,7 +97,7 @@ jobs: build-push-container-image: name: "Build and push container image" needs: [ prepare-and-validate ] - runs-on: ${{ needs.prepare-and-validate.outputs.runnerName }} + runs-on: ubuntu-latest steps: - name: Checkout calling repo uses: actions/checkout@v4 @@ -135,7 +134,7 @@ jobs: deploy-kubernetes: name: "Deploy image to Kubernetes" needs: [ prepare-and-validate, build-push-container-image ] - runs-on: ${{ needs.prepare-and-validate.outputs.runnerName }} + runs-on: ubuntu-latest if: | always() && (needs.build-push-container-image.result == 'success' || (needs.build-push-container-image.result == 'skipped' diff --git a/.github/workflows/shared-deploy-container-kubernetes.yml b/.github/workflows/shared-deploy-container-kubernetes.yml index e18031be..1caaa38d 100644 --- a/.github/workflows/shared-deploy-container-kubernetes.yml +++ b/.github/workflows/shared-deploy-container-kubernetes.yml @@ -40,7 +40,6 @@ jobs: runs-on: ubuntu-latest outputs: environment: ${{ steps.load-environment.outputs.environment }} - runnerName: ${{ steps.load-environment.outputs.runnerName }} steps: - name: Checkout calling repo uses: actions/checkout@v4 @@ -52,26 +51,20 @@ jobs: path: ./github-actions-shared-deploy-image ref: ${{ inputs.actionsRepoRef }} - - name: "Detect Environment and Runner" + - name: "Detect Environment" shell: bash id: load-environment run: | if [[ "${{ inputs.environment }}" == "prod" ]]; then DETECTED_ENVIRONMENT="production" - RUNNER_NAME="prod-trakx-runner" elif [[ "${{ inputs.environment }}" == "stage" ]]; then DETECTED_ENVIRONMENT="staging" - RUNNER_NAME="stage-trakx-runner" else DETECTED_ENVIRONMENT="development" - RUNNER_NAME="dev-trakx-runner" fi echo "Detected Environment is: $DETECTED_ENVIRONMENT" - echo "Detected Runner is: $RUNNER_NAME" - echo "environment=$DETECTED_ENVIRONMENT" >> $GITHUB_OUTPUT - echo "runnerName=$RUNNER_NAME" >> $GITHUB_OUTPUT - name: Outputs if this is a workflow_dispatch for production (manual deploy) shell: bash @@ -100,7 +93,7 @@ jobs: deploy-kubernetes: name: "Deploy image to Kubernetes" needs: [ prepare-and-validate ] - runs-on: ${{ needs.prepare-and-validate.outputs.runnerName }} + runs-on: ubuntu-latest steps: - name: Checkout calling repo uses: actions/checkout@v4 From e3bbf2b87ff02f7f38cbfb3fe5b2bbdd8ba7fdcf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Sep 2025 09:24:28 +0100 Subject: [PATCH 2/2] Bump actions/checkout from 4 to 5 (#129) Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/deploy.yml | 2 +- .github/workflows/shared-build-deploy-container.yml | 12 ++++++------ .../workflows/shared-deploy-container-kubernetes.yml | 8 ++++---- .github/workflows/test-action.yml | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 626cc7f0..4b25247e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -23,7 +23,7 @@ jobs: steps: - name: checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Get current or bumped version tag id: bumpVersion diff --git a/.github/workflows/shared-build-deploy-container.yml b/.github/workflows/shared-build-deploy-container.yml index eabf6597..b7b4fe62 100644 --- a/.github/workflows/shared-build-deploy-container.yml +++ b/.github/workflows/shared-build-deploy-container.yml @@ -57,10 +57,10 @@ jobs: tagPrefix: ${{ steps.load-environment.outputs.tagPrefix }} steps: - name: Checkout calling repo - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Checkout trakx/github-actions repo - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: repository: trakx/github-actions path: ./github-actions-shared-build-deploy-container @@ -100,10 +100,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout calling repo - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Checkout trakx/github-actions repo - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: repository: trakx/github-actions path: ./github-actions-shared-build-deploy-container @@ -142,10 +142,10 @@ jobs: && github.event.workflow_run.conclusion == 'success' )) steps: - name: Checkout calling repo - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Checkout trakx/github-actions repo - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: repository: trakx/github-actions path: ./github-actions-shared-build-deploy-container diff --git a/.github/workflows/shared-deploy-container-kubernetes.yml b/.github/workflows/shared-deploy-container-kubernetes.yml index 1caaa38d..0b3e022c 100644 --- a/.github/workflows/shared-deploy-container-kubernetes.yml +++ b/.github/workflows/shared-deploy-container-kubernetes.yml @@ -42,10 +42,10 @@ jobs: environment: ${{ steps.load-environment.outputs.environment }} steps: - name: Checkout calling repo - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Checkout trakx/github-actions repo - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: repository: trakx/github-actions path: ./github-actions-shared-deploy-image @@ -96,10 +96,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout calling repo - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Checkout trakx/github-actions repo - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: repository: trakx/github-actions path: ./github-actions-shared-deploy-image diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index 72dcdc6e..ad0ff90e 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -26,7 +26,7 @@ jobs: steps: - name: checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Get current or bumped version tag id: bumpVersion