From 154be053138c4dd3fde66d397e485d164b49cf5f Mon Sep 17 00:00:00 2001
From: madomado <wboy111@outlook.com>
Date: Sun, 23 Apr 2023 13:25:44 +0800
Subject: [PATCH] feat(ci): make f38 the default branch (#393)

* feat(ci): make f38 the default branch

* feat(ci): turn off autoupdate for f37

* fix(ci): turn off sync
---
 .github/workflows/lint.yml                   |  2 +-
 .github/workflows/{sync.yml => sync.yml.bak} |  5 +++--
 .github/workflows/update-comps.yml           |  3 +--
 .github/workflows/update-nightly.yml         |  2 +-
 .github/workflows/update.yml                 | 16 ++++++----------
 .gitignore                                   |  3 ++-
 6 files changed, 14 insertions(+), 17 deletions(-)
 rename .github/workflows/{sync.yml => sync.yml.bak} (95%)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 9800f36cac..3720348bb3 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -6,7 +6,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:main
+      image: ghcr.io/terrapkg/builder:f38
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml.bak
similarity index 95%
rename from .github/workflows/sync.yml
rename to .github/workflows/sync.yml.bak
index a98efeea15..48f66660ec 100644
--- a/.github/workflows/sync.yml
+++ b/.github/workflows/sync.yml.bak
@@ -4,13 +4,14 @@ on:
     types:
       - closed
     branches:
-      - f39
+      - f38
 
 jobs:
   sync:
     strategy:
       matrix:
-        branch: ["f37", "f38"]
+        branch: ["f37"]
+      fail-fast: false
     if: github.event.pull_request.merged == true && !contains(github.event.pull_request.labels.*.name, 'nosync')
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/update-comps.yml b/.github/workflows/update-comps.yml
index f8afc492fc..70df7eded0 100644
--- a/.github/workflows/update-comps.yml
+++ b/.github/workflows/update-comps.yml
@@ -3,7 +3,6 @@ name: Push comps updates
 on:
   push:
     branches:
-      - f39
       - f38
       - f37
     paths:
@@ -14,7 +13,7 @@ jobs:
   update-comps:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:main
+      image: ghcr.io/terrapkg/builder:38
     steps:
       - uses: actions/checkout@v3
       - id: get-branch
diff --git a/.github/workflows/update-nightly.yml b/.github/workflows/update-nightly.yml
index 6039147fab..dceda6d9e9 100644
--- a/.github/workflows/update-nightly.yml
+++ b/.github/workflows/update-nightly.yml
@@ -8,7 +8,7 @@ jobs:
   autoupdate:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:main
+      image: ghcr.io/terrapkg/builder:38
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Checkout
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index 345d42fcfa..8c9f856395 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -8,7 +8,7 @@ jobs:
   autoupdate:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:main
+      image: ghcr.io/terrapkg/builder:38
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Checkout
@@ -39,14 +39,10 @@ jobs:
             git config user.signingkey "${{ runner.temp }}/signing_key"
             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
-            git apply *.patch || true
-            git add anda
-            git commit -S -a -m "$msg"
-            git checkout f37
-            git apply *.patch || true
-            git add anda
-            git commit -S -a -m "$msg"
+            # git format-patch HEAD^
+            # git checkout f37
+            # git apply *.patch || true
+            # git add *
+            # git commit -S -a -m "$msg"
             git push -u origin --all
           fi
diff --git a/.gitignore b/.gitignore
index 79b8e8a9dd..e35d328cee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-anda-build/
\ No newline at end of file
+anda-build/
+*.patch