Skip to content

Commit

Permalink
fix: integration tests and use new ftl deploy (#613)
Browse files Browse the repository at this point in the history
  • Loading branch information
wesbillman authored Nov 17, 2023
1 parent 6426c98 commit 0d76edc
Show file tree
Hide file tree
Showing 47 changed files with 358 additions and 210 deletions.
5 changes: 0 additions & 5 deletions examples/echo-kotlin/.gitignore

This file was deleted.

199 changes: 0 additions & 199 deletions examples/echo-kotlin/pom.xml

This file was deleted.

1 change: 1 addition & 0 deletions examples/kotlin/bin/[email protected]
1 change: 1 addition & 0 deletions examples/kotlin/bin/.maven-3.8.6.pkg
1 change: 1 addition & 0 deletions examples/kotlin/bin/.openjdk-17.0.8_7.pkg
7 changes: 7 additions & 0 deletions examples/kotlin/bin/README.hermit.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Hermit environment

This is a [Hermit](https://github.com/cashapp/hermit) bin directory.

The symlinks in this directory are managed by Hermit and will automatically
download and install Hermit itself as well as packages. These packages are
local to this environment.
21 changes: 21 additions & 0 deletions examples/kotlin/bin/activate-hermit
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/bin/bash
# This file must be used with "source bin/activate-hermit" from bash or zsh.
# You cannot run it directly
#
# THIS FILE IS GENERATED; DO NOT MODIFY

if [ "${BASH_SOURCE-}" = "$0" ]; then
echo "You must source this script: \$ source $0" >&2
exit 33
fi

BIN_DIR="$(dirname "${BASH_SOURCE[0]:-${(%):-%x}}")"
if "${BIN_DIR}/hermit" noop > /dev/null; then
eval "$("${BIN_DIR}/hermit" activate "${BIN_DIR}/..")"

if [ -n "${BASH-}" ] || [ -n "${ZSH_VERSION-}" ]; then
hash -r 2>/dev/null
fi

echo "Hermit environment $("${HERMIT_ENV}"/bin/hermit env HERMIT_ENV) activated"
fi
1 change: 1 addition & 0 deletions examples/kotlin/bin/ftl
1 change: 1 addition & 0 deletions examples/kotlin/bin/ftl-controller
1 change: 1 addition & 0 deletions examples/kotlin/bin/ftl-initdb
1 change: 1 addition & 0 deletions examples/kotlin/bin/ftl-runner
43 changes: 43 additions & 0 deletions examples/kotlin/bin/hermit
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
#!/bin/bash
#
# THIS FILE IS GENERATED; DO NOT MODIFY

set -eo pipefail

export HERMIT_USER_HOME=~

if [ -z "${HERMIT_STATE_DIR}" ]; then
case "$(uname -s)" in
Darwin)
export HERMIT_STATE_DIR="${HERMIT_USER_HOME}/Library/Caches/hermit"
;;
Linux)
export HERMIT_STATE_DIR="${XDG_CACHE_HOME:-${HERMIT_USER_HOME}/.cache}/hermit"
;;
esac
fi

export HERMIT_DIST_URL="${HERMIT_DIST_URL:-https://github.com/cashapp/hermit/releases/download/stable}"
HERMIT_CHANNEL="$(basename "${HERMIT_DIST_URL}")"
export HERMIT_CHANNEL
export HERMIT_EXE=${HERMIT_EXE:-${HERMIT_STATE_DIR}/pkg/hermit@${HERMIT_CHANNEL}/hermit}

if [ ! -x "${HERMIT_EXE}" ]; then
echo "Bootstrapping ${HERMIT_EXE} from ${HERMIT_DIST_URL}" 1>&2
INSTALL_SCRIPT="$(mktemp)"
# This value must match that of the install script
INSTALL_SCRIPT_SHA256="180e997dd837f839a3072a5e2f558619b6d12555cd5452d3ab19d87720704e38"
if [ "${INSTALL_SCRIPT_SHA256}" = "BYPASS" ]; then
curl -fsSL "${HERMIT_DIST_URL}/install.sh" -o "${INSTALL_SCRIPT}"
else
# Install script is versioned by its sha256sum value
curl -fsSL "${HERMIT_DIST_URL}/install-${INSTALL_SCRIPT_SHA256}.sh" -o "${INSTALL_SCRIPT}"
# Verify install script's sha256sum
openssl dgst -sha256 "${INSTALL_SCRIPT}" | \
awk -v EXPECTED="$INSTALL_SCRIPT_SHA256" \
'$2!=EXPECTED {print "Install script sha256 " $2 " does not match " EXPECTED; exit 1}'
fi
/bin/bash "${INSTALL_SCRIPT}" 1>&2
fi

exec "${HERMIT_EXE}" --level=fatal exec "$0" -- "$@"
Empty file added examples/kotlin/bin/hermit.hcl
Empty file.
1 change: 1 addition & 0 deletions examples/kotlin/bin/jar
1 change: 1 addition & 0 deletions examples/kotlin/bin/jarsigner
1 change: 1 addition & 0 deletions examples/kotlin/bin/java
1 change: 1 addition & 0 deletions examples/kotlin/bin/javac
1 change: 1 addition & 0 deletions examples/kotlin/bin/javadoc
1 change: 1 addition & 0 deletions examples/kotlin/bin/javap
1 change: 1 addition & 0 deletions examples/kotlin/bin/jcmd
1 change: 1 addition & 0 deletions examples/kotlin/bin/jconsole
1 change: 1 addition & 0 deletions examples/kotlin/bin/jdb
1 change: 1 addition & 0 deletions examples/kotlin/bin/jdeprscan
1 change: 1 addition & 0 deletions examples/kotlin/bin/jdeps
1 change: 1 addition & 0 deletions examples/kotlin/bin/jfr
1 change: 1 addition & 0 deletions examples/kotlin/bin/jhsdb
1 change: 1 addition & 0 deletions examples/kotlin/bin/jimage
1 change: 1 addition & 0 deletions examples/kotlin/bin/jinfo
1 change: 1 addition & 0 deletions examples/kotlin/bin/jlink
1 change: 1 addition & 0 deletions examples/kotlin/bin/jmap
1 change: 1 addition & 0 deletions examples/kotlin/bin/jmod
1 change: 1 addition & 0 deletions examples/kotlin/bin/jpackage
1 change: 1 addition & 0 deletions examples/kotlin/bin/jps
1 change: 1 addition & 0 deletions examples/kotlin/bin/jrunscript
1 change: 1 addition & 0 deletions examples/kotlin/bin/jshell
1 change: 1 addition & 0 deletions examples/kotlin/bin/jstack
1 change: 1 addition & 0 deletions examples/kotlin/bin/jstat
1 change: 1 addition & 0 deletions examples/kotlin/bin/jstatd
1 change: 1 addition & 0 deletions examples/kotlin/bin/keytool
1 change: 1 addition & 0 deletions examples/kotlin/bin/mvn
1 change: 1 addition & 0 deletions examples/kotlin/bin/rmiregistry
1 change: 1 addition & 0 deletions examples/kotlin/bin/serialver
2 changes: 2 additions & 0 deletions examples/kotlin/ftl-module-echo/ftl.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
module = "echo"
language = "kotlin"
Loading

0 comments on commit 0d76edc

Please sign in to comment.