Skip to content

Commit 2324d83

Browse files
committed
github: Simplify running the msvcrt workflow on push, for testing
Only pick parameters from "inputs" if we were invoked through a "workflow_dispatch" event.
1 parent 0681c73 commit 2324d83

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

.github/workflows/msvcrt.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ jobs:
3131
with:
3232
workflow: build.yml
3333
workflow_conclusion: success
34-
ref: ${{inputs.ref}}
35-
event: push
34+
ref: ${{github.event_name == 'workflow_dispatch' && inputs.ref || 'master'}}
35+
event: ${{github.event_name == 'workflow_dispatch' && 'push' || 'schedule'}}
3636
name: parameters
3737
- name: Get build parameters
3838
id: get-parameters
@@ -47,14 +47,14 @@ jobs:
4747
steps:
4848
- uses: actions/checkout@v4
4949
with:
50-
ref: ${{inputs.ref}}
50+
ref: ${{github.event_name == 'workflow_dispatch' && inputs.ref || 'master'}}
5151
- name: Download toolchain
5252
uses: dawidd6/action-download-artifact@v10
5353
with:
5454
workflow: build.yml
5555
workflow_conclusion: success
56-
ref: ${{inputs.ref}}
57-
event: push
56+
ref: ${{github.event_name == 'workflow_dispatch' && inputs.ref || 'master'}}
57+
event: ${{github.event_name == 'workflow_dispatch' && 'push' || 'schedule'}}
5858
name: linux-ucrt-x86_64-toolchain
5959
- name: Unpack original toolchain
6060
run: |
@@ -105,14 +105,14 @@ jobs:
105105
echo /opt/llvm-mingw/bin >> $GITHUB_PATH
106106
- uses: actions/checkout@v4
107107
with:
108-
ref: ${{inputs.ref}}
108+
ref: ${{github.event_name == 'workflow_dispatch' && inputs.ref || 'master'}}
109109
- name: Download profile
110110
uses: dawidd6/action-download-artifact@v10
111111
with:
112112
workflow: build.yml
113113
workflow_conclusion: success
114-
ref: ${{inputs.ref}}
115-
event: push
114+
ref: ${{github.event_name == 'workflow_dispatch' && inputs.ref || 'master'}}
115+
event: ${{github.event_name == 'workflow_dispatch' && 'push' || 'schedule'}}
116116
name: profile
117117
- name: Build
118118
env:
@@ -169,14 +169,14 @@ jobs:
169169
echo /llvm-mingw/bin >> $GITHUB_PATH
170170
- uses: actions/checkout@v4
171171
with:
172-
ref: ${{inputs.ref}}
172+
ref: ${{github.event_name == 'workflow_dispatch' && inputs.ref || 'master'}}
173173
- name: Run tests
174174
run: |
175175
./run-tests.sh /llvm-mingw
176176
./run-lldb-tests.sh /llvm-mingw
177177
178178
upload:
179-
if: ${{inputs.upload}}
179+
if: ${{github.event_name == 'workflow_dispatch' && inputs.upload}}
180180
permissions:
181181
contents: write
182182
needs: [linux-msvcrt, linux-cross-windows, test-toolchain, prepare]

0 commit comments

Comments
 (0)