Skip to content

Commit 60d5aab

Browse files
Merge pull request #201 from firebase/feature/aks-prune-tests
Remove several Windows test jobs from pull requests
2 parents 05f847d + db91e07 commit 60d5aab

File tree

2 files changed

+15
-16
lines changed

2 files changed

+15
-16
lines changed

.github/workflows/android.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,9 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
os: [ubuntu-latest, macos-latest, windows-latest]
18-
architecture: ["x64",]
19-
include:
20-
- os: ubuntu-latest
21-
architecture: "x64"
22-
- os: macos-latest
23-
architecture: "x64"
24-
- os: windows-latest
25-
architecture: "x64"
17+
# Windows temporarily removed while broken
18+
os: [ubuntu-latest, macos-latest]
19+
architecture: ["x64"]
2620

2721
steps:
2822
- uses: actions/checkout@v2

.github/workflows/desktop.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,30 +17,35 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
os: [windows-latest, ubuntu-latest, macos-latest]
20+
os: [ubuntu-latest, macos-latest]
2121
build_type: ["Release", "Debug"]
2222
architecture: ["x64", "x86"]
23-
msvc_runtime: ["static", "dynamic"]
2423
python_version: [3.7]
2524
include:
25+
# Add these Windows jobs.
2626
- os: windows-latest
27+
build_type: "Release"
28+
architecture: "x64"
29+
msvc_runtime: "static"
2730
vcpkg_triplet_suffix: "windows-static"
2831
- os: windows-latest
32+
build_type: "Debug"
33+
architecture: "x86"
2934
msvc_runtime: "dynamic"
30-
3135
vcpkg_triplet_suffix: "windows-static-md"
36+
37+
# Specify additional parameters for these jobs.
3238
- os: ubuntu-latest
39+
msvc_runtime: "static"
3340
vcpkg_triplet_suffix: "linux"
3441
- os: macos-latest
42+
msvc_runtime: "static"
3543
vcpkg_triplet_suffix: "osx"
3644

45+
# Don't build for x86 on MacOS.
3746
exclude:
3847
- os: macos-latest
3948
architecture: "x86"
40-
- os: macos-latest
41-
msvc_runtime: "dynamic"
42-
- os: ubuntu-latest
43-
msvc_runtime: "dynamic"
4449

4550
steps:
4651
- name: setup Xcode version (macos)

0 commit comments

Comments
 (0)