diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1b44b72..38a24bd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -58,7 +58,7 @@ jobs:
with:
submodules: recursive
- name: Install cargo-dist
- run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.4.0-prerelease.2/cargo-dist-installer.sh | sh"
+ run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.4.0-prerelease.3/cargo-dist-installer.sh | sh"
- id: plan
run: |
cargo dist plan ${{ !github.event.pull_request && format('--tag={0}', github.ref_name) || '' }} --output-format=json > dist-manifest.json
@@ -104,17 +104,10 @@ jobs:
run: |
${{ matrix.packages_install }}
- name: Build artifacts
- if: ${{ hashFiles('Brewfile') == '' }}
run: |
# Actually do builds and make zips and whatnot
cargo dist build ${{ needs.plan.outputs.tag-flag }} --print=linkage --output-format=json ${{ matrix.dist_args }} > dist-manifest.json
echo "cargo dist ran successfully"
- - name: Build artifacts (using Brewfile)
- if: ${{ hashFiles('Brewfile') != '' }}
- run: |
- # Actually do builds and make zips and whatnot
- brew bundle exec -- cargo dist build ${{ needs.plan.outputs.tag-flag }} --print=linkage --output-format=json ${{ matrix.dist_args }} > dist-manifest.json
- echo "cargo dist ran successfully"
- id: cargo-dist
name: Post-build
# We force bash here just because github makes it really hard to get values up
@@ -147,7 +140,7 @@ jobs:
with:
submodules: recursive
- name: Install cargo-dist
- run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.4.0-prerelease.2/cargo-dist-installer.sh | sh"
+ run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.4.0-prerelease.3/cargo-dist-installer.sh | sh"
# Get all the local artifacts for the global tasks to use (for e.g. checksums)
- name: Fetch local artifacts
uses: actions/download-artifact@v3
diff --git a/Cargo.toml b/Cargo.toml
index e7c561e..f73936a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -48,7 +48,7 @@ split-debuginfo = "packed"
# Config for 'cargo dist'
[workspace.metadata.dist]
# The preferred cargo-dist version to use in CI (Cargo.toml SemVer syntax)
-cargo-dist-version = "0.4.0-prerelease.2"
+cargo-dist-version = "0.4.0-prerelease.3"
# CI backends to support
ci = ["github"]
# The installers to generate for each app
@@ -56,7 +56,7 @@ installers = ["shell", "powershell", "msi"]
# Target platforms to build apps for (Rust target-triple syntax)
targets = ["x86_64-unknown-linux-gnu", "aarch64-apple-darwin", "x86_64-apple-darwin", "x86_64-pc-windows-msvc"]
# Publish jobs to run in CI
-pr-run-mode = "plan"
+pr-run-mode = "upload"
[workspace.metadata.dist.dependencies.apt]
libclang-dev = "*"
@@ -66,4 +66,3 @@ libxcb-shape0-dev = "*"
libxcb-xfixes0-dev = "*"
libxkbcommon-dev = "*"
libssl-dev = "*"
-
diff --git a/wix/main.wxs b/wix/main.wxs
index f2c0eae..4ab09f7 100644
--- a/wix/main.wxs
+++ b/wix/main.wxs
@@ -173,7 +173,7 @@
-
+