From 13faad68c865fd3c5b3fed8f384a038545531b5d Mon Sep 17 00:00:00 2001 From: Lleyton Gray Date: Tue, 2 Apr 2024 06:24:35 +0000 Subject: [PATCH 1/2] ci: fix rawhide action files --- .github/workflows/autobuild.yml | 11 ++++++----- .github/workflows/bootstrap.yml | 2 +- .github/workflows/build.yml | 7 ++++--- .github/workflows/json-build.yml | 7 ++++--- .github/workflows/lint.yml | 2 +- .github/workflows/update-comps.yml | 3 +-- .github/workflows/update-nightly.yml | 13 ++++++++----- .github/workflows/update.yml | 7 ++++--- 8 files changed, 29 insertions(+), 23 deletions(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 88901c99d0..814aa3fb44 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -29,7 +29,7 @@ jobs: - name: Set workspace as safe run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Generate build matrix @@ -40,7 +40,7 @@ jobs: strategy: matrix: pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }} - version: ["rawhide"] + version: ["39"] fail-fast: false runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }} container: @@ -48,7 +48,7 @@ jobs: options: --cap-add=SYS_ADMIN --privileged steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up git repository @@ -56,7 +56,7 @@ jobs: - name: Cache buildroot id: br-cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /var/cache key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }} @@ -75,9 +75,10 @@ jobs: x=${NAME//\//@} echo "name=$x" >> $GITHUB_OUTPUT - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: ${{ steps.art.outputs.name }} + compression-level: 0 # The RPMs are already compressed :p path: | anda-build/rpm/rpms/* anda-build/rpm/srpm/* diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml index 9183ea7cb5..e78df7b691 100644 --- a/.github/workflows/bootstrap.yml +++ b/.github/workflows/bootstrap.yml @@ -21,7 +21,7 @@ jobs: - name: Install Anda run: cargo install anda - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: f${{ matrix.version }} fetch-depth: 1 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9978b31a98..7bd55ee66b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,7 @@ jobs: options: --cap-add=SYS_ADMIN --privileged steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up git repository @@ -38,7 +38,7 @@ jobs: - name: Cache buildroot id: br-cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /var/cache key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.arch }}-${{ matrix.pkg }} @@ -53,9 +53,10 @@ jobs: x=${NAME//\//@} echo "name=$x" >> $GITHUB_OUTPUT - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: ${{ steps.art.outputs.name }} + compression-level: 0 # The RPMs are already compressed :p path: | anda-build/rpm/rpms/* anda-build/rpm/srpm/* diff --git a/.github/workflows/json-build.yml b/.github/workflows/json-build.yml index 7bb62563d7..f817d728ba 100644 --- a/.github/workflows/json-build.yml +++ b/.github/workflows/json-build.yml @@ -19,7 +19,7 @@ jobs: options: --cap-add=SYS_ADMIN --privileged steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up git repository @@ -27,7 +27,7 @@ jobs: - name: Cache buildroot id: br-cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /var/cache key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }} @@ -42,9 +42,10 @@ jobs: x=${NAME//\//@} echo "name=$x" >> $GITHUB_OUTPUT - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: ${{ steps.art.outputs.name }} + compression-level: 0 # The RPMs are already compressed :p path: | anda-build/rpm/rpms/* anda-build/rpm/srpm/* diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d11b911d6c..ae7cc951be 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -17,6 +17,6 @@ jobs: image: ghcr.io/terrapkg/builder:frawhide steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Lint spec files run: rpmlint $(find anda -type f -name "*.spec" -type f) diff --git a/.github/workflows/update-comps.yml b/.github/workflows/update-comps.yml index 4eb4697528..7f93960926 100644 --- a/.github/workflows/update-comps.yml +++ b/.github/workflows/update-comps.yml @@ -3,7 +3,6 @@ name: Push comps updates on: push: branches: - - frawhide - f39 - f38 - f37 @@ -17,7 +16,7 @@ jobs: container: image: ghcr.io/terrapkg/builder:frawhide steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Push to subatomic run: | branch=${{ github.ref_name }} diff --git a/.github/workflows/update-nightly.yml b/.github/workflows/update-nightly.yml index 2add134544..c0786a3c6c 100644 --- a/.github/workflows/update-nightly.yml +++ b/.github/workflows/update-nightly.yml @@ -8,11 +8,11 @@ jobs: autoupdate: runs-on: ubuntu-latest container: - image: ghcr.io/terrapkg/builder:f38 + image: ghcr.io/terrapkg/builder:frawhide options: --cap-add=SYS_ADMIN --privileged steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }} @@ -38,13 +38,16 @@ jobs: git config user.signingkey "${{ runner.temp }}/signing_key" msg="bump(nightly): $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')" git commit -S -a -m "$msg" - f37 () { + copy_over () { git format-patch HEAD^ - git checkout f37 + git checkout $1 git apply *.patch || true + rm *.patch git add * git commit -S -a -m "$msg" } - f37 || true + copy_over f38 || true + copy_over f39 || true + copy_over f40 || true git push -u origin --all fi diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index af0e27014d..358716c0fb 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -8,11 +8,11 @@ jobs: autoupdate: runs-on: ubuntu-latest container: - image: ghcr.io/terrapkg/builder:f39 + image: ghcr.io/terrapkg/builder:frawhide options: --cap-add=SYS_ADMIN --privileged steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }} @@ -47,7 +47,8 @@ jobs: git add * git commit -S -a -m "$msg" } - copy_over f37 || true copy_over f38 || true + copy_over f39 || true + copy_over f40 || true git push -u origin --all fi From 6e278197080d25756ab4a69574647d5345308f6e Mon Sep 17 00:00:00 2001 From: Lleyton Gray Date: Tue, 2 Apr 2024 06:39:56 +0000 Subject: [PATCH 2/2] fix: readd frawhide in update-comps --- .github/workflows/update-comps.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/update-comps.yml b/.github/workflows/update-comps.yml index 7f93960926..5be8e2e8bd 100644 --- a/.github/workflows/update-comps.yml +++ b/.github/workflows/update-comps.yml @@ -3,6 +3,7 @@ name: Push comps updates on: push: branches: + - frawhide - f39 - f38 - f37