From 65b7e83a97e9064a845e1a6db0038d71c697b87a Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Sat, 2 Sep 2023 22:32:16 +0200
Subject: [PATCH 1/2] Fix mixup with YAML tags

---
 .github/workflows/deployment.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index d4704ae3239..c439988a226 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -229,7 +229,7 @@ jobs:
           rm debian-binary control.tar.* data.tar.*
           mv -f jabref_${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}_amd64_repackaged.deb  jabref_${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}_amd64.deb
       - name: Upload to builds.jabref.org (ubuntu)
-        if: (matrix.os == 'ubuntu-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') && (! startsWith(github.ref, 'refs/heads/gh-readonly-queue'))
+        if: (matrix.os == 'ubuntu-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') && (!startsWith(github.ref, 'refs/heads/gh-readonly-queue'))
         uses: Pendect/action-rsyncer@v2.0.0
         env:
           DEPLOY_KEY: ${{ secrets.buildJabRefPrivateKey }}
@@ -240,13 +240,13 @@ jobs:
           src: 'build/distribution/'
           dest: jrrsync@build-upload.jabref.org:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/
       - name: Upload to GitHub workflow artifacts store (windows)
-        if: (matrix.os == 'windows-latest') && (! startsWith(github.ref, 'refs/heads/gh-readonly-queue'))
+        if: (matrix.os == 'windows-latest') && (!startsWith(github.ref, 'refs/heads/gh-readonly-queue'))
         uses: actions/upload-artifact@v3
         with:
           name: JabRef-${{ matrix.displayName }}
           path: build/distribution
       - name: Upload to GitHub workflow artifacts store (macos)
-        if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') && (! startsWith(github.ref, 'refs/heads/gh-readonly-queue'))
+        if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') && (!startsWith(github.ref, 'refs/heads/gh-readonly-queue'))
         uses: actions/upload-artifact@v3
         with:
           # tbn = to-be-notarized
@@ -307,7 +307,7 @@ jobs:
         shell: bash
         run: ${{ matrix.archivePortable }}
       - name: Upload to GitHub workflow artifacts store
-        if: (steps.checksecrets.outputs.secretspresent == 'YES') && (! startsWith(github.ref, 'refs/heads/gh-readonly-queue'))
+        if: (steps.checksecrets.outputs.secretspresent == 'YES') && (!startsWith(github.ref, 'refs/heads/gh-readonly-queue'))
         uses: actions/upload-artifact@v3
         with:
           name: JabRef-macOS
@@ -318,7 +318,7 @@ jobs:
     name: Upload binaries on builds.jabref.org
     runs-on: ubuntu-latest
     needs: [build, notarize]
-    if: ! startsWith(github.ref, 'refs/heads/gh-readonly-queue')
+    if: ${{ !startsWith(github.ref, 'refs/heads/gh-readonly-queue') }}
     steps:
       - name: Check secrets presence
         id: checksecrets
@@ -353,7 +353,7 @@ jobs:
           name: JabRef-windows
           path: build/distribution
       - name: Get macOS binaries unsigned
-        if: (steps.checksecrets.outputs.secretspresent == 'YES') && (inputs.notarization == false && ! startsWith(github.ref, 'refs/tags/'))
+        if: (steps.checksecrets.outputs.secretspresent == 'YES') && (inputs.notarization == false && !startsWith(github.ref, 'refs/tags/'))
         uses: actions/download-artifact@master
         with:
           name: JabRef-macOS-tbn

From ca59ffa32242dd846bd89c6158392bb4d400997e Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Sat, 2 Sep 2023 22:33:27 +0200
Subject: [PATCH 2/2] Fix also ARM64

---
 .github/workflows/deployment-arm64.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deployment-arm64.yml b/.github/workflows/deployment-arm64.yml
index d70fb31c04e..38693c6fd8b 100644
--- a/.github/workflows/deployment-arm64.yml
+++ b/.github/workflows/deployment-arm64.yml
@@ -163,7 +163,7 @@ jobs:
           xcrun notarytool submit build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-arm64.pkg --keychain-profile "notarytool-profile" --keychain ${{runner.temp}}/keychain/notarization.keychain --wait
           xcrun stapler staple build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-arm64.pkg
       - name: Upload with rsync
-        if: ! startsWith(github.ref, 'refs/heads/gh-readonly-queue')
+        if: ${{ !startsWith(github.ref, 'refs/heads/gh-readonly-queue') }}
         shell: bash
         run: |
           mkdir ${{runner.temp}}/sshkey
@@ -173,7 +173,7 @@ jobs:
           fi
           rsync -Pavz --itemize-changes --stats --partial-dir=/tmp/partial --rsync-path="mkdir -p /var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }} && rsync" -e 'ssh -p 9922 -i ~/.ssh/id_rsa' build/distribution/ jrrsync@build-upload.jabref.org:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/
       - name: Upload to GitHub workflow artifacts store
-        if: ! startsWith(github.ref, 'refs/heads/gh-readonly-queue')
+        if: ${{ !startsWith(github.ref, 'refs/heads/gh-readonly-queue') }}
         uses: actions/upload-artifact@v3
         with:
           name: JabRef-${{ matrix.displayName }}