Update workflows

terrapkg · Jan 28, 2023 · 11479f3 · 11479f3
1 parent c3ac88d
commit 11479f3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 27 deletions.
diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
@@ -6,7 +6,7 @@ on:
     paths:
       - anda/**
     branches:
-      - main
+      - f38
   workflow_dispatch:
   workflow_call:
 
@@ -17,9 +17,8 @@ jobs:
     outputs:
       build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
     container:
-      image: ghcr.io/terrapkg/builder:main
+      image: ghcr.io/terrapkg/builder:f38
       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: ["38"]
       fail-fast: false
-    #if: ${{ matrix.changed_folders != '' }}
     runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
     container:
       image: ghcr.io/terrapkg/builder:main

diff --git a/.github/workflows/update-comps.yml b/.github/workflows/update-comps.yml
@@ -3,7 +3,7 @@ name: Push comps updates
 on:
   push:
     branches:
-      - main
+      - f38
     paths:
       - comps.xml
   workflow_dispatch:
@@ -12,7 +12,7 @@ jobs:
   update-comps:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:main
+      image: ghcr.io/terrapkg/builder:f38
     steps:
       - uses: actions/checkout@v3
       - name: Push to subatomic