feat: branch off frawhide to f42

This commit is contained in:
madonuko
2025-02-13 20:47:10 +08:00
parent 9a469c22b7
commit 5bbda3309d
8 changed files with 17 additions and 22 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
"repoOwner": "terrapkg",
"repoName": "packages",
"resetAuthor": true,
"targetBranchChoices": ["f39", "f40", "frawhide"],
"targetBranchChoices": ["f39", "f40", "f41", "f42", "frawhide"],
"branchLabelMapping": {
"^sync-(.+)$": "$1"
}
+3 -7
View File
@@ -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",
+5 -5
View File
@@ -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:
+1 -1
View File
@@ -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' }}
+1 -1
View File
@@ -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' }}
+1 -1
View File
@@ -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:
+3 -5
View File
@@ -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
+2 -1
View File
@@ -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