From bcbc7a1f51bc52b4cc1190d792bc2cf50f916fcc Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Mon, 23 Jun 2025 12:16:02 +0200 Subject: [PATCH 01/19] Automatically checksum renovated packages --- .github/workflows/build.yaml | 70 +++++++++++++++++++++++++++------ .github/workflows/renovate.yaml | 15 ++----- 2 files changed, 63 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2d381ce..d4c06c5 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,17 +1,59 @@ name: build on: - # TODO: Enable once we have conditional build logic built - # pull_request: - # paths: - # - 'srcpkgs/**' + pull_request: + paths: + - "srcpkgs/**" + types: + - opened + - reopened + - synchronize + branches: + - main push: paths: - - 'srcpkgs/**' + - "srcpkgs/**" + branches: + - main jobs: + checksum: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + ref: ${{ github.ref }} + + - name: get changed package + run: | + echo "CHANGED_PKG=$(git diff --name-only origin/main ${GITHUB_HEAD_REF} "srcpkgs/*/template" | head -1 | cut -d/ -f2)" >> $GITHUB_ENV + + - name: checkout upstream templates + if: ${{ env.CHANGED_PKG != '' }} + uses: actions/checkout@v4 + with: + repository: void-linux/void-packages + ref: master + fetch-depth: 1 + path: distdir + + - name: generate checksum + if: ${{ env.CHANGED_PKG != '' }} + run: | + XBPS_DISTDIR="$PWD/distdir" xgensum -i ${{ env.CHANGED_PKG }} + + - name: Commit + if: ${{ env.CHANGED_PKG != '' }} + uses: stefanzweifel/git-auto-commit-action@v6 + with: + file_pattern: "*/template" + commit_message: "Update checksum" + changedpkgs: name: Check package changes + needs: [checksum] runs-on: ubuntu-latest if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')" @@ -36,14 +78,20 @@ jobs: build: name: Build packages runs-on: ubuntu-latest - needs: [ changedpkgs ] + needs: [changedpkgs] if: "needs.changedpkgs.outputs.changed != '' && !contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')" strategy: fail-fast: false matrix: config: - - { arch: x86_64, host: x86_64, libc: glibc, platform: linux/amd64, test: 1 } + - { + arch: x86_64, + host: x86_64, + libc: glibc, + platform: linux/amd64, + test: 1, + } # - { arch: i686, host: i686, libc: glibc, platform: linux/386, test: 1 } # - { arch: aarch64, host: x86_64, libc: glibc, platform: linux/amd64, test: 0 } # - { arch: armv7l, host: x86_64, libc: glibc, platform: linux/amd64, test: 0 } @@ -57,9 +105,9 @@ jobs: volumes: - /dev:/dev env: - ARCH: '${{ matrix.config.arch }}' - BOOTSTRAP: '${{ matrix.config.host }}' - TEST: '${{ matrix.config.test }}' + ARCH: "${{ matrix.config.arch }}" + BOOTSTRAP: "${{ matrix.config.host }}" + TEST: "${{ matrix.config.test }}" steps: - name: Prepare container @@ -135,7 +183,7 @@ jobs: deploy: name: Deploy repository runs-on: ubuntu-latest - needs: [ build ] + needs: [build] concurrency: group: ${{ github.workflow }}-${{ github.ref }}-deployment cancel-in-progress: false diff --git a/.github/workflows/renovate.yaml b/.github/workflows/renovate.yaml index 9cf2fd9..61ced21 100644 --- a/.github/workflows/renovate.yaml +++ b/.github/workflows/renovate.yaml @@ -1,15 +1,15 @@ name: renovate on: schedule: - - cron: '0 * * * *' + - cron: "0 * * * *" push: paths: - - '.github/**' # TODO: remove after debugging + - ".github/**" # TODO: remove after debugging env: - LOG_LEVEL: 'debug' + LOG_LEVEL: "info" RENOVATE_AUTODISCOVER: true - RENOVATE_AUTODISCOVER_FILTER: '${{ github.repository }}' + RENOVATE_AUTODISCOVER_FILTER: "${{ github.repository }}" RENOVATE_PLATFORM: github # RENOVATE_PLATFORM_COMMIT: true # RENOVATE_BOT_NAME: 'breq' @@ -26,10 +26,3 @@ jobs: with: configurationFile: .github/renovate.json token: ${{ secrets.RENOVATE_TOKEN }} - - - - name: Find updated package - run: | - #!/usr/bin/env bash - set -euxo pipefail - echo "pkgbuild=$(git diff --name-only origin/main origin/${GITHUB_HEAD_REF} "*template" | head -1 | xargs dirname)" >> $GITHUB_ENV From a5f05da58f2a008c439dd20ca30b716d89c42727 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Mon, 23 Jun 2025 12:16:02 +0200 Subject: [PATCH 02/19] Automatically checksum renovated packages --- .github/workflows/build.yaml | 35 ++++++++++++++++++++++----------- .github/workflows/renovate.yaml | 15 ++++---------- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2d381ce..cd0b5e4 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,13 +1,20 @@ name: build on: - # TODO: Enable once we have conditional build logic built - # pull_request: - # paths: - # - 'srcpkgs/**' + pull_request: + paths: + - "srcpkgs/**" + types: + - opened + - reopened + - synchronize + branches: + - main push: paths: - - 'srcpkgs/**' + - "srcpkgs/**" + branches: + - main jobs: changedpkgs: @@ -36,14 +43,20 @@ jobs: build: name: Build packages runs-on: ubuntu-latest - needs: [ changedpkgs ] + needs: [changedpkgs] if: "needs.changedpkgs.outputs.changed != '' && !contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')" strategy: fail-fast: false matrix: config: - - { arch: x86_64, host: x86_64, libc: glibc, platform: linux/amd64, test: 1 } + - { + arch: x86_64, + host: x86_64, + libc: glibc, + platform: linux/amd64, + test: 1, + } # - { arch: i686, host: i686, libc: glibc, platform: linux/386, test: 1 } # - { arch: aarch64, host: x86_64, libc: glibc, platform: linux/amd64, test: 0 } # - { arch: armv7l, host: x86_64, libc: glibc, platform: linux/amd64, test: 0 } @@ -57,9 +70,9 @@ jobs: volumes: - /dev:/dev env: - ARCH: '${{ matrix.config.arch }}' - BOOTSTRAP: '${{ matrix.config.host }}' - TEST: '${{ matrix.config.test }}' + ARCH: "${{ matrix.config.arch }}" + BOOTSTRAP: "${{ matrix.config.host }}" + TEST: "${{ matrix.config.test }}" steps: - name: Prepare container @@ -135,7 +148,7 @@ jobs: deploy: name: Deploy repository runs-on: ubuntu-latest - needs: [ build ] + needs: [build] concurrency: group: ${{ github.workflow }}-${{ github.ref }}-deployment cancel-in-progress: false diff --git a/.github/workflows/renovate.yaml b/.github/workflows/renovate.yaml index 9cf2fd9..61ced21 100644 --- a/.github/workflows/renovate.yaml +++ b/.github/workflows/renovate.yaml @@ -1,15 +1,15 @@ name: renovate on: schedule: - - cron: '0 * * * *' + - cron: "0 * * * *" push: paths: - - '.github/**' # TODO: remove after debugging + - ".github/**" # TODO: remove after debugging env: - LOG_LEVEL: 'debug' + LOG_LEVEL: "info" RENOVATE_AUTODISCOVER: true - RENOVATE_AUTODISCOVER_FILTER: '${{ github.repository }}' + RENOVATE_AUTODISCOVER_FILTER: "${{ github.repository }}" RENOVATE_PLATFORM: github # RENOVATE_PLATFORM_COMMIT: true # RENOVATE_BOT_NAME: 'breq' @@ -26,10 +26,3 @@ jobs: with: configurationFile: .github/renovate.json token: ${{ secrets.RENOVATE_TOKEN }} - - - - name: Find updated package - run: | - #!/usr/bin/env bash - set -euxo pipefail - echo "pkgbuild=$(git diff --name-only origin/main origin/${GITHUB_HEAD_REF} "*template" | head -1 | xargs dirname)" >> $GITHUB_ENV From d91417d4ea1131cdf54921fce0a58609f3c17ab2 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Mon, 23 Jun 2025 21:00:06 +0200 Subject: [PATCH 03/19] Add checksum workflow for PRs --- .github/workflows/checksum.yaml | 80 +++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 .github/workflows/checksum.yaml diff --git a/.github/workflows/checksum.yaml b/.github/workflows/checksum.yaml new file mode 100644 index 0000000..18100c8 --- /dev/null +++ b/.github/workflows/checksum.yaml @@ -0,0 +1,80 @@ +name: update packages + +on: + pull_request: + paths: + - "srcpkgs/**" + types: + - opened + - reopened # TODO: For debugging purposes + - synchronize + branches: + - main + +jobs: + checksum: + runs-on: ubuntu-latest + container: + image: ghcr.io/void-linux/void-glibc-full:latest + options: --platform linux/amd64 --privileged + volumes: + - /dev:/dev + env: + ARCH: x86_64 + BOOTSTRAP: x86_64 + TEST: 1 + + steps: + - name: Prepare container + 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 + # install dependencies + xbps-install -Suy xbps && xbps-install -Suy sudo xtools bash + # create non-root user + useradd -G xbuilder -M builder + + - name: checkout local templates + uses: actions/checkout@v4 + + - name: remember changed package + run: | + echo "CHANGED_PKG=$(git diff --name-only origin/main origin/${GITHUB_HEAD_REF} "srcpkgs/*/template" | head -1 | cut -d/ -f2)" >> $GITHUB_ENV + + - name: checkout upstream templates + uses: actions/checkout@v4 + with: + repository: void-linux/void-packages + ref: master + fetch-depth: 1 + path: upstream + + - name: copy to upstream + run: cp -rv srcpkgs/* upstream/srcpkgs + + - name: prep masterdir + run: | + cd upstream && + chown -R builder:builder . && + sudo -Eu builder common/travis/set_mirror.sh && + sudo -Eu builder common/travis/prepare.sh && + cd .. + + - name: generate checksum + env: + CHANGED_PKG: ${{ needs.changedpkgs.outputs.changed }} + run: | + cd upstream && + sudo -Eu builder xgensum -f -i ${{ env.CHANGED_PKG }} && + cd .. + + - name: receive relevant copy from upstream + run: | + cp -r upstream/srcpkgs/${{ env.CHANGED_PKG }} srcpkgs + + - name: Commit new checksum + uses: stefanzweifel/git-auto-commit-action@v6 + with: + file_pattern: "srcpkgs/${{ env.CHANGED_PKG }}/template" + commit_message: "Update ${{ env.CHANGED_PKG }} checksum" From 5978dfe2efc5d73870c68034985d6745c8a6ae43 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Mon, 23 Jun 2025 22:23:29 +0200 Subject: [PATCH 04/19] Set new run conditions for building --- .github/workflows/build.yaml | 14 ++++---------- .github/workflows/checksum.yaml | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index cd0b5e4..81d939b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,15 +1,9 @@ name: build on: - pull_request: - paths: - - "srcpkgs/**" - types: - - opened - - reopened - - synchronize - branches: - - main + workflow_run: + workflows: [PackageUpdate] + types: [completed] push: paths: - "srcpkgs/**" @@ -20,7 +14,7 @@ jobs: changedpkgs: name: Check package changes runs-on: ubuntu-latest - if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')" + if: "${{ github.event.workflow_run.conclusion == 'success' }} && !contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')" outputs: changed: ${{ steps.grabchanged.outputs.changed }} diff --git a/.github/workflows/checksum.yaml b/.github/workflows/checksum.yaml index 18100c8..c99aded 100644 --- a/.github/workflows/checksum.yaml +++ b/.github/workflows/checksum.yaml @@ -1,4 +1,4 @@ -name: update packages +name: PackageUpdate on: pull_request: From 512874ffc471f80e560ffba7decc8205097a60d1 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Mon, 23 Jun 2025 22:29:44 +0200 Subject: [PATCH 05/19] Use different working directories --- .github/workflows/checksum.yaml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/checksum.yaml b/.github/workflows/checksum.yaml index c99aded..dcca554 100644 --- a/.github/workflows/checksum.yaml +++ b/.github/workflows/checksum.yaml @@ -50,24 +50,22 @@ jobs: fetch-depth: 1 path: upstream + - name: prep masterdir + working-directory: upstream + run: | + chown -R builder:builder . && + sudo -Eu builder common/travis/set_mirror.sh && + sudo -Eu builder common/travis/prepare.sh + - name: copy to upstream run: cp -rv srcpkgs/* upstream/srcpkgs - - name: prep masterdir - run: | - cd upstream && - chown -R builder:builder . && - sudo -Eu builder common/travis/set_mirror.sh && - sudo -Eu builder common/travis/prepare.sh && - cd .. - - name: generate checksum + working-directory: upstream env: CHANGED_PKG: ${{ needs.changedpkgs.outputs.changed }} run: | - cd upstream && - sudo -Eu builder xgensum -f -i ${{ env.CHANGED_PKG }} && - cd .. + sudo -Eu builder xgensum -f -i ${{ env.CHANGED_PKG }} - name: receive relevant copy from upstream run: | From 3dd576935bb7febc83503eab56e09293edfea04d Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Mon, 23 Jun 2025 22:36:44 +0200 Subject: [PATCH 06/19] Fetch current github ref --- .github/workflows/checksum.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/checksum.yaml b/.github/workflows/checksum.yaml index dcca554..29c4265 100644 --- a/.github/workflows/checksum.yaml +++ b/.github/workflows/checksum.yaml @@ -37,6 +37,9 @@ jobs: - name: checkout local templates uses: actions/checkout@v4 + with: + fetch-depth: 0 + ref: ${{ github.ref }} - name: remember changed package run: | From 08f0d251ef9a188ab4d3a66aefa9c343f92db22a Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Mon, 23 Jun 2025 22:43:43 +0200 Subject: [PATCH 07/19] Add pwd as safe git directory --- .github/workflows/checksum.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/checksum.yaml b/.github/workflows/checksum.yaml index 29c4265..1d94fc0 100644 --- a/.github/workflows/checksum.yaml +++ b/.github/workflows/checksum.yaml @@ -31,7 +31,7 @@ jobs: 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 # install dependencies - xbps-install -Suy xbps && xbps-install -Suy sudo xtools bash + xbps-install -Suy xbps && xbps-install -Suy sudo xtools bash git # create non-root user useradd -G xbuilder -M builder @@ -43,7 +43,9 @@ jobs: - name: remember changed package run: | + git config --global --add safe.directory $PWD echo "CHANGED_PKG=$(git diff --name-only origin/main origin/${GITHUB_HEAD_REF} "srcpkgs/*/template" | head -1 | cut -d/ -f2)" >> $GITHUB_ENV + echo "CHANGED: ${{ env.CHANGED_PKG }}" - name: checkout upstream templates uses: actions/checkout@v4 From 0cbf4b6b652e65369041e8f3d531777d02df1023 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Mon, 23 Jun 2025 22:43:43 +0200 Subject: [PATCH 08/19] Fix receiving correct changed pkg env var to xgensum --- .github/workflows/checksum.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/checksum.yaml b/.github/workflows/checksum.yaml index 1d94fc0..db50db0 100644 --- a/.github/workflows/checksum.yaml +++ b/.github/workflows/checksum.yaml @@ -67,14 +67,11 @@ jobs: - name: generate checksum working-directory: upstream - env: - CHANGED_PKG: ${{ needs.changedpkgs.outputs.changed }} - run: | - sudo -Eu builder xgensum -f -i ${{ env.CHANGED_PKG }} + run: "sudo -Eu builder xgensum -f -i ${{ env.CHANGED_PKG }}" - name: receive relevant copy from upstream run: | - cp -r upstream/srcpkgs/${{ env.CHANGED_PKG }} srcpkgs + cp -r "upstream/srcpkgs/${{ env.CHANGED_PKG }}" srcpkgs - name: Commit new checksum uses: stefanzweifel/git-auto-commit-action@v6 From b1277a20890e7aad493fae789de0ecf34931aaee Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Mon, 23 Jun 2025 22:55:18 +0200 Subject: [PATCH 09/19] Fix checking out correct ref in build workflow --- .github/workflows/build.yaml | 8 ++++++++ .github/workflows/checksum.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 81d939b..37a4bfe 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -20,7 +20,15 @@ jobs: changed: ${{ steps.grabchanged.outputs.changed }} steps: + - name: checkout local templates from prev workflow + if: "${{ github.event_name == 'workflow_run' }}" + uses: actions/checkout@v4 + with: + fetch-depth: 0 + ref: ${{ github.event.workflow_run.head_branch }} + - name: checkout local templates + if: "${{ github.event_name != 'workflow_run' }}" uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/checksum.yaml b/.github/workflows/checksum.yaml index db50db0..672b8dc 100644 --- a/.github/workflows/checksum.yaml +++ b/.github/workflows/checksum.yaml @@ -73,7 +73,7 @@ jobs: run: | cp -r "upstream/srcpkgs/${{ env.CHANGED_PKG }}" srcpkgs - - name: Commit new checksum + - name: commit new checksum uses: stefanzweifel/git-auto-commit-action@v6 with: file_pattern: "srcpkgs/${{ env.CHANGED_PKG }}/template" From c7ae80f33ae0be1a03f2d9f9d397cdebeffba4a5 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Mon, 23 Jun 2025 23:12:13 +0200 Subject: [PATCH 10/19] Improve build artifact naming --- .github/workflows/build.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 37a4bfe..941be1d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -124,8 +124,10 @@ jobs: - name: Archive xbps artifacts uses: actions/upload-artifact@v4 + env: + CHANGED: ${{ needs.changedpkgs.outputs.changed }} with: - name: binaries-${{ matrix.config.arch }}-${{ matrix.config.libc }} + name: binaries-${{ CHANGED }}-${{ matrix.config.arch }}-${{ matrix.config.libc }}.xbps path: | hostdir/binpkgs/*.xbps From 7be7e5029ad5ec0f7ca19c50253785d01465b9e6 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Mon, 23 Jun 2025 23:15:24 +0200 Subject: [PATCH 11/19] Only run deployment if called from PR --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 941be1d..ac8edba 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -156,7 +156,7 @@ jobs: concurrency: group: ${{ github.workflow }}-${{ github.ref }}-deployment cancel-in-progress: false - if: "github.ref == 'refs/heads/main' && !contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')" + if: "github.ref == 'refs/heads/main' && ${{ github.event_name != 'workflow_run' }} && !contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')" container: image: ghcr.io/void-linux/void-glibc-full:20250227R1 From e5d8f52668ae42bb6b4dbcad0eb6973067413216 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 24 Jun 2025 09:14:45 +0200 Subject: [PATCH 12/19] Switch to latest void containers --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ac8edba..5e5188f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -67,7 +67,7 @@ jobs: # - { arch: aarch64-musl, host: x86_64-musl, libc: musl, platform: linux/amd64, test: 0 } container: - image: ghcr.io/void-linux/void-${{ matrix.config.libc }}-full:20250227R1 + image: ghcr.io/void-linux/void-${{ matrix.config.libc }}-full:latest options: --platform ${{ matrix.config.platform }} --privileged volumes: - /dev:/dev @@ -159,7 +159,7 @@ jobs: if: "github.ref == 'refs/heads/main' && ${{ github.event_name != 'workflow_run' }} && !contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')" container: - image: ghcr.io/void-linux/void-glibc-full:20250227R1 + image: ghcr.io/void-linux/void-glibc-full:latest options: --privileged steps: From 936aa8fbbc017f309d43aa67ed3d250790264a82 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 24 Jun 2025 09:56:35 +0200 Subject: [PATCH 13/19] Commit deployed package changes --- .github/workflows/build.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 5e5188f..d88bf9b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -200,6 +200,12 @@ jobs: xbps-rindex --add $PWD/*.xbps xbps-rindex --clean $PWD + - name: Commit new repo state + uses: stefanzweifel/git-auto-commit-action@v6 + with: + file_pattern: "*.xbps" + commit_message: "Update package repo" + # - name: checksum # run: | # for pkg in *.xbps; do sha256sum "$pkg" | tee "$pkg".sha256sum; done From 963ee15eeba8165c81b3baf9b9db05d37b3e2827 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 24 Jun 2025 10:00:30 +0200 Subject: [PATCH 14/19] Distinguish between package and checksum updates --- .github/workflows/build.yaml | 2 +- .github/workflows/checksum.yaml | 2 +- .github/workflows/renovate.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d88bf9b..f1253db 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -2,7 +2,7 @@ name: build on: workflow_run: - workflows: [PackageUpdate] + workflows: [ChecksumUpdate] types: [completed] push: paths: diff --git a/.github/workflows/checksum.yaml b/.github/workflows/checksum.yaml index 672b8dc..0bbf44d 100644 --- a/.github/workflows/checksum.yaml +++ b/.github/workflows/checksum.yaml @@ -1,4 +1,4 @@ -name: PackageUpdate +name: ChecksumUpdate on: pull_request: diff --git a/.github/workflows/renovate.yaml b/.github/workflows/renovate.yaml index 61ced21..04ac533 100644 --- a/.github/workflows/renovate.yaml +++ b/.github/workflows/renovate.yaml @@ -1,4 +1,4 @@ -name: renovate +name: Check package updates on: schedule: - cron: "0 * * * *" From b198bcab2efad8b9e736b85738400a26dfad947c Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 24 Jun 2025 10:06:40 +0200 Subject: [PATCH 15/19] Fix build workflow CHANGED env var --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f1253db..a9a400b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -114,7 +114,7 @@ jobs: - name: Find changed templates env: CHANGED: ${{ needs.changedpkgs.outputs.changed }} - run: sudo -Eu builder echo "$CHANGED" | sed 's/ /\n/g' > /tmp/templates + run: sudo -Eu builder echo "${{ env.CHANGED }}" | sed 's/ /\n/g' > /tmp/templates - name: Build and check packages run: sudo -Eu builder common/travis/build.sh "$BOOTSTRAP" "$ARCH" "$TEST" @@ -127,7 +127,7 @@ jobs: env: CHANGED: ${{ needs.changedpkgs.outputs.changed }} with: - name: binaries-${{ CHANGED }}-${{ matrix.config.arch }}-${{ matrix.config.libc }}.xbps + name: binaries-${{ env.CHANGED }}-${{ matrix.config.arch }}-${{ matrix.config.libc }}.xbps path: | hostdir/binpkgs/*.xbps From bf07c11fb453210217adb3d2174144572af19f17 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 24 Jun 2025 10:17:08 +0200 Subject: [PATCH 16/19] Fix deployment branch checking --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a9a400b..10beb5e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -156,7 +156,7 @@ jobs: concurrency: group: ${{ github.workflow }}-${{ github.ref }}-deployment cancel-in-progress: false - if: "github.ref == 'refs/heads/main' && ${{ github.event_name != 'workflow_run' }} && !contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')" + if: "github.ref == 'refs/heads/main' && github.event_name != 'workflow_run' && !contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')" container: image: ghcr.io/void-linux/void-glibc-full:latest From 6a30e8f64c9980c316b8a3430ab38aa9708e6697 Mon Sep 17 00:00:00 2001 From: marty-oehme <2098447+marty-oehme@users.noreply.github.com> Date: Tue, 24 Jun 2025 10:26:54 +0200 Subject: [PATCH 17/19] Update phiresky/ripgrep-all to v0.10.9 (#6) * Update dependency phiresky/ripgrep-all to v0.10.9 * Update ripgrep-all checksum --------- Co-authored-by: Renovate Bot --- srcpkgs/ripgrep-all/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ripgrep-all/template b/srcpkgs/ripgrep-all/template index 2f435c4..c5eec16 100644 --- a/srcpkgs/ripgrep-all/template +++ b/srcpkgs/ripgrep-all/template @@ -1,6 +1,6 @@ # Template file for 'ripgrep-all' pkgname=ripgrep-all -version=0.10.6 # renovate: datasource=github-tags depName=phiresky/ripgrep-all +version=0.10.9 # renovate: datasource=github-tags depName=phiresky/ripgrep-all revision=2 build_style=cargo hostmakedepends="rust pkg-config" @@ -13,7 +13,7 @@ maintainer="Marty Oehme " license="AGPL-3.0-only" homepage="https://github.com/phiresky/ripgrep-all" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=06cd619ad6638be206266a77fdf11034dc2dc15d97b3a057b0d6280a17334680 +checksum=a5b3150940dcddd35a26e9de398f11a563d0466a335e5450ceb7ff369e9fef45 post_install() { vdoc README.md From 2afd3f986c7c9a17b5404d579d23c2c2fb20f1de Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 24 Jun 2025 10:49:27 +0200 Subject: [PATCH 18/19] Remove leftover packages before creating repo website --- .github/workflows/build.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 10beb5e..26eb511 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -199,11 +199,12 @@ jobs: run: | xbps-rindex --add $PWD/*.xbps xbps-rindex --clean $PWD + xbps-rindex --remove $PWD - name: Commit new repo state uses: stefanzweifel/git-auto-commit-action@v6 with: - file_pattern: "*.xbps" + file_pattern: "*.xbps *.xbps.sig2" commit_message: "Update package repo" # - name: checksum From 85401c22ab98f7a6bd78247b79dd3bbf259c796a Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 24 Jun 2025 12:03:13 +0200 Subject: [PATCH 19/19] Remove workflow events used for testing --- .github/workflows/build.yaml | 2 ++ .github/workflows/checksum.yaml | 1 - .github/workflows/renovate.yaml | 3 --- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 26eb511..589a5cc 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,9 +1,11 @@ name: build on: + # a package changed (usually in PR) workflow_run: workflows: [ChecksumUpdate] types: [completed] + # we are integrating updates push: paths: - "srcpkgs/**" diff --git a/.github/workflows/checksum.yaml b/.github/workflows/checksum.yaml index 0bbf44d..fc0614f 100644 --- a/.github/workflows/checksum.yaml +++ b/.github/workflows/checksum.yaml @@ -6,7 +6,6 @@ on: - "srcpkgs/**" types: - opened - - reopened # TODO: For debugging purposes - synchronize branches: - main diff --git a/.github/workflows/renovate.yaml b/.github/workflows/renovate.yaml index 04ac533..54fbe14 100644 --- a/.github/workflows/renovate.yaml +++ b/.github/workflows/renovate.yaml @@ -2,9 +2,6 @@ name: Check package updates on: schedule: - cron: "0 * * * *" - push: - paths: - - ".github/**" # TODO: remove after debugging env: LOG_LEVEL: "info"