From 62ac36becfd3416402f3ed48d1c974c551ad3f7c Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 13 Feb 2024 00:54:11 +0800 Subject: [PATCH] feat(ci): bump to f40 Signed-off-by: madomado --- .github/workflows/autobuild.yml | 10 +++++----- .github/workflows/bootstrap.yml | 2 +- .github/workflows/build.yml | 2 +- .github/workflows/json-build.yml | 2 +- .github/workflows/lint.yml | 8 ++++---- .github/workflows/update-comps.yml | 3 ++- .github/workflows/update-nightly.yml | 2 +- .github/workflows/update.yml | 3 ++- 8 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 3db33939a1..0b2004b68d 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -6,13 +6,13 @@ on: paths: - anda/** branches: - - f39 + - f40 pull_request: branches: - - f39 + - f40 merge_group: branches: - - f39 + - f40 workflow_dispatch: workflow_call: @@ -23,7 +23,7 @@ jobs: outputs: build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }} container: - image: ghcr.io/terrapkg/builder:f39 + image: ghcr.io/terrapkg/builder:f40 options: --cap-add=SYS_ADMIN --privileged steps: - name: Set workspace as safe @@ -40,7 +40,7 @@ jobs: strategy: matrix: pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }} - version: ["39"] + version: ["40"] fail-fast: false runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }} container: diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml index 600b7eaa4a..de23db1295 100644 --- a/.github/workflows/bootstrap.yml +++ b/.github/workflows/bootstrap.yml @@ -7,7 +7,7 @@ jobs: bootstrap: strategy: matrix: - version: ["39"] + version: ["40"] arch: ["x86_64", "aarch64"] fail-fast: true runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e773d56b02..2b129d8bec 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: strategy: matrix: pkg: ${{ fromJson(needs.parse.outputs.pkgs) }} - version: ["39"] + version: ["40"] arch: ["x86_64", "aarch64"] fail-fast: false runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }} diff --git a/.github/workflows/json-build.yml b/.github/workflows/json-build.yml index 62ecb35e29..7607118339 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: ["39"] + version: ["40"] fail-fast: false runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }} container: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 14eb64e80b..97e7eed743 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -3,18 +3,18 @@ name: Lint on: push: branches: - - f39 + - f40 pull_request: branches: - - f39 + - f40 merge_group: branches: - - f39 + - f40 jobs: lint: runs-on: ubuntu-latest container: - image: ghcr.io/terrapkg/builder:f39 + image: ghcr.io/terrapkg/builder:f40 steps: - name: Checkout repository uses: actions/checkout@v3 diff --git a/.github/workflows/update-comps.yml b/.github/workflows/update-comps.yml index 3ebc1259f2..dc61aae9aa 100644 --- a/.github/workflows/update-comps.yml +++ b/.github/workflows/update-comps.yml @@ -3,6 +3,7 @@ name: Push comps updates on: push: branches: + - f40 - f39 - f38 - f37 @@ -14,7 +15,7 @@ jobs: update-comps: runs-on: ubuntu-latest container: - image: ghcr.io/terrapkg/builder:f39 + image: ghcr.io/terrapkg/builder:f40 steps: - uses: actions/checkout@v3 - name: Push to subatomic diff --git a/.github/workflows/update-nightly.yml b/.github/workflows/update-nightly.yml index 8b9e3c2ed2..ebcfc34d6d 100644 --- a/.github/workflows/update-nightly.yml +++ b/.github/workflows/update-nightly.yml @@ -8,7 +8,7 @@ jobs: autoupdate: runs-on: ubuntu-latest container: - image: ghcr.io/terrapkg/builder:f39 + image: ghcr.io/terrapkg/builder:f40 options: --cap-add=SYS_ADMIN --privileged steps: - name: Checkout diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 97354ee012..b77c8700ae 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -8,7 +8,7 @@ jobs: autoupdate: runs-on: ubuntu-latest container: - image: ghcr.io/terrapkg/builder:f39 + image: ghcr.io/terrapkg/builder:f40 options: --cap-add=SYS_ADMIN --privileged steps: - name: Checkout @@ -47,6 +47,7 @@ jobs: git add * git commit -S -a -m "$msg" } + copy_over f39 || true copy_over f37 || true copy_over f38 || true copy_over frawhide || true