Merge branch 'um41' into pr/ultramarine-sysconfig

.github/ISSUE_TEMPLATE/package_request.yml

@@ -0,0 +1,64 @@
+name: Package Request
+description: Request a package to be patched and added to Ultramarine Linux repos
+title: "[Request] "
+labels: ["enhancement"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        # README
+        You are submitting a package request in the **[Ultramarine-Linux/packages]** repository.
+        This repository only hosts packages specific to Ultramarine Linux, such as OS identity files,
+        branding files, desktop configurations, release files, etc.
+
+        If you are requesting packages for software that **works fine on other Linux distributions
+        or operating systems**, chances are you should [submit this to Terra] instead.
+
+        However, if the package for some reason will not meet [Terra's packaging policies], we do
+        welcome such submissions to be included into Ultramarine exclusively instead. Possible
+        cases include:
+        - packages that alters existing Fedora installations/setups significantly
+          - e.g. a version of `uutils-coreutils` that replaces the `coreutils` package in Fedora
+          - e.g. replacing Fedora kernels with the Liquorix kernels
+        - packages that only works on Ultramarine
+          - e.g. [Ultramarine Hop] (`umswitch`, allowing users to switch between editions)
+          - but not [dive] (chroot utility for Ultramrine but works on other distros too)
+
+        **TL;DR: When in doubt, [submit this to Terra] instead.**
+
+        [Ultramarine-Linux/packages]: https://github.com/Ultramarine-Linux/packages
+        [Submit this to Terra]: https://github.com/terrapkg/packages/issues
+        [Terra's packaging policies]: https://developer.fyralabs.com/terra/policy
+        [Ultramarine Hop]: https://github.com/Ultramarine-Linux/hop
+        [dive]: https://github.com/Ultramarine-Linux/dive
+  - type: textarea
+    id: pkgs
+    attributes:
+      labels: List of packages to add
+      description: Also include their links if applicable.
+      placeholder: |
+        - nya (https://example.com)
+        - fyra (https://fyralabs.com)
+    validations:
+      required: true
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: Checklist
+      options:
+        - label: Package is not already in the Ultramarine repositories
+          required: true
+        - label: Package is not in [Fedora repositories](https://packages.fedoraproject.org/), unless it is a patched/forked version or an upstream version
+          required: true
+        - label: Package is not deprecated or obsolete
+          required: true
+        - label: Package is not a private package or illegal to distribute (e.g a cracked copy or a package that is not publicly available for download)
+          required: true
+        - label: Package is buildable and tested
+          required: true
+    validations:
+      required: true
+  - type: input
+    id: maintainer
+    attributes:
+      label: Nominate a Maintainer

.github/workflows/autobuild.yml

@@ -6,10 +6,10 @@ on:
     paths:
       - ultramarine/**
     branches:
-      - um40
+      - um41
   pull_request:
     branches:
-      - um40
+      - um41
   workflow_dispatch:
   workflow_call:
 
@@ -19,13 +19,13 @@ jobs:
     outputs:
       build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
     container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:f41
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Set workspace as safe
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Generate build matrix
@@ -35,7 +35,7 @@ jobs:
     needs: manifest
     strategy:
       matrix:
-        version: ["40"]
+        version: ["41"]
         pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
       fail-fast: false
     runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
@@ -44,15 +44,15 @@ jobs:
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up git repository
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
       - name: Cache buildroot
         id: br-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: /var/cache
           key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}
@@ -71,7 +71,7 @@ jobs:
           x=${NAME//\//@}
           echo "name=$x" >> $GITHUB_OUTPUT
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.art.outputs.name }}
           path: |

.github/workflows/bootstrap.yml

@@ -6,16 +6,16 @@ jobs:
   build:
     strategy:
       matrix:
-        version: ["40"]
+        version: ["41"]
         arch: ["x86_64", "aarch64"]
       fail-fast: false
     runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
     container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:f41
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Build ultramarine-mock-configs
         run: |

.github/workflows/mass-rebuild.yml

@@ -9,7 +9,7 @@ jobs:
   manifest:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:f41
       options: --cap-add=SYS_ADMIN --privileged
 
     outputs:
@@ -18,19 +18,19 @@ jobs:
     # check out the repo
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Generate Build matrix
         id: generate_build_matrix
         # generate build matrix by checking out changes in ultramarine/
         run: |
-          git config --global --add safe.directory /__w/ultramarine-pkgs/ultramarine-pkgs
+          git config --global --add safe.directory /__w/packages/packages
           git config --global user.email "[email protected]"
           git config --global user.name "Your Name"
           init=$(git rev-list HEAD | tail -n 1)
-          git diff ${init}..HEAD > a.diff
+          git diff ${init}..HEAD --binary > a.diff
           git checkout $init
           git apply a.diff
           git add *
@@ -41,7 +41,7 @@ jobs:
     strategy:
       matrix:
         pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["40"]
+        version: ["41"]
       fail-fast: false
     #if: ${{ matrix.changed_folders != '' }}
     runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
@@ -50,7 +50,7 @@ jobs:
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up git repository
@@ -70,23 +70,21 @@ jobs:
           x=${NAME//\//@}
           echo "name=$x" >> $GITHUB_OUTPUT
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.art.outputs.name }}
           path: |
             anda-build/rpm/rpms/*
             anda-build/rpm/srpm/*
 
       - name: Upload packages to subatomic
-        if: github.event_name == 'push'
         run: |
           subatomic-cli upload --prune \
             --server https://subatomic.fyralabs.com \
             --token ${{ secrets.SUBATOMIC_TOKEN }} \
             um${{ matrix.version }} anda-build/rpm/rpms/*
 
       - name: Upload source packages to subatomic
-        if: github.event_name == 'push'
         run: |
           subatomic-cli upload --prune \
             --server https://subatomic.fyralabs.com \

.github/workflows/update-comps.yml

@@ -3,7 +3,7 @@ name: Push comps updates
 on:
   push:
     branches:
-      - um40
+      - um41
     paths:
       - comps.xml
   workflow_dispatch:
@@ -12,9 +12,9 @@ jobs:
   update-comps:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:f41
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Push to subatomic
         run: |
           branch=${{ github.ref_name }}

.github/workflows/update.yml

@@ -0,0 +1,53 @@
+name: Update
+on:
+  schedule:
+    - cron: "0 * * * *"
+  workflow_dispatch:
+
+jobs:
+  autoupdate:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/terrapkg/builder:frawhide
+      options: --cap-add=SYS_ADMIN --privileged
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
+
+      - name: Install SSH signing key & Set up git repository
+        run: |
+          mkdir -p ${{ runner.temp }}
+          echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
+          chmod 0700 ${{ runner.temp }}/signing_key
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+
+      - name: Run Update
+        run: anda update -vv
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          RUST_BACKTRACE: full
+
+      - name: Save
+        run: |
+          if [[ `git status --porcelain` ]]; then
+            git config user.name "Raboneko"
+            git config user.email "[email protected]"
+            git config gpg.format "ssh"
+            git config user.signingkey "${{ runner.temp }}/signing_key"
+            msg="bump: $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
+            git commit -S -a -m "$msg"
+            copy_over () {
+              git format-patch HEAD^
+              git checkout $1
+              git apply *.patch || true
+              rm *.patch
+              git add *
+              git commit -S -a -m "$msg"
+            }
+            copy_over um39 || true
+            copy_over um40 || true
+            git push -u origin --all
+          fi