aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2024-02-06 12:06:36 -0800
committerRob Mensching <rob@firegiant.com>2024-02-06 14:20:07 -0800
commita85929822f9932fcb938a8f260555e2476040298 (patch)
tree2fceb208a444a30e54a1f44abfd77c76e5709fb0
parente30c1b2432726d2d5ba572328f9a3956c5d7389c (diff)
downloadwix-4.0.4.tar.gz
wix-4.0.4.tar.bz2
wix-4.0.4.zip
WiX Toolset v4.0.4v4.0.4
-rw-r--r--.github/workflows/build.yml5
-rw-r--r--src/version.txt2
2 files changed, 2 insertions, 5 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0cd8e135..bec4f1e1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,12 +5,10 @@ on:
5 branches: 5 branches:
6 - master 6 - master
7 - develop 7 - develop
8 - develop404
9 pull_request: 8 pull_request:
10 branches: 9 branches:
11 - master 10 - master
12 - develop 11 - develop
13 - develop404
14 workflow_dispatch: 12 workflow_dispatch:
15 inputs: 13 inputs:
16 tags: 14 tags:
@@ -63,7 +61,6 @@ jobs:
63 allow-no-subscriptions: true 61 allow-no-subscriptions: true
64 client-id: ${{ secrets.WIX_SIGNING_CLIENTID }} 62 client-id: ${{ secrets.WIX_SIGNING_CLIENTID }}
65 tenant-id: ${{ secrets.WIX_SIGNING_TENANTID }} 63 tenant-id: ${{ secrets.WIX_SIGNING_TENANTID }}
66 subscription-id: ${{ secrets.WIX_SIGNING_SUBSCRIPTIONID }}
67 64
68 - name: Build wix4 65 - name: Build wix4
69 shell: cmd 66 shell: cmd
@@ -107,5 +104,5 @@ jobs:
107 path: build/logs/ 104 path: build/logs/
108 105
109 - name: Push to GitHub Packages 106 - name: Push to GitHub Packages
110 if: github.event_name == 'push' && github.repository_owner == 'wixtoolset' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/develop404') 107 if: github.event_name == 'push' && github.repository_owner == 'wixtoolset' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop')
111 run: dotnet nuget push "build/artifacts/**/*.nupkg" --source https://nuget.pkg.github.com/wixtoolset/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate 108 run: dotnet nuget push "build/artifacts/**/*.nupkg" --source https://nuget.pkg.github.com/wixtoolset/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate
diff --git a/src/version.txt b/src/version.txt
index 81002d34..c5106e6d 100644
--- a/src/version.txt
+++ b/src/version.txt
@@ -1 +1 @@
4.0.4-build.{height} 4.0.4