Migrate to f38

This commit is contained in:
windowsboy111
2023-01-28 16:09:46 +08:00
parent 046dd9e959
commit c3ac88d312
11 changed files with 18 additions and 28 deletions
+1 -1
View File
@@ -58,7 +58,7 @@ jobs:
strategy:
matrix:
pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
version: ["37"]
version: ["38"]
fail-fast: false
#if: ${{ matrix.changed_folders != '' }}
runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
+3 -3
View File
@@ -7,12 +7,12 @@ jobs:
bootstrap:
strategy:
matrix:
version: ["37"]
version: ["38"]
arch: ["x86_64", "aarch64"]
fail-fast: true
runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
container:
image: fedora:37
image: fedora:38
options: --cap-add=SYS_ADMIN --privileged
steps:
- uses: actions/checkout@v3
@@ -45,7 +45,7 @@ jobs:
run: go install github.com/FyraLabs/subatomic/subatomic-cli@latest
- name: Build
run: anda build -c anda-37-${{ matrix.arch }} anda -p rpm
run: anda build -c anda-38-${{ matrix.arch }} anda -p rpm
- run: |
subatomic-cli upload --prune \
+3 -3
View File
@@ -7,12 +7,12 @@ jobs:
bootstrap:
strategy:
matrix:
version: ["37"]
version: ["38"]
arch: ["x86_64", "aarch64"]
fail-fast: true
runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
container:
image: fedora:37
image: fedora:38
options: --cap-add=SYS_ADMIN --privileged
steps:
# - name: Run shell commands
@@ -50,7 +50,7 @@ jobs:
run: go install github.com/FyraLabs/subatomic/subatomic-cli@latest
- name: Build
run: anda build -c anda-37-${{ matrix.arch }} subatomic -p rpm
run: anda build -c anda-38-${{ matrix.arch }} subatomic -p rpm
- run: |
subatomic-cli upload --prune \
--server https://subatomic.fyralabs.com \
+2 -2
View File
@@ -20,7 +20,7 @@ jobs:
strategy:
matrix:
pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
version: ["37"]
version: ["38"]
arch: ["x86_64", "aarch64"]
fail-fast: false
runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
@@ -31,7 +31,7 @@ jobs:
- uses: terrapkg/anda-build@main
with:
name: "${{ matrix.pkg }}pkg"
mockConfig: anda-37-${{ matrix.arch }}
mockConfig: anda-38-${{ matrix.arch }}
extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}"
andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo
+2 -2
View File
@@ -34,7 +34,7 @@ jobs:
strategy:
matrix:
pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
version: ["37"]
version: ["38"]
arch: ["x86_64", "aarch64"]
fail-fast: false
#if: ${{ matrix.changed_folders != '' }}
@@ -60,7 +60,7 @@ jobs:
if: steps.check_files.outputs.EXISTS == 'true'
with:
name: "${{ matrix.pkg }}pkg"
mockConfig: anda-37-${{ matrix.arch }}
mockConfig: anda-38-${{ matrix.arch }}
extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}"
andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo
+1 -1
View File
@@ -20,4 +20,4 @@ jobs:
subatomic-cli upload-comps \
--server https://subatomic.fyralabs.com \
--token ${{ secrets.SUBATOMIC_TOKEN }} \
terra37 comps.xml
terra38 comps.xml