Make release tags (#86)

* Make both latest and release tags at the same time * Actually Run the Task on BuildJet
Kaiede · Apr 24, 2024 · eca1c57 · eca1c57
1 parent daed0fe
commit eca1c57
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -14,7 +14,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     name: Docker - ${{ matrix.os }}
     if: github.repository == 'Kaiede/Bedrockifier'
     env:
@@ -73,6 +73,10 @@ jobs:
         username: ${{ secrets.DOCKER_USER }}
         password: ${{ secrets.DOCKER_PASSWORD }}
 
-    - name: Merge Manifests
+    - name: Make Manifest - ${{ env.docker_tag }}
       if: github.event_name != 'pull_request'
-      run: bash Docker/merge.sh kaiede/minecraft-bedrock-backup:${{ env.docker_tag }}
+      run: bash Docker/merge.sh kaiede/minecraft-bedrock-backup:${{ env.docker_tag }} kaiede/minecraft-bedrock-backup:${{ env.docker_tag }}
+
+    - name: Make Manifest - ${{ github.event.release.name }}
+      if: github.event_name == 'release'
+      run: bash Docker/merge.sh kaiede/minecraft-bedrock-backup:${{ github.event.release.name }} kaiede/minecraft-bedrock-backup:${{ env.docker_tag }}
diff --git a/Docker/merge.sh b/Docker/merge.sh
@@ -3,9 +3,10 @@
 # Merges amd64 and arm64 into a single tag
 
 tag=$1
+sourceTag=$2
 
 echo Running 'docker buildx imagetools create'
 docker buildx imagetools create \
     -t $tag \
-    $tag-amd64 \
-    $tag-arm64 \
+    $sourceTag-amd64 \
+    $sourceTag-arm64 \