swift{3,4,5}: fix Linux Dockerfile, enable in CI.

Update the paths for the swift packages in the Dockerfile. Enable swift3, swift4, and swift5 builds using Linux on CI (the OSX/XCode ones are there are commented out since they have go GHA runners that support them).
kanaka · Oct 9, 2024 · 03f735d · 03f735d
1 parent 5e81e35
commit 03f735d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/IMPLS.yml b/IMPLS.yml
@@ -115,9 +115,12 @@ IMPL:
   - {IMPL: zig}
 
   # See .travis.yml (for older osx / xcode tests)
-# - {IMPL: swift,  NO_DOCKER: 1, OS: xcode7.3}}
-# - {IMPL: swift3, NO_DOCKER: 1, OS: xcode8}}
-# - {IMPL: swift4, NO_DOCKER: 1, OS: xcode10}}
+# - {IMPL: swift,  NO_DOCKER: 1, OS: xcode7.3}
+  - {IMPL: swift3}
+# - {IMPL: swift3, NO_DOCKER: 1, OS: xcode8}
+  - {IMPL: swift4}
+# - {IMPL: swift4, NO_DOCKER: 1, OS: xcode10}
+  - {IMPL: swift5}
   - {IMPL: swift5, NO_DOCKER: 1, OS: macos}
 
   - {IMPL: vbs, NO_DOCKER: 1, OS: windows}
diff --git a/impls/swift3/Dockerfile b/impls/swift3/Dockerfile
@@ -31,11 +31,11 @@ RUN apt-get -y install clang-3.6 cmake pkg-config \
 RUN ln -sf /usr/lib/llvm-3.6/bin/clang++ /usr/bin/clang++
 RUN ln -sf /usr/lib/llvm-3.6/bin/clang /usr/bin/clang
 
-ENV SWIFT_PREFIX swift-3.0.1-PREVIEW-3
+ENV SWIFT_PREFIX swift-3.1.1-RELEASE
 ENV SWIFT_RELEASE ${SWIFT_PREFIX}-ubuntu16.04
 
 RUN cd /opt && \
-    curl -O https://swift.org/builds/swift-3.0.1-preview-3/ubuntu1604/${SWIFT_PREFIX}/${SWIFT_RELEASE}.tar.gz && \
+    curl -O https://download.swift.org/swift-3.1.1-release/ubuntu1604/${SWIFT_PREFIX}/${SWIFT_RELEASE}.tar.gz && \
     tar xvzf ${SWIFT_RELEASE}.tar.gz && \
     rm ${SWIFT_RELEASE}.tar.gz
 

diff --git a/impls/swift4/Dockerfile b/impls/swift4/Dockerfile
@@ -31,11 +31,11 @@ RUN apt-get -y install clang-3.6 cmake pkg-config \
 RUN ln -sf /usr/lib/llvm-3.6/bin/clang++ /usr/bin/clang++
 RUN ln -sf /usr/lib/llvm-3.6/bin/clang /usr/bin/clang
 
-ENV SWIFT_PREFIX swift-4.2.3-RELEASE
+ENV SWIFT_PREFIX swift-4.2.4-RELEASE
 ENV SWIFT_RELEASE ${SWIFT_PREFIX}-ubuntu16.04
 
 RUN cd /opt && \
-    curl -O https://swift.org/builds/swift-4.2.3-release/ubuntu1604/${SWIFT_PREFIX}/${SWIFT_RELEASE}.tar.gz && \
+    curl -O https://download.swift.org/swift-4.2.4-release/ubuntu1604/${SWIFT_PREFIX}/${SWIFT_RELEASE}.tar.gz && \
     tar xvzf ${SWIFT_RELEASE}.tar.gz && \
     rm ${SWIFT_RELEASE}.tar.gz
 

diff --git a/impls/swift5/Dockerfile b/impls/swift5/Dockerfile
@@ -35,7 +35,7 @@ ENV SWIFT_PREFIX swift-5.1.1-RELEASE
 ENV SWIFT_RELEASE ${SWIFT_PREFIX}-ubuntu16.04
 
 RUN cd /opt && \
-    curl -O https://swift.org/builds/swift-5.1.1-release/ubuntu1604/${SWIFT_PREFIX}/${SWIFT_RELEASE}.tar.gz && \
+    curl -O https://download.swift.org/swift-5.1.1-release/ubuntu1604/${SWIFT_PREFIX}/${SWIFT_RELEASE}.tar.gz && \
     tar xvzf ${SWIFT_RELEASE}.tar.gz && \
     rm ${SWIFT_RELEASE}.tar.gz