fixes

chovanecadam · Mar 22, 2024 · 4e27a28 · 4e27a28
1 parent a3f045e
commit 4e27a28
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 12 deletions.
diff --git a/.github/workflows/build-gdb.yml b/.github/workflows/build-gdb.yml
@@ -142,11 +142,14 @@ jobs:
       - name: List Artifacts
         run: ls -laR /tmp/releases
 
+      - name: Fetch tags
+        run: git fetch --tags --prune --quiet
+
       - name: Tag Release
         id: tag_release
         run: |
           set +e
-          if git rev-list "gdb-v${{ needs.build-x86.outputs.version }}".. >/dev/null;then
+          if git rev-list "gdb-v${{ needs.build-x86.outputs.version }}" >/dev/null;then
             echo "Tag for gdb-v${{ needs.build-x86.outputs.version }} already exists. Skipping release creation."
             echo ::set-output name=NEW_RELEASE::"false"
           else
@@ -162,4 +165,4 @@ jobs:
           name: gdb-v${{ needs.build-x86.outputs.version }}
           tag: gdb-v${{ needs.build-x86.outputs.version }}
           artifacts: "/tmp/releases/*/*"
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/build-nmap.yml b/.github/workflows/build-nmap.yml
@@ -144,12 +144,14 @@ jobs:
         - name: List Artifacts
           run: ls -laR /tmp/releases
 
+        - name: Fetch tags
+          run: git fetch --tags --prune --quiet
+
         - name: Tag Release
           id: tag_release
           run: |
             set +e
-            git fetch --quiet --prune --tags
-            if [[ $(git tag -l | grep nmap-v${{ needs.build-x86.outputs.version }} | wc -l) -gt 0 ]]; then
+            if git rev-list "nmap-v${{ needs.build-x86.outputs.version }}" >/dev/null;then
               echo "Tag for nmap-v${{ needs.build-x86.outputs.version }} already exists. Skipping release creation."
               echo "NEW_RELEASE=false" >> $GITHUB_OUTPUT
             else

diff --git a/.github/workflows/build-openssh.yml b/.github/workflows/build-openssh.yml
@@ -107,11 +107,14 @@ jobs:
         - name: List Artifacts
           run: ls -laR /tmp/releases
 
+        - name: Fetch tags
+          run: git fetch --tags --prune --quiet
+
         - name: Tag Release
           id: tag_release
           run: |
             set +e
-            if git rev-list "openssh-v${{ needs.build-x86.outputs.version }}".. >/dev/null;then
+            if git rev-list "openssh-v${{ needs.build-x86.outputs.version }}" >/dev/null;then
               echo "Tag for openssh-v${{ needs.build-x86.outputs.version }} already exists. Skipping release creation."
               echo "NEW_RELEASE=false" >> $GITHUB_OUTPUT
             else
@@ -127,4 +130,4 @@ jobs:
             name: openssh-v${{ needs.build-x86.outputs.version }}
             tag: openssh-v${{ needs.build-x86.outputs.version }}
             artifacts: "/tmp/releases/*/*"
-            token: ${{ secrets.GITHUB_TOKEN }}
+            token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/build-socat.yml b/.github/workflows/build-socat.yml
@@ -201,7 +201,7 @@ jobs:
           run: ls -laR /tmp/releases
 
         - name: Fetch tags
-          run: git fetch --tags
+          run: git fetch --tags --prune --quiet
 
         - name: Tag Release
           id: tag_release

diff --git a/.github/workflows/build-strace.yml b/.github/workflows/build-strace.yml
@@ -143,11 +143,14 @@ jobs:
         - name: List Artifacts
           run: ls -laR /tmp/releases
 
+        - name: Fetch tags
+          run: git fetch --tags --prune --quiet
+
         - name: Tag Release
           id: tag_release
           run: |
             set +e
-            if git rev-list "strace-v${{ needs.build-x86.outputs.version }}".. >/dev/null;then
+            if git rev-list "strace-v${{ needs.build-x86.outputs.version }}" >/dev/null;then
               echo "Tag for strace-v${{ needs.build-x86.outputs.version }} already exists. Skipping release creation."
               echo "NEW_RELEASE=false" >> $GITHUB_OUTPUT
             else
@@ -163,4 +166,4 @@ jobs:
             name: strace-v${{ needs.build-x86.outputs.version }}
             tag: strace-v${{ needs.build-x86.outputs.version }}
             artifacts: "/tmp/releases/*/*"
-            token: ${{ secrets.GITHUB_TOKEN }}
+            token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/build-tcpdump.yml b/.github/workflows/build-tcpdump.yml
@@ -108,14 +108,16 @@ jobs:
         - name: List Artifacts
           run: ls -laR /tmp/releases
 
-        - name: Tag Release # temporary change by setting new release to always true
+        - name: Fetch tags
+          run: git fetch --tags --prune --quiet
+
+        - name: Tag Release
           id: tag_release
           run: |
             set +e
-            git fetch --tags
             if git rev-list "tcpdump-v${{ needs.build-x86.outputs.version }}" >/dev/null;then
               echo "Tag for tcpdump-v${{ needs.build-x86.outputs.version }} already exists. Skipping release creation."
-              echo "NEW_RELEASE=true" >> "$GITHUB_OUTPUT"
+              echo "NEW_RELEASE=false" >> "$GITHUB_OUTPUT"
             else
               git tag "tcpdump-v${{ needs.build-x86.outputs.version }}"
               git push origin "tcpdump-v${{ needs.build-x86.outputs.version }}"