Skip to content

Commit

Permalink
Merge pull request #6 from WalletConnect/fix/use-ubuntu-latest
Browse files Browse the repository at this point in the history
fix: default to ubuntu-latest runner
  • Loading branch information
chris13524 committed Mar 14, 2024
2 parents 26e8cc3 + 3a3e541 commit 73ba415
Show file tree
Hide file tree
Showing 26 changed files with 78 additions and 110 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/build-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ on:
description: 'The ARN of the AWS role to assume for publication'
type: string
required: true
run-group:
description: 'The run group to use for the actions'
run-label:
description: 'The run label to use for the actions'
type: string
default: ${{ vars.RUN_GROUP }}
default: 'ubuntu-latest'

permissions:
contents: read
Expand All @@ -32,8 +32,7 @@ permissions:
jobs:
build-publish:
name: Build
runs-on:
group: ${{ inputs.run-group }}
runs-on: ${{ inputs.run-label }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ on:
description: 'The ARN of the AWS role to assume for the monitoring deployment'
type: string
default: ${{ vars.AWS_ROLE_MONITORING }}
run-group:
description: 'The run group to use for the actions'
run-label:
description: 'The run label to use for the actions'
type: string
default: ${{ vars.RUN_GROUP }}
default: 'ubuntu-latest'

concurrency: cd-${{ inputs.stage }}

Expand All @@ -82,7 +82,7 @@ jobs:
grafana-workspace-name: ${{ inputs.grafana-workspace-name }}
tf-directory: ${{ inputs.tf-directory }}
tf-variables: ${{ inputs.tf-variables }}
run-group: ${{ inputs.run-group }}
run-label: ${{ inputs.run-label }}

deploy-app:
name: Deploy App
Expand All @@ -97,4 +97,4 @@ jobs:
stage-url: ${{ inputs.stage-url }}
aws-role-arn: ${{ inputs.aws-role-arn }}
aws-region: ${{ inputs.aws-region }}
run-group: ${{ inputs.run-group }}
run-label: ${{ inputs.run-label }}
24 changes: 9 additions & 15 deletions .github/workflows/ci-check-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ on:
description: 'The environment variables to set for the tests'
type: string
default: ''
run-group:
description: 'The run group to use for the actions'
run-label:
description: 'The run label to use for the actions'
type: string
default: ${{ vars.RUN_GROUP }}
default: 'ubuntu-latest'

env:
RUST_BACKTRACE: ${{ inputs.rust-backtrace }}
Expand All @@ -57,8 +57,7 @@ permissions:
jobs:
clippy:
name: Clippy
runs-on:
group: ${{ inputs.run-group }}
runs-on: ${{ inputs.run-label }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -89,8 +88,7 @@ jobs:

formatting:
name: Formatting
runs-on:
group: ${{ inputs.run-group }}
runs-on: ${{ inputs.run-label }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -114,8 +112,7 @@ jobs:

tests:
name: Unit Tests
runs-on:
group: ${{ inputs.run-group }}
runs-on: ${{ inputs.run-label }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -150,8 +147,7 @@ jobs:
fail-fast: false
matrix:
element: ${{ fromJson(inputs.test-suites) }}
runs-on:
group: ${{ inputs.run-group }}
runs-on: ${{ inputs.run-label }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -189,8 +185,7 @@ jobs:

unused-dependencies:
name: Unused Dependencies
runs-on:
group: ${{ inputs.run-group }}
runs-on: ${{ inputs.run-label }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -214,8 +209,7 @@ jobs:

license:
name: Licenses
runs-on:
group: ${{ inputs.run-group }}
runs-on: ${{ inputs.run-label }}
steps:
- uses: actions/checkout@v4
- uses: EmbarkStudios/cargo-deny-action@v1
Expand Down
18 changes: 7 additions & 11 deletions .github/workflows/ci-check-infra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ on:
description: 'The directory containing the Terraform files'
type: string
default: ${{ vars.TF_DIRECTORY }}
run-group:
description: 'The run group to use for the actions'
run-label:
description: 'The run label to use for the actions'
type: string
default: ${{ vars.RUN_GROUP }}
default: 'ubuntu-latest'
secrets:
TF_API_TOKEN:
required: true
Expand All @@ -29,8 +29,7 @@ env:
jobs:
check-fmt:
name: Formatting
runs-on:
group: ${{ inputs.run-group }}
runs-on: ${{ inputs.run-label }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -49,8 +48,7 @@ jobs:

validate:
name: Validate
runs-on:
group: ${{ inputs.run-group }}
runs-on: ${{ inputs.run-label }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -79,8 +77,7 @@ jobs:

tfsec:
name: TFSec
runs-on:
group: ${{ inputs.run-group }}
runs-on: ${{ inputs.run-label }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -111,8 +108,7 @@ jobs:

tflint:
name: TFLint
runs-on:
group: ${{ inputs.run-group }}
runs-on: ${{ inputs.run-label }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/ci-plan-infra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ on:
description: 'The ARN of the AWS role to assume for the monitoring deployment'
type: string
default: ${{ vars.AWS_ROLE_MONITORING }}
run-group:
description: 'The run group to use for the actions'
run-label:
description: 'The run label to use for the actions'
type: string
default: ${{ vars.RUN_GROUP }}
default: 'ubuntu-latest'
secrets:
TF_API_TOKEN:
required: true
Expand All @@ -56,8 +56,7 @@ env:
jobs:
plan:
name: Plan `${{ inputs.stage }}`
runs-on:
group: ${{ inputs.run-group }}
runs-on: ${{ inputs.run-label }}
environment:
name: ${{ inputs.stage }}
url: ${{ inputs.stage-url }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,10 @@ on:
description: 'The ARN of the AWS role to assume for the monitoring deployment'
type: string
default: ${{ vars.AWS_ROLE_MONITORING }}
run-group:
description: 'The run group to use for the actions'
run-label:
description: 'The run label to use for the actions'
type: string
default: ${{ vars.RUN_GROUP }}
default: 'ubuntu-latest'
secrets:
TF_API_TOKEN:
required: true
Expand All @@ -118,7 +118,7 @@ jobs:
use-sccache: ${{ inputs.rust-use-sccache }}
use-postgresql: ${{ inputs.rust-use-postgresql }}
test-env-vars: ${{ inputs.rust-test-env-vars }}
run-group: ${{ inputs.run-group }}
run-label: ${{ inputs.run-label }}

check-infra:
name: Check Infra
Expand All @@ -128,7 +128,7 @@ jobs:
with:
stage: staging
tf-directory: ${{ inputs.tf-directory }}
run-group: ${{ inputs.run-group }}
run-label: ${{ inputs.run-label }}

plan-infra:
name: Plan Infra ❱❱ ${{ matrix.stage.name }}
Expand All @@ -148,4 +148,4 @@ jobs:
tf-variables: ${{ inputs.tf-variables }}
aws-region: ${{ inputs.aws-region }}
aws-role-monitoring-arn: ${{ inputs.aws-role-monitoring-arn }}
run-group: ${{ inputs.run-group }}
run-label: ${{ inputs.run-label }}
9 changes: 4 additions & 5 deletions .github/workflows/deploy-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ on:
description: 'The ARN of the AWS role to assume for the deployment'
type: string
required: true
run-group:
description: 'The run group to use for the actions'
run-label:
description: 'The run label to use for the actions'
type: string
default: ${{ vars.RUN_GROUP }}
default: 'ubuntu-latest'

concurrency: deploy-${{ inputs.stage }}

Expand All @@ -45,8 +45,7 @@ permissions:
jobs:
deploy-app:
name: Deploy App `${{ inputs.stage }}`
runs-on:
group: ${{ inputs.run-group }}
runs-on: ${{ inputs.run-label }}
environment:
name: ${{ inputs.stage }}
url: ${{ inputs.stage-url }}
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/deploy-infra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ on:
description: 'The ARN of the AWS role to assume for the monitoring deployment'
type: string
default: ${{ vars.AWS_ROLE_MONITORING }}
run-group:
description: 'The run group to use for the actions'
run-label:
description: 'The run label to use for the actions'
type: string
default: ${{ vars.RUN_GROUP }}
default: 'ubuntu-latest'
secrets:
TF_API_TOKEN:
required: true
Expand All @@ -56,8 +56,7 @@ env:
jobs:
apply-infra:
name: Apply Infra `${{ inputs.stage }}`
runs-on:
group: ${{ inputs.run-group }}
runs-on: ${{ inputs.run-label }}
environment:
name: ${{ inputs.stage }}
url: ${{ inputs.stage-url }}
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/release-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ on:
description: 'The AWS region to publish to'
type: string
default: ${{ vars.AWS_REGION }}
run-group:
description: 'The run group to use for the actions'
run-label:
description: 'The run label to use for the actions'
type: string
default: ${{ vars.RUN_GROUP }}
default: 'ubuntu-latest'
secrets:
RELEASE_PAT:
required: true
Expand All @@ -36,8 +36,7 @@ permissions:
jobs:
update_version:
name: Update Version
runs-on:
group: ${{ inputs.run-group }}
runs-on: ${{ inputs.run-label }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -57,8 +56,7 @@ jobs:
display_version:
name: Version ➠ ${{ needs.update_version.outputs.version }}
needs: [ update_version ]
runs-on:
group: ${{ inputs.run-group }}
runs-on: ${{ inputs.run-label }}
steps:
- run: echo "Version = ${{ needs.update_version.outputs.version }}"

Expand All @@ -75,4 +73,4 @@ jobs:
image-name: ${{ inputs.image-name }}
aws-region: ${{ inputs.aws-region }}
aws-role-arn: ${{ matrix.env.role }}
run-group: ${{ inputs.run-group }}
run-label: ${{ inputs.run-label }}
12 changes: 5 additions & 7 deletions .github/workflows/release-get_deployed_version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ on:
type: string
default: '-'

run-group:
description: 'The run group to use for the actions'
run-label:
description: 'The run label to use for the actions'
type: string
default: ${{ vars.RUN_GROUP }}
default: 'ubuntu-latest'

outputs:
version:
Expand Down Expand Up @@ -82,8 +82,7 @@ jobs:
get_version:
name: Lookup ECS
needs: [ get_names ]
runs-on:
group: ${{ inputs.run-group }}
runs-on: ${{ inputs.run-label }}
steps:
- name: Get task definition from ECS
id: get_task
Expand All @@ -99,7 +98,6 @@ jobs:
display_version:
name: Version ➠ ${{ needs.get_version.outputs.version }}
needs: [ get_version ]
runs-on:
group: ${{ inputs.run-group }}
runs-on: ${{ inputs.run-label }}
steps:
- run: echo "Version = ${{ needs.get_version.outputs.version }}"
Loading

0 comments on commit 73ba415

Please sign in to comment.