From 712f5a3f16e1368c56409970b6e9bc48e4887294 Mon Sep 17 00:00:00 2001 From: George Adams Date: Tue, 26 May 2020 14:46:34 +0100 Subject: [PATCH] fix matrix --- .github/workflows/workflow.yml | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 7f443954..7e83a415 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -24,7 +24,7 @@ jobs: runs-on: ${{ matrix.operating-system }} strategy: matrix: - operating-system: [ubuntu-latest, windows-latest, macOS-latest] + operating-system: [ubuntu-latest, windows-latest] steps: - name: Checkout uses: actions/checkout@v2 @@ -46,7 +46,32 @@ jobs: if: runner.os == 'windows' run: __tests__/verify-java.ps1 13.0.2 "${{ steps.setup-java.outputs.path }}" "${{ steps.setup-java.outputs.version }}" - test-proxy: + test-proxy-adopt: + runs-on: ubuntu-latest + container: + image: ubuntu:latest + options: --dns 127.0.0.1 + services: + squid-proxy: + image: datadog/squid:latest + ports: + - 3128:3128 + env: + https_proxy: http://squid-proxy:3128 + steps: + - uses: actions/checkout@v2 + - name: Clear tool cache + run: rm -rf $RUNNER_TOOL_CACHE/* + - name: Setup Java 13 + uses: ./ + with: + java-version: 13 + vendor: 'adoptopenjdk' + - name: Verify Java 13 + run: __tests__/verify-java.sh 13.0.2 + + + test-proxy-zulu: runs-on: ubuntu-latest container: image: ubuntu:latest