Merge pull request #13 from EMarshal/armRunners

Arm runners
EMarshal · Feb 1, 2025 · baf57ed · baf57ed
2 parents 162876f + 2cd9447
commit baf57ed
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -15,15 +15,17 @@ on:
 
 jobs:
   docker-build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+        matrix:
+          os: [ubuntu-24.04, ubuntu-24.04-arm]
     permissions:
       contents: read
     steps:
       - uses: actions/checkout@v4
         with:
           sparse-checkout: |
             Dockerfile
-          show-progress: 'false'
           sparse-checkout-cone-mode: false
       - name: Parse Caddy version
         id: version
@@ -51,7 +53,7 @@ jobs:
           context: .
           no-cache: true
           labels: ${{ steps.meta.outputs.labels }}
-          platforms: linux/amd64, linux/arm64
+          platforms: ${{ (matrix.os == 'ubuntu-24.04' && 'linux/amd64') || (matrix.os == 'ubuntu-24.04-arm' && 'linux/arm64') }}
           provenance: mode=min
           push: ${{ github.event_name == 'push' && 'true' || inputs.push_build == true }}
           tags: ${{ steps.meta.outputs.tags }}
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -13,16 +13,15 @@ on:
       - Dockerfile
 
 jobs:
-  docker-build:
-    runs-on: ubuntu-latest
+  lint:
+    runs-on: ubuntu-24.04-arm
     permissions:
       contents: read
     steps:
       - uses: actions/checkout@v4
         with:
           sparse-checkout: |
             Dockerfile
-          show-progress: 'false'
           sparse-checkout-cone-mode: false
       - name: Hadolint Action
         uses: hadolint/[email protected]
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -26,6 +26,6 @@ repos:
     hooks:
     -   id: forbid-tabs
 -   repo: https://github.com/rhysd/actionlint
-    rev: v1.7.6
+    rev: v1.7.7
     hooks:
     -   id: actionlint