remove duplication by adding more commands to the Justfile

rust-lang · Jan 31, 2024 · 4ed6b49 · 4ed6b49
1 parent c43f3a4
commit 4ed6b49
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,6 +28,9 @@ jobs:
           rustup override set stable
           rustup update stable
 
+      - name: install `just`
+        run: sudo snap install --edge --classic just
+
       - name: restore build & cargo cache
         uses: Swatinem/rust-cache@v2
         with:
@@ -53,12 +56,7 @@ jobs:
         run: cargo install sqlx-cli --no-default-features --features postgres
 
       - name: run sqlx prepare --check
-        run: |
-          cargo sqlx prepare \
-            --database-url $DOCSRS_DATABASE_URL \
-            --workspace \
-            --check \
-            -- --all-targets --all-features
+        run: just sqlx-check
 
       - name: test reverse migrations
         run: |
@@ -229,7 +227,10 @@ jobs:
           rustup update stable
           rustup component add clippy
 
+      - name: install `just`
+        run: sudo snap install --edge --classic just
+
       - name: restore build & cargo cache
         uses: Swatinem/rust-cache@v2
 
-      - run: cargo clippy --all-features --all-targets --workspace --locked -- -D warnings
+      - run: just lint
diff --git a/Justfile b/Justfile
@@ -2,8 +2,15 @@
 _default:
     just --list
 
-sqlx-prepare:
+sqlx-prepare ADDITIONAL_ARGS="":
   cargo sqlx prepare \
     --database-url $DOCSRS_DATABASE_URL \
-    --workspace \
+    --workspace {{ ADDITIONAL_ARGS }} \
     -- --all-targets --all-features
+
+sqlx-check:
+  just sqlx-prepare "--check"
+
+lint: 
+  cargo clippy --all-features --all-targets --workspace --locked -- -D warnings
+