From 83a9637f3702a00dd2c45677861da3c6c48bb54d Mon Sep 17 00:00:00 2001
From: Sven F <sven.fillinger@qbic.uni-tuebingen.de>
Date: Mon, 28 Feb 2022 16:34:41 +0100
Subject: [PATCH] Adjust workflow triggers (#305)

* Test commit

* Add new triggers

* Reorder git commands
---
 .github/workflows/build_package.yml  |  9 +++++++--
 .github/workflows/create-release.yml | 13 ++++++++-----
 .github/workflows/run_tests.yml      |  8 +++++++-
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build_package.yml b/.github/workflows/build_package.yml
index 9d334b8fa..85c2e00a7 100644
--- a/.github/workflows/build_package.yml
+++ b/.github/workflows/build_package.yml
@@ -1,7 +1,12 @@
 name: Build Maven Package
 
-on: [push]
-
+on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ main, master ]
 jobs:
   package:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index 76e2552ce..4203baf0b 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -42,7 +42,7 @@ jobs:
           || contains(github.event.inputs.versionTag, 'rc')) }}
         uses: actions/github-script@v4.0.2
         with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
+          github-token: ${{secrets.JOHNNY_Q5_REPORTS_TOKEN}}
           script: |
             await github.request(`POST /repos/${{ github.repository }}/releases`, {
               tag_name: "${{ github.event.inputs.versionTag }}",
@@ -55,7 +55,7 @@ jobs:
           || contains(github.event.inputs.versionTag, 'rc')) }}
         uses: actions/github-script@v4.0.2
         with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
+          github-token: ${{secrets.JOHNNY_Q5_REPORTS_TOKEN}}
           script: |
             await github.request(`POST /repos/${{ github.repository }}/releases`, {
               tag_name: "${{ github.event.inputs.versionTag }}",
@@ -71,16 +71,19 @@ jobs:
       - name: Switch to new branch
         run: git checkout -b release/set-version-to-${{ github.event.inputs.versionTag }}
 
+      - name: Set remote branch
+        run: git push --set-upstream origin release/set-version-to-${{ github.event.inputs.versionTag }}
+
       - name: Checkin commit
         run: git commit . -m 'Set version to ${{ github.event.inputs.versionTag }}'
 
-      - name: Set remote branch
-        run: git push --set-upstream origin release/set-version-to-${{ github.event.inputs.versionTag }}
+      - name: Push to Github
+        run: git push
 
       - name: Open PR with version bump
         uses: actions/github-script@v4.0.2
         with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
+          github-token: ${{secrets.JOHNNY_Q5_REPORTS_TOKEN}}
           script: |
             await github.request(`POST /repos/${{ github.repository }}/pulls`, {
               title: 'Update version to ${{ github.event.inputs.versionTag }}',
diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index 23fafb97b..ab4e81d9b 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -1,6 +1,12 @@
 name: Run Maven Tests
 
-on: [push]
+on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ main, master ]
 
 jobs:
   test: