Skip to content
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.

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

ci: Use arm64 runners for arm builds #1672

Merged
merged 3 commits into from
Jan 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
69 changes: 64 additions & 5 deletions .github/workflows/c_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:
path: ./packages/c/sshnpd/tarball
if-no-files-found: error

docker_build:
docker_build_amd64:
needs: [verify_tags]
runs-on: ubuntu-latest
if: ${{ ! inputs.native_build_only }}
Expand All @@ -114,8 +114,6 @@ jobs:
include:
- platform: linux/amd64
output-name: sshnpd-linux-x64
- platform: linux/arm64
output-name: sshnpd-linux-arm64
## 20240806: Clang and CMake that we use aren't packaged for
## armv7 or riscv64 (also no Debian 10 for RISC-V)
# - platform: linux/arm/v7
Expand All @@ -141,7 +139,38 @@ jobs:
}}-${{ github.run_attempt }}
path: ./packages/c/tarballs/${{ matrix.output-name }}.tgz

musl_build:
docker_build_arm64:
needs: [verify_tags]
runs-on: ubuntu-24.04-arm
if: ${{ ! inputs.native_build_only }}
defaults:
run:
working-directory: ./packages/c
strategy:
matrix:
include:
- platform: linux/arm64
output-name: sshnpd-linux-arm64
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: c_release-${{github.run_number}}
- uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3.3.0
- uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
- run: |
docker buildx build -t atsigncompany/sshnpdc -f sshnpd/tools/Dockerfile.package \
--platform ${{ matrix.platform }} -o type=tar,dest=bins.tar .
mkdir tarballs
tar -xvf bins.tar -C tarballs
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
with:
name:
${{
matrix.output-name }}-${{ github.ref_name }}-${{ github.run_number
}}-${{ github.run_attempt }}
path: ./packages/c/tarballs/${{ matrix.output-name }}.tgz

musl_build_amd64:
needs: [verify_tags]
runs-on: ubuntu-latest
if: ${{ ! inputs.native_build_only }}
Expand All @@ -154,6 +183,36 @@ jobs:
include:
- platform: linux/amd64
output-name: sshnpd-linux-x64-musl
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: c_release-${{github.run_number}}
- uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3.3.0
- uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
- run: |
docker buildx build -t atsigncompany/sshnpdcmusl -f sshnpd/tools/Dockerfile.musl \
--platform ${{ matrix.platform }} -o type=tar,dest=bins.tar .
mkdir tarballs
tar -xvf bins.tar -C tarballs
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
with:
name:
${{
matrix.output-name }}-${{ github.ref_name }}-${{ github.run_number
}}-${{ github.run_attempt }}
path: ./packages/c/tarballs/${{ matrix.output-name }}.tgz

musl_build_arm64:
needs: [verify_tags]
runs-on: ubuntu-24.04-arm
if: ${{ ! inputs.native_build_only }}
defaults:
run:
working-directory: ./packages/c
strategy:
fail-fast: false
matrix:
include:
- platform: linux/arm/v7
output-name: sshnpd-linux-arm-musl
- platform: linux/arm64
Expand Down Expand Up @@ -201,7 +260,7 @@ jobs:
github-release:
name: >-
Upload artifacts and generate checksums for provenance
needs: [native_build, docker_build, musl_build, source_tarball]
needs: [native_build, docker_build_amd64, docker_build_arm64, musl_build_amd64, musl_build_arm64, source_tarball]
runs-on: ubuntu-latest
outputs:
hashes: ${{ steps.hash.outputs.hashes }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/multibuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ jobs:

other_build:
needs: verify_tags
runs-on: ubuntu-latest
runs-on: uubuntu-24.04-arm
strategy:
matrix:
# platform: [linux/arm/v7, linux/arm64, linux/riscv64]
Expand Down
Loading