ci: fix rawhide action files

terrapkg · Apr 2, 2024 · 13faad6 · 13faad6
1 parent 96bfec2
commit 13faad6
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 23 deletions.
diff --git 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,23 +40,23 @@ 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:
       image: ghcr.io/terrapkg/builder:f${{ matrix.version}}
       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
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
       - 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
@@ -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
@@ -30,15 +30,15 @@ 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
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
       - 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
@@ -19,15 +19,15 @@ 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
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
       - 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
@@ -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
@@ -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
@@ -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
@@ -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