Merge 856cc070b8 into 4e16e59391

.github/workflows/main.yml

@@ -17,27 +17,27 @@ concurrency:
    cancel-in-progress: true
 
 jobs:
-   #create-release:
-      #runs-on: ubuntu-latest
-      #steps:
-      #   -  uses: actions/checkout@master
+   create-release:
+      runs-on: ubuntu-latest
+      steps:
+         -  uses: actions/checkout@master
 
-      #   -  name: Archive Images
-      #      run: |
-      #         rm -rf docker Dockerfile
-      #         mkdir -p img
-      #         ls | grep -v img | xargs mv -t img
-      #         zip -r -s 500m img-${{ github.ref_name }}.zip img/
+         -  name: Archive Images
+            run: |
+               rm -rf docker Dockerfile
+               mkdir -p img
+               ls | grep -v img | xargs mv -t img
+               zip -r -s 500m img-${{ github.ref_name }}.zip img/
 
-      #   -  name: Upload Release
+         -  name: Upload Release
             # Add the files one-by-one in an effort to avoid timeouts
             # Sleep between creating the release and adding files, as the release takes time to be created (?)
-      #      run: |
-      #         gh release create "${{github.ref_name}}" --title "${{github.ref_name}}" --notes "Version ${{ github.ref_name }}"
-      #         sleep 10
-      #         for f in $(find . -name 'img-${{ github.ref_name }}.*' -print); do gh release upload ${{ github.ref_name }} $f; done
-      #      env:
-      #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            run: |
+               gh release create "${{github.ref_name}}" --title "${{github.ref_name}}" --notes "Version ${{ github.ref_name }}"
+               sleep 10
+               for f in $(find . -name 'img-${{ github.ref_name }}.*' -print); do gh release upload ${{ github.ref_name }} $f; done
+            env:
+               GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
    create-image:
       runs-on: ubuntu-latest
@@ -59,20 +59,17 @@ jobs:
             uses: docker/setup-qemu-action@master
             with:
              platforms: all
+
+         -  name: Testing metadata extraction
+            id: meta
+            uses: docker/metadata-action@master
+            with:
+              images: kokomo123/5etools-img
+              tags: |
+                add-arm64-building
+                type=edge
+                type=sha
                       
-         - name: Free Disk Space (Ubuntu)
-           uses: insightsengineering/disk-space-reclaimer@v1
-           with:
-        # this might remove tools that are actually needed,
-        # if set to "true" but frees about 6 GB
-            tools-cache: true
-            android: true
-            dotnet: true
-            haskell: true
-            large-packages: true
-            swap-storage: true
-            docker-images: false
-      
          - name: Set up Docker Buildx
            id: buildx
            uses: docker/setup-buildx-action@master
@@ -86,6 +83,17 @@ jobs:
              context: .
              builder: ${{ steps.buildx.outputs.name }}
              platforms: linux/arm64,linux/amd64
-             push: true
-             tags: ghcr.io/kokomo123/5etools-img:latest               
+             push: false
+
+         -  name: Push image
+            run: |
+               echo IMAGE_ID=$IMAGE_ID
+               echo IMAGE_VERSION=$IMAGE_VERSION
+               docker tag $IMAGE_ID $IMAGE_ID:$IMAGE_VERSION
+               [[ "${{ github.ref }}" == "refs/tags/"* ]] && docker tag $IMAGE_NAME $IMAGE_ID:add-arm64-building
+               docker push $IMAGE_ID:$IMAGE_VERSION
+               docker push $IMAGE_ID:add-arm64-building
+               
+             
+               
          # endregion