chore CI: refactor Taskfile & use dtolnay/rust-toolchain instead of…

… `actions-rs`
ohkami-rs · Oct 29, 2024 · 5dfaa08 · 5dfaa08
1 parent 4bec17a
commit 5dfaa08
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 138 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -1,17 +1,17 @@
 name: CI
+
 on:
   pull_request:
   push:
-    branches:
-      - main
+    branches: [main]
 
 jobs:
   CI:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        toolchain: ['stable', 'nightly']
+        toolchain: [stable, nightly]
 
     steps:
       - uses: actions/checkout@v4
@@ -22,14 +22,11 @@ jobs:
           echo '[target.x86_64-unknown-linux-gnu]'                     >> $HOME/.cargo/config.toml
           echo 'linker    = "clang"'                                   >> $HOME/.cargo/config.toml
           echo 'rustflags = ["-C", "link-arg=-fuse-ld=/usr/bin/mold"]' >> $HOME/.cargo/config.toml
-          cat $HOME/.cargo/config.toml
 
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.toolchain }}
-          profile:   minimal
-          override:  true
-          target:    wasm32-unknown-unknown
+          targets:   x86_64-unknown-linux-gnu, wasm32-unknown-unknown
 
       - name: Cache cargo subcommands
         id:   cache_cargo_subcommands
@@ -47,7 +44,6 @@ jobs:
         run:  |
           echo '[build]'                                      >> $HOME/.cargo/config.toml
           echo "rustc-wrapper = \"$HOME/.cargo/bin/sccache\"" >> $HOME/.cargo/config.toml
-          cat $HOME/.cargo/config.toml
       - name: Cache sccahe dir
         id:   cahce_sccahe_dir
         uses: actions/cache@v3
@@ -58,4 +54,4 @@ jobs:
       - name: Run tasks
         run:  |
           sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin
-          ${{ matrix.toolchain == 'nightly' && 'task CI' || 'task CI_stable' }}
+          task CI
diff --git a/.github/workflows/auto_approve.yml → .github/workflows/auto-approve.yml b/.github/workflows/auto_approve.yml → .github/workflows/auto-approve.yml
diff --git a/Taskfile.yaml b/Taskfile.yaml
@@ -1,180 +1,102 @@
-version: '3'
+version: 3
+
+vars:
+  maybe_nightly: { sh: cargo version | grep -q 'nightly' && echo 'nightly' || echo ''  }
 
 tasks:
   CI:
     deps:
-      - test
-      - check
-      - bench_dryrun
-  CI_stable:
-    deps:
-      - test
-      - check
+      - task: test
+      - task: check
+      - task: bench:dryrun
 
   test:
     deps:
-      - test_doc
-      - test_examples
-      - test_no_rt
-      - test_rt_tokio
-      - test_rt_async-std
-      - test_rt_smol
-      - test_rt_glommio
-      - test_rt_worker
+      - task: test:examples
+      - task: test:doc
+        # vars: { nightly: '{{.maybe_nightly}}' }
+      - task: test:no_rt
+        # vars: { nightly: '{{.maybe_nightly}}' }
+      - for:  [tokio, async-std, smol, glommio, worker]
+        task: test:rt
+        vars: { rt: '{{.ITEM}}' }
 
   check:
     deps:
-      - check_no_rt
-      - check_rt_tokio
-      - check_rt_async-std
-      - check_rt_smol
-      - check_rt_glommio
-      - check_rt_worker
+      - task: check:no_rt
+      - for:  [tokio, async-std, smol, glommio]
+        task: check:native_rt
+        vars: { native_rt: '{{.ITEM}}' }
+      - task: check:rt_worker
+        # vars: { nightly: '{{.maybe_nightly}}' }
 
-  bench_dryrun:
+  bench:dryrun:
+    status:
+      - (! cargo version | grep -q 'nightly')
     cmds:
       - cd benches && cargo bench --features DEBUG --no-run
-      - cd benches && cargo check
       - cd benches_rt/glommio && cargo check
       - cd benches_rt/smol && cargo check
       - cd benches_rt/tokio && cargo check
       - cd benches_rt/vs_actix-web && cargo check
 
   bench:
-    dir: benches
+    status:
+      - (! cargo version | grep -q 'nightly')
+    dir: ./benches
     cmds:
+      - task: bench:dryrun
       - cargo bench --features DEBUG
 
 #### tests ####
-  test_doc:
-    vars:
-      MAYBE_NIGHTLY:
-        sh: cargo version | grep -q 'nightly' && echo 'nightly' || echo ''
-    dir: ohkami
+  test:doc:
+    dir: ./ohkami
     cmds:
-      - cargo test --doc --features DEBUG,rt_tokio,sse,ws,{{.MAYBE_NIGHTLY}}
+      - cargo test --doc --features DEBUG,rt_tokio,sse,ws,{{.maybe_nightly}}
 
-  test_examples:
+  test:examples:
     dir: examples
     cmds:
       - docker compose -f ./realworld/docker-compose.yml up -d
       - cd ./realworld && sleep 5 && sqlx migrate run
       - cargo test
       - docker compose -f ./realworld/docker-compose.yml down
 
-  test_no_rt:
-    vars:
-      MAYBE_NIGHTLY:
-        sh: cargo version | grep -q 'nightly' && echo 'nightly' || echo ''
-    dir: ohkami
-    cmds:
-      - cargo test --lib --features DEBUG,{{.MAYBE_NIGHTLY}}
-      - cargo test --lib --features DEBUG,sse,ws,{{.MAYBE_NIGHTLY}}
-
-  test_rt_tokio:
-    vars:
-      MAYBE_NIGHTLY:
-        sh: cargo version | grep -q 'nightly' && echo 'nightly' || echo ''
-    dir: ohkami
-    cmds:
-      - cargo test --lib --features rt_tokio,DEBUG,{{.MAYBE_NIGHTLY}}
-      - cargo test --lib --features rt_tokio,DEBUG,sse,ws,{{.MAYBE_NIGHTLY}}
-
-  test_rt_async-std:
-    vars:
-      MAYBE_NIGHTLY:
-        sh: cargo version | grep -q 'nightly' && echo 'nightly' || echo ''
-    dir: ohkami
-    cmds:
-      - cargo test --lib --features rt_async-std,DEBUG,{{.MAYBE_NIGHTLY}}
-      - cargo test --lib --features rt_async-std,DEBUG,sse,ws,{{.MAYBE_NIGHTLY}}
-
-  test_rt_smol:
-    vars:
-      MAYBE_NIGHTLY:
-        sh: cargo version | grep -q 'nightly' && echo 'nightly' || echo ''
-    dir: ohkami
-    cmds:
-      - cargo test --lib --features rt_smol,DEBUG,{{.MAYBE_NIGHTLY}}
-      - cargo test --lib --features rt_smol,DEBUG,sse,ws,{{.MAYBE_NIGHTLY}}
-
-  test_rt_glommio:
-    vars:
-      MAYBE_NIGHTLY:
-        sh: cargo version | grep -q 'nightly' && echo 'nightly' || echo ''
-    dir: ohkami
+  test:no_rt:
+    dir: ./ohkami
     cmds:
-      - cargo test --lib --features rt_glommio,DEBUG,{{.MAYBE_NIGHTLY}}
-      - cargo test --lib --features rt_glommio,DEBUG,sse,ws,{{.MAYBE_NIGHTLY}}
+      - cargo test --lib --features DEBUG,{{.maybe_nightly}}
+      - cargo test --lib --features DEBUG,sse,ws,{{.maybe_nightly}}
 
-  test_rt_worker:
-    vars:
-      MAYBE_NIGHTLY:
-        sh: cargo version | grep -q 'nightly' && echo 'nightly' || echo ''
-    dir: ohkami
+  test:rt:
+    dir: ./ohkami
     cmds:
-      - cargo test --lib --features rt_worker,DEBUG,{{.MAYBE_NIGHTLY}}
-      - cargo test --lib --features rt_worker,DEBUG,sse,ws,{{.MAYBE_NIGHTLY}}
+      - cargo test --lib --features rt_{{.rt}},DEBUG,{{.maybe_nightly}}
+      - cargo test --lib --features rt_{{.rt}},DEBUG,sse,ws,{{.maybe_nightly}}
 
 #### checks ####
   # Assure buildability without "DEBUG" feature
 
-  check_no_rt:
+  check:no_rt:
     vars:
       MAYBE_FEATURES_NIGHTLY:
         sh: cargo version | grep -q 'nightly' && echo '--features nightly' || echo ''
       MAYBE_FEATURES_NIGHTLY_full:
         sh: cargo version | grep -q 'nightly' && echo '--features nightly,sse,ws' || echo '--features testing'
-    dir: ohkami
+    dir: ./ohkami
     cmds:
       - cargo check --lib {{.MAYBE_FEATURES_NIGHTLY}}
       - cargo check --lib {{.MAYBE_FEATURES_NIGHTLY_full}}
 
-  check_rt_tokio:
-    vars:
-      MAYBE_NIGHTLY:
-        sh: cargo version | grep -q 'nightly' && echo 'nightly' || echo ''
-    dir: ohkami
-    cmds:
-      - cargo check --lib --features rt_tokio,{{.MAYBE_NIGHTLY}}
-      - cargo check --lib --features rt_tokio,sse,{{.MAYBE_NIGHTLY}}
-      - cargo check --lib --features rt_tokio,sse,ws,{{.MAYBE_NIGHTLY}}
-
-  check_rt_async-std:
-    vars:
-      MAYBE_NIGHTLY:
-        sh: cargo version | grep -q 'nightly' && echo 'nightly' || echo ''
-    dir: ohkami
-    cmds:
-      - cargo check --lib --features rt_async-std,{{.MAYBE_NIGHTLY}}
-      - cargo check --lib --features rt_async-std,sse,{{.MAYBE_NIGHTLY}}
-      - cargo check --lib --features rt_async-std,sse,ws,{{.MAYBE_NIGHTLY}}
-
-  check_rt_smol:
-    vars:
-      MAYBE_NIGHTLY:
-        sh: cargo version | grep -q 'nightly' && echo 'nightly' || echo ''
-    dir: ohkami
-    cmds:
-      - cargo check --lib --features rt_smol,{{.MAYBE_NIGHTLY}}
-      - cargo check --lib --features rt_smol,sse,{{.MAYBE_NIGHTLY}}
-      - cargo check --lib --features rt_smol,sse,ws,{{.MAYBE_NIGHTLY}}
-
-  check_rt_glommio:
-    vars:
-      MAYBE_NIGHTLY:
-        sh: cargo version | grep -q 'nightly' && echo 'nightly' || echo ''
-    dir: ohkami
+  check:native_rt:
+    dir: ./ohkami
     cmds:
-      - cargo check --lib --features rt_glommio,{{.MAYBE_NIGHTLY}}
-      - cargo check --lib --features rt_glommio,sse,{{.MAYBE_NIGHTLY}}
-      - cargo check --lib --features rt_glommio,sse,ws,{{.MAYBE_NIGHTLY}}
+      - cargo check --lib --features rt_{{.native_rt}},{{.maybe_nightly}}
+      - cargo check --lib --features rt_{{.native_rt}},sse,{{.maybe_nightly}}
+      - cargo check --lib --features rt_{{.native_rt}},sse,ws,{{.maybe_nightly}}
 
-  check_rt_worker:
-    vars:
-      MAYBE_NIGHTLY:
-        sh: cargo version | grep -q 'nightly' && echo 'nightly' || echo ''
+  check:rt_worker:
     dir: ohkami
     cmds:
-      - cargo check --target wasm32-unknown-unknown --lib --features rt_worker,{{.MAYBE_NIGHTLY}}
-      - cargo check --target wasm32-unknown-unknown --lib --features rt_worker,sse,ws,{{.MAYBE_NIGHTLY}}
+      - cargo check --target wasm32-unknown-unknown --lib --features rt_worker,{{.maybe_nightly}}
+      - cargo check --target wasm32-unknown-unknown --lib --features rt_worker,sse,ws,{{.maybe_nightly}}