diff --git a/.dx/toolchain.yaml b/.dx/toolchain.yaml index ca379330..9262998d 100644 --- 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 index ba4b45be..20f83c27 100644 --- 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/checkout@v4.1.0 @@ -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)] }}