Browse Source

Merge pull request #15071 from shahmishal/support-windows-swift

[Swift] Add support for Windows Docker image
yosifkit 2 years ago
parent
commit
1f3ec9d579
2 changed files with 18 additions and 1 deletions
  1. 6 0
      library/swift
  2. 12 1
      test/tests/run-swift-in-container.sh

+ 6 - 0
library/swift

@@ -54,6 +54,12 @@ Architectures: amd64, arm64v8
 GitCommit: df8e8e36df704e52b2fabf9e732a0f08fbb333e4
 Directory: 5.9/rhel-ubi/9/slim
 
+Tags: 5.9.1-windowsservercore-ltsc2022, 5.9-windowsservercore-ltsc2022, windowsservercore-ltsc2022
+Architectures: windows-amd64
+GitCommit: 3fc609343f771e31c17140ed90d6cb2023e6e701
+Directory: 5.9/windows/LTSC2022
+Constraints: windowsservercore-ltsc2022
+
 Tags: 5.8.1, 5.8, 5.8.1-jammy, 5.8-jammy
 Architectures: amd64, arm64v8
 GitCommit: 0190ac8d812bfcfab0ee39d600116ab5e3243f48

+ 12 - 1
test/tests/run-swift-in-container.sh

@@ -4,4 +4,15 @@ set -e
 testDir="$(readlink -f "$(dirname "$BASH_SOURCE")")"
 runDir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
-source "$runDir/run-in-container.sh" "$testDir" "$1" swift ./container.swift
+image="$1"
+
+testName="$(basename "$testDir")"
+newImage="$("$runDir/image-name.sh" "librarytest/$testName" "$image")"
+"$runDir/docker-build.sh" "$testDir" "$newImage" <<EOD
+FROM $image
+COPY dir/container.swift /
+RUN swiftc /container.swift -o container
+CMD [ "/container" ]
+EOD
+
+docker run --rm "$newImage"