CI Updates (#198)

puffyCid · Dec 5, 2024 · b97bd7c · b97bd7c
1 parent affef80
commit b97bd7c
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 39 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -47,8 +47,6 @@ jobs:
         run: npm install -D daisyui@latest
       - name: Install TailwindCSS Typography
         run: npm install -D @tailwindcss/typography
-      - name: Add WASM Support
-        run: rustup target add wasm32-unknown-unknown
 
       - name: Tauri build dependencies on Linux
         if: matrix.info.os == 'ubuntu-latest'
@@ -82,7 +80,7 @@ jobs:
 
       - name: Setup Rust for root (Linux)
         if: matrix.info.os == 'ubuntu-latest'
-        run: sudo env "PATH=$PATH" rustup default stable && sudo env "PATH=$PATH" rustup target add wasm32-unknown-unknown
+        run: sudo env "PATH=$PATH" rustup default stable
       - name: Generate code coverage (Linux)
         if: matrix.info.os == 'ubuntu-latest'
         run: sudo env "PATH=$PATH" just _coverage

diff --git a/.github/workflows/cross-release.yml b/.github/workflows/cross-release.yml
@@ -28,18 +28,13 @@ jobs:
       - name: Setup Stable Rust toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
-          targets: wasm32-unknown-unknown
           components: clippy, rustfmt
       - name: Setup Cross
         run: cargo install cross --git https://github.com/cross-rs/cross
 
       - uses: actions/checkout@v4
       - uses: taiki-e/install-action@just
 
-      # Compile WASM before compiling binary
-      - name: Compile WASM
-        run: just _wasm
-
       - name: Build Artemis
         shell: bash
         run: just --shell bash --shell-arg -uc _ci_release_cross ${{ matrix.info.target }}

diff --git a/.github/workflows/cross.yml b/.github/workflows/cross.yml
@@ -30,18 +30,13 @@ jobs:
       - name: Setup Stable Rust toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
-          targets: wasm32-unknown-unknown
           components: clippy, rustfmt
       - name: Setup Cross
         run: cargo install cross --git https://github.com/cross-rs/cross
 
       - uses: actions/checkout@v4
       - uses: taiki-e/install-action@just
 
-      # Compile WASM before compiling binary
-      - name: Compile WASM
-        run: just _wasm
-
       - name: Build Artemis
         shell: bash
         run: just --shell bash --shell-arg -uc _ci_release_cross ${{ matrix.info.target }}

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -44,8 +44,6 @@ jobs:
         run: npm install -D daisyui@latest
       - name: Install TailwindCSS Typography
         run: npm install -D @tailwindcss/typography
-      - name: Add WASM Support
-        run: rustup target add wasm32-unknown-unknown
 
       - name: Enable Rust cache
         uses: Swatinem/[email protected]
@@ -84,7 +82,7 @@ jobs:
 
       - name: Setup Rust for root (Linux)
         if: matrix.info.os == 'ubuntu-latest'
-        run: sudo env "PATH=$PATH" rustup default stable && sudo env "PATH=$PATH" rustup target add wasm32-unknown-unknown
+        run: sudo env "PATH=$PATH" rustup default stable
 
       - name: Build tests (Linux)
         if: matrix.info.os == 'ubuntu-latest'

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -36,22 +36,14 @@ jobs:
       - name: Setup Stable Rust toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
-          targets: wasm32-unknown-unknown, ${{ matrix.info.target }}
+          targets: ${{ matrix.info.target }}
           components: clippy, rustfmt
       - name: Setup Auditable
         run: cargo install cargo-auditable
 
       - uses: actions/checkout@v4
       - uses: taiki-e/install-action@just
 
-      # Compile WASM before compiling binary
-      - if: matrix.info.os == 'windows-latest'
-        name: Compile WASM
-        run: just --shell pwsh.exe --shell-arg -c _wasm
-      - if: matrix.info.os != 'windows-latest'
-        name: Compile WASM
-        run: just _wasm
-
       - name: Tauri build dependencies on Linux
         if: matrix.info.os == 'ubuntu-latest'
         run: sudo apt install libgtk-3-dev libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev

diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
@@ -44,8 +44,6 @@ jobs:
         run: npm install -D daisyui@latest
       - name: Install TailwindCSS Typography
         run: npm install -D @tailwindcss/typography
-      - name: Add WASM Support
-        run: rustup target add wasm32-unknown-unknown
 
       - name: Tauri build dependencies on Linux
         if: matrix.info.os == 'ubuntu-latest'
@@ -89,7 +87,7 @@ jobs:
 
       - name: Setup Rust for root (Linux)
         if: matrix.info.os == 'ubuntu-latest'
-        run: sudo env "PATH=$PATH" rustup default stable && sudo env "PATH=$PATH" rustup target add wasm32-unknown-unknown
+        run: sudo env "PATH=$PATH" rustup default stable
 
       - name: Build tests (Linux)
         if: matrix.info.os == 'ubuntu-latest'

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -34,22 +34,14 @@ jobs:
       - name: Setup Stable Rust toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
-          targets: wasm32-unknown-unknown, ${{ matrix.info.target }}
+          targets: ${{ matrix.info.target }}
           components: clippy, rustfmt
       - name: Setup Auditable
         run: cargo install cargo-auditable
 
       - uses: actions/checkout@v4
       - uses: taiki-e/install-action@just
 
-      # Compile WASM before compiling binary
-      - if: matrix.info.os == 'windows-latest'
-        name: Compile WASM
-        run: just --shell pwsh.exe --shell-arg -c _wasm
-      - if: matrix.info.os != 'windows-latest'
-        name: Compile WASM
-        run: just _wasm
-
       - name: Tauri build dependencies on Linux
         if: matrix.info.os == 'ubuntu-latest'
         run: sudo apt install libgtk-3-dev libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev

diff --git a/.setup/rust.just b/.setup/rust.just
@@ -4,8 +4,6 @@
   curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
   . "$HOME/.cargo/env"
 
-  echo "Adding WASM target to Rust toolchain"
-  rustup target add wasm32-unknown-unknown
 
 @_cargo-plugins:
   echo "Installing Cargo plugins and binaries: deny, audit, auditable, nextest, update, and cross"