Skip to content

Commit f99b37f

Browse files
authored
Merge branch 'master' into powershell-daily-patch
2 parents f145abb + 3e979d5 commit f99b37f

File tree

4 files changed

+51
-18
lines changed

4 files changed

+51
-18
lines changed

.github/workflows/PR-powershell-daily.yml

+13-5
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
# Copyright (c) Microsoft Corporation.
22
# Licensed under the MIT license.
33

4-
name: PowerShell daily Formula
4+
name: PowerShell daily Formula PR
55

66
permissions: read-all
77

88
on:
99
workflow_dispatch:
1010
push:
1111
paths:
12-
- '.github/workflows/powershell-daily.yml'
12+
- '.github/workflows/PR-powershell-daily.yml'
1313
- 'Formula/powershell-daily.rb'
1414
branches:
1515
- master
1616
pull_request:
17-
paths:
18-
- '.github/workflows/powershell-daily.yml'
19-
- 'Formula/powershell-daily.rb'
2017

2118
defaults:
2219
run:
@@ -37,9 +34,20 @@ jobs:
3734
steps:
3835
- name: Checkout
3936
uses: actions/checkout@v2
37+
38+
- name: Check for applicable files
39+
uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50
40+
id: filter
41+
with:
42+
filters: |
43+
workflows:
44+
- .github/workflows/PR-powershell-daily.yml
45+
- Formula/powershell-daily.rb
4046
4147
- name: Prepare Agent
48+
if: steps.filter.outputs.workflows == 'true'
4249
uses: ./.github/workflows/composite/prep
4350

4451
- name: Install and Test Formula
52+
if: steps.filter.outputs.workflows == 'true'
4553
uses: ./.github/workflows/composite/installAndTest

.github/workflows/PR-powershell-lts.yml

+12-4
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,11 @@ permissions: read-all
88
on:
99
push:
1010
paths:
11-
- '.github/workflows/powershell-lts.yml'
11+
- '.github/workflows/PR-powershell-lts.yml'
1212
- 'Formula/powershell-lts.rb'
1313
branches:
1414
- master
1515
pull_request:
16-
paths:
17-
- '.github/workflows/powershell-lts.yml'
18-
- 'Formula/powershell-lts.rb'
1916

2017
defaults:
2118
run:
@@ -36,8 +33,19 @@ jobs:
3633
- name: Checkout
3734
uses: actions/checkout@v2
3835

36+
- name: Check for applicable files
37+
uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50
38+
id: filter
39+
with:
40+
filters: |
41+
workflows:
42+
- '.github/workflows/PR-powershell-lts.yml'
43+
- 'Formula/powershell-lts.rb'
44+
3945
- name: Prepare Agent
46+
if: steps.filter.outputs.workflows == 'true'
4047
uses: ./.github/workflows/composite/prep
4148

4249
- name: Install and Test Formula
50+
if: steps.filter.outputs.workflows == 'true'
4351
uses: ./.github/workflows/composite/installAndTest

.github/workflows/PR-powershell-preview.yml

+12-4
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,11 @@ permissions: read-all
88
on:
99
push:
1010
paths:
11-
- '.github/workflows/powershell-preview.yml'
11+
- '.github/workflows/PR-powershell-preview.yml'
1212
- 'Formula/powershell-preview.rb'
1313
branches:
1414
- master
1515
pull_request:
16-
paths:
17-
- '.github/workflows/powershell-preview.yml'
18-
- 'Formula/powershell-preview.rb'
1916

2017
defaults:
2118
run:
@@ -35,9 +32,20 @@ jobs:
3532
steps:
3633
- name: Checkout
3734
uses: actions/checkout@v2
35+
36+
- name: Check for applicable files
37+
uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50
38+
id: filter
39+
with:
40+
filters: |
41+
workflows:
42+
- .github/workflows/PR-powershell-preview.yml
43+
- Formula/powershell-preview.rb
3844
3945
- name: Prepare Agent
46+
if: steps.filter.outputs.workflows == 'true'
4047
uses: ./.github/workflows/composite/prep
4148

4249
- name: Install and Test Formula
50+
if: steps.filter.outputs.workflows == 'true'
4351
uses: ./.github/workflows/composite/installAndTest

.github/workflows/PR-powershell.yml

+14-5
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
# Copyright (c) Microsoft Corporation.
22
# Licensed under the MIT license.
33

4-
name: PowerShell Formula CI
4+
name: PowerShell Formula PR
55

66
permissions: read-all
77

88
on:
99
workflow_dispatch:
1010
push:
1111
paths:
12-
- '.github/workflows/powershell.yml'
12+
- '.github/workflows/PR-powershell.yml'
1313
- 'Formula/powershell.rb'
1414
branches:
1515
- master
1616
pull_request:
17-
paths:
18-
- '.github/workflows/powershell.yml'
19-
- 'Formula/powershell.rb'
2017

2118
defaults:
2219
run:
@@ -38,10 +35,21 @@ jobs:
3835
- name: Checkout
3936
uses: actions/checkout@v2
4037

38+
- name: Check for applicable files
39+
uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50
40+
id: filter
41+
with:
42+
filters: |
43+
workflows:
44+
- '.github/workflows/PR-powershell.yml'
45+
- 'Formula/powershell.rb'
46+
4147
- name: Prepare Agent
48+
if: steps.filter.outputs.workflows == 'true'
4249
uses: ./.github/workflows/composite/prep
4350

4451
- name: Uninstall PowerShell
52+
if: steps.filter.outputs.workflows == 'true'
4553
shell: bash
4654
run: |
4755
cd /
@@ -50,4 +58,5 @@ jobs:
5058
sudo pkgutil --forget ${PKG_ID}
5159
5260
- name: Install and Test Formula
61+
if: steps.filter.outputs.workflows == 'true'
5362
uses: ./.github/workflows/composite/installAndTest

0 commit comments

Comments
 (0)