From f582dcf85632c65025697ed5ceba9f855894d0b4 Mon Sep 17 00:00:00 2001
From: M0Rf30 <morf3089@gmail.com>
Date: Mon, 5 Sep 2022 01:28:35 +0200
Subject: [PATCH] feat(CI): enable rocky builds

---
 .github/workflows/release.yml    |  7 ++++++-
 packages/cie-middleware/PKGBUILD | 18 +++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 155b7999..dc3ae084 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # Runs a set of commands using the runners shell
       - name: Detect version
@@ -31,8 +31,11 @@ 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
+          docker run -v $(pwd)/.ccache:/ccache -v $(pwd):/project -e CCACHE_DIR=/ccache packagefoundation/yap-rocky-8:latest build rocky-8 packages
+
           mkdir artifacts_ci
           sudo mv artifacts/*.deb artifacts_ci
+          sudo mv artifacts/*.rpm artifacts_ci
           for i in $(ls artifacts_ci/); do sha256sum artifacts_ci/$i >> artifacts_ci/SHA256SUMS; done
 
       - name: Archive production artifacts
@@ -51,4 +54,6 @@ jobs:
           title: "cie-middleware-${{ steps.version.outputs.version }}"
           files: |
             artifacts_ci/*.deb
+            artifacts_ci/*.rpm
+
             artifacts_ci/SHA256SUMS
diff --git a/packages/cie-middleware/PKGBUILD b/packages/cie-middleware/PKGBUILD
index cf26885b..f3794d13 100644
--- a/packages/cie-middleware/PKGBUILD
+++ b/packages/cie-middleware/PKGBUILD
@@ -1,11 +1,10 @@
 targets=(
-    "archlinux"
+    "arch"
     "fedora"
-    "opensuse"
     "ubuntu"
 )
 pkgname="cie-middleware"
-pkgver="1.4.3.2"
+pkgver="1.4.3.3"
 pkgrel="1"
 pkgdesc="A fork of Middleware della CIE (Carta di Identità Elettronica) per Linux"
 pkgdesclong=("A fork of Middleware della CIE (Carta di Identità Elettronica) per Linux")
@@ -20,7 +19,7 @@ sources=(
     "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:archlinux=(
+sources:pacman=(
     "https://github.com/M0Rf30/cie-middleware-linux/archive/main.tar.gz"
     "https://github.com/M0Rf30/cie-middleware-linux/releases/download/podofo-1.4.2/libpodofo-1.4.2.tar.gz"
 )
@@ -30,7 +29,7 @@ hashsums=(
     "ef81e439b12aa2ff309b353399c033bd62b027e7bd4cbf649c025226f1de5287"
     "skip"
 )
-hashsums:archlinux=(
+hashsums:pacman=(
     "skip"
     "ef81e439b12aa2ff309b353399c033bd62b027e7bd4cbf649c025226f1de5287"
 )
@@ -67,7 +66,7 @@ depends:pacman=(
     "curl"
     "fontconfig"
     "freetype2"
-    "java-runtime"
+    "jre11-openjdk"
     "libpng"
     "libxml2"
     "openssl"
@@ -80,6 +79,7 @@ makedepends:pacman=(
     "fontconfig"
     "freetype2"
     "gradle"
+    "jdk11-openjdk"
     "libpng"
     "libxml2"
     "meson"
@@ -115,7 +115,7 @@ makedepends:yum=(
     "pkgconf-pkg-config"
 )
 
-build:archlinux() {
+build:pacman() {
     export JAVA_HOME=/usr/lib/jvm/default/
     cp "${srcdir}/libpodofo.a" \
       "${srcdir}/${pkgname}-linux-main/libs/lib"
@@ -127,7 +127,7 @@ build:archlinux() {
     meson compile -C builddir
 }
 
-build:fedora() {
+build:yum() {
     export JAVA_HOME=/usr/lib/jvm/java-11-openjdk/
     cp "${srcdir}/libpodofo.a" \
       "${srcdir}/${pkgname}-linux-main/libs/lib"
@@ -139,7 +139,7 @@ build:fedora() {
     meson compile -C builddir
 }
 
-build:ubuntu() {
+build:apt() {
     export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
     pip3 install ninja==1.10.2.3 meson==0.61.1
     cp "${srcdir}/libpodofo.a" \