aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/build.yml17
1 files changed, 8 insertions, 9 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8a320821..94f4e1be 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,14 +1,12 @@
1name: Build WiX Toolset v5 1name: Build WiX Toolset v6
2 2
3on: 3on:
4 push: 4 push:
5 branches: 5 branches:
6 - master 6 - main
7 - develop
8 pull_request: 7 pull_request:
9 branches: 8 branches:
10 - master 9 - main
11 - develop
12 workflow_dispatch: 10 workflow_dispatch:
13 inputs: 11 inputs:
14 tags: 12 tags:
@@ -29,9 +27,10 @@ jobs:
29 id-token: write 27 id-token: write
30 steps: 28 steps:
31 - name: Checkout code 29 - name: Checkout code
32 uses: actions/checkout@v3 30 uses: actions/checkout@v4
33 with: 31 with:
34 fetch-depth: 0 32 fetch-depth: 0
33 filter: tree:0
35 34
36 # - name: Configure Visual Studio 35 # - name: Configure Visual Studio
37 # shell: cmd 36 # shell: cmd
@@ -40,7 +39,7 @@ jobs:
40 - name: Install sign tool 39 - name: Install sign tool
41 if: (github.ref == 'refs/heads/master') 40 if: (github.ref == 'refs/heads/master')
42 shell: cmd 41 shell: cmd
43 run: dotnet tool install --tool-path build\.tools sign --version 0.9.1-beta.23356.1 42 run: dotnet tool install --tool-path build\.tools sign --version 0.9.1-beta.24170.3
44 43
45 - name: Configure automated logging and crash dumps 44 - name: Configure automated logging and crash dumps
46 shell: cmd 45 shell: cmd
@@ -62,7 +61,7 @@ jobs:
62 client-id: ${{ secrets.WIX_SIGNING_CLIENTID }} 61 client-id: ${{ secrets.WIX_SIGNING_CLIENTID }}
63 tenant-id: ${{ secrets.WIX_SIGNING_TENANTID }} 62 tenant-id: ${{ secrets.WIX_SIGNING_TENANTID }}
64 63
65 - name: Build wix5 64 - name: Build wix6
66 shell: cmd 65 shell: cmd
67 run: ./src/build_official.cmd 66 run: ./src/build_official.cmd
68 env: 67 env:
@@ -107,5 +106,5 @@ jobs:
107 path: build/logs/ 106 path: build/logs/
108 107
109 - name: Push to GitHub Packages 108 - 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') 109 if: github.event_name == 'push' && github.repository_owner == 'wixtoolset' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main')
111 run: dotnet nuget push "build/artifacts/**/*.nupkg" --source https://nuget.pkg.github.com/wixtoolset/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate 110 run: dotnet nuget push "build/artifacts/**/*.nupkg" --source https://nuget.pkg.github.com/wixtoolset/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate