Skip to content

ci: use arm runners when available #428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fzipi wants to merge 2 commits into
base: main
Choose a base branch
from
Open

ci: use arm runners when available #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10bc6e4
ci: use arm runners when available
fzipi May 19, 2026
c22f4c6
fix: add arch to go-ftw download
fzipi May 19, 2026
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
6 changes: 4 additions & 2 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ jobs:
uses: docker/bake-action/subaction/matrix@5be5f02ff8819ecd3092ea6b2e6261c31774f2b4 # v6
with:
target: default
fields: platforms

build:
name: Build ${{ matrix.target }}
runs-on: ubuntu-latest
runs-on: ${{ startsWith(matrix.platforms, 'linux/arm') && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
needs:
- prepare
permissions:
Expand Down Expand Up @@ -75,6 +76,8 @@ jobs:
files: |
./docker-bake.hcl
targets: ${{ matrix.target }}
set: |
*.platform=${{ matrix.platforms }}
push: true
provenance: true
sbom: true
Expand All @@ -90,4 +93,3 @@ jobs:
images+="${tag}@${DIGEST} "
done
cosign sign --yes ${images}

10 changes: 6 additions & 4 deletions .github/workflows/verifyimage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,15 @@ jobs:
uses: docker/bake-action/subaction/matrix@5be5f02ff8819ecd3092ea6b2e6261c31774f2b4 # v6
with:
target: default
fields: platforms
- name: Check modsecurity recommended
run: |
curl -sSL https://raw.githubusercontent.com/owasp-modsecurity/ModSecurity/v3/master/modsecurity.conf-recommended -o modsecurity.conf-recommended
echo '${{ env.MODSECURITY_RECOMMENDED }}' > sha256sum.txt
sha256sum -c sha256sum.txt

build:
runs-on: ubuntu-latest
runs-on: ${{ startsWith(matrix.platforms, 'linux/arm') && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
permissions:
contents: read
packages: write
Expand Down Expand Up @@ -73,10 +74,10 @@ jobs:
files: |
./docker-bake.hcl
targets: ${{ matrix.target }}
# Build only linux/amd64 and tag the images as verification builds.
Comment thread
theseion marked this conversation as resolved.
# Build only the specified platform and tag as verification build.
# Create a tar archive and load the image into Docker.
set: |
*.platform=linux/amd64
*.platform=${{ matrix.platforms }}
${{ matrix.target }}.tags=${{ matrix.target }}-verification
*.output=type=docker,dest=${{ matrix.target }}-verification.tar
*.output=type=docker
Expand Down Expand Up @@ -195,8 +196,9 @@ jobs:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
cd crs
ARCH="${{ startsWith(matrix.platforms, 'linux/arm') && 'arm64' || 'amd64' }}"
gh release download -R coreruleset/go-ftw "v${{ env.GO_FTW_VERSION }}" \
-p "ftw_${{ env.GO_FTW_VERSION }}_linux_amd64.tar.gz" -O - | tar -xzvf - ftw
-p "ftw_${{ env.GO_FTW_VERSION }}_linux_${ARCH}.tar.gz" -O - | tar -xzvf - ftw
- name: Patch CRS compose file to use verification image
run: |
sed -i \
Expand Down
Loading