From d77d9ce384a4af2f5fbd347fba595fb9af577871 Mon Sep 17 00:00:00 2001 From: DmitriyLewen <91113035+DmitriyLewen@users.noreply.github.com> Date: Fri, 14 Jun 2024 12:16:26 +0600 Subject: [PATCH] ci: use `ubuntu-latest-m` runner (#6918) --- .github/workflows/bypass-test.yaml | 4 +- .github/workflows/reusable-release.yaml | 11 +---- .github/workflows/test.yaml | 54 ++++--------------------- 3 files changed, 11 insertions(+), 58 deletions(-) diff --git a/.github/workflows/bypass-test.yaml b/.github/workflows/bypass-test.yaml index abf91aff45f..b46addba1d3 100644 --- a/.github/workflows/bypass-test.yaml +++ b/.github/workflows/bypass-test.yaml @@ -20,12 +20,12 @@ jobs: runs-on: ${{ matrix.operating-system }} strategy: matrix: - operating-system: [ubuntu-latest, windows-latest, macos-latest] + operating-system: [ubuntu-latest-m, windows-latest, macos-latest] steps: - run: 'echo "No test required"' integration: name: Integration Test - runs-on: ubuntu-latest + runs-on: ubuntu-latest-m steps: - run: 'echo "No test required"' \ No newline at end of file diff --git a/.github/workflows/reusable-release.yaml b/.github/workflows/reusable-release.yaml index ecae0832b93..49b3ced06da 100644 --- a/.github/workflows/reusable-release.yaml +++ b/.github/workflows/reusable-release.yaml @@ -19,7 +19,7 @@ env: jobs: release: name: Release - runs-on: ubuntu-latest + runs-on: ubuntu-latest-m env: DOCKER_CLI_EXPERIMENTAL: "enabled" permissions: @@ -27,15 +27,6 @@ jobs: packages: write # For GHCR contents: read # Not required for public repositories, but for clarity steps: - - name: Maximize build space - uses: easimon/maximize-build-space@v10 - with: - root-reserve-mb: 32768 # The Go cache (`~/.cache/go-build` and `~/go/pkg`) requires a lot of storage space. - remove-android: 'true' - remove-docker-images: 'true' - remove-dotnet: 'true' - remove-haskell: 'true' - - name: Cosign install uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 8ff082624f9..c472b931ea6 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -15,18 +15,8 @@ jobs: runs-on: ${{ matrix.operating-system }} strategy: matrix: - operating-system: [ubuntu-latest, windows-latest, macos-latest] + operating-system: [ubuntu-latest-m, windows-latest, macos-latest] steps: - - name: Maximize build space - uses: easimon/maximize-build-space@v10 - with: - root-reserve-mb: 32768 # The golangci-lint uses a lot of space. - remove-android: "true" - remove-docker-images: "true" - remove-dotnet: "true" - remove-haskell: "true" - if: matrix.operating-system == 'ubuntu-latest' - - uses: actions/checkout@v4.1.6 - name: Set up Go @@ -40,7 +30,7 @@ jobs: echo "Run 'go mod tidy' and push it" exit 1 fi - if: matrix.operating-system == 'ubuntu-latest' + if: matrix.operating-system == 'ubuntu-latest-m' - name: Lint id: lint @@ -48,7 +38,7 @@ jobs: with: version: v1.58 args: --verbose --out-format=line-number - if: matrix.operating-system == 'ubuntu-latest' + if: matrix.operating-system == 'ubuntu-latest-m' - name: Check if linter failed run: | @@ -69,14 +59,14 @@ jobs: echo "Run 'mage docs:generate' and push it" exit 1 fi - if: matrix.operating-system == 'ubuntu-latest' + if: matrix.operating-system == 'ubuntu-latest-m' - name: Run unit tests run: mage test:unit integration: name: Integration Test - runs-on: ubuntu-latest + runs-on: ubuntu-latest-m steps: - name: Check out code into the Go module directory uses: actions/checkout@v4.1.6 @@ -96,17 +86,8 @@ jobs: k8s-integration: name: K8s Integration Test - runs-on: ubuntu-latest + runs-on: ubuntu-latest-m steps: - - name: Maximize build space - uses: easimon/maximize-build-space@v10 - with: - root-reserve-mb: 32768 # The Go cache (`~/.cache/go-build` and `~/go/pkg`) requires a lot of storage space. - remove-android: "true" - remove-docker-images: "true" - remove-dotnet: "true" - remove-haskell: "true" - - name: Check out code into the Go module directory uses: actions/checkout@v4.1.6 @@ -147,17 +128,8 @@ jobs: vm-test: name: VM Integration Test - runs-on: ubuntu-latest + runs-on: ubuntu-latest-m steps: - - name: Maximize build space - uses: easimon/maximize-build-space@v10 - with: - root-reserve-mb: 32768 # The Go cache (`~/.cache/go-build` and `~/go/pkg`) requires a lot of storage space. - remove-android: 'true' - remove-docker-images: 'true' - remove-dotnet: 'true' - remove-haskell: 'true' - - name: Checkout uses: actions/checkout@v4.1.6 @@ -178,20 +150,10 @@ jobs: runs-on: ${{ matrix.operating-system }} strategy: matrix: - operating-system: [ubuntu-latest, windows-latest, macos-latest] + operating-system: [ubuntu-latest-m, windows-latest, macos-latest] env: DOCKER_CLI_EXPERIMENTAL: "enabled" steps: - - name: Maximize build space - uses: easimon/maximize-build-space@v10 - with: - root-reserve-mb: 32768 # The Go cache (`~/.cache/go-build` and `~/go/pkg`) requires a lot of storage space. - remove-android: 'true' - remove-docker-images: 'true' - remove-dotnet: 'true' - remove-haskell: 'true' - if: matrix.operating-system == 'ubuntu-latest' - - name: Checkout uses: actions/checkout@v4.1.6