Merge pull request #304 from kitsudaiki/fix/fix-integration-tests-for…

…-tags related issue: #125
kitsudaiki · Mar 25, 2024 · f16f3ff · f16f3ff
2 parents 16e1db6 + d366de9
commit f16f3ff
Showing 1 changed file with 18 additions and 12 deletions.
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
@@ -471,12 +471,14 @@ jobs:
       - 
         name: Set branch name as environment variable
         run: |
-          if [[ $github_event_name == 'push' && $github_ref == 'refs/heads/develop' ]]; then \
-              echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/})" | sed 's#/#\-#' >> $GITHUB_ENV; \
-          fi
-          if [[ $github_event_name == 'push' && $github_ref == refs/tags/* ]]; then \
+          if [[ ${GITHUB_REF#} == refs/tags/* ]]; then \
               echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/tags/})" | sed 's#/#\-#' >> $GITHUB_ENV; \
+          else \
+              echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/})" | sed 's#/#\-#' >> $GITHUB_ENV; \
           fi
+      - 
+        name: Check docker-tag
+        run: echo "Docker-tag=$BRANCH_NAME"
       - 
         name: Checkout repository
         run: |
@@ -583,12 +585,14 @@ jobs:
       - 
         name: Set branch name as environment variable
         run: |
-          if [[ $github_event_name == 'push' && $github_ref == 'refs/heads/develop' ]]; then \
-              echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/})" | sed 's#/#\-#' >> $GITHUB_ENV; \
-          fi
-          if [[ $github_event_name == 'push' && $github_ref == refs/tags/* ]]; then \
+          if [[ ${GITHUB_REF#} == refs/tags/* ]]; then \
               echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/tags/})" | sed 's#/#\-#' >> $GITHUB_ENV; \
+          else \
+              echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/})" | sed 's#/#\-#' >> $GITHUB_ENV; \
           fi
+      - 
+        name: Check docker-tag
+        run: echo "Docker-tag=$BRANCH_NAME"
       - 
         name: Checkout repository
         run: |
@@ -674,12 +678,14 @@ jobs:
       - 
         name: Set branch name as environment variable
         run: |
-          if [[ $github_event_name == 'push' && $github_ref == 'refs/heads/develop' ]]; then \
-              echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/})" | sed 's#/#\-#' >> $GITHUB_ENV; \
-          fi
-          if [[ $github_event_name == 'push' && $github_ref == refs/tags/* ]]; then \
+          if [[ ${GITHUB_REF#} == refs/tags/* ]]; then \
               echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/tags/})" | sed 's#/#\-#' >> $GITHUB_ENV; \
+          else \
+              echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/})" | sed 's#/#\-#' >> $GITHUB_ENV; \
           fi
+      - 
+        name: Check docker-tag
+        run: echo "Docker-tag=$BRANCH_NAME"
       - 
         uses: earthly/actions-setup@v1
         with: