Skip to content

Commit 305a61b

Browse files
authored
Revert "Dockerless windows"
1 parent bc31587 commit 305a61b

File tree

8 files changed

+3
-223
lines changed

8 files changed

+3
-223
lines changed

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

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

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

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

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

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

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

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

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

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

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

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

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

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

.github/workflows/swift_package_test.yml

Lines changed: 3 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -45,26 +45,14 @@ on:
4545
linux_env_vars:
4646
description: "List of environment variables"
4747
type: string
48-
windows_env_vars:
49-
description: "List of environment variables"
50-
type: string
51-
enable_linux_checks:
52-
type: boolean
53-
description: "Boolean to enable linux testing. Defaults to true"
54-
default: true
5548
enable_windows_checks:
5649
type: boolean
5750
description: "Boolean to enable windows testing. Defaults to true"
5851
default: true
59-
enable_windows_docker:
60-
type: boolean
61-
description: "Boolean to enable running build in windows docker container. Defaults to true"
62-
default: true
6352

6453
jobs:
6554
linux-build:
6655
name: Linux (${{ matrix.swift_version }} - ${{ matrix.os_version }})
67-
if: ${{ inputs.enable_linux_checks }}
6856
runs-on: ubuntu-latest
6957
strategy:
7058
fail-fast: false
@@ -99,22 +87,14 @@ jobs:
9987
strategy:
10088
fail-fast: false
10189
matrix:
102-
swift_version: ['5.9', '5.10', '6.0', 'nightly', 'nightly-6.0']
90+
swift_version: ['5.9', '6.0', 'nightly', 'nightly-6.0']
10391
exclude:
10492
- ${{ fromJson(inputs.windows_exclude_swift_versions) }}
10593
steps:
10694
- name: Checkout repository
10795
uses: actions/checkout@v4
108-
- name: Set environment variables
109-
if: ${{ inputs.windows_env_vars }}
110-
run: |
111-
$lines = "${{ inputs.windows_env_vars }}" -split "`r`n"
112-
foreach ($line in $lines) {
113-
echo $line | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
114-
}
11596
- name: Pull Docker image
11697
id: pull_docker_image
117-
if: ${{ inputs.enable_windows_docker }}
11898
run: |
11999
if ("${{ matrix.swift_version }}".Contains("nightly")) {
120100
$Image = "swiftlang/swift:${{ matrix.swift_version }}-windowsservercore-1809"
@@ -123,27 +103,9 @@ jobs:
123103
}
124104
docker pull $Image
125105
echo "image=$Image" >> "$env:GITHUB_OUTPUT"
126-
- name: Install Visual Studio Build Tools
127-
if: ${{ !inputs.enable_windows_docker }}
128-
run: |
129-
Invoke-WebRequest -Uri https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/windows/install-vsb.ps1 -OutFile $env:TEMP\install-vsb.ps1
130-
. $env:TEMP\install-vsb.ps1
131-
del $env:TEMP\install-vsb.ps1
132-
- name: Install Swift
133-
if: ${{ !inputs.enable_windows_docker }}
134-
run: |
135-
Invoke-WebRequest -Uri https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/windows/swift/install-swift.ps1 -OutFile $env:TEMP\install-swift.ps1
136-
Invoke-WebRequest -Uri https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/windows/swift/install-swift-${{ matrix.swift_version }}.ps1 -OutFile $env:TEMP\install-swift-${{ matrix.swift_version }}.ps1
137-
. $env:TEMP\install-swift-${{ matrix.swift_version }}.ps1
138-
del $env:TEMP\install-swift*.ps1
139106
- name: Create test script
140107
run: |
141108
mkdir $env:TEMP\test-script
142-
if ("${{ inputs.enable_windows_docker }}" -eq "true") {
143-
$Source = C:\source
144-
} else {
145-
$Source = $env:GITHUB_WORKSPACE
146-
}
147109
echo @'
148110
Set-PSDebug -Trace 1
149111
@@ -157,21 +119,11 @@ jobs:
157119
}
158120
Invoke-Program swift --version
159121
Invoke-Program swift test --version
160-
Invoke-Program cd $Source
122+
Invoke-Program cd C:\source\
161123
${{ inputs.windows_pre_build_command }}
162124
Invoke-Program ${{ inputs.windows_build_command }} ${{ (contains(matrix.swift_version, 'nightly') && inputs.swift_nightly_flags) || inputs.swift_flags }}
163125
'@ >> $env:TEMP\test-script\run.ps1
164-
# Docker build
165-
- name: Docker Build / Test
166-
timeout-minutes: 60
167-
if: ${{ inputs.enable_windows_docker }}
168-
run: |
169-
docker run -v ${{ github.workspace }}:C:\source -v $env:TEMP\test-script:C:\test-script ${{ steps.pull_docker_image.outputs.image }} powershell.exe -NoLogo -File C:\test-script\run.ps1
170-
# Docker-less build
171126
- name: Build / Test
172127
timeout-minutes: 60
173-
if: ${{ !inputs.enable_windows_docker }}
174128
run: |
175-
Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
176-
RefreshEnv
177-
powershell.exe -NoLogo -File $env:TEMP\test-script\run.ps1; exit $LastExitCode
129+
docker run -v ${{ github.workspace }}:C:\source -v $env:TEMP\test-script:C:\test-script ${{ steps.pull_docker_image.outputs.image }} powershell.exe -NoLogo -File C:\test-script\run.ps1

0 commit comments

Comments
 (0)