Skip to content

Commit f1f3c56

Browse files
committed
Point to branch in forked workflows repo
1 parent b9648e2 commit f1f3c56

File tree

8 files changed

+2
-278
lines changed

8 files changed

+2
-278
lines changed

.github/workflows/pull_request.yml

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
tests:
2222
name: Test
23-
uses: ./.github/workflows/swift_package_test.yml
23+
uses: award999/github-workflows/.github/workflows/swift_package_test.yml@dockerless-windows
2424
with:
2525
# Linux
2626
linux_exclude_swift_versions: '[{"swift_version": "nightly-main"}]'
@@ -41,38 +41,9 @@ jobs:
4141
# Windows
4242
enable_windows_checks: true
4343
enable_windows_docker: false
44-
windows_exclude_swift_versions: '[{"swift_version": "nightly-main"}]'
44+
windows_exclude_swift_versions: '[{"swift_version": "nightly"}]'
4545
windows_env_vars: |
4646
CI=1
4747
FAST_TEST_RUN=1
4848
windows_pre_build_command: .github\workflows\scripts\windows\install-nodejs.ps1
4949
windows_build_command: docker\test-windows.ps1
50-
51-
tests-windows:
52-
defaults:
53-
run:
54-
shell: powershell
55-
name: Windows (${{ matrix.swift_version }})
56-
runs-on: ${{ contains(matrix.swift_version, 'nightly') && 'windows-2019' || 'windows-2022' }}
57-
strategy:
58-
fail-fast: false
59-
matrix:
60-
swift_version: ['5.9', '5.10', '6.0', 'nightly', 'nightly-6.0']
61-
steps:
62-
- name: Checkout repository
63-
uses: actions/checkout@v4
64-
- name: Install node.js
65-
if: ${{ !vars.skip_nodejs_install }}
66-
run: . .github\workflows\scripts\windows\install-nodejs.ps1
67-
- name: Install Visual Studio Build Tools
68-
if: ${{ !vars.skip_vsb_install }}
69-
run: . .github\workflows\scripts\windows\install-vsb.ps1
70-
- name: Install Swift
71-
if: ${{ !vars.skip_swift_install }}
72-
run: . .github\workflows\scripts\windows\swift\install-swift-${{ matrix.swift_version }}.ps1
73-
- name: Build / Test
74-
run: |
75-
cd $env:GITHUB_WORKSPACE
76-
Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
77-
refreshenv
78-
docker\test-windows.ps1

.github/workflows/scripts/windows/install-vsb.ps1

Lines changed: 0 additions & 32 deletions
This file was deleted.

.github/workflows/scripts/windows/swift/install-swift-5.10.ps1

Lines changed: 0 additions & 6 deletions
This file was deleted.

.github/workflows/scripts/windows/swift/install-swift-5.9.ps1

Lines changed: 0 additions & 6 deletions
This file was deleted.

.github/workflows/scripts/windows/swift/install-swift-6.0.ps1

Lines changed: 0 additions & 6 deletions
This file was deleted.

.github/workflows/scripts/windows/swift/install-swift-nightly-6.0.ps1

Lines changed: 0 additions & 7 deletions
This file was deleted.

.github/workflows/scripts/windows/swift/install-swift.ps1

Lines changed: 0 additions & 31 deletions
This file was deleted.

.github/workflows/swift_package_test.yml

Lines changed: 0 additions & 159 deletions
This file was deleted.

0 commit comments

Comments
 (0)