Use path from repo root for build-and-push

In the end, this script is only mean for github actions anyway.
INL · Jun 4, 2024 · 009f049 · 009f049
1 parent d8c657a
commit 009f049
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/publish-dev.yml b/.github/workflows/publish-dev.yml
@@ -28,6 +28,6 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push
-        run: cd scripts && ./build-and-push-all.sh
+        run: ./scripts/build-and-push-all.sh
         env:
           VERSION_LABEL: dev
diff --git a/.github/workflows/publish-prod.yml b/.github/workflows/publish-prod.yml
@@ -1,8 +1,9 @@
 name: Prod images to docker
 
 on:
-  tags: 
-    - '[0-9]+.[0-9]+.[0-9]+'
+  push:
+    tags: 
+      - '[0-9]+.[0-9]+.[0-9]+'
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
@@ -28,6 +29,6 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push
-        run: cd scripts && ./build-and-push-all.sh
+        run: ./scripts/build-and-push-all.sh
         env:
           VERSION_LABEL: latest
diff --git a/scripts/build-and-push-all.sh b/scripts/build-and-push-all.sh
@@ -1,7 +1,7 @@
 # Set the default label
 : ${VERSION_LABEL:=dev}
 
-./build-all.sh
+./scripts/build-all.sh
 
 echo "Will push galahad images with version <$VERSION_LABEL>. Set VERSION_LABEL to override this."