From 24e34794f666da0cf5027019c2d0d73b748427e4 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Sat, 4 May 2024 05:43:57 +0200
Subject: [PATCH] Fix pipelines

---
 .github/workflows/PKGBUILD    |  2 +-
 .github/workflows/release.yml | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/PKGBUILD b/.github/workflows/PKGBUILD
index 107c80e..a1f0728 100644
--- a/.github/workflows/PKGBUILD
+++ b/.github/workflows/PKGBUILD
@@ -33,6 +33,6 @@ build() {
 package() {
   cd "$pkgname-$pkgver"
   install -Dm755 build/$pkgname "$pkgdir"/usr/bin/$pkgname
-  install -Dm644 "$srcdir/$pkgname-$pkgver/resources/com.quexten.goldwarden.policy" "$pkgdir/usr/share/polkit-1/actions/com.quexten.goldwarden.policy"
+  install -Dm644 "$srcdir/$pkgname-$pkgver/cli/resources/com.quexten.goldwarden.policy" "$pkgdir/usr/share/polkit-1/actions/com.quexten.goldwarden.policy"
   chown root:root "$pkgdir/usr/share/polkit-1/actions/com.quexten.goldwarden.policy"
 }
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2f2c27f..cbaeec4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,7 +31,7 @@ jobs:
       with:
         go-version: ${{ env.GO_VERSION }}
     - name: Write version
-      run: echo "${GITHUB_REF#refs/tags/}" > ./cli/cmd/version.txt
+      run: echo "${{ github.event.release.tag_name }}" > ./cli/cmd/version.txt
     - name: Install libfido2-dev
       run: sudo apt-get install -y libfido2-dev
     - name: Build
@@ -48,8 +48,8 @@ jobs:
         cp -p goldwarden_linux_x86_64 .rpmpkg/usr/bin/goldwarden
         mkdir -p .debpkg/usr/share/polkit-1/actions/
         mkdir -p .rpmpkg/usr/share/polkit-1/actions/
-        cp -p resources/com.quexten.goldwarden.policy .debpkg/usr/share/polkit-1/actions/
-        cp -p resources/com.quexten.goldwarden.policy .rpmpkg/usr/share/polkit-1/actions/
+        cp -p cli/resources/com.quexten.goldwarden.policy .debpkg/usr/share/polkit-1/actions/
+        cp -p cli/resources/com.quexten.goldwarden.policy .rpmpkg/usr/share/polkit-1/actions/
     - uses: jiro4989/build-deb-action@v3
       with:
         package: goldwarden
@@ -84,7 +84,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Write version
-      run: echo "${GITHUB_REF#refs/tags/}" > ./cli/cmd/version.txt
+      run: echo "${{ github.event.release.tag_name }}" > ./cli/cmd/version.txt
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
@@ -101,7 +101,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Write version
-      run: echo "${GITHUB_REF#refs/tags/}" > ./cli/cmd/version.txt
+      run: echo "${{ github.event.release.tag_name }}" > ./cli/cmd/version.txt
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
@@ -119,7 +119,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v1
       - name: Write version
-        run: echo "${GITHUB_REF#refs/tags/}" > ./cli/cmd/version.txt
+        run: echo "${{ github.event.release.tag_name }}" > ./cli/cmd/version.txt
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
@@ -142,7 +142,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v1
       - name: Write version
-        run: echo "${GITHUB_REF#refs/tags/}" > ./cli/cmd/version.txt
+        run: echo "${{ github.event.release.tag_name }}" > ./cli/cmd/version.txt
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
@@ -165,7 +165,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v1
       - name: Write version
-        run: echo "${GITHUB_REF#refs/tags/}" > ./cli/cmd/version.txt
+        run: echo "${{ github.event.release.tag_name }}" > ./cli/cmd/version.txt
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
@@ -188,7 +188,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v1
       - name: Write version
-        run: echo "${GITHUB_REF#refs/tags/}" > ./cli/cmd/version.txt
+        run: echo "${{ github.event.release.tag_name }}" > ./cli/cmd/version.txt
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
@@ -208,7 +208,7 @@ jobs:
       - name: Write version
         run: echo "${GITHUB_REF#refs/tags/}" > ./cli/cmd/version.txt
       - name: Replace version in PKGBUILD
-        run: sed -i "s/pkgver=.*/pkgver=${GITHUB_REF#refs\/tags\//}/" ./.github/workflows/PKGBUILD
+        run: sed -i "s/pkgver=.*/pkgver=${{ github.event.release.tag_name }}/" ./.github/workflows/PKGBUILD
       - name: Publish AUR package
         uses: KSXGitHub/github-actions-deploy-aur@v2.7.0
         with:
@@ -219,4 +219,4 @@ jobs:
           commit_email: ${{ secrets.AUR_EMAIL }}
           ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
           commit_message: Update AUR package from GitHub Actions automation
-          ssh_keyscan_types: ed25519
\ No newline at end of file
+          ssh_keyscan_types: ed25519