Run maven with different jdks

smecalculus · Oct 21, 2023 · 6f4f376 · 6f4f376
1 parent 64c4f60
commit 6f4f376
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.dx/toolchain.yaml b/.dx/toolchain.yaml
@@ -6,7 +6,6 @@
       ansible.builtin.include_vars:
         file: envs/dev/{{ devenv }}/vars.yaml
         name: dev
-
     - name: Capture maven version
       ansible.builtin.command:
         cmd: mvn --version --quiet
@@ -19,7 +18,6 @@
           - maven_version.stdout is version(dev.maven_version.min, '>=', version_type='semver')
           - maven_version.stdout is version(dev.maven_version.max, '<', version_type='semver')
         msg: "{{ dev.maven_version.min }} <= maven < {{ dev.maven_version.max }}"
-
     - name: Capture docker version
       ansible.builtin.command:
         cmd: docker version --format {{'{{.Server.Version}}'}}

diff --git a/.github/workflows/toolchain-sanity.yaml b/.github/workflows/toolchain-sanity.yaml
@@ -20,8 +20,10 @@ jobs:
         devenv:
           - name: turing
             os: ubuntu-22.04
+            java: 19
           - name: church
             os: ubuntu-20.04
+            java: 17
     runs-on: ${{ matrix.devenv.os }}
     steps:
       - uses: actions/[email protected]
@@ -35,8 +37,10 @@ jobs:
         env:
           GITHUB_ACTOR: ${{ github.actor }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          JAVA_HOME: ${{ env[format('JAVA_HOME_{0}_X64', matrix.devenv.java)] }}
       - run: ansible-playbook binaries.yaml -e focus=toolchain
         working-directory: .dx
         env:
           GITHUB_ACTOR: ${{ github.actor }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          JAVA_HOME: ${{ env[format('JAVA_HOME_{0}_X64', matrix.devenv.java)] }}