From 7fb2f96a80060165d911a02448ceb9f1ebc15de3 Mon Sep 17 00:00:00 2001
From: M0Rf30 <morf3089@gmail.com>
Date: Sat, 16 Dec 2023 16:57:03 +0100
Subject: [PATCH] chore: move to up-to-date yap agent

---
 .github/workflows/release.yml        | 12 +++++++-----
 packages/cie-middleware/PKGBUILD     | 16 ++++++++--------
 packages/{ => deb}/cryptopp/PKGBUILD |  6 +++---
 packages/deb/yap.json                |  7 ++-----
 packages/{rpm => }/yap.json          |  4 ++--
 5 files changed, 22 insertions(+), 23 deletions(-)
 rename packages/{ => deb}/cryptopp/PKGBUILD (96%)
 rename packages/{rpm => }/yap.json (79%)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 645afb1b..8946a5b5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,13 +30,15 @@ jobs:
 
       - name: Build
         run: |
-          docker run -v $(pwd)/.ccache:/ccache -v $(pwd):/project -e CCACHE_DIR=/ccache packagefoundation/yap-ubuntu-focal:latest build ubuntu-focal packages/deb
-          docker run -v $(pwd)/.ccache:/ccache -v $(pwd):/project -e CCACHE_DIR=/ccache packagefoundation/yap-rocky-8:latest build rocky-8 packages/rpm
+          docker run -v $(pwd)/.ccache:/ccache -v $(pwd):/project -e CCACHE_DIR=/ccache M0Rf30/yap-ubuntu-focal:latest build ubuntu-focal packages/deb
+          docker run -v $(pwd)/.ccache:/ccache -v $(pwd):/project -e CCACHE_DIR=/ccache M0Rf30/yap-ubuntu-focal:latest build ubuntu-focal packages
+          docker run -v $(pwd)/.ccache:/ccache -v $(pwd):/project -e CCACHE_DIR=/ccache M0Rf30/yap-rocky-8:latest build rocky-8 packages
 
           mkdir artifacts_ci
           sudo mv artifacts/*.deb artifacts_ci
-          sudo mv artifacts/*.rpm artifacts_ci
+          sudo mv artifacts/x86_64/*.rpm artifacts_ci
           for i in $(ls artifacts_ci/); do sha256sum artifacts_ci/$i >> artifacts_ci/SHA256SUMS; done
+          for i in $(ls artifacts_ci/x86_64/); do sha256sum artifacts_ci/x86_64/$i >> artifacts_ci/SHA256SUMS; done
 
       - name: Archive production artifacts
         uses: actions/upload-artifact@v3
@@ -44,6 +46,7 @@ jobs:
           name: "cie-middleware-${{ steps.version.outputs.version }}"
           path: |
             artifacts_ci/*.deb
+            artifacts_ci/x86_64/*.rpm
             artifacts/SHA256SUMS
 
       - uses: "marvinpinto/action-automatic-releases@latest"
@@ -54,6 +57,5 @@ jobs:
           title: "cie-middleware-${{ steps.version.outputs.version }}"
           files: |
             artifacts_ci/*.deb
-            artifacts_ci/*.rpm
-
+            artifacts_ci/x86_64/*.rpm
             artifacts_ci/SHA256SUMS
diff --git a/packages/cie-middleware/PKGBUILD b/packages/cie-middleware/PKGBUILD
index 886f7f26..d61b99de 100644
--- a/packages/cie-middleware/PKGBUILD
+++ b/packages/cie-middleware/PKGBUILD
@@ -4,27 +4,27 @@ pkgrel="1"
 pkgdesc="A fork of Middleware della CIE (Carta di Identità Elettronica) per Linux"
 maintainer="M0Rf30"
 url="https://github.com/italia/cie-middleware-linux"
-arch=("amd64")
+arch=("x86_64")
 license=("BSD-3")
 section="utils"
 priority="optional"
-sources=(
+source=(
   "https://github.com/M0Rf30/cie-middleware-linux/archive/refs/tags/${pkgver}.tar.gz"
   "https://github.com/M0Rf30/cie-middleware-linux/releases/download/podofo-1.4.2/libpodofo-1.4.2.tar.gz"
   "https://downloads.gradle-dn.com/distributions/gradle-7.4.2-bin.zip"
 )
-sources__pacman=(
+source__pacman=(
   "https://github.com/M0Rf30/cie-middleware-linux/archive/refs/tags/${pkgver}.tar.gz"
   "https://github.com/M0Rf30/cie-middleware-linux/releases/download/podofo-1.4.2/libpodofo-1.4.2.tar.gz"
 )
 
-hashsums=(
-  "skip"
+sha256sums=(
+  "SKIP"
   "ef81e439b12aa2ff309b353399c033bd62b027e7bd4cbf649c025226f1de5287"
-  "skip"
+  "SKIP"
 )
-hashsums__pacman=(
-  "skip"
+sha256sums__pacman=(
+  "SKIP"
   "ef81e439b12aa2ff309b353399c033bd62b027e7bd4cbf649c025226f1de5287"
 )
 depends__apt=(
diff --git a/packages/cryptopp/PKGBUILD b/packages/deb/cryptopp/PKGBUILD
similarity index 96%
rename from packages/cryptopp/PKGBUILD
rename to packages/deb/cryptopp/PKGBUILD
index 60d54ba3..11fc57cc 100644
--- a/packages/cryptopp/PKGBUILD
+++ b/packages/deb/cryptopp/PKGBUILD
@@ -2,15 +2,15 @@ pkgname="cryptopp"
 pkgver="8.6.0"
 pkgrel="1"
 pkgdesc="A free C++ class library of cryptographic schemes"
-arch=("amd64")
+arch=("x86_64")
 maintainer="M0Rf30"
 url="https://www.cryptopp.com/"
 section="libs"
 priority="important"
-sources=(
+source=(
   "https://github.com/weidai11/cryptopp/archive/69bf6b53052b59ccb57ce068ce741988ae087317.tar.gz"
 )
-hashsums=(
+sha256sums=(
   "SKIP"
 )
 
diff --git a/packages/deb/yap.json b/packages/deb/yap.json
index 2d1837d4..21c20321 100644
--- a/packages/deb/yap.json
+++ b/packages/deb/yap.json
@@ -5,11 +5,8 @@
     "output": "artifacts",
     "Projects": [
         {
-            "name": "../cryptopp",
+            "name": "cryptopp",
             "install": true
-        },
-        {
-            "name": "../cie-middleware"
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/packages/rpm/yap.json b/packages/yap.json
similarity index 79%
rename from packages/rpm/yap.json
rename to packages/yap.json
index e1191b4e..eea72ff7 100644
--- a/packages/rpm/yap.json
+++ b/packages/yap.json
@@ -5,7 +5,7 @@
     "output": "artifacts",
     "Projects": [
         {
-            "name": "../cie-middleware"
+            "name": "cie-middleware"
         }
     ]
-}
+}
\ No newline at end of file