Try to consolidate more workflows

yamadapc · Aug 23, 2024 · fc3a5da · fc3a5da
1 parent fd9106b
commit fc3a5da
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git a/.github/actions/common.yml b/.github/actions/common.yml
@@ -6,10 +6,6 @@ run:
   setup:
     name: Setup dependencies
     steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: recursive
-          lfs: {{ inputs.lfs }}
       - uses: Swatinem/rust-cache@v2
         with:
           shared-key: ${{ inputs.cache_key }}
@@ -38,10 +34,6 @@ run:
           tool: cargo-tarpaulin,cargo-nextest
 
   inputs:
-    lfs:
-      description: 'Enable LFS clone'
-      required: true
-      default: false
     cache_key:
       description: 'A cache key for this step'
       required: true

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,7 +21,10 @@ jobs:
           - macos-14
           - ubuntu-20.04
     steps:
-      - uses: ../actions/common.yml
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - uses: ./.github/actions/common.yml
         with:
           lfs: false
           cache_key: ${{ matrix.os }}_build
@@ -45,7 +48,11 @@ jobs:
           - macos-14
           - ubuntu-20.04
     steps:
-      - uses: ../actions/common.yml
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+          lfs: true
+      - uses: ./.github/actions/common.yml
         with:
           lfs: true
           cache_key: ${{ matrix.os }}_test
@@ -67,7 +74,10 @@ jobs:
           - macos-14
           - ubuntu-20.04
     steps:
-      - uses: ../actions/common.yml
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - uses: ./.github/actions/common.yml
         with:
           lfs: true
           cache_key: ${{ matrix.os }}_lint
@@ -76,4 +86,7 @@ jobs:
         with:
           name: build_target
       - name: Run clippy
-        run: ./scripts/clippy.sh
+        run: ./scripts/clippy.sh
+
+  dart:
+    uses: ./dart.yml
diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
@@ -1,10 +1,6 @@
 name: Dart
 
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+on: {}
 
 jobs:
   build_metronome: