Skip to content

Commit

Permalink
Merge pull request #461 from MrAnno/oss-arm-runner
Browse files Browse the repository at this point in the history
ci: use publicly available ARM runners
  • Loading branch information
alltilla authored Jan 21, 2025
2 parents d23a6e6 + 8d2bcf5 commit a038997
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 15 deletions.
15 changes: 1 addition & 14 deletions .github/workflows/axosyslog-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
image-build:
if: github.repository_owner == 'axoflow' || github.event_name != 'schedule'
runs-on: ${{ matrix.platform == 'linux/arm64' && 'linux-arm64' || 'ubuntu-latest' }}
runs-on: ${{ matrix.platform == 'linux/arm64' && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
needs: prepare

strategy:
Expand All @@ -66,19 +66,6 @@ jobs:
[ "$TYPE" = "stable" ] || [ "$TYPE" = "snapshot" ]
echo "PLATFORM_PAIR=${PLATFORM//\//-}" >> $GITHUB_ENV
# TODO: remove this block once the arm64 runner is available for open-source and has docker pre-installed
if [ "${{ matrix.platform }}" = "linux/arm64" ]; then
sudo install -m 0755 -d /etc/apt/keyrings
sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
echo \
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
$(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
sudo apt-get update && sudo apt-get install -y acl docker-ce docker-ce-cli containerd.io docker-buildx-plugin
USERID=$(id -u)
sudo setfacl --modify user:${USERID}:rw /var/run/docker.sock
fi
- name: Checkout source
uses: actions/checkout@v4

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/axosyslog-image-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch:
inputs:
platforms:
default: "linux/amd64,linux/arm64,linux/arm/v7"
default: "linux/amd64,linux/arm64"
push:
branches:
- main
Expand Down

0 comments on commit a038997

Please sign in to comment.