diff --git a/.github/workflows/linux-makepkg.yml b/.github/workflows/linux-makepkg.yml index e9f9f7cc4..6aa31d884 100644 --- a/.github/workflows/linux-makepkg.yml +++ b/.github/workflows/linux-makepkg.yml @@ -38,6 +38,8 @@ jobs: SRCDEST: ${{ github.workspace }}/srcdest steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + with: + path: cryptomator - name: Prepare pacman run: | pacman-key --init @@ -49,13 +51,14 @@ jobs: echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/builder chown -R builder:builder "$GITHUB_WORKSPACE" install -d -m 0755 -o builder -g builder "$PKGDEST" "$SRCDEST" - - name: Set package version - run: | - sed -i -e "s|^pkgver=.*$|pkgver=${VERSION//-/_}|" dist/linux/makepkg/PKGBUILD + - name: Prepare PKGBUILD + run: envsubst '$PKG_VERSION PKG_RELEASE SOURCES SOURCES_SHA' < cryptomator/dist/linux/makepkg/PKGBUILD.template > PKGBUILD env: - VERSION: ${{ needs.get-version.outputs.semVerStr }} + PKG_VERSION: ${{ needs.get-version.outputs.semVerStr }} + PKG_RELEASE: 1 + SOURCES: '"${_src_app_dir}::git+file://${{ github.workspace }}/cryptomator"' + SOURCES_SHA: "'SKIP'" - name: Build package with makepkg - working-directory: dist/linux/makepkg run: | sudo -u builder env \ PKGDEST="$PKGDEST" \ diff --git a/dist/linux/makepkg/PKGBUILD b/dist/linux/makepkg/PKGBUILD.template similarity index 98% rename from dist/linux/makepkg/PKGBUILD rename to dist/linux/makepkg/PKGBUILD.template index 222d53624..051708b14 100644 --- a/dist/linux/makepkg/PKGBUILD +++ b/dist/linux/makepkg/PKGBUILD.template @@ -5,8 +5,8 @@ # Contributor: Armin Schrenk pkgname=cryptomator -pkgver=1.19.0_SNAPSHOT -pkgrel=1 +pkgver=$PKG_VERSION +pkgrel=$PKG_RELEASE pkgdesc="Multiplatform transparent client-side encryption of your files in the cloud." arch=('any') url="https://cryptomator.org/" @@ -17,13 +17,13 @@ optdepends=('keepassxc-cryptomator: Use KeePassXC to store vault passwords' 'ttf _jdkver=24.0.1+9 _jfxver=25 _src_app_dir=cryptomator-${pkgver//_/-} -source=("${_src_app_dir}::git+file://${startdir}/../../.."); +source=($SOURCES); source_x86_64=("jdk-${_jdkver}.tar.gz::https://github.com/adoptium/temurin${_jdkver:0:2}-binaries/releases/download/jdk-${_jdkver//\+/%2B}/OpenJDK${_jdkver:0:2}U-jdk_x64_linux_hotspot_${_jdkver//\+/_}.tar.gz" "openjfx-${_jfxver}.zip::https://download2.gluonhq.com/openjfx/${_jfxver}/openjfx-${_jfxver}_linux-x64_bin-jmods.zip") source_aarch64=("jdk-${_jdkver}.tar.gz::https://github.com/adoptium/temurin${_jdkver:0:2}-binaries/releases/download/jdk-${_jdkver//\+/%2B}/OpenJDK${_jdkver:0:2}U-jdk_aarch64_linux_hotspot_${_jdkver//\+/_}.tar.gz" "openjfx-${_jfxver}.zip::https://download2.gluonhq.com/openjfx/${_jfxver}/openjfx-${_jfxver}_linux-aarch64_bin-jmods.zip") noextract=("jdk-${_jdkver}.tar.gz" "openjfx-${_jfxver}.zip") -sha256sums=('SKIP') +sha256sums=($SOURCES_SHA) sha256sums_x86_64=('78832cb5ea4074f2215cde0d01d6192d09c87636fc24b36647aea61fb23b8272' '96e520f48610d8ffb94ca30face1f11ffe8a977ddc1c4ff80b1a9e9f048bd94e') sha256sums_aarch64=('a598260e340028d9b2383c23df16aa286769a661bd3bf28a52e8c1a5774b1110'