diff --git a/.forgejo/workflows/publish.yaml b/.forgejo/workflows/publish.yaml index 59ec1f8707e..b8f984d1b31 100644 --- a/.forgejo/workflows/publish.yaml +++ b/.forgejo/workflows/publish.yaml @@ -4,7 +4,7 @@ name: Build/Publish XBPS on: push: branches: - - main + - "master" paths: - "srcpkgs/**" @@ -66,30 +66,17 @@ jobs: container: image: ghcr.io/void-linux/void-buildroot-${{ matrix.config.libc }}:20231230R1 steps: - - name: Checkout - uses: https://code.forgejo.org/actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 - with: - submodules: true - - - name: Get changed packages - id: changed - uses: https://github.com/tj-actions/changed-files@a29e8b565651ce417abb5db7164b4a2ad8b6155c # v44 - with: - since_last_remote_commit: true + - name: Clone and checkout + uses: https://github.com/classabbyamp/treeless-checkout-action@v1 - name: Prepare container - if: ${{ steps.changed.outputs.all_changed_files != '' }} run: | - # switch to repo-ci mirror mkdir -p /etc/xbps.d && cp /usr/share/xbps.d/*-repository-*.conf /etc/xbps.d/ sed -i 's|repo-default|repo-ci|g' /etc/xbps.d/*-repository-*.conf - # Sync and upgrade once, assume error comes from xbps update - xbps-install -Syu || xbps-install -yu xbps - # Upgrade again (in case there was a xbps update) - xbps-install -yu + xbps-install -Syu || { xbps-install -yu xbps && xbps-install -yu; } + xbps-install -y grep curl git node - name: Create hostrepo and prepare masterdir - if: ${{ steps.changed.outputs.all_changed_files != '' }} run: | ln -s "$(pwd)" /hostrepo && common/travis/set_mirror.sh && @@ -99,7 +86,6 @@ jobs: curl -so "/hostdir/binpkgs/${{ matrix.config.arch }}-repodata" "https://xbps.snaile.de/${{ matrix.config.arch }}-repodata" || true - name: Build packages - if: ${{ steps.changed.outputs.all_changed_files != '' }} run: | ( here="$(pwd)" @@ -107,20 +93,15 @@ jobs: "$here/common/travis/build.sh" "$BOOTSTRAP" "$ARCH" "$TEST" ) - - name: Sign packages - if: ${{ steps.changed.outputs.all_changed_files != '' }} + - name: Sign and upload packages run: | echo '${{ secrets.XBPS_SIGNING_KEY }}' >"/tmp/privkey.pem" - for package in ${{ steps.changed.outputs.all_changed_files }}; do - file=$(echo /hostdir/binpkgs/${package}-*.${{ matrix.config.arch }}.xbps | cut -d ' ' -f 1) - [ -r "$file" ] - XBPS_PASSPHRASE=${{ secrets.XBPS_SIGNING_PASSPHRASE }} xbps-rindex --privkey "/tmp/privkey.pem" --sign-pkg --signedby "${{ env.MAINTAINER }}" "$file" + for package in $(echo /hostdir/binpkgs/*.${{ matrix.config.arch }}.xbps | cut -d ' ' -f 1); do + XBPS_PASSPHRASE=${{ secrets.XBPS_SIGNING_PASSPHRASE }} xbps-rindex --privkey "/tmp/privkey.pem" --sign-pkg --signedby "${{ env.MAINTAINER }}" "$package" + for item in "$package" "${package}.sig2"; do + curl -X PUT --digest -u "${{ vars.XBPS_WEBDAV_USER }}:${{ secrets.XBPS_WEBDAV_KEY }}" -T "${item}" "https://xbps.snaile.de/$(basename $item)" + done done rm /tmp/privkey.pem - - - name: Upload packages - if: ${{ steps.changed.outputs.all_changed_files != '' }} - run: | - find /hostdir/binpkgs -type f -exec sh -c 'curl -X PUT --digest -u "${{ vars.XBPS_WEBDAV_USER }}:${{ secrets.XBPS_WEBDAV_KEY }}" -T "${1}" "https://xbps.snaile.de/$(basename $1)"' find-shell {} \; diff --git a/srcpkgs/zk/template b/srcpkgs/zk/template new file mode 100644 index 00000000000..1f7c0fb2cfc --- /dev/null +++ b/srcpkgs/zk/template @@ -0,0 +1,18 @@ +# Template file for 'zk' +pkgname=zk +version=0.14.0 +revision=2 +build_style=go +go_import_path=github.com/mickael-menu/zk +go_build_tags=fts5 +short_desc="Plain text note-taking assistant" +maintainer="luca " +license="GPL-3.0-or-later" +homepage="https://github.com/zk-org/zk/" +changelog="https://raw.githubusercontent.com/zk-org/zk/main/CHANGELOG.md" +distfiles="https://github.com/zk-org/zk/archive/refs/tags/v${version}.tar.gz" +checksum=bd96f93d50e2e72ce05f36c3dab5b7942ae205756f26d4c68ba2a7ccc783abc8 + +do_check() { + go test -v +}