From 1fc7208b7abaa01081a385af49cba5c6c954addd Mon Sep 17 00:00:00 2001 From: M0Rf30 Date: Sat, 16 Dec 2023 16:57:03 +0100 Subject: [PATCH] chore: move to up-to-date yap agent --- .github/workflows/release.yml | 34 +++++++++++++++------------- packages/cie-middleware/PKGBUILD | 27 ++++++++++------------ packages/{ => deb}/cryptopp/PKGBUILD | 6 ++--- packages/deb/yap.json | 7 ++---- packages/{rpm => }/yap.json | 4 ++-- 5 files changed, 37 insertions(+), 41 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..51d8a607 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,26 +25,29 @@ jobs: run: echo "::set-output name=version::$(cat packages/cie-middleware/PKGBUILD | grep pkgver | cut -d\" -f2)" id: version - - name: ccache - uses: hendrikmuhs/ccache-action@v1 - - 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 - - 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 + docker run --entrypoint=bash -v $(pwd):/project m0rf30/yap-ubuntu-focal:latest -c "cd /project; \ + yap prepare ubuntu-focal; \ + yap build ubuntu-focal /project/packages/deb; \ + yap build ubuntu-focal /project/packages" + docker run --entrypoint=bash -v $(pwd):/project m0rf30/yap-rocky-8:latest -c "cd /project; \ + yap prepare rocky-8; \ + dnf -y install dnf-plugins-core epel-release; \ + dnf config-manager --set-enabled powertools; \ + yap build rocky-8 /project/packages" + + for i in $(ls artifacts/); do sha256sum artifacts/$i >> SHA256SUMS; done + for i in $(ls artifacts/x86_64/); do sha256sum artifacts/x86_64/$i >> SHA256SUMS; done - name: Archive production artifacts uses: actions/upload-artifact@v3 with: name: "cie-middleware-${{ steps.version.outputs.version }}" path: | - artifacts_ci/*.deb - artifacts/SHA256SUMS + artifacts/*.deb + artifacts/x86_64/*.rpm + SHA256SUMS - uses: "marvinpinto/action-automatic-releases@latest" with: @@ -53,7 +56,6 @@ jobs: prerelease: false title: "cie-middleware-${{ steps.version.outputs.version }}" files: | - artifacts_ci/*.deb - artifacts_ci/*.rpm - - artifacts_ci/SHA256SUMS + artifacts/*.deb + artifacts/x86_64/*.rpm + SHA256SUMS diff --git a/packages/cie-middleware/PKGBUILD b/packages/cie-middleware/PKGBUILD index 4f9ec0f8..c88a65ba 100644 --- a/packages/cie-middleware/PKGBUILD +++ b/packages/cie-middleware/PKGBUILD @@ -4,24 +4,24 @@ 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") -license=("BSD-3") +arch=("x86_64") +license=("BSD-3-Clause") section="utils" priority="optional" -sources=( +source=( "https://github.com/M0Rf30/cie-middleware-linux/archive/refs/tags/${pkgver}-podofo.tar.gz" - "https://downloads.gradle-dn.com/distributions/gradle-7.4.2-bin.zip" + "https://services.gradle.org/distributions/gradle-8.5-bin.zip" ) -sources__pacman=( +source__pacman=( "https://github.com/M0Rf30/cie-middleware-linux/archive/refs/tags/${pkgver}-podofo.tar.gz" ) -hashsums=( - "skip" - "skip" +sha256sums=( + "SKIP" + "SKIP" ) -hashsums__pacman=( - "skip" +sha256sums__pacman=( + "SKIP" ) depends__apt=( "cryptopp" @@ -37,7 +37,6 @@ depends__apt=( "pcscd" ) makedepends__apt=( - "ccache" "g++" "libcurl4-openssl-dev" "libfontconfig1-dev" @@ -66,7 +65,6 @@ depends__pacman=( "podofo" ) makedepends__pacman=( - "ccache" "crypto++" "curl" "fontconfig" @@ -96,7 +94,6 @@ depends__yum=( "podofo-libs" ) makedepends__yum=( - "ccache" "cryptopp-devel" "fontconfig-devel" "freetype-devel" @@ -126,7 +123,7 @@ build__yum() { export JAVA_HOME=/usr/lib/jvm/java-11-openjdk/ cd "${srcdir}/${pkgname}-linux-${pkgver}-podofo" - ../gradle-7.4.2/bin/gradle -b cie-java/build.gradle standalone + ../gradle-8.5/bin/gradle -b cie-java/build.gradle standalone meson builddir libs meson configure -Dprefix=/usr builddir meson compile -C builddir @@ -137,7 +134,7 @@ build__apt() { pip3 install ninja==1.10.2.3 meson==0.61.1 cd "${srcdir}/${pkgname}-linux-${pkgver}-podofo" - ../gradle-7.4.2/bin/gradle -b cie-java/build.gradle standalone + ../gradle-8.5/bin/gradle -b cie-java/build.gradle standalone meson builddir libs meson configure -Dprefix=/usr builddir 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