aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-10-19 16:21:58 -0700
committerRob Mensching <rob@firegiant.com>2021-10-19 16:31:05 -0700
commit54ebab73cd3254c97ed1bc8e1abeed0b5d239177 (patch)
treea6012a08c8cec7ce4fc65eae039683fc87589e57 /.github
parent5c8752cf09d1b09a574146904f50cb90babffdf1 (diff)
downloadwix-54ebab73cd3254c97ed1bc8e1abeed0b5d239177.tar.gz
wix-54ebab73cd3254c97ed1bc8e1abeed0b5d239177.tar.bz2
wix-54ebab73cd3254c97ed1bc8e1abeed0b5d239177.zip
Formatting fixes to YAML files
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/build.yml8
-rw-r--r--.github/workflows/cla.yml6
2 files changed, 8 insertions, 6 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0b632755..e8246f03 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,7 +3,8 @@ name: Build WiX Toolset v4
3on: 3on:
4 push: 4 push:
5 branches: 5 branches:
6 master 6 - master
7 - develop
7 pull_request: 8 pull_request:
8 branches: 9 branches:
9 - master 10 - master
@@ -32,10 +33,11 @@ jobs:
32 uses: microsoft/setup-msbuild@v1.0.3 33 uses: microsoft/setup-msbuild@v1.0.3
33 34
34 - name: Build wix4 35 - name: Build wix4
35 run: build.cmd 36 shell: cmd
37 run: ./build.cmd
36 38
37 - name: Save build 39 - name: Save build
38 - uses: actions/upload-artifact@v2 40 uses: actions/upload-artifact@v2
39 with: 41 with:
40 name: artifacts 42 name: artifacts
41 path: build/artifacts/ 43 path: build/artifacts/
diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
index 818fdcf3..9d449e81 100644
--- a/.github/workflows/cla.yml
+++ b/.github/workflows/cla.yml
@@ -1,17 +1,17 @@
1name: "CLA-Bot" 1name: "CLA-Bot"
2on: 2on:
3 issue_comment: 3 issue_comment:
4 types: [created] 4 types: [ created ]
5 pull_request_target: 5 pull_request_target:
6 types: [ opened, closed, synchronize ] 6 types: [ opened, closed, synchronize ]
7 7
8jobs: 8jobs:
9 CLAssistant: 9 clabot:
10 runs-on: ubuntu-latest 10 runs-on: ubuntu-latest
11 steps: 11 steps:
12 - name: "CLA-Bot signature check" 12 - name: "CLA-Bot signature check"
13 if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
14 uses: cla-assistant/github-action@v2.1.3-beta 13 uses: cla-assistant/github-action@v2.1.3-beta
14 if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
15 env: 15 env:
16 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 16 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
17 PERSONAL_ACCESS_TOKEN : ${{ secrets.CLA_BOT_ACCESS_TOKEN }} 17 PERSONAL_ACCESS_TOKEN : ${{ secrets.CLA_BOT_ACCESS_TOKEN }}