diff --git a/.github/workflows/check-changes.yml b/.github/workflows/check-changes.yml index 77991d6c6d..a0c60ace1e 100644 --- a/.github/workflows/check-changes.yml +++ b/.github/workflows/check-changes.yml @@ -10,7 +10,7 @@ env: jobs: check-changes: - runs-on: runs-on,runner=4cpu-linux-x64,run-id=${{ github.run_id }} + runs-on: ubuntu-latest steps: - diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 73636e9f00..31f87b08e7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ env: jobs: unit-test: - runs-on: runs-on,runner=16cpu-linux-x64,mem=16,run-id=${{ github.run_id }} + runs-on: ubuntu-latest steps: - diff --git a/.github/workflows/e2e-ci.yml b/.github/workflows/e2e-ci.yml index 22bf43516c..8b101aa8b5 100644 --- a/.github/workflows/e2e-ci.yml +++ b/.github/workflows/e2e-ci.yml @@ -14,7 +14,7 @@ env: jobs: e2e-fleet-test: - runs-on: runs-on,runner=16cpu-linux-x64,mem=16,run-id=${{ github.run_id }} + runs-on: ubuntu-latest strategy: fail-fast: false diff --git a/.github/workflows/e2e-fleet-upgrade-ci.yml b/.github/workflows/e2e-fleet-upgrade-ci.yml index b1e9c75494..efd4e1a528 100644 --- a/.github/workflows/e2e-fleet-upgrade-ci.yml +++ b/.github/workflows/e2e-fleet-upgrade-ci.yml @@ -13,7 +13,7 @@ env: jobs: fleet-upgrade-test: - runs-on: runs-on,runner=8cpu-linux-x64,mem=16,run-id=${{ github.run_id }} + runs-on: ubuntu-latest strategy: matrix: diff --git a/.github/workflows/e2e-multicluster-ci.yml b/.github/workflows/e2e-multicluster-ci.yml index 6901051e5e..4b74d407bd 100644 --- a/.github/workflows/e2e-multicluster-ci.yml +++ b/.github/workflows/e2e-multicluster-ci.yml @@ -16,7 +16,7 @@ env: jobs: e2e-fleet-mc-test: - runs-on: runs-on,runner=8cpu-linux-x64,mem=16,run-id=${{ github.run_id }} + runs-on: ubuntu-latest steps: - diff --git a/.github/workflows/e2e-nightly-ci.yml b/.github/workflows/e2e-nightly-ci.yml index 98c286558f..fa0665eb70 100644 --- a/.github/workflows/e2e-nightly-ci.yml +++ b/.github/workflows/e2e-nightly-ci.yml @@ -13,7 +13,7 @@ env: jobs: e2e-fleet-nightly-test: - runs-on: runs-on,runner=8cpu-linux-x64,mem=16,run-id=${{ github.run_id }} + runs-on: ubuntu-latest strategy: matrix: diff --git a/.github/workflows/e2e-rancher-upgrade-fleet-to-head-ci.yml b/.github/workflows/e2e-rancher-upgrade-fleet-to-head-ci.yml index cb8d212476..59fc709c8f 100644 --- a/.github/workflows/e2e-rancher-upgrade-fleet-to-head-ci.yml +++ b/.github/workflows/e2e-rancher-upgrade-fleet-to-head-ci.yml @@ -24,7 +24,7 @@ env: jobs: rancher-fleet-integration: - runs-on: runs-on,runner=8cpu-linux-x64,mem=16,run-id=${{ github.run_id }} + runs-on: ubuntu-latest steps: - diff --git a/.github/workflows/e2e-rancher-upgrade-fleet.yml b/.github/workflows/e2e-rancher-upgrade-fleet.yml index e33ae33090..cb29c077d4 100644 --- a/.github/workflows/e2e-rancher-upgrade-fleet.yml +++ b/.github/workflows/e2e-rancher-upgrade-fleet.yml @@ -42,7 +42,7 @@ env: jobs: rancher-fleet-upgrade: - runs-on: runs-on,runner=8cpu-linux-x64,mem=16,run-id=${{ github.run_id }} + runs-on: ubuntu-latest steps: - diff --git a/.github/workflows/e2e-test-fleet-in-rancher.yml b/.github/workflows/e2e-test-fleet-in-rancher.yml index f97bfcf27a..10df099ac4 100644 --- a/.github/workflows/e2e-test-fleet-in-rancher.yml +++ b/.github/workflows/e2e-test-fleet-in-rancher.yml @@ -50,7 +50,7 @@ env: jobs: rancher-integration: - runs-on: runs-on,runner=4cpu-linux-x64,run-id=${{ github.run_id }} + runs-on: ubuntu-latest steps: - diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 06fc5ba440..bd40a2058d 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -8,7 +8,7 @@ on: jobs: golangci: name: golangci-lint - runs-on: runs-on,runner=4cpu-linux-x64,run-id=${{ github.run_id }} + runs-on: ubuntu-latest steps: - name: Checkout diff --git a/.github/workflows/release-against-charts.yml b/.github/workflows/release-against-charts.yml index a8741fea61..959aca560f 100644 --- a/.github/workflows/release-against-charts.yml +++ b/.github/workflows/release-against-charts.yml @@ -29,7 +29,7 @@ on: jobs: create-rancher-charts-pr: - runs-on: runs-on,runner=4cpu-linux-x64,run-id=${{ github.run_id }} + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/release-against-rancher.yml b/.github/workflows/release-against-rancher.yml index aa76f6ffc6..b15aab1738 100644 --- a/.github/workflows/release-against-rancher.yml +++ b/.github/workflows/release-against-rancher.yml @@ -30,7 +30,7 @@ env: jobs: create-rancher-pr: - runs-on: runs-on,runner=4cpu-linux-x64,run-id=${{ github.run_id }} + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/release-against-test-charts.yml b/.github/workflows/release-against-test-charts.yml index bb0b19e62b..bd0aa92ae3 100644 --- a/.github/workflows/release-against-test-charts.yml +++ b/.github/workflows/release-against-test-charts.yml @@ -28,7 +28,7 @@ permissions: jobs: push-test-rancher-charts: - runs-on: runs-on,runner=8cpu-linux-x64,run-id=${{ github.run_id }} + runs-on: ubuntu-latest outputs: target_branch: ${{ steps.compute_target_branch.outputs.target_branch }} diff --git a/.github/workflows/release-fleet.yml b/.github/workflows/release-fleet.yml index 0f3e88cbc7..bd19e07e6a 100644 --- a/.github/workflows/release-fleet.yml +++ b/.github/workflows/release-fleet.yml @@ -18,7 +18,7 @@ env: jobs: build-fleet: - runs-on: runs-on,runner=8cpu-linux-x64,mem=16,run-id=${{ github.run_id }} + runs-on: ubuntu-latest env: IS_HOTFIX: ${{ contains(github.ref, '-hotfix-ch-') }} diff --git a/.github/workflows/typos.yaml b/.github/workflows/typos.yaml index d6c540934a..3c1e275376 100644 --- a/.github/workflows/typos.yaml +++ b/.github/workflows/typos.yaml @@ -4,7 +4,7 @@ on: [pull_request] jobs: run: name: Spell Check with Typos - runs-on: runs-on,runner=4cpu-linux-x64,run-id=${{ github.run_id }} + runs-on: ubuntu-latest steps: - name: Checkout Repository diff --git a/.github/workflows/updatecli.yml b/.github/workflows/updatecli.yml index 15ff468372..1de27eed2b 100644 --- a/.github/workflows/updatecli.yml +++ b/.github/workflows/updatecli.yml @@ -16,7 +16,7 @@ permissions: jobs: updatecli: - runs-on: runs-on,runner=4cpu-linux-x64,run-id=${{ github.run_id }} + runs-on: ubuntu-latest if: github.ref == 'refs/heads/main' steps: