Merge branch 'main' of github.com:activecm/rita

activecm · Jun 28, 2024 · 7e432d2 · 7e432d2
2 parents 619c773 + ed707f1
commit 7e432d2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -34,7 +34,9 @@ jobs:
             type=schedule
             type=ref,event=branch
             type=ref,event=pr
+            type=ref,event=tag
             type=semver,pattern={{raw}}
+            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
             type=sha        
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -52,7 +54,7 @@ jobs:
           context: .
           platforms: linux/amd64,linux/arm64
           # TODO: comment this back in
-#           push: ${{ github.event_name != 'pull_request' }}
-          push: true
+          push: ${{ github.event_name != 'pull_request' }}
+          # push: true
           tags: ${{ steps.meta.outputs.tags }}
 
diff --git a/installer/generate_installer.sh b/installer/generate_installer.sh
@@ -81,10 +81,10 @@ fi
 
 
 
-# TODO remove when repo is public
-./build_image.sh
-cp "./rita-$VERSION-image.tar" "$ANSIBLE_FILES" # was $INSTALL_OPT
-rm "./rita-$VERSION-image.tar"
+
+# ./build_image.sh
+# cp "./rita-$VERSION-image.tar" "$ANSIBLE_FILES" # was $INSTALL_OPT
+# rm "./rita-$VERSION-image.tar"
 
 # create tar
 # TODO the inner folder is named stage, should be rita-$VERSION