Merge pull request #15 from lukehmcc/main

update gh action files
s5-dev · Jun 1, 2023 · 6951476 · 6951476
2 parents e8c2133 + d5610f8
commit 6951476
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml
@@ -1,9 +1,6 @@
 name: Docker Build and Push
 
 on:
-  # push:
-  #   branches:
-  #     - main
   release:
     types: [created]
 
@@ -33,7 +30,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
         with:
           buildkitd-flags: --debug
           driver-opts: image=moby/buildkit:v0.9.1
@@ -65,7 +62,7 @@ jobs:
         uses: docker/setup-qemu-action@v1
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
         with:
           driver-opts: image=moby/buildkit:v0.9.1
 
@@ -106,7 +103,7 @@ jobs:
         uses: docker/setup-qemu-action@v1
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
         with:
           driver-opts: image=moby/buildkit:v0.9.1
 
@@ -134,7 +131,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
         with:
           driver-opts: image=moby/buildkit:v0.9.1
 

diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml
@@ -11,13 +11,12 @@ env:
 jobs:
   build-and-push-amd64:
     runs-on: ubuntu-latest
-    needs: get_version
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
         with:
           buildkitd-flags: --debug
           driver-opts: image=moby/buildkit:v0.9.1
@@ -30,7 +29,6 @@ jobs:
 
   build-and-push-armv7:
     runs-on: ubuntu-latest
-    needs: get_version
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -39,7 +37,7 @@ jobs:
         uses: docker/setup-qemu-action@v1
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
         with:
           buildkitd-flags: --debug
           driver-opts: image=moby/buildkit:v0.9.1
@@ -62,7 +60,6 @@ jobs:
 
   build-and-push-arm64:
     runs-on: ubuntu-latest
-    needs: get_version
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -71,7 +68,7 @@ jobs:
         uses: docker/setup-qemu-action@v1
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
         with:
           buildkitd-flags: --debug
           driver-opts: image=moby/buildkit:v0.9.1