From 70a1fd1f2c2b501e126befd0ac3e60b739bbad40 Mon Sep 17 00:00:00 2001 From: Wouter Wijsman Date: Wed, 23 Oct 2024 21:12:28 +0200 Subject: [PATCH 1/2] Deploy pacman repository as well when releasing --- .github/workflows/main.yaml | 29 +++++++++++++++++++++++++++++ README.md | 16 ++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 4884099..321ee71 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -5,6 +5,10 @@ on: tags: '*' workflow_dispatch: +permissions: + pages: write + id-token: write + env: PKGDEST: "/tmp/linux-chimeraos" BUILDDIR: "/tmp/build" @@ -63,6 +67,18 @@ jobs: path: | ${{ env.PKGDEST }}/*.pkg.tar.zst if-no-files-found: error + - name: Create repo archive + run: | + cd $PKGDEST + repo-add linux-chimeraos.db.tar.gz *.pkg.tar.zst + mv linux-chimeraos.db.tar.gz linux-chimeraos.db + mv linux-chimeraos.files.tar.gz linux-chimeraos.files + tar -cvf repo.tar ./* + - name: Upload repo artifact + uses: actions/upload-artifact@v4 + with: + name: github-pages + path: ${{ env.PKGDEST }}/repo.tar make-release: runs-on: ubuntu-latest @@ -84,3 +100,16 @@ jobs: fail_on_unmatched_files: true files: | ${{ env.PKGDEST }}/*.pkg.tar.zst + + make-repo: + needs: [build-kernel] + runs-on: ubuntu-latest + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + steps: + - name: Setup Pages + uses: actions/configure-pages@v5 + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v4 diff --git a/README.md b/README.md index e25e59d..887ba8a 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,22 @@ This repository will use a PKGBUILD to build ArchLinux packages and publish them as GitHub releases in binary package form. We currently do not provide a custom ArchLinux repository. +## Pacman Repository + +The pacman repository created from this repo is published to GitHub Pages by the GitHub Action in this repo. The repository can be configured in `pacman` like this at the bottom of `/etc/pacman.conf`: + +``` +[linux-chimeraos] +SigLevel = Optional TrustAll +Server = https://chimeraos.github.io/linux-chimeraos/ +``` + +Installing the packages from this repo can be done with: + +```shell +pacman -Sy linux-chimeraos/linux-chimeraos linux-chimeraos/linux-chimeraos-headers +``` + # Contributing Feel free to submit Pull Requests if a patch has merit over the current stable From 6f1dc9e6102f65214ced6b443734fe80a665c015 Mon Sep 17 00:00:00 2001 From: Wouter Wijsman Date: Wed, 23 Oct 2024 23:42:23 +0200 Subject: [PATCH 2/2] Clean up pacman install command Specifying the repo was not required. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 887ba8a..dfb9503 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Server = https://chimeraos.github.io/linux-chimeraos/ Installing the packages from this repo can be done with: ```shell -pacman -Sy linux-chimeraos/linux-chimeraos linux-chimeraos/linux-chimeraos-headers +pacman -Sy linux-chimeraos linux-chimeraos-headers ``` # Contributing @@ -31,4 +31,4 @@ around it # Patch locations We have two types of patches. Patches that are stabilized will be merged our [linux repo](https://github.com/chimeraos/linux). There a branch is kept for each version. -Those patches are part of the -chos* patch set. Furthermore we have experiments which are located in the patch file. This is one experiment at the time. Changes in this will result in a new pkgrel version. \ No newline at end of file +Those patches are part of the -chos* patch set. Furthermore we have experiments which are located in the patch file. This is one experiment at the time. Changes in this will result in a new pkgrel version.