Update CI workflows

vv9k · Sep 14, 2022 · a124471 · a124471
1 parent e29741e
commit a124471
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 154 deletions.
diff --git a/.github/actions/check/action.yml b/.github/actions/check/action.yml
diff --git a/.github/actions/clippy/action.yml b/.github/actions/clippy/action.yml
diff --git a/.github/actions/fmt/action.yml b/.github/actions/fmt/action.yml
diff --git a/.github/actions/lint/action.yml b/.github/actions/lint/action.yml
@@ -0,0 +1,15 @@
+name: 'Lint'
+description: 'Reports lints to improve code quality and checks code formatting'
+inputs: {}
+outputs: {}
+runs:
+  using: 'composite'
+  steps:
+    - name: Set up Rust
+      uses: hecrj/setup-rust-action@v1
+      with:
+        components: clippy,rustfmt
+    - uses: actions/checkout@v2
+    - name: Lint
+      run: make lint
+      shell: bash
diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml
@@ -6,15 +6,10 @@ runs:
   using: 'composite'
   steps:
     - uses: actions/checkout@v2
-    - uses: actions-rs/toolchain@v1
-      with:
-        profile: minimal
-        toolchain: stable
-        override: true
+    - name: Set up Rust
+      uses: hecrj/setup-rust-action@v1
     - name: Install dependencies
       run: sudo apt-get install libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxkbcommon-dev || true
       shell: bash
     - name: Run tests
-      uses: actions-rs/cargo@v1
-      with:
-        command: test
+      run: make test
diff --git a/.github/workflows/build_pr.yml b/.github/workflows/build_pr.yml
@@ -10,8 +10,8 @@ on:
 name: epick PR CI
 
 jobs:
-  check:
-    name: Check
+  lint:
+    name: Lint
     strategy:
       matrix:
         os:
@@ -21,37 +21,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@main
-      - uses: ./.github/actions/check
-
-  fmt:
-    name: Rustfmt
-    strategy:
-      matrix:
-        os:
-          - ubuntu-latest
-          - windows-latest
-          - macos-latest
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@main
-      - uses: ./.github/actions/fmt
-
-  clippy:
-    name: Clippy
-    strategy:
-      matrix:
-        os:
-          - ubuntu-latest
-          - windows-latest
-          - macos-latest
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@main
-      - uses: ./.github/actions/clippy
+      - uses: ./.github/actions/lint
 
   test:
     name: Test Suite
-    needs: [check, fmt, clippy]
+    needs: [lint]
     strategy:
       matrix:
         os:
@@ -81,4 +55,4 @@ jobs:
       - name: Add wasm target
         run: rustup target add wasm32-unknown-unknown
       - name: Test web build
-        run: ./scripts/build_web.sh
+        run: ./scripts/build_web.sh
diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml
@@ -9,8 +9,8 @@ on:
 name: epick CI
 
 jobs:
-  check:
-    name: Check
+  lint:
+    name: Lint
     strategy:
       matrix:
         os:
@@ -20,37 +20,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@main
-      - uses: ./.github/actions/check
-
-  fmt:
-    name: Rustfmt
-    strategy:
-      matrix:
-        os:
-          - ubuntu-latest
-          - windows-latest
-          - macos-latest
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@main
-      - uses: ./.github/actions/fmt
-
-  clippy:
-    name: Clippy
-    strategy:
-      matrix:
-        os:
-          - ubuntu-latest
-          - windows-latest
-          - macos-latest
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@main
-      - uses: ./.github/actions/clippy
+      - uses: ./.github/actions/lint
 
   test:
     name: Test Suite
-    needs: [check, fmt, clippy]
+    needs: [lint]
     strategy:
       matrix:
         os:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,8 +7,8 @@ on:
     tags:
       - "**"
 jobs:
-  check:
-    name: Check
+  lint:
+    name: Lint
     strategy:
       matrix:
         os:
@@ -18,37 +18,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@main
-      - uses: ./.github/actions/check
-
-  fmt:
-    name: Rustfmt
-    strategy:
-      matrix:
-        os:
-          - ubuntu-latest
-          - windows-latest
-          - macos-latest
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@main
-      - uses: ./.github/actions/fmt
-
-  clippy:
-    name: Clippy
-    strategy:
-      matrix:
-        os:
-          - ubuntu-latest
-          - windows-latest
-          - macos-latest
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@main
-      - uses: ./.github/actions/clippy
+      - uses: ./.github/actions/lint
 
   test:
     name: Test Suite
-    needs: [check, fmt, clippy]
+    needs: [lint]
     strategy:
       matrix:
         os: