From cb803937236069d9d920b2cf1e912d5ed01ef2fe Mon Sep 17 00:00:00 2001 From: azur84 Date: Sat, 25 Apr 2026 10:07:42 +0100 Subject: [PATCH] Update workflow --- .gitea/workflows/build.yml | 68 +++++++++++++++----------------------- 1 file changed, 26 insertions(+), 42 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 604f763..4ee3efd 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -6,25 +6,19 @@ on: workflow_dispatch: jobs: - check-and-build: - runs-on: archlinux-base-devel - permissions: - packages: write - contents: write - + runs-on: ubuntu-latest + container: + image: archlinux + options: --privileged + permissions: + packages: write + contents: write steps: - - name: Setup packages - run: pacman -Sy --noconfirm git pacman-contrib sudo nodejs - - name: Checkout repo - uses: actions/checkout@v6 - - - name: Setup build user - run: | - useradd -m builduser - echo "builduser ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/builduser - chmod 0440 /etc/sudoers.d/builduser - chown -R builduser:builduser $PWD + uses: actions/checkout@v4 + with: + fetch-depth: 0 + token: ${{ secrets.GITEA_TOKEN }} - name: Get Pandora Version id: get_tag @@ -41,23 +35,19 @@ jobs: - name: Compare Version id: compare run: | - if [ "${{ steps.get_tag.outputs.latest_tag }}" != "${{ steps.current.outputs.current }}" ]; then + if [ "${{ steps.get_tag.outputs.latest_tag }}" != "${{ sted -i '/^pkgver=/s/=.*$/='$version'/' PKGBUILDeps.current.outputs.current }}" ]; then echo "build=true" >> $GITHUB_OUTPUT else echo "build=false" >> $GITHUB_OUTPUT fi - - - name: Update PKGBUILD - if: steps.compare.outputs.build == 'true' + - name: Update packages run: | - sed -i "s/pkgver=.*/pkgver=${{ steps.get_tag.outputs.latest_tag }}/" PKGBUILD - sudo -u builduser updpkgsums - sudo -u builduser makepkg --printsrcinfo > .SRCINFO + pacman -Syu --noconfirm --noprogressbar --needed base-devel devtools btrfs-progs dbus sudo - name: Build Package if: steps.compare.outputs.build == 'true' run: | - sudo -u builduser makepkg -sf --noconfirm + pkgctl build --pkgver=${{ steps.get_tag.outputs.latest_tag }} - name: Upload Artefact uses: christopherHX/gitea-upload-artifact@v4 @@ -74,22 +64,16 @@ jobs: --upload-file *.pkg.tar.zst \ https://git.azur.webhop.me/api/packages/Azur/arch/pandora-arch - - name: Configure Git - if: steps.compare.outputs.build == 'true' + - name: Commit and Push Changes run: | - git config user.name "gitea-actions" - git config user.email "actions@gitea.local" + git config user.name "Gitea Bot" + git config user.email "bot@gitea.io" + git add -A - - name: Commit changes - if: steps.compare.outputs.build == 'true' - run: | - git add PKGBUILD .SRCINFO - git commit -m "chore: bump to ${{ steps.get_tag.outputs.latest_tag }}" || echo "No changes" - - - name: Push changes - if: steps.compare.outputs.build == 'true' - env: - TOKEN: ${{ secrets.GITEA_TOKEN }} - run: | - git remote set-url origin https://oauth2:${TOKEN}@git.azur.webhop.me/Azur/pandora-arch.git - git push origin HEAD:main + # On ne commit que s'il y a des changements + if git diff --staged --quiet; then + echo "No changes to commit" + else + git commit -m "updpkg: Update to ${{ steps.get_tag.outputs.latest_tag }}" + git push origin ${{ gitea.ref }} + fi