Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
runs-on: [self-hosted, ci]
needs: get-branch-from-workflow-file
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }}
- if: ${{ env.SCOPE == 'per_workspace'}}
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
needs: [get-branch-from-workflow-file, build]
runs-on: [self-hosted, ci]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }}
- uses: ./.github/actions/terraform/
Expand All @@ -98,7 +98,7 @@ jobs:
needs: [get-branch-from-workflow-file, terraform--init]
runs-on: [self-hosted, ci]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }}
- uses: ./.github/actions/terraform/
Expand All @@ -116,7 +116,7 @@ jobs:
environment: ${{ inputs.account }}
runs-on: [self-hosted, ci]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }}
- uses: ./.github/actions/terraform/
Expand All @@ -133,7 +133,7 @@ jobs:
needs: [get-branch-from-workflow-file, terraform--apply]
runs-on: [self-hosted, ci]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }}
- uses: ./.github/actions/make/
Expand All @@ -144,7 +144,7 @@ jobs:
restore-from-cache: "true"
cache-suffix: ${{ env.CACHE_NAME }}
- name: Archive swagger
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: swagger
path: |
Expand All @@ -157,7 +157,7 @@ jobs:
needs: [get-branch-from-workflow-file, apigee--deploy]
runs-on: [self-hosted, ci]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }}
- if: ${{ env.SCOPE == 'per_workspace' && (env.ACCOUNT == 'int' || env.ACCOUNT == 'prod') }}
Expand All @@ -172,7 +172,7 @@ jobs:
needs: [get-branch-from-workflow-file, apigee--deploy]
runs-on: [self-hosted, ci]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }}
- if: ${{ env.ACCOUNT != 'mgmt' && env.ACCOUNT != 'backups' }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/_deploy_backups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
runs-on: [self-hosted, ci]
needs: get-branch-from-workflow-file
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }}
- if: ${{ env.SCOPE == 'per_workspace'}}
Expand All @@ -73,7 +73,7 @@ jobs:
needs: [get-branch-from-workflow-file, build]
runs-on: [self-hosted, ci]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }}
- uses: ./.github/actions/terraform/
Expand All @@ -90,7 +90,7 @@ jobs:
needs: [get-branch-from-workflow-file, terraform--init]
runs-on: [self-hosted, ci]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }}
- uses: ./.github/actions/terraform/
Expand All @@ -108,7 +108,7 @@ jobs:
environment: ${{ inputs.account }}
runs-on: [self-hosted, ci]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }}
- uses: ./.github/actions/terraform/
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/destroy-expired-workspaces.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
runs-on: [self-hosted, ci]
needs: [parse-secrets]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ env.BRANCH_NAME }}
- uses: ./.github/actions/make/
Expand All @@ -42,7 +42,7 @@ jobs:
needs: [build-base]
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
ref: ${{ env.BRANCH_NAME }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/destroy-nonprod-workspace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
runs-on: [self-hosted, ci]
needs: [get-branch-from-workflow-file]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }}
- uses: ./.github/actions/make/
Expand All @@ -55,7 +55,7 @@ jobs:
needs: [build-base]
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }}
- name: Destroy workspace
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
name: Create a tag from main
steps:
- name: Checkout the repo
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Create 'env.tag' from the latest release
run: |
TAG=$(make changelog--get-latest-release)
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
runs-on: [self-hosted, ci]
needs: [create-coverage-name, make-tag]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: main
- name: Download artifact
Expand All @@ -62,7 +62,7 @@ jobs:
workflow: pull-requests.yml
workflow_conclusion: success
- name: SonarQube Scan
uses: SonarSource/sonarqube-scan-action@v5
uses: SonarSource/sonarqube-scan-action@v7
env:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
SONAR_HOST_URL: https://sonarcloud.io
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/on-pr-close.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ jobs:
steps:
- name: Checkout Branch
id: checkout-build-branch
uses: actions/checkout@v4
uses: actions/checkout@v6
continue-on-error: true
with:
ref: ${{ env.BRANCH_NAME }}
- name: Fallback to main
if: steps.checkout-build-branch.outcome == 'failure'
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
ref: main
- uses: ./.github/actions/make/
Expand All @@ -49,13 +49,13 @@ jobs:
steps:
- name: Checkout Branch for destroy
id: checkout-destroy-branch
uses: actions/checkout@v4
uses: actions/checkout@v6
continue-on-error: true
with:
ref: ${{ env.BRANCH_NAME }}
- name: Fallback to main for destroy
if: steps.checkout-destroy-branch.outcome == 'failure'
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
ref: main
fetch-depth: 0
Expand Down
42 changes: 21 additions & 21 deletions .github/workflows/pull-requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
workflow--check--branch-name:
runs-on: [self-hosted, ci]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ env.BRANCH_NAME }}
- uses: ./.github/actions/make/
Expand All @@ -30,7 +30,7 @@ jobs:
workflow--check--rebased-on-main:
runs-on: [self-hosted, ci]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
fetch-depth: 0
- uses: ./.github/actions/make/
Expand All @@ -40,7 +40,7 @@ jobs:
workflow--check--release-branch-name:
runs-on: [self-hosted, ci]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ github.event.pull_request.head.ref }}
- uses: ./.github/actions/make/
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
runs-on: [self-hosted, ci]
needs: [parse-secrets]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ env.BRANCH_NAME }}
- uses: ./.github/actions/make/
Expand All @@ -89,7 +89,7 @@ jobs:
runs-on: [self-hosted, ci]
needs: [workflow--check--branch-name]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ env.BASE_BRANCH_NAME }}
- uses: ./.github/actions/make/
Expand All @@ -103,7 +103,7 @@ jobs:
runs-on: [self-hosted, ci]
needs: [build-head]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ env.BRANCH_NAME }}
- uses: ./.github/actions/make/
Expand All @@ -117,7 +117,7 @@ jobs:
matrix:
test-type: [unit, slow]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ env.BRANCH_NAME }}
- uses: ./.github/actions/pytest-with-rerun/
Expand All @@ -128,7 +128,7 @@ jobs:
needs: [build-head]
runs-on: [self-hosted, ci]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ env.BRANCH_NAME }}
- uses: ./.github/actions/make/
Expand All @@ -139,7 +139,7 @@ jobs:
needs: [create-workspace-name, build-base, parse-secrets]
runs-on: [self-hosted, ci]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ env.BASE_BRANCH_NAME }}
- uses: ./.github/actions/terraform/
Expand Down Expand Up @@ -168,7 +168,7 @@ jobs:
]
runs-on: [self-hosted, ci]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ env.BRANCH_NAME }}
- uses: ./.github/actions/terraform/
Expand All @@ -186,7 +186,7 @@ jobs:
needs: [build-head, terraform-head-build]
runs-on: [self-hosted, ci]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ env.BRANCH_NAME }}
- uses: ./.github/actions/make/
Expand All @@ -200,7 +200,7 @@ jobs:
needs: [build-head, apigee--deploy]
runs-on: [self-hosted, ci]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ env.BRANCH_NAME }}
- run: |
Expand All @@ -227,7 +227,7 @@ jobs:
matrix:
test-type: [integration]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ env.BRANCH_NAME }}
- uses: ./.github/actions/pytest-with-rerun/
Expand All @@ -247,7 +247,7 @@ jobs:
]
runs-on: [self-hosted, ci]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ env.BRANCH_NAME }}
- uses: ./.github/actions/make/
Expand All @@ -270,7 +270,7 @@ jobs:
]
runs-on: [self-hosted, ci]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ env.BRANCH_NAME }}
- uses: ./.github/actions/make/
Expand Down Expand Up @@ -305,7 +305,7 @@ jobs:
]
runs-on: [self-hosted, ci]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ env.BRANCH_NAME }}
- uses: ./.github/actions/make/
Expand All @@ -314,12 +314,12 @@ jobs:
requires-aws: true
save-to-cache: "true"
- name: Upload artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: "${{ needs.create-coverage-name.outputs.coverage-name }}-coverage"
path: "sonarcloud-coverage.xml"
- name: SonarQube Scan
uses: SonarSource/sonarqube-scan-action@v5
uses: SonarSource/sonarqube-scan-action@v7
env:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
SONAR_HOST_URL: https://sonarcloud.io
Expand All @@ -335,7 +335,7 @@ jobs:
runs-on: [self-hosted, ci]
if: ${{ needs.apigee--attach-product.result == 'success' }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ env.BRANCH_NAME }}
- run: |
Expand All @@ -352,7 +352,7 @@ jobs:
runs-on: [self-hosted, ci]
if: ${{ needs.apigee--deploy.result == 'success' }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ env.BRANCH_NAME }}
- uses: ./.github/actions/make/
Expand All @@ -366,7 +366,7 @@ jobs:
runs-on: [self-hosted, ci]
needs: [build-head]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ env.BRANCH_NAME }}
fetch-depth: 0
Expand Down
Loading