fix: CI/CD

.github/workflows/publish.yml

@@ -24,8 +24,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
   publish-crate:
     name: Publish to crates.io
-    needs:
+    needs: [audit]
-      - audit
     runs-on: ubuntu-latest
     timeout-minutes: 25
     steps:
@@ -53,8 +52,9 @@ jobs:
             --execute
   github-release:
     name: Create GitHub Release
-    needs:
+    needs: [audit]
-      - audit
+    permissions:
+      contents: write
     strategy:
       matrix:
         include:
@@ -82,54 +82,90 @@ jobs:
             tar czf ../../sula-alus-${{ matrix.target }}.tar.gz sula-alus
           fi
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: sula-alus-${{ matrix.target }}
           path: target/sula-alus-${{ matrix.target }}.*
+          compression-level: 0
   create-release:
     needs: [github-release]
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
       - uses: actions/checkout@v4
-      - name: Generate PKGBUILD
+      - uses: actions/download-artifact@v4
-        run: |
-          cat > PKGBUILD << 'EOF'
-          # Maintainer: Kristofers Solo <dev@kristofers.xyz>
-          pkgname=sula-alus-bin
-          pkgver=${GITHUB_REF#refs/tags/v}
-          pkgrel=1
-          pkgdesc="A CLI tool to reverse strings"
-          arch=('x86_64')
-          url="https://github.com/$GITHUB_REPOSITORY"
-          license=('MIT', 'Apache-2.0')
-          provides=('sula-alus')
-          conflicts=('sula-alus')
-          source=("$url/releases/download/v$pkgver/sula-alus-x86_64-unknown-linux-gnu.tar.gz")
-          sha256sums=('SKIP')
-
-          package() {
-              install -Dm755 sula-alus "$pkgdir/usr/bin/sula-alus"
-          }
-          EOF
-      - uses: actions/download-artifact@v3
-      - name: Create Release
-        uses: softprops/action-gh-release@v1
         with:
-          files: sula-alus-*/sula-alus-*
+          path: artifacts
+          merge-multiple: true
+      - name: Create Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: artifacts/sula-alus-*
           generate_release_notes: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   publish-aur:
     needs: [create-release]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - name: Get version and description
+        id: metadata
+        run: |
+          DESCRIPTION=$(cargo metadata --format-version=1 --no-deps | jq -r '.packages[0].description')
+          VERSION=$(cargo metadata --format-version=1 --no-deps | jq -r '.packages[0].version')
+          echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
+          echo "DESCRIPTION=${DESCRIPTION}" >> $GITHUB_OUTPUT
+      - name: Get SHA256 sum
+        id: sha256
+        run: |
+          curl -LO "${{ github.server_url }}/${{ github.repository }}/releases/download/v${{ steps.get_version.outputs.VERSION }}/sula-alus-x86_64-unknown-linux-gnu.tar.gz"
+          echo "SHA256=$(sha256sum sula-alus-x86_64-unknown-linux-gnu.tar.gz | cut -d' ' -f1)" >> $GITHUB_OUTPUT
+      - name: Generate PKGBUILD
+        run: |
+          cat > PKGBUILD << 'EOF'
+          # Maintainer: Kristofers Solo <dev@kristofers.xyz>
+          pkgname=sula-alus-bin
+          pkgver=${{ steps.metadata.outputs.VERSION }}
+          pkgrel=1
+          pkgdesc="${{ steps.metadata.outputs.DESCRIPTION }}"
+          arch=("x86_64")
+          url="https://github.com/kristoferssolo/sula-alus"
+          license=("MIT" "Apache-2.0")
+          provides=("sula-alus")
+          conflicts=("sula-alus" "sula-alus-git")
+          source=("\${url}/releases/download/v\${pkgver}/sula-alus-x86_64-unknown-linux-gnu.tar.gz")
+          EOF
+      - name: Update SHA256 and package function
+        run: |
+          echo "sha256sums=(\"${{ steps.sha256.outputs.SHA256 }}\")" >> PKGBUILD
+          echo >> PKGBUILD
+          cat >> PKGBUILD << 'EOF'
+
+          prepare() {
+              cd "$srcdir"
+              tar xf "sula-alus-x86_64-unknown-linux-gnu.tar.gz"
+          }
+
+          package() {
+              cd "$srcdir"
+              install -Dm755 sula-alus "${pkgdir}/usr/bin/sula-alus"
+          }
+          EOF
+      - name: Generate .SRCINFO
+        run: |
+          docker run --rm -v "$PWD":/pkg -w /pkg archlinux:base-devel bash -c '
+            useradd -m builder && \
+            echo "builder ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \
+            chown -R builder:builder /pkg && \
+            su builder -c "makepkg --printsrcinfo > .SRCINFO"
+          '
       - name: Publish AUR package
-        uses: KSXGitHub/github-actions-deploy-aur@v2.7.0
+        uses: KSXGitHub/github-actions-deploy-aur@v3.0.1
         with:
           pkgname: sula-alus-bin
           pkgbuild: ./PKGBUILD
           commit_username: ${{ secrets.AUR_USERNAME }}
           commit_email: ${{ secrets.AUR_EMAIL }}
           ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
-          commit_message: "Update to version ${GITHUB_REF#refs/tags/v}"
+          commit_message: "Update to version ${{ steps.metadata.outputs.VERSION }}"
+          ssh_keyscan_types: rsa,ecdsa,ed25519

Cargo.lock

@@ -142,7 +142,7 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "sula-alus"
-version = "0.1.1"
+version = "0.1.5"
 dependencies = [
  "clap",
 ]

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "sula-alus"
 authors = ["Kristofers Solo <dev@kristofers.xyz>"]
-version = "0.1.1"
+version = "0.1.5"
 edition = "2021"
 description = "A CLI tool to encode strings and files using Sula-Alus encoding"
 repository = "https://github.com/kristoferssolo/sula-alus"