Merge remote-tracking branch 'origin/master'

SteveCookTU · Sep 3, 2024 · 2cd7e39 · 2cd7e39
2 parents 4dc3880 + 71e3013
commit 2cd7e39
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions-rs/toolchain@v1 # get rust toolchain for wasm
         with:
           profile: minimal
-          toolchain: nightly-2023-06-27
+          toolchain: nightly-2024-08-07
           target: wasm32-unknown-unknown
           override: true
       - name: Rust Cache # cache the rust build artefacts
@@ -35,7 +35,7 @@ jobs:
         # this is necessary for github pages where the site is deployed to username.github.io/repo_name and all files must be requested
         # relatively as eframe_template/favicon.ico. if we skip public-url option, the href paths will instead request username.github.io/favicon.ico which
         # will obviously return error 404 not found.
-        run: ./trunk build --release --public-url "${GITHUB_REPOSITORY#*/}"
+        run: ./trunk build --release --public-url "."
       - name: Deploy
         uses: JamesIves/github-pages-deploy-action@v4
         with:

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly-2023-06-27
+          toolchain: nightly-2024-08-07
           override: true
       - uses: actions-rs/cargo@v1
         with:
@@ -32,7 +32,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly-2023-06-27
+          toolchain: nightly-2024-08-07
           target: wasm32-unknown-unknown
           override: true
       - uses: actions-rs/cargo@v1
@@ -48,7 +48,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly-2023-06-27
+          toolchain: nightly-2024-08-07
           override: true
       - run: sudo apt-get install libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev
       - uses: actions-rs/cargo@v1
@@ -64,7 +64,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly-2023-06-27
+          toolchain: nightly-2024-08-07
           override: true
           components: rustfmt
       - uses: actions-rs/cargo@v1
@@ -80,7 +80,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly-2023-06-27
+          toolchain: nightly-2024-08-07
           override: true
           components: clippy
       - uses: actions-rs/cargo@v1
@@ -96,7 +96,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly-2023-06-27
+          toolchain: nightly-2024-08-07
           target: wasm32-unknown-unknown
           override: true
       - name: Download and install Trunk binary