diff --git a/.forgejo/workflows/release-build.yaml b/.forgejo/workflows/release-build.yaml index 68e9dd0..416ea34 100644 --- a/.forgejo/workflows/release-build.yaml +++ b/.forgejo/workflows/release-build.yaml @@ -63,13 +63,14 @@ jobs: runs-on: x86_64 env: FORGEJO: "https://ayakael.net" + VERBOSE: true container: image: node:latest steps: - name: Package download uses: forgejo/download-artifact@v3 - name: Release creation - uses: actions/forgejo-release@v2.3.1 + uses: actions/forgejo-release@v2 with: direction: upload url: "https://ayakael.net" diff --git a/.forgejo/workflows/release-build.yaml.orig b/.forgejo/workflows/release-build.yaml.orig deleted file mode 100644 index 423f97b..0000000 --- a/.forgejo/workflows/release-build.yaml.orig +++ /dev/null @@ -1,73 +0,0 @@ -on: - push: - tags: - - 'alpine*' - -jobs: - release-build: - runs-on: x86_64 - container: - image: alpine:latest - steps: - - name: Environment setup - run: | - apk add rpm wget coreutils eudev e2fsprogs xen doas sudo curl nodejs git alpine-sdk fuse2fs patch findutils grep - cd /etc/apk/keys - curl -JO https://ayakael.net/api/packages/forge/alpine/key - - name: Repo pull - uses: actions/checkout@v4 - with: - fetch-depth: 500 - - name: RPM build - run: | - git clone https://github.com/QubesOS/qubes-builder - mkdir qubes-builder/qubes-src - ln -s $GITHUB_WORKSPACE qubes-builder/qubes-src/builder-alpine - cp builder.conf qubes-builder/. - git clone https://github.com/QubesOS/qubes-linux-template-builder qubes-builder/qubes-src/linux-template-builder - patch -d qubes-builder/qubes-src/linux-template-builder -p1 -i $GITHUB_WORKSPACE/.forgejo/patches/linux-template-builder_use-fuse.patch - echo "%define _arch x86_64" >> qubes-builder/qubes-src/linux-template-builder/templates.spec - cd qubes-builder - make linux-template-builder - cp qubes-src/linux-template-builder/rpm/noarch/qubes-template-*.rpm $GITHUB_WORKSPACE/. - - name: Package upload - uses: forgejo/upload-artifact@v3 - with: - name: package - path: qubes-template-*.rpm - release-deploy: - needs: [release-build] - runs-on: x86_64 - container: - image: alpine:latest - env: - CI_RPM_REPO: 'https://ayakael.net/api/packages/forge/rpm' - FORGE_REPO_TOKEN: ${{ secrets.FORGE_REPO_TOKEN }} - FORGE_REPO_USER: ${{ vars.FORGE_REPO_USER }} - steps: - - name: Setting up environment - run: apk add nodejs curl findutils git gawk - - name: Repo pull - uses: actions/checkout@v4 - - name: Package download - uses: forgejo/download-artifact@v3 - - name: Package deployment - run: ${{ github.workspace }}/.forgejo/bin/deploy.sh - release-create: - needs: [release-build] - runs-on: x86_64 - container: - image: ubuntu:latest - steps: - - name: Package download - uses: forgejo/download-artifact@v3 - - name: Release creation - uses: actions/forgejo-release@v2.3.1 - with: - direction: upload - url: https://api.ayakael.net - repo: ayakael/qubes-builder-alpine - token: "${{ secrets.FORGE_REPO_TOKEN }}" - release-dir: ./package - release-notes: "For download of template through DNF, please go to https://ayakael.net/forge/-/packages/rpm/qubes-template-alpine320" - diff --git a/.forgejo/workflows/release-build.yaml.rej b/.forgejo/workflows/release-build.yaml.rej deleted file mode 100644 index ee98c3f..0000000 --- a/.forgejo/workflows/release-build.yaml.rej +++ /dev/null @@ -1,12 +0,0 @@ ---- .forgejo/workflows/release-build.yaml -+++ .forgejo/workflows/release-build.yaml -@@ -7,6 +7,9 @@ jobs: - runs-on: x86_64 - container: - image: alpine:3.20 -+ env: -+ QUBES_REL: r4.2 -+ DIST: alpine320 - steps: - - name: Environment setup - run: |