Merge pull request #5394 from DefectDojo/master

workflow updates

.github/release-drafter.yml

@@ -39,5 +39,7 @@ exclude-labels:
   - 'skip-changelog'      
 change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
 template: |
+  Please consult the [Upgrade notes in the documentation ](https://defectdojo.github.io/django-DefectDojo/getting_started/upgrading/) for specific instructions for this release, and general upgrade instructions. Below is an automatically generated list of all PRs merged since the previous release.
+  
   ## Changes since $PREVIOUS_TAG
   $CHANGES

.github/workflows/flake8.yml

@@ -20,6 +20,7 @@ jobs:
         # more info https://github.community/t/github-actions-are-severely-limited-on-prs/18179/16
         # we checkout merge_commit here as this contains all new code from dev also. we don't need to compare against base_commit
         with:
+          persist-credentials: false
           fetch-depth: 0
           ref: refs/pull/${{ github.event.pull_request.number }}/merge
           # repository: ${{github.event.pull_request.head.repo.full_name}}

.github/workflows/gh-pages.yml

@@ -4,6 +4,7 @@ on:
   workflow_dispatch:
   push:
     branches:
+      - master
       - dev
 
 # Taken from https://github.com/marketplace/actions/hugo-setup#%EF%B8%8F-workflow-for-autoprefixer-and-postcss-cli
@@ -13,6 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
+          persist-credentials: false
           submodules: recursive  # Fetch the Docsy theme
           fetch-depth: 0         # Fetch all history for .GitInfo and .Lastmod
 
@@ -37,6 +39,11 @@ jobs:
 
       - run: cd docs && npm ci && hugo --minify
 
+      # for dev we move everything into a subfolder, so the master version stays in the root
+      # remove .git folder to avoid conflicts
+      - run: mkdir dev && mv * dev/ && rm -rf ./docs/public/dev/.git
+        if: ${{ github.ref == 'dev' }}
+
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3
         with: # publishes to the `gh-pages` branch by default

.github/workflows/integration-tests.yml

@@ -34,6 +34,8 @@ jobs:
 
       - name: Checkout
         uses: actions/checkout@v2
+        with:
+          persist-credentials: false
 
       - name: Read Docker Image Identifiers
         id: read-docker-image-identifiers

.github/workflows/k8s-testing.yml

@@ -55,6 +55,8 @@ jobs:
 
       - name: Checkout
         uses: actions/checkout@v2
+        with:
+          persist-credentials: false
 
       - name: Read Docker Image Identifiers
         id: read-docker-image-identifiers

.github/workflows/new-release-chart.yml

@@ -8,7 +8,7 @@ on:
     inputs:
       release_number:
         description: 'Release number'
-        required: true  
+        required: true
 
 jobs:
   release-chart:

.github/workflows/plantuml.yml

@@ -14,6 +14,9 @@ jobs:
     steps:
       - name: Checkout Source
         uses: actions/checkout@v2
+        with:
+          persist-credentials: false
+
       - name: Get changed UML files
         id: getfile
         run: |

.github/workflows/test-helm-chart.yml

@@ -16,6 +16,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
         with:
+          persist-credentials: false
           fetch-depth: 0
 
       - name: Set up Helm

.github/workflows/unit-tests.yml

@@ -28,6 +28,8 @@ jobs:
 
       - name: Checkout
         uses: actions/checkout@v2
+        with:
+          persist-credentials: false
 
       # - name: Read Docker Image Identifiers
       #   id: read-docker-image-identifiers