Merge pull request #291 from cashapp/adrw.2023-02-01.hermit

Use Hermit for JDK and Gradle setup
cashapp · Feb 1, 2023 · 1f79e14 · 1f79e14
2 parents df59b21 + 5bce9fb
commit 1f79e14
Show file tree

Hide file tree

Showing 47 changed files with 130 additions and 17 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -11,17 +11,12 @@ jobs:
     steps:
       - checkout
       - run:
-          name: "Download and extract OpenJDK 11"
-          command: |
-            mkdir -p ~/openjdk-11 && cd ~/openjdk-11 && curl -sSL https://download.oracle.com/java/GA/jdk11/9/GPL/openjdk-11.0.2_linux-x64_bin.tar.gz | tar -xz --strip-components 1
-            echo '
-              export PATH="$JAVA_HOME/bin:$PATH"
-              export JAVA_HOME="$HOME/openjdk-11"
-            ' >> $BASH_ENV
+          name: Hermit
+          command: ./bin/hermit env -r >> $BASH_ENV
       - run:
           name: "Compile"
           command: |
-            ./gradlew testClasses --parallel --build-cache
+            gradle testClasses --parallel --build-cache
       - save_cache:
           paths:
             - ~/.gradle/caches
@@ -46,13 +41,8 @@ jobs:
             - v1-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}
             - v1-master-compile
       - run:
-          name: "Download and extract OpenJDK 11"
-          command: |
-            mkdir -p ~/openjdk-11 && cd ~/openjdk-11 && curl -sSL https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_linux-x64_bin.tar.gz | tar -xz --strip-components 1
-            echo '
-              export PATH="$JAVA_HOME/bin:$PATH"
-              export JAVA_HOME="$HOME/openjdk-11"
-            ' >> $BASH_ENV
+          name: Hermit
+          command: ./bin/hermit env -r >> $BASH_ENV
       - run:
           name: "Dump environment variables"
           command: env
@@ -64,7 +54,7 @@ jobs:
           command: docker run -d -p 3306:3306 --name mysql -e MYSQL_ALLOW_EMPTY_PASSWORD=1 mysql:5.7 --sql-mode=""
       - run:
           name: "Build and test"
-          command: ./gradlew build check -i --parallel --build-cache
+          command: gradle build check -i --parallel --build-cache
       - run:
           name: Collect test results
           command: |

diff --git a/README.md b/README.md
@@ -4,11 +4,22 @@ Backfila is a service that manages backfill state, calling into other services t
 
 Note: some instructions here are out of date
 
+## Hermit
+
+[Hermit](https://cashapp.github.io/hermit/) is used to manage build dependencies like local Java and Gradle versions.
+
+Install [Hermit shell hooks](https://cashapp.github.io/hermit/usage/shell/?h=shell) or run the following manually.
+
+```
+cd backfila
+. ./bin/activate-hermit
+```
+
 ## Building
 Build backfila:
 
 ```
-$ ./gradlew clean shadowJar
+$ gradle clean shadowJar
 ```
 
 ## Run the Service

diff --git a/bin/.gradle-7.6.pkg b/bin/.gradle-7.6.pkg
@@ -0,0 +1 @@
+hermit
diff --git a/bin/[email protected] b/bin/[email protected]
@@ -0,0 +1 @@
+hermit
diff --git a/bin/[email protected] b/bin/[email protected]
@@ -0,0 +1 @@
+hermit
diff --git a/bin/README.hermit.md b/bin/README.hermit.md
@@ -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.
diff --git a/bin/activate-hermit b/bin/activate-hermit
@@ -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
diff --git a/bin/corepack b/bin/corepack
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/gradle b/bin/gradle
@@ -0,0 +1 @@
+.gradle-7.6.pkg
diff --git a/bin/hermit b/bin/hermit
@@ -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" -- "$@"
diff --git a/bin/hermit.hcl b/bin/hermit.hcl
diff --git a/bin/jaotc b/bin/jaotc
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/jar b/bin/jar
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/jarsigner b/bin/jarsigner
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/java b/bin/java
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/javac b/bin/javac
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/javadoc b/bin/javadoc
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/javap b/bin/javap
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/jcmd b/bin/jcmd
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/jconsole b/bin/jconsole
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/jdb b/bin/jdb
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/jdeprscan b/bin/jdeprscan
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/jdeps b/bin/jdeps
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/jfr b/bin/jfr
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/jhsdb b/bin/jhsdb
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/jimage b/bin/jimage
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/jinfo b/bin/jinfo
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/jjs b/bin/jjs
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/jlink b/bin/jlink
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/jmap b/bin/jmap
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/jmod b/bin/jmod
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/jps b/bin/jps
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/jrunscript b/bin/jrunscript
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/jshell b/bin/jshell
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/jstack b/bin/jstack
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/jstat b/bin/jstat
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/jstatd b/bin/jstatd
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/keytool b/bin/keytool
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/node b/bin/node
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/npm b/bin/npm
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/npx b/bin/npx
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/pack200 b/bin/pack200
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/rmic b/bin/rmic
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/rmid b/bin/rmid
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/rmiregistry b/bin/rmiregistry
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/serialver b/bin/serialver
@@ -0,0 +1 @@
+[email protected]
diff --git a/bin/unpack200 b/bin/unpack200
@@ -0,0 +1 @@
+[email protected]