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 74fd26c8..b7b4fe62 100644 --- a/.github/workflows/shared-build-deploy-container.yml +++ b/.github/workflows/shared-build-deploy-container.yml @@ -54,20 +54,19 @@ 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 - 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 ref: ${{ inputs.actionsRepoRef }} - - name: Load environment and runner + - name: Load environment id: load-environment uses: ./github-actions-shared-build-deploy-container/load-environment @@ -98,13 +97,13 @@ 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 + 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 @@ -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' @@ -143,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 e18031be..0b3e022c 100644 --- a/.github/workflows/shared-deploy-container-kubernetes.yml +++ b/.github/workflows/shared-deploy-container-kubernetes.yml @@ -40,38 +40,31 @@ 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 + 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 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,13 +93,13 @@ 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 + 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