versus workflows: Update existing PR if any instead of closing/opening

Signed-off-by: kingthorin <[email protected]>

Author: kingthorin

.github/workflows/auth-tests.yml

@@ -58,5 +58,5 @@ jobs:
             git add .
             git commit -sm 'Authentication Tests Update'
             git push -u origin $BRANCH -f
-            gh pr view --json mergedAt|jq -e '.mergedAt' && gh pr create -f
+            gh pr view --json mergedAt|jq -e '.mergedAt' && gh pr create --fill
           fi

.github/workflows/zap-vs-crawlmaze.yml

@@ -60,12 +60,10 @@ jobs:
         git update-index -q --refresh
         ## If there are changes: comment, commit, PR
         if ! git diff-index --quiet HEAD --; then
-
+          gh repo set-default zaproxy/zaproxy-website
+          git remote set-url origin https://$GITHUB_USER:[email protected]/$GITHUB_USER/zaproxy-website.git
           git add site/data/scans/crawlmaze/*
-          git commit -s -m "Updated Crawl Maze Results"
-          git push origin
-
-          echo ${{ secrets.ZAPBOT_TOKEN }} | gh auth login --with-token
-          gh pr create --fill
-
+          git commit -sm "Updated Crawl Maze Results"
+          git push -u origin $BRANCH -f
+          gh pr view --json mergedAt|jq -e '.mergedAt' && gh pr create --fill
         fi

.github/workflows/zap-vs-firingrange.yml

@@ -50,12 +50,10 @@ jobs:
         git update-index -q --refresh
         ## If there are changes: comment, commit, PR
         if ! git diff-index --quiet HEAD --; then
-
+          gh repo set-default zaproxy/zaproxy-website
+          git remote set-url origin https://$GITHUB_USER:[email protected]/$GITHUB_USER/zaproxy-website.git
           git add site/data/scans/firingrange/*
-          git commit -s -m "Updated Firing Range Results"
-          git push origin
-
-          echo ${{ secrets.ZAPBOT_TOKEN }} | gh auth login --with-token
-          gh pr create --fill
-
+          git commit -sm "Updated Firing Range Results"
+          git push -u origin $BRANCH -f
+          gh pr view --json mergedAt|jq -e '.mergedAt' && gh pr create --fill
         fi

.github/workflows/zap-vs-juiceshop.yml

@@ -20,15 +20,6 @@ jobs:
 
         git clone https://github.com/$GITHUB_USER/zaproxy-website.git
 
-        # Update to the latest upstream
-        cd zaproxy-website
-        git remote set-url origin https://$GITHUB_USER:[email protected]/$GITHUB_USER/zaproxy-website.git
-        git remote add upstream https://github.com/zaproxy/zaproxy-website.git
-        git checkout -B juiceshop
-        git pull upstream main
-        git reset --hard upstream/main
-        git push --set-upstream origin juiceshop --force
-
     - name: Scan Juice Shop
       run: |
         # start Juice Shop
@@ -45,16 +36,16 @@ jobs:
       run: |
         cd zaproxy-website
 
+        git checkout -b juiceshop
+
         # Update the index to be sure git is aware of changes
         git update-index -q --refresh
         ## If there are changes: comment, commit, PR
         if ! git diff-index --quiet HEAD --; then
-
+          gh repo set-default zaproxy/zaproxy-website
+          git remote set-url origin https://$GITHUB_USER:[email protected]/$GITHUB_USER/zaproxy-website.git
           git add site/data/scans/juiceshop/*
-          git commit -s -m "Updated Juice Shop Results"
-          git push origin
-
-          echo ${{ secrets.ZAPBOT_TOKEN }} | gh auth login --with-token
-          gh pr create --fill
-
+          git commit -sm "Updated Juice Shop Results"
+          git push -u origin $BRANCH -f
+          gh pr view --json mergedAt|jq -e '.mergedAt' && gh pr create --fill
         fi

.github/workflows/zap-vs-owasp-benchmark.yml

@@ -58,12 +58,10 @@ jobs:
           git update-index -q --refresh
           ## If there are changes: comment, commit, PR
           if ! git diff-index --quiet HEAD --; then
-
+            gh repo set-default zaproxy/zaproxy-website
+            git remote set-url origin https://$GITHUB_USER:[email protected]/$GITHUB_USER/zaproxy-website.git
             git add site/data/scans/benchmark/*
-            git commit -s -m "Updated OWASP Benchmark Results"
-            git push origin
-
-            echo ${{ secrets.ZAPBOT_TOKEN }} | gh auth login --with-token
-            gh pr create --fill
-
+            git commit -sm "Updated OWASP Benchmark Results"
+            git push -u origin $BRANCH -f
+            gh pr view --json mergedAt|jq -e '.mergedAt' && gh pr create --fill
           fi

.github/workflows/zap-vs-ssti.yml

@@ -59,12 +59,10 @@ jobs:
         git update-index -q --refresh
         ## If there are changes: comment, commit, PR
         if ! git diff-index --quiet HEAD --; then
-
+          gh repo set-default zaproxy/zaproxy-website
+          git remote set-url origin https://$GITHUB_USER:[email protected]/$GITHUB_USER/zaproxy-website.git
           git add site/data/scans/ssti/*
-          git commit -s -m "Updated Vuln to SSTI Results"
-          git push origin
-
-          echo ${{ secrets.ZAPBOT_TOKEN }} | gh auth login --with-token
-          gh pr create --fill
-
+          git commit -sm "Updated Vuln to SSTI Results"
+          git push -u origin $BRANCH -f
+          gh pr view --json mergedAt|jq -e '.mergedAt' && gh pr create --fill
         fi

.github/workflows/zap-vs-webseclab.yml

@@ -50,12 +50,10 @@ jobs:
         git update-index -q --refresh
         ## If there are changes: comment, commit, PR
         if ! git diff-index --quiet HEAD --; then
-
+          gh repo set-default zaproxy/zaproxy-website
+          git remote set-url origin https://$GITHUB_USER:[email protected]/$GITHUB_USER/zaproxy-website.git
           git add site/data/scans/webseclab/*
-          git commit -s -m "Updated Webseclab Results"
-          git push origin
-
-          echo ${{ secrets.ZAPBOT_TOKEN }} | gh auth login --with-token
-          gh pr create --fill
-
+          git commit -sm "Updated Webseclab Results"
+          git push -u origin $BRANCH -f
+          gh pr view --json mergedAt|jq -e '.mergedAt' && gh pr create --fill
         fi