Skip to content

Commit 08774c9

Browse files
committed
more CI fixes
- Linux build is failing because of an issue with a dependency improperly using `#![feature]` Trying to fix by switching egui backend to wgpu. - Publishing now when tests complete, not necessarily when a crate is published. This will change. It's temporary to test whether the Mac app build by GH actually works.
1 parent 2e1422b commit 08774c9

File tree

2 files changed

+39
-23
lines changed

2 files changed

+39
-23
lines changed

.github/workflows/release.yml

Lines changed: 38 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Run tests with coverage
3535
run: cargo llvm-cov --workspace --lcov --output-path ./target/lcov.info
3636
- name: Upload coverage reports to Codecov
37-
uses: codecov/codecov-action@v4.0.1
37+
uses: codecov/codecov-action@v4.4.1
3838
with:
3939
token: ${{ secrets.CODECOV_TOKEN }}
4040
- name: Install cargo bundle
@@ -74,7 +74,7 @@ jobs:
7474
- name: Run tests with coverage
7575
run: cargo llvm-cov --workspace --lcov --output-path ./target/lcov.info
7676
- name: Upload coverage reports to Codecov
77-
uses: codecov/codecov-action@v4.0.1
77+
uses: codecov/codecov-action@v4.4.1
7878
with:
7979
token: ${{ secrets.CODECOV_TOKEN }}
8080
- name: Install cargo bundle
@@ -101,6 +101,12 @@ jobs:
101101
with:
102102
toolchain: stable
103103
components: rustfmt, clippy
104+
- name: Install LLVM and Clang
105+
uses: KyleMayes/install-llvm-action@v2
106+
with:
107+
version: "18"
108+
- name: Installe Cuda Toolkit
109+
uses: Jimver/cuda-toolkit@v0.2.15
104110
- name: Run cargo check
105111
uses: actions-rs/cargo@v1
106112
with:
@@ -112,7 +118,7 @@ jobs:
112118
- name: Run tests with coverage
113119
run: cargo llvm-cov --workspace --lcov --output-path ./target/lcov.info
114120
- name: Upload coverage reports to Codecov
115-
uses: codecov/codecov-action@v4.0.1
121+
uses: codecov/codecov-action@v4.4.1
116122
with:
117123
token: ${{ secrets.CODECOV_TOKEN }}
118124
- name: Install cargo bundle
@@ -224,41 +230,51 @@ jobs:
224230
echo "No PRs found for package $package_name"
225231
fi
226232
done
227-
publish-binaries:
228-
name: Publish binaries to GitHub
229-
needs: [release-plz]
233+
publish-mac:
234+
name: Publish Mac binary to GitHub
235+
needs: [mac-test]
230236
runs-on: ubuntu-latest
231237
steps:
232238
- name: Download Mac App
233239
uses: actions/download-artifact@v4
234240
with:
235241
name: mac-app
236-
path: target/release/bundle/osx/
237-
- name: Download Linux Binary
238-
uses: actions/download-artifact@v4
239-
with:
240-
name: linux-binary
241-
path: target/release/bundle/linux/
242-
- name: Download Windows Binary
243-
uses: actions/download-artifact@v4
244-
with:
245-
name: windows-exe
246-
path: target/release/bundle/windows/Weave.exe
242+
path: target/release/bundle/osx/Weave.tar.gz
247243
- name: Publish Mac App
248244
uses: softprops/action-gh-release@v2.0.5
249245
if: startsWith(github.ref, 'refs/tags/')
250246
with:
251-
files: target/release/bundle/osx/
247+
files: target/release/bundle/osx/Weave.tar.gz
252248
token: ${{ secrets.PAT }}
253-
- name: Publish Linux Binary
249+
publish-linux:
250+
name: Publish Linux binary to GitHub
251+
needs: [linux-test]
252+
runs-on: ubuntu-latest
253+
steps:
254+
- name: Download Linux binary
255+
uses: actions/download-artifact@v4
256+
with:
257+
name: linux-binary
258+
path: target/release/bundle/linux/Weave.tar.gz
259+
- name: Publish Linux binary
254260
uses: softprops/action-gh-release@v2.0.5
255261
if: startsWith(github.ref, 'refs/tags/')
256262
with:
257-
files: target/release/bundle/linux/Weave
263+
files: target/release/bundle/linux/Weave.tar.gz
258264
token: ${{ secrets.PAT }}
259-
- name: Publish Windows Binary
265+
publish-windows:
266+
name: Publish Windows binary to GitHub
267+
needs: [windows-test]
268+
runs-on: ubuntu-latest
269+
steps:
270+
- name: Download Windows binary
271+
uses: actions/download-artifact@v4
272+
with:
273+
name: windows-exe
274+
path: target/release/bundle/windows/
275+
- name: Publish Windows binary
260276
uses: softprops/action-gh-release@v2.0.5
261277
if: startsWith(github.ref, 'refs/tags/')
262278
with:
263-
files: target/release/bundle/windows/Weave.exe
279+
files: target/release/bundle/windows/
264280
token: ${{ secrets.PAT }}

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ strip = true
4343

4444
[dependencies]
4545
serde = { version = "1.0", features = ["derive"] }
46-
egui = { version = "0.27", features = ["persistence"], optional = true }
46+
egui = { version = "0.27", features = ["persistence", "wgpu"], optional = true }
4747
eframe = { version = "0.27", features = [
4848
"persistence",
4949
"wgpu",

0 commit comments

Comments
 (0)