figure out where Swift lib paths are on CI

Author: ktoso

.github/scripts/prep-gh-action.sh

@@ -0,0 +1,87 @@
+#!/bin/bash
+
+# This script does a bit of extra preparation of the docker containers used to run the GitHub workflows
+# that are specific to this project's needs when building/testing. Note that this script runs on
+# every supported Linux distribution and macOS so it must adapt to the distribution that it is running.
+
+if [[ "$(uname -s)" == "Linux" ]]; then
+    # Install the basic utilities depending on the type of Linux distribution
+    apt-get --help && apt-get update && TZ=Etc/UTC apt-get -y install curl make gpg tzdata
+    yum --help && (curl --help && yum -y install curl) && yum install make gpg
+fi
+
+set -e
+
+while [ $# -ne 0 ]; do
+    arg="$1"
+    case "$arg" in
+        --install-swiftly)
+            installSwiftly=true
+            ;;
+        --swift-main-snapshot)
+            swiftMainSnapshot=true
+            ;;
+        *)
+            ;;
+    esac
+    shift
+done
+
+if [ "$installSwiftly" == true ]; then
+    echo "Installing swiftly"
+
+    if [[ "$(uname -s)" == "Linux" ]]; then
+        curl -O https://download.swift.org/swiftly/linux/swiftly-$(uname -m).tar.gz && tar zxf swiftly-*.tar.gz && ./swiftly init -y --skip-install
+        . "/root/.local/share/swiftly/env.sh"
+    else
+        export SWIFTLY_HOME_DIR="$(pwd)/swiftly-bootstrap"
+        export SWIFTLY_BIN_DIR="$SWIFTLY_HOME_DIR/bin"
+        export SWIFTLY_TOOLCHAINS_DIR="$SWIFTLY_HOME_DIR/toolchains"
+
+        curl -O https://download.swift.org/swiftly/darwin/swiftly.pkg && pkgutil --check-signature swiftly.pkg && pkgutil --verbose --expand swiftly.pkg "${SWIFTLY_HOME_DIR}" && tar -C "${SWIFTLY_HOME_DIR}" -xvf "${SWIFTLY_HOME_DIR}"/swiftly-*/Payload && "$SWIFTLY_HOME_DIR/bin/swiftly" init -y --skip-install
+
+        . "$SWIFTLY_HOME_DIR/env.sh"
+    fi
+
+    hash -r
+
+    if [ -n "$GITHUB_ENV" ]; then
+        echo "Updating GitHub environment"
+        echo "PATH=$PATH" >> "$GITHUB_ENV" && echo "SWIFTLY_HOME_DIR=$SWIFTLY_HOME_DIR" >> "$GITHUB_ENV" && echo "SWIFTLY_BIN_DIR=$SWIFTLY_BIN_DIR" >> "$GITHUB_ENV" && echo "SWIFTLY_TOOLCHAINS_DIR=$SWIFTLY_TOOLCHAINS_DIR" >> "$GITHUB_ENV"
+    fi
+
+    selector=()
+    runSelector=()
+
+    if [ "$swiftMainSnapshot" == true ]; then
+        echo "Installing latest main-snapshot toolchain"
+        selector=("main-snapshot")
+        runSelector=("+main-snapshot")
+    elif [ -f .swift-version ]; then
+        echo "Installing selected swift toolchain from .swift-version file"
+        selector=()
+        runSelector=()
+    else
+        echo "Installing latest toolchain"
+        selector=("latest")
+        runSelector=("+latest")
+    fi
+
+    swiftly install --post-install-file=post-install.sh "${selector[@]}"
+
+    if [ -f post-install.sh ]; then
+        echo "Performing swift toolchain post-installation"
+        chmod u+x post-install.sh && ./post-install.sh
+    fi
+
+    echo "Displaying swift version"
+    swiftly run "${runSelector[@]}" swift --version
+
+    if [[ "$(uname -s)" == "Linux" ]]; then
+        CC=clang swiftly run "${runSelector[@]}" "$(dirname "$0")/install-libarchive.sh"
+    fi
+else
+    if [[ "$(uname -s)" == "Linux" ]]; then
+        "$(dirname "$0")/install-libarchive.sh"
+    fi
+fi

.github/scripts/validate_sample.sh

@@ -11,6 +11,8 @@ declare -r RESET='\033[0m'
 declare -r sampleDir="$1"
 declare -r CI_VALIDATE_SCRIPT='ci-validate.sh'
 
+echo "Using Swift: $(which swift)"
+
 echo ""
 echo ""
 echo "========================================================================"

Samples/SwiftAndJavaJarSampleLib/ci-validate.sh

@@ -34,7 +34,7 @@ echo "CLASSPATH       = ${CLASSPATH}"
 
 $JAVAC -cp "${CLASSPATH}" Example.java
 
-# TODO: move all this into Gradle or SwiftPM and make it easier to get the right classpath for running
+# FIXME: move all this into Gradle or SwiftPM and make it easier to get the right classpath for running
 if [ "$(uname -s)" = 'Linux' ]
 then
   SWIFT_LIB_PATHS=/usr/lib/swift/linux
@@ -44,6 +44,7 @@ then
   SWIFT_CORE_LIB=$(find "$HOME"/.local -name "libswiftCore.so" 2>/dev/null | grep "$SWIFT_VERSION" | head -n1)
   if [ -n "$SWIFT_CORE_LIB" ]; then
     SWIFT_LIB_PATHS="${SWIFT_LIB_PATHS}:$(dirname "$SWIFT_CORE_LIB")"
+    ls "$SWIFT_LIB_PATHS"
   else
     # maybe there is one installed system-wide in /usr/lib?
     SWIFT_CORE_LIB2=$(find /usr/lib -name "libswiftCore.so" 2>/dev/null | grep "$SWIFT_VERSION" | head -n1)
@@ -53,8 +54,15 @@ then
   fi
 elif [ "$(uname -s)" = 'Darwin' ]
 then
-  SWIFT_LIB_PATHS=$(find "$(swiftly use --print-location)" | grep dylib$ | grep libswiftCore | grep macos | xargs dirname)
+  SWIFT_LIB_PATHS=$(find "$(swiftly use --print-location)" | grep dylib$ | grep libswiftCore | grep macos | head -n1 | xargs dirname)
+  if [ -z "${SWIFT_LIB_PATHS}" ]
+  then
+    # if we failed to locate paths using swiftly...
+    # try to use the the path that we know about for github actions macOS
+    SWIFT_LIB_PATHS="${SWIFT_LIB_PATHS}:/Library/Developer/CommandLineTools/usr/lib/swift-5.0/macosx/"
+  fi
   SWIFT_LIB_PATHS="${SWIFT_LIB_PATHS}:$(pwd)/$(find . | grep libMySwiftLibrary.dylib$ | sort | head -n1 | xargs dirname)"
+
 fi
 echo "SWIFT_LIB_PATHS = ${SWIFT_LIB_PATHS}"