feat(ci): improve workflows (#279)

* feat(ci): improve workflows

* feat(ci): improve workflows

* fix(ci): mass-rebuild.yml

* fix(ci): rename mass-rebuild-recurse.yml

.github/workflows/autobuild.yml

@@ -19,7 +19,6 @@ jobs:
     container:
       image: ghcr.io/terrapkg/builder:main
       options: --cap-add=SYS_ADMIN --privileged
-    # check out the repo
     steps:
       - name: Set workspace as safe
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
@@ -28,27 +27,6 @@ jobs:
         with:
           fetch-depth: 2
       - run: git pull
-      #- run: git checkout HEAD^
-
-      # - name: Generate Build matrix
-      #   id: generate_build_matrix
-      #   # generate build matrix by checking out changes in anda/
-      #   run: |
-      #     # get the list of changed folders in the current commit, including subfolders
-      #     changed_folders=$(git diff --name-only HEAD^ | grep -oP 'anda\/(.+)(\/|\$)' | sort -u )
-      #     echo "Changed folders: $changed_folders"
-      #     # if changed_folders is empty then set is empty to true
-      #     if [ -z "$changed_folders" ]; then
-      #       echo "::set-output name=is_empty::true"
-      #     else
-      #       echo "::set-output name=is_empty::false"
-      #     fi
-      #     # turn it into a json array
-      #     build_matrix=$(echo "$changed_folders" | jq -R . | jq -s . | jq -c .)
-
-      #     echo "::set-output name=build_matrix::$build_matrix"
-      #     #echo "::set-output name=build_matrix::$build_matrix"
-
       - name: Generate build matrix
         id: generate_build_matrix
         run: |
@@ -60,7 +38,6 @@ jobs:
         pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
         version: ["37"]
       fail-fast: false
-    #if: ${{ matrix.changed_folders != '' }}
     runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
     container:
       image: ghcr.io/terrapkg/builder:main

.github/workflows/bootstrap.yml

@@ -1,4 +1,4 @@
-name: Bootstrap Andaman and Subatomic (Fedora 37)
+name: Bootstrap Andaman and Subatomic
 
 on:
   workflow_dispatch:
@@ -43,7 +43,7 @@ jobs:
       - name: Build Subatomic
         run: |
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
-          anda build -c anda-37-${{ matrix.arch }} subatomic -p rpm -D "autogitcommit $(git log -1 --format='%H')"
+          anda build -c anda-${{ matrix.version }}-${{ matrix.arch }} subatomic -p rpm -D "autogitcommit $(git log -1 --format='%H')"
       - name: Install Subatomic
         run: sudo dnf install -y ./anda-build/rpm/rpms/subatomic-*.rpm
 
@@ -52,14 +52,7 @@ jobs:
           repository: FyraLabs/anda
 
       - name: Build Andaman
-        run: anda build -c anda-37-${{ matrix.arch }} anda -p rpm
-
-      - name: Upload to Subatomic
-        run: |
-          subatomic-cli upload --prune \
-            --server https://subatomic.fyralabs.com \
-            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }} anda-build/rpm/rpms/*
+        run: anda build -c anda-${{ matrix.version }}-${{ matrix.arch }} anda -p rpm
 
       - name: Upload to Subatomic
         run: |

.github/workflows/build.yml

@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
     inputs:
       packages:
-        description: "Packages to Build (pkg-a, pkg-b, ...)"
+        description: "Packages to Build"
         required: true
 
 jobs:

.github/workflows/update-comps.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - f38
     paths:
       - comps.xml
   workflow_dispatch:

.github/workflows/update-nightly.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          fetch-depth: 2
+          fetch-depth: 0
           ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
 
       - name: Install SSH signing key
@@ -36,6 +36,14 @@ jobs:
             git config user.email "[email protected]"
             git config gpg.format "ssh"
             git config user.signingkey "${{ runner.temp }}/signing_key"
-            git commit -S -a -m "Automatic Update: $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
-            git push -u origin main
+            msg="bump(nightly): $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
+            git commit -S -a -m "$msg"
+            git format-patch HEAD^
+            git checkout f38
+            for file in *.patch; do
+              git apply $file || true
+            done
+            rm *.patch
+            git commit -S -a -m "$msg"
+            git push -u origin --all
           fi

.github/workflows/update.yml

@@ -1,6 +1,3 @@
-# for each folder in ultramarine/
-# if there is chkupdate.py
-# run it every 2 hours
 name: Automatically check for updates
 on:
   schedule:
@@ -17,7 +14,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          fetch-depth: 2
+          fetch-depth: 0
           ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
 
       - name: Install SSH signing key
@@ -40,6 +37,14 @@ jobs:
             git config user.email "[email protected]"
             git config gpg.format "ssh"
             git config user.signingkey "${{ runner.temp }}/signing_key"
-            git commit -S -a -m "Automatic Update: $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
-            git push -u origin main
+            msg="bump: $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
+            git commit -S -a -m "$msg"
+            git format-patch HEAD^
+            git checkout f38
+            for file in *.patch; do
+              git apply $file || true
+            done
+            rm *.patch
+            git commit -S -a -m "$msg"
+            git push -u origin --all
           fi