From c3ac88d3125e166994e5e3c7816f72bf85ce7883 Mon Sep 17 00:00:00 2001 From: windowsboy111 Date: Sat, 28 Jan 2023 16:09:46 +0800 Subject: [PATCH] Migrate to f38 --- .devcontainer/Dockerfile | 2 +- .devcontainer/devcontainer.json | 2 +- .github/workflows/autobuild.yml | 2 +- .github/workflows/bootstrap-anda.yml | 6 +++--- .github/workflows/bootstrap-subatomic.yml | 6 +++--- .github/workflows/build.yml | 4 ++-- .github/workflows/mass-rebuild.yml | 4 ++-- .github/workflows/update-comps.yml | 2 +- anda/mock-configs/anda-37-aarch64.cfg | 5 ----- anda/mock-configs/anda-37-x86_64.cfg | 5 ----- anda/mock-configs/anda-mock-configs.spec | 8 ++++---- 11 files changed, 18 insertions(+), 28 deletions(-) delete mode 100644 anda/mock-configs/anda-37-aarch64.cfg delete mode 100644 anda/mock-configs/anda-37-x86_64.cfg diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 0dcb38c417..8c21d4db49 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -ARG VARIANT="37" +ARG VARIANT="38" FROM fedora:${VARIANT} RUN useradd -m vscode diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index cb097274fe..e9843ff87a 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ "name": "Fedora", "build": { "dockerfile": "Dockerfile", - "args": { "VARIANT": "37" } + "args": { "VARIANT": "38" } }, "settings": {}, "extensions": [], diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 37c9d7ee75..71dd57d6f1 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -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' }} diff --git a/.github/workflows/bootstrap-anda.yml b/.github/workflows/bootstrap-anda.yml index f334dab9ad..860bea8b97 100644 --- a/.github/workflows/bootstrap-anda.yml +++ b/.github/workflows/bootstrap-anda.yml @@ -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 \ diff --git a/.github/workflows/bootstrap-subatomic.yml b/.github/workflows/bootstrap-subatomic.yml index b56d3cbbe5..02adf22286 100644 --- a/.github/workflows/bootstrap-subatomic.yml +++ b/.github/workflows/bootstrap-subatomic.yml @@ -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 \ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d3c9b294e4..12759381eb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 diff --git a/.github/workflows/mass-rebuild.yml b/.github/workflows/mass-rebuild.yml index 9bbabd2d4a..59f4e73398 100644 --- a/.github/workflows/mass-rebuild.yml +++ b/.github/workflows/mass-rebuild.yml @@ -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 diff --git a/.github/workflows/update-comps.yml b/.github/workflows/update-comps.yml index 971980cbb5..abdf3c12ff 100644 --- a/.github/workflows/update-comps.yml +++ b/.github/workflows/update-comps.yml @@ -20,4 +20,4 @@ jobs: subatomic-cli upload-comps \ --server https://subatomic.fyralabs.com \ --token ${{ secrets.SUBATOMIC_TOKEN }} \ - terra37 comps.xml + terra38 comps.xml diff --git a/anda/mock-configs/anda-37-aarch64.cfg b/anda/mock-configs/anda-37-aarch64.cfg deleted file mode 100644 index 6a0d4b382e..0000000000 --- a/anda/mock-configs/anda-37-aarch64.cfg +++ /dev/null @@ -1,5 +0,0 @@ -config_opts['releasever'] = '37' -config_opts['target_arch'] = 'aarch64' -config_opts['legal_host_arches'] = ('aarch64',) - -include('templates/anda.tpl') diff --git a/anda/mock-configs/anda-37-x86_64.cfg b/anda/mock-configs/anda-37-x86_64.cfg deleted file mode 100644 index 076427db2b..0000000000 --- a/anda/mock-configs/anda-37-x86_64.cfg +++ /dev/null @@ -1,5 +0,0 @@ -config_opts['releasever'] = '37' -config_opts['target_arch'] = 'x86_64' -config_opts['legal_host_arches'] = ('x86_64',) - -include('templates/anda.tpl') diff --git a/anda/mock-configs/anda-mock-configs.spec b/anda/mock-configs/anda-mock-configs.spec index db532d5ea9..d072d20c12 100644 --- a/anda/mock-configs/anda-mock-configs.spec +++ b/anda/mock-configs/anda-mock-configs.spec @@ -6,8 +6,8 @@ Summary: Mock configs for Terra repos License: MIT URL: http://fedoraproject.org/wiki/Extras Source0: anda.tpl -Source1: anda-37-x86_64.cfg -Source2: anda-37-aarch64.cfg +Source1: anda-38-x86_64.cfg +Source2: anda-38-aarch64.cfg BuildRequires: mock-core-configs Requires: mock-core-configs @@ -33,8 +33,8 @@ cp -v %{SOURCE2} %{buildroot}%{_sysconfdir}/mock/ %files %{_sysconfdir}/mock/templates/anda.tpl -%{_sysconfdir}/mock/anda-37-x86_64.cfg -%{_sysconfdir}/mock/anda-37-aarch64.cfg +%{_sysconfdir}/mock/anda-38-x86_64.cfg +%{_sysconfdir}/mock/anda-38-aarch64.cfg %changelog * Mon Oct 03 2022 Cappy Ishihara