Update swift test to work in windows image

update swift windows commit: 3fc609343f
This commit is contained in:
Joseph Ferguson 2023-11-09 11:51:01 -08:00
parent e18ceefd40
commit 83d6a98ffe
2 changed files with 13 additions and 2 deletions

View File

@ -56,7 +56,7 @@ Directory: 5.9/rhel-ubi/9/slim
Tags: 5.9.1-windowsservercore-ltsc2022, 5.9-windowsservercore-ltsc2022, windowsservercore-ltsc2022 Tags: 5.9.1-windowsservercore-ltsc2022, 5.9-windowsservercore-ltsc2022, windowsservercore-ltsc2022
Architectures: windows-amd64 Architectures: windows-amd64
GitCommit: c8e240c7d638c1fbc037aaa15961e1e1f0d93e97 GitCommit: 3fc609343f771e31c17140ed90d6cb2023e6e701
Directory: 5.9/windows/LTSC2022 Directory: 5.9/windows/LTSC2022
Constraints: windowsservercore-ltsc2022 Constraints: windowsservercore-ltsc2022

View File

@ -4,4 +4,15 @@ set -e
testDir="$(readlink -f "$(dirname "$BASH_SOURCE")")" testDir="$(readlink -f "$(dirname "$BASH_SOURCE")")"
runDir="$(dirname "$(readlink -f "$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"