ci: make ci.yml reusable, remove bors branchs

7sDream · Nov 15, 2023 · 86fe8a7 · 86fe8a7
1 parent a51d05c
commit 86fe8a7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,12 +4,11 @@ on:
   push:
     branches:
       - master
-      - staging
-      - trying
   pull_request:
     branches:
       - master
   workflow_dispatch:
+  workflow_call:
 
 jobs:
   style:
@@ -40,5 +39,6 @@ jobs:
 
   build:
     uses: ./.github/workflows/build.yml
+    needs: [style]
     with:
       name: fontfor
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -6,17 +6,15 @@ on:
       - "v[0-9]+.[0-9]+.[0-9]+"
 
 jobs:
-
   daily:
     uses: ./.github/workflows/daily.yml
 
-  build:
-    uses: ./.github/workflows/build.yml
-    with: 
-      name: fontfor
+  ci:
+    needs: [daily]
+    uses: ./.github/workflows/ci.yml
 
   release:
-    needs: [daily, build]
+    needs: [ci]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout