Skip to content
This repository was archived by the owner on Jan 17, 2025. It is now read-only.

Commit b0def68

Browse files
authored
Fix build break due to updated travis build vm. (#96)
1 parent 8e87a0d commit b0def68

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

.travis.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
sudo: required
2-
group: deprecated-2017Q3
3-
language: scala
4-
scala:
5-
- 2.11.8
2+
os: linux
3+
dist: bionic
4+
jdk: openjdk11
5+
66
services:
77
- docker
88

9+
910
notifications:
1011
email: false
1112
webhooks:
@@ -14,6 +15,8 @@ notifications:
1415
secure: ZE3Y6k7io6D13CsP45gDGpIVToQbucSftdDmZicreSK9+TjBjMG90GPEGc1BXSyfQEgmmvZ2eHuL2iuA9cbrY/exX14YMzrT7ejh9YhvS2QDjMazvp7PigSVp05BiixppmWEAYiituPxAONr80mXxMKSUQBTqdoqaiIOVkMURMOvxg3n5iwSLQgTZrV+eaVjCcgJ4WWIFgrktr+Dpo6qd7IBc7cM+Wfk5WKhP9arXY59KPxKeB8Ksy2+geOspyZjLM3dEKhx2IfUkwtf4L3aW9LQewglWdGrsOt3S+vpGbMhvviua1HQsC8Al8TY5FnSfd9wM2x9hyZbFT7omz7/em8zuGZQi5C3NNCgRoHjlg0ccp9Kqh3ulIDAMhcTG+yYqo1y420HV4kdneuDbF+nyNnU+ouswgSwWlCUOSbwnprW3B39qui/8l9ktB/rOI7J76hlRj5ke0oi7bfEbcNSSFlTyZwHq6zzWXprSdXJAnT3DomN/rwTb+RiqA9T+G6TafmSB7ay4nmxzcuzTmMYQw3RCrXK9Uk7XzGCPvcquoimK5x13bi8yV2AjTw9rPy2xLsG0Yyn/ltnlbD7oDBWAdMkJZO/4s/STCJOUff05k94r62333pqKsP7sYoUX3bJuNoMvUr1GMSX1ydu7FEcBQG2ItDJKWl0uNWHI+o6pZ8=
1516

1617
before_install:
18+
# Refresh built in certificates.
19+
- sudo update-ca-certificates --fresh
1720
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then openssl aes-256-cbc -K "$encrypted_DF18CF3F552A_key" -iv "$encrypted_DF18CF3F552A_iv" -in tests/credentials.json.enc -out tests/credentials.json -d; fi'
1821
- "./tools/travis/setup.sh"
1922
install: true

swift4.2/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ ENV SWIFT_PLATFORM=$SWIFT_PLATFORM \
6565
SWIFT_VERSION=$SWIFT_VERSION
6666

6767
# Download GPG keys, signature and Swift package, then unpack, cleanup and execute permissions for foundation libs.
68-
RUN SWIFT_URL=https://swift.org/builds/$SWIFT_BRANCH/$(echo "$SWIFT_PLATFORM" | tr -d .)/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM.tar.gz \
68+
# https://download.swift.org/swift-4.2.4-release/ubuntu1804/swift-4.2.4-RELEASE/swift-4.2.4-RELEASE-ubuntu18.04.tar.gz
69+
RUN set -x \
70+
&& SWIFT_URL=https://download.swift.org/$SWIFT_BRANCH/$(echo "$SWIFT_PLATFORM" | tr -d .)/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM.tar.gz \
6971
&& curl -fSsL $SWIFT_URL -o swift.tar.gz \
7072
&& curl -fSsL $SWIFT_URL.sig -o swift.tar.gz.sig \
7173
&& export GNUPGHOME="$(mktemp -d)" \
@@ -89,7 +91,7 @@ RUN SWIFT_URL=https://swift.org/builds/$SWIFT_BRANCH/$(echo "$SWIFT_PLATFORM" |
8991
done \
9092
&& gpg --batch --verify --quiet swift.tar.gz.sig swift.tar.gz \
9193
&& tar -xzf swift.tar.gz --directory / --strip-components=1 \
92-
&& rm -r "$GNUPGHOME" swift.tar.gz.sig swift.tar.gz \
94+
&& rm -r "$GNUPGHOME" swift.tar.gz.sig swift.tar.gz || true \
9395
&& chmod -R o+r /usr/lib/swift \
9496
# Print Installed Swift Version
9597
&& swift --version

0 commit comments

Comments
 (0)