Skip to content

Commit

Permalink
ci: use ubuntu-latest-m runner (aquasecurity#6918)
Browse files Browse the repository at this point in the history
  • Loading branch information
DmitriyLewen committed Jun 14, 2024
1 parent 55fa610 commit d77d9ce
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 58 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/bypass-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"'
11 changes: 1 addition & 10 deletions .github/workflows/reusable-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,14 @@ env:
jobs:
release:
name: Release
runs-on: ubuntu-latest
runs-on: ubuntu-latest-m
env:
DOCKER_CLI_EXPERIMENTAL: "enabled"
permissions:
id-token: write # For cosign
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

Expand Down
54 changes: 8 additions & 46 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -40,15 +30,15 @@ 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
uses: golangci/golangci-lint-action@v6.0.1
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: |
Expand All @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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

Expand All @@ -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

Expand Down

0 comments on commit d77d9ce

Please sign in to comment.