oops

nilsnolde · Nov 13, 2023 · 551d931 · 551d931
1 parent 98a5e22
commit 551d931
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/.github/workflows/manual_build.yml b/.github/workflows/manual_build.yml
@@ -9,21 +9,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Log in to GitHub Docker Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: Build latest image
         run: |
-          docker buildx build --push --platform linux/arm64 --tag ghcr.io/${{ github.repository }}/valhalla:manually_triggered_build_arm64 .
+          sed -i "s/:latest/:manually_triggered_build/g" Dockerfile
+          docker build -t ghcr.io/${{ github.repository }}/valhalla:manually_triggered_build .
+          docker push ghcr.io/${{ github.repository }}/valhalla:manually_triggered_build
diff --git a/.github/workflows/manual_build_arm64.yml b/.github/workflows/manual_build_arm64.yml
@@ -1,6 +1,4 @@
-# Builds a new image from Valhalla's "manually_triggered_build" image
-
-name: manual image build
+name: manual arm64 image build
 on:
   workflow_dispatch
 
@@ -9,17 +7,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Log in to GitHub Docker Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Build latest image
         run: |
-          sed -i "s/:latest/:manually_triggered_build/g" Dockerfile
-          docker build -t ghcr.io/${{ github.repository }}/valhalla:manually_triggered_build .
-          docker push ghcr.io/${{ github.repository }}/valhalla:manually_triggered_build
+          docker buildx build --push --platform linux/arm64 --tag ghcr.io/${{ github.repository }}/valhalla:manually_triggered_build_arm64 .
+