From b40379ef997ca10dc9aea7e829efbe08451c2474 Mon Sep 17 00:00:00 2001 From: pm100 Date: Sat, 24 Oct 2020 17:59:03 -0700 Subject: [PATCH 1/5] msi try 2 --- .github/workflows/ci.yml | 4 +++- .gitignore | 1 + Makefile | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 89e47930f2..e0ac73a87d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,7 +43,9 @@ jobs: make clippy - name: Build Release - run: make build-release + run: | + make build-release + make release-win build-linux-musl: runs-on: ubuntu-latest diff --git a/.gitignore b/.gitignore index 715365c3bb..4af07b5737 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /target /release +/wix .DS_Store /.idea/ flamegraph.svg diff --git a/Makefile b/Makefile index 3bb825f417..8401a6085e 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,9 @@ release-mac: build-release release-win: build-release mkdir -p release tar -C ./target/release/ -czvf ./release/gitui-win.tar.gz ./gitui.exe + cargo install wix + cargo wix init + cargo wix release-linux-musl: build-linux-musl-release strip target/x86_64-unknown-linux-musl/release/gitui From a3eea4e45cc524529be4c0a1670289b40f6fb2b0 Mon Sep 17 00:00:00 2001 From: pm100 Date: Sat, 24 Oct 2020 18:09:50 -0700 Subject: [PATCH 2/5] try 3 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8401a6085e..5cecd09e49 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ release-mac: build-release release-win: build-release mkdir -p release tar -C ./target/release/ -czvf ./release/gitui-win.tar.gz ./gitui.exe - cargo install wix + cargo install cargo-wix cargo wix init cargo wix From ca15f82dbe559c4f1efed9027b042c2f8c31c0cf Mon Sep 17 00:00:00 2001 From: pm100 Date: Sun, 25 Oct 2020 10:06:49 -0700 Subject: [PATCH 3/5] try 3 --- .github/workflows/ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e0ac73a87d..e121a1c993 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,9 +43,11 @@ jobs: make clippy - name: Build Release - run: | - make build-release - make release-win + run: make build-release + + - name: make-wix + if: matrix.os == 'windows-latest' + run: make release-win build-linux-musl: runs-on: ubuntu-latest From 104a496605d8fab0dcca117add5b2a651db8871a Mon Sep 17 00:00:00 2001 From: pm100 Date: Sun, 25 Oct 2020 11:35:42 -0700 Subject: [PATCH 4/5] again --- .github/workflows/cd.yml | 2 ++ Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index d30f32dd84..ce4db2b940 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -70,6 +70,8 @@ jobs: files: | ./release/*.tar.gz ./release/*.zip + ./release/*.msi + env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/Makefile b/Makefile index 5cecd09e49..96c2c549e9 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ release-win: build-release tar -C ./target/release/ -czvf ./release/gitui-win.tar.gz ./gitui.exe cargo install cargo-wix cargo wix init - cargo wix + cargo wix --no-build -- nocapture --output ./release/gitui.msi release-linux-musl: build-linux-musl-release strip target/x86_64-unknown-linux-musl/release/gitui From 9a0c8d9759ed7c16b6a6764b000aabc79bf00e98 Mon Sep 17 00:00:00 2001 From: pm100 Date: Sun, 25 Oct 2020 11:49:39 -0700 Subject: [PATCH 5/5] try 4 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 96c2c549e9..96d1420012 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ release-win: build-release tar -C ./target/release/ -czvf ./release/gitui-win.tar.gz ./gitui.exe cargo install cargo-wix cargo wix init - cargo wix --no-build -- nocapture --output ./release/gitui.msi + cargo wix --no-build --nocapture --output ./release/gitui.msi release-linux-musl: build-linux-musl-release strip target/x86_64-unknown-linux-musl/release/gitui