Adjusting CI files

SquireTournamentServices · Dec 21, 2023 · e393898 · e393898
1 parent b2982f1
commit e393898
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 43 deletions.
diff --git a/.github/workflows/cleaniness.yml b/.github/workflows/cleaniness.yml
@@ -1,4 +1,4 @@
-name: SquireCore CI
+name: Code Cleaniness
 
 on:
   push:
@@ -12,19 +12,15 @@ env:
 jobs:
   code_cleaniness_checks:
     name: Formatting Checks
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        rust: [nightly]
-        os: [ubuntu-latest]
+    runs-on: ubuntu-latest
     steps:
-      - uses: hecrj/setup-rust-action@v2
+      - name: Setup Rust
+        uses: hecrj/setup-rust-action@v2
         with:
-          rust-version: ${{ matrix.rust }}
+          rust-version: nightly
           components: rustfmt
-          targets: wasm32-unknown-unknown
       - uses: actions/checkout@v4
       - run: cargo fmt --check --package squire_lib
       - run: cargo fmt --check --package squire_sdk
-      - run: cargo fmt --check --package squire_web
+      - run: cargo fmt --check --manifest-path squire_web/Cargo.toml
       - run: cargo fmt --check --package squire_core
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -2,7 +2,7 @@ name: Squire Coverage
 
 on:
   push:
-    branches: [ main, development ]
+    branches: [ main ]
   pull_request:
     branches: [ main, development ]
 

diff --git a/.github/workflows/squire_core_ci.yml b/.github/workflows/squire_core_ci.yml
@@ -2,7 +2,7 @@ name: SquireCore CI
 
 on:
   push:
-    branches: [ main, development ]
+    branches: [ main ]
   pull_request:
     branches: [ main, development ]
 
@@ -12,17 +12,13 @@ env:
 jobs:
   squire_core_build_tests:
     name: Tests
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        rust: [nightly]
-        os: [ubuntu-latest]
+    runs-on: ubuntu-latest
     steps:
-      - uses: hecrj/setup-rust-action@v2
+      - name: Setup Rust
+        uses: hecrj/setup-rust-action@v2
         with:
-          rust-version: ${{ matrix.rust }}
+          rust-version: stable
           components: rustfmt
-          targets: wasm32-unknown-unknown
       - uses: actions/checkout@v4
       - name: Fetch Trunk
         uses: jetli/trunk-action@v0.4.0
@@ -34,4 +30,4 @@ jobs:
           mongodb-version: '6.0'
       - run: cargo build --package squire_core --verbose
       - run: cargo test --package squire_core --verbose --features="db-tests"
-      - run: cargo doc --package squire_core --verbose
+      # - run: cargo doc --package squire_core --verbose
diff --git a/.github/workflows/squire_lib_ci.yml b/.github/workflows/squire_lib_ci.yml
@@ -2,7 +2,7 @@ name: SquireLib CI
 
 on:
   push:
-    branches: [ main, development ]
+    branches: [ main ]
   pull_request:
     branches: [ main, development ]
 
@@ -15,27 +15,24 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        rust: [stable, beta, nightly]
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
-      - uses: hecrj/setup-rust-action@v2
+      - name: Setup Rust
+        uses: hecrj/setup-rust-action@v2
         with:
-          rust-version: ${{ matrix.rust }}
-          components: rustfmt
+          rust-version: stable
       - uses: actions/checkout@v4
       - run: cargo build --package squire_lib --verbose
       - run: cargo test --package squire_lib --verbose
       - run: cargo doc --package squire_lib --verbose
   squire_lib_wasm_tests:
     name: Wasm Tests
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        rust: [stable, beta, nightly]
     steps:
-      - uses: hecrj/setup-rust-action@v2
+      - name: Setup Rust
+        uses: hecrj/setup-rust-action@v2
         with:
-          rust-version: ${{ matrix.rust }}
+          rust-version: stable
           targets: wasm32-unknown-unknown
       - uses: actions/checkout@v4
       - run: cargo build --package squire_lib --target=wasm32-unknown-unknown --verbose

diff --git a/.github/workflows/squire_sdk_ci.yml b/.github/workflows/squire_sdk_ci.yml
@@ -2,7 +2,7 @@ name: SquireSDK CI
 
 on:
   push:
-    branches: [ main, development ]
+    branches: [ main ]
   pull_request:
     branches: [ main, development ]
 
@@ -15,12 +15,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        rust: [stable, beta, nightly]
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
       - uses: hecrj/setup-rust-action@v2
         with:
-          rust-version: ${{ matrix.rust }}
+          rust-version: stable
           components: rustfmt
       - uses: taiki-e/install-action@cargo-hack
       - uses: actions/checkout@v4
@@ -30,13 +29,10 @@ jobs:
   squire_lib_wasm_tests:
     name: Wasm Tests
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        rust: [nightly, beta, stable]
     steps:
       - uses: hecrj/setup-rust-action@v2
         with:
-          rust-version: ${{ matrix.rust }}
+          rust-version: stable
           targets: wasm32-unknown-unknown
       - uses: actions/checkout@v4
       - run: cargo build --package squire_sdk --features=client --target=wasm32-unknown-unknown --verbose

diff --git a/.github/workflows/squire_web_ci.yml b/.github/workflows/squire_web_ci.yml
@@ -2,7 +2,7 @@ name: SquireWeb CI
 
 on:
   push:
-    branches: [ main, development ]
+    branches: [ main ]
   pull_request:
     branches: [ main, development ]
 
@@ -13,13 +13,10 @@ jobs:
   squire_web_build_tests:
     name: Build Test
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        rust: [stable, beta, nightly]
     steps:
       - uses: hecrj/setup-rust-action@v2
         with:
-          rust-version: ${{ matrix.rust }}
+          rust-version: stable
           components: rustfmt
           targets: wasm32-unknown-unknown
       - uses: actions/checkout@v4