mirror of
https://github.com/actions/setup-java.git
synced 2025-04-21 10:26:46 +00:00
rebase
This commit is contained in:
parent
c09dd7e6e1
commit
74163c09fb
1 changed files with 0 additions and 4 deletions
4
.github/workflows/workflow.yml
vendored
4
.github/workflows/workflow.yml
vendored
|
@ -73,7 +73,6 @@ jobs:
|
|||
if: runner.os == 'windows'
|
||||
run: __tests__/verify-java.ps1 13.0.2 "${{ steps.setup-java-zulu.outputs.path }}" "${{ steps.setup-java-zulu.outputs.version }}"
|
||||
|
||||
<<<<<<< HEAD
|
||||
test-proxy-adopt:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
|
@ -100,9 +99,6 @@ jobs:
|
|||
|
||||
|
||||
test-proxy-zulu:
|
||||
=======
|
||||
test-proxy:
|
||||
>>>>>>> add more capabilities
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: ubuntu:latest
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue