feat(deploy): merge deploy with build

bezysoftware · Oct 5, 2024 · 1d171f1 · 1d171f1
1 parent 9caff83
commit 1d171f1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 57 deletions.
diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml
@@ -2,7 +2,7 @@ name: Build & Deploy
 
 on:
   push:
-    branches: [ main ]
+  pull_request:
 
 jobs:
   build:
@@ -36,8 +36,14 @@ jobs:
 
       - name: Get docker tag
         id: tag
-        run: echo "IMAGE_TAG=latest" >> $GITHUB_OUTPUT
-
+        run: |
+            echo "${GITHUB_REF##*/}"
+            if [[ "${GITHUB_REF##*/}" == "main" ]]; then
+                echo "IMAGE_TAG=latest" >> $GITHUB_OUTPUT
+            else
+                echo "IMAGE_TAG=${GITHUB_REF##*/}" >> $GITHUB_OUTPUT
+            fi
+            
       - name: Build and push
         id: docker_build
         uses: docker/build-push-action@v6

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
diff --git a/Netstr.sln b/Netstr.sln
@@ -23,7 +23,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{320F094E-4B63-40D7-8D8B-AB5B01F6FCB0}"
 	ProjectSection(SolutionItems) = preProject
 		.github\workflows\build-deploy.yml = .github\workflows\build-deploy.yml
-		.github\workflows\build.yml = .github\workflows\build.yml
 		.github\workflows\manual.yml = .github\workflows\manual.yml
 		.github\workflows\release.yml = .github\workflows\release.yml
 	EndProjectSection