diff options
| author | Mathias Preiner <mathias.preiner@gmail.com> | 2020-03-31 21:31:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-31 21:31:13 -0700 |
| commit | 6d43ef828f5cc84f05b2c52a1991f3fb8505db84 (patch) | |
| tree | 83213c59fa326670f46ab902b5ee934da241b246 | |
| parent | cfeaf40ed6a9d4d7fec925352e30d2470a1ca567 (diff) | |
Fix install for ANTLR contrib script and CI dependency caching. (#4196)
| -rw-r--r-- | .github/workflows/ci.yml | 2 | ||||
| -rwxr-xr-x | contrib/get-antlr-3.4 | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 99654b794..705e0679d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -87,7 +87,7 @@ jobs: uses: actions/cache@v1 with: path: deps/install - key: ${{ runner.os }}-deps-${{ hashFiles('contrib/get-**.sh') }}-${{ hashFiles('.github/workflows/ci.yml') }} + key: ${{ runner.os }}-deps-${{ hashFiles('contrib/get-**') }}-${{ hashFiles('.github/workflows/ci.yml') }} - name: Setup Dependencies if: steps.restore-deps.outputs.cache-hit != 'true' diff --git a/contrib/get-antlr-3.4 b/contrib/get-antlr-3.4 index 9ab0695b7..bc75e8339 100755 --- a/contrib/get-antlr-3.4 +++ b/contrib/get-antlr-3.4 @@ -26,15 +26,15 @@ if [ -z "${MACHINE_TYPE}" ]; then MACHINE_TYPE=$(${CONFIG_GUESS_SCRIPT} | sed 's,-.*,,') fi -mkdir -p "$ANTLR_HOME_DIR/share/java" +mkdir -p "$INSTALL_DIR/share/java" webget \ "https://www.antlr3.org/download/antlr-3.4-complete.jar" \ - "$ANTLR_HOME_DIR/share/java/antlr-3.4-complete.jar" + "$INSTALL_DIR/share/java/antlr-3.4-complete.jar" mkdir -p "$ANTLR_HOME_DIR/bin" tee "$ANTLR_HOME_DIR/bin/antlr3" <<EOF #!/usr/bin/env bash -export CLASSPATH=$ANTLR_HOME_DIR/share/java/antlr-3.4-complete.jar:\$CLASSPATH +export CLASSPATH=$INSTALL_DIR/share/java/antlr-3.4-complete.jar:\$CLASSPATH exec java org.antlr.Tool "\$@" EOF chmod a+x "$ANTLR_HOME_DIR/bin/antlr3" |