From 5bbda3309d3cbb3bf370f1dd409cd841de2fd53d Mon Sep 17 00:00:00 2001
From: madonuko <madonuko@outlook.com>
Date: Thu, 13 Feb 2025 20:47:10 +0800
Subject: [PATCH] feat: branch off frawhide to f42

---
 .backportrc.json                    |  2 +-
 .devcontainer/devcontainer.json     | 10 +++-------
 .github/workflows/autobuild.yml     | 10 +++++-----
 .github/workflows/bootstrap.yml     |  2 +-
 .github/workflows/build.yml         |  2 +-
 .github/workflows/json-build.yml    |  2 +-
 .github/workflows/update-branch.yml |  8 +++-----
 .github/workflows/update-comps.yml  |  3 ++-
 8 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/.backportrc.json b/.backportrc.json
index 1c7b5305f4..c09fd186f0 100644
--- a/.backportrc.json
+++ b/.backportrc.json
@@ -2,7 +2,7 @@
   "repoOwner": "terrapkg",
   "repoName": "packages",
   "resetAuthor": true,
-  "targetBranchChoices": ["f39", "f40", "frawhide"],
+  "targetBranchChoices": ["f39", "f40", "f41", "f42", "frawhide"],
   "branchLabelMapping": {
     "^sync-(.+)$": "$1"
   }
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 96c9104ef2..1e7531ca2d 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,17 +1,13 @@
 {
   "name": "Terra Devcontainer",
-  "image": "ghcr.io/terrapkg/builder:frawhide",
-  "runArgs": [
-    "--privileged"
-  ],
+  "image": "ghcr.io/terrapkg/builder:f42",
+  "runArgs": ["--privileged"],
   "features": {
     "ghcr.io/devcontainers/features/common-utils:2": {}
   },
   "customizations": {
     "vscode": {
-      "extensions": [
-        "rhaiscript.vscode-rhai"
-      ]
+      "extensions": ["rhaiscript.vscode-rhai"]
     }
   },
   "remoteUser": "vscode",
diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
index 19bf560f06..b741656bd6 100644
--- a/.github/workflows/autobuild.yml
+++ b/.github/workflows/autobuild.yml
@@ -6,13 +6,13 @@ on:
     paths:
       - anda/**
     branches:
-      - frawhide
+      - f42
   pull_request:
     branches:
-      - frawhide
+      - f42
   merge_group:
     branches:
-      - frawhide
+      - f42
   workflow_dispatch:
   workflow_call:
 
@@ -22,7 +22,7 @@ jobs:
     outputs:
       build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
     container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f42
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Set workspace as safe
@@ -39,7 +39,7 @@ jobs:
     strategy:
       matrix:
         pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["rawhide"]
+        version: ["42"]
       fail-fast: false
     runs-on: ${{ (matrix.pkg.arch == 'aarch64' && matrix.pkg.labels['large']) && 'ARM64' || matrix.pkg.arch == 'aarch64' && 'ubuntu-22.04-arm' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-22.04' }}
     container:
diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
index 56a7e75322..f09ea6130a 100644
--- a/.github/workflows/bootstrap.yml
+++ b/.github/workflows/bootstrap.yml
@@ -7,7 +7,7 @@ jobs:
   bootstrap:
     strategy:
       matrix:
-        version: ["rawhide"]
+        version: ["42"]
         arch: ["x86_64", "aarch64"]
       fail-fast: true
     runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-22.04' }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4d27dd60ae..caa4c6f35b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,7 +44,7 @@ jobs:
     strategy:
       matrix:
         pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
-        version: ["rawhide"]
+        version: ["42"]
         arch: ${{ fromJson(needs.parse.outputs.arch) }}
       fail-fast: false
     runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || needs.parse.outputs.builder && needs.parse.outputs.builder || 'ubuntu-22.04' }}
diff --git a/.github/workflows/json-build.yml b/.github/workflows/json-build.yml
index 20a94c6e1c..0077c425e1 100644
--- a/.github/workflows/json-build.yml
+++ b/.github/workflows/json-build.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         pkg: ${{ fromJson(inputs.packages) }}
-        version: ["rawhide"]
+        version: ["42"]
       fail-fast: false
     runs-on: ${{ (matrix.pkg.arch == 'aarch64' && matrix.pkg.labels['large']) && 'ARM64' || matrix.pkg.arch == 'aarch64' && 'ubuntu-22.04-arm' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-22.04' }}
     container:
diff --git a/.github/workflows/update-branch.yml b/.github/workflows/update-branch.yml
index ecd9b4b23d..42289d4f52 100644
--- a/.github/workflows/update-branch.yml
+++ b/.github/workflows/update-branch.yml
@@ -13,9 +13,10 @@ jobs:
           - frawhide
           - f40
           - f41
+          - f42
           - el10
     container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f42
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Checkout
@@ -33,10 +34,7 @@ jobs:
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
       - name: Run Update
-        run: |
-          nbranch="${{ matrix.branch }}"
-          [ "$nbranch" = 'frawhide' ] && nbranch='f42'
-          anda update --filters updbranch=1 --labels branch=${{ matrix.branch }},nbranch=$nbranch
+        run: anda update --filters updbranch=1 --labels branch=${{ matrix.branch }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           RUST_BACKTRACE: full
diff --git a/.github/workflows/update-comps.yml b/.github/workflows/update-comps.yml
index adad0d0133..657b739725 100644
--- a/.github/workflows/update-comps.yml
+++ b/.github/workflows/update-comps.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - frawhide
+      - f42
       - f41
       - f40
       - el10
@@ -15,7 +16,7 @@ jobs:
   update-comps:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f42
     steps:
       - uses: actions/checkout@v4
       - name: Push to subatomic