Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: actions/setup-java
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b8162e8075c5ade989ea353fe5310b3700ed4c4b
Choose a base ref
..
head repository: actions/setup-java
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e53962a2a48d6709f49a1fe99b87a2c6b1e8bc79
Choose a head ref
Showing with 94,163 additions and 860 deletions.
  1. +13 −13 .github/workflows/e2e-cache.yml
  2. +88 −30 .github/workflows/e2e-versions.yml
  3. +20 −0 .github/workflows/publish-immutable-actions.yml
  4. +1 −1 .github/workflows/release-new-action-version.yml
  5. +1 −1 .licenses/npm/@actions/cache.dep.yml
  6. +1 −1 .licenses/npm/@actions/http-client.dep.yml
  7. +1 −1 .licenses/npm/@types/node.dep.yml
  8. +2 −2 .licenses/npm/{semver-7.5.4.dep.yml → semver-7.6.0.dep.yml}
  9. +1 −1 .licenses/npm/undici.dep.yml
  10. +18 −13 README.md
  11. +186 −0 __tests__/data/dragonwell.json
  12. +443 −0 __tests__/data/liberica-linux.json
  13. +452 −0 __tests__/data/liberica-windows.json
  14. +6 −0 __tests__/data/microsoft.json
  15. +87,242 −0 __tests__/data/sapmachine.json
  16. +254 −0 __tests__/data/zulu-linux.json
  17. +254 −0 __tests__/data/zulu-windows.json
  18. +41 −10 __tests__/distributors/dragonwell-installer.test.ts
  19. +152 −0 __tests__/distributors/graalvm-installer.test.ts
  20. +290 −0 __tests__/distributors/liberica-linux-installer.test.ts
  21. +290 −0 __tests__/distributors/liberica-windows-installer.test.ts
  22. +48 −0 __tests__/distributors/microsoft-installer.test.ts
  23. +7 −1 __tests__/distributors/oracle-installer.test.ts
  24. +294 −0 __tests__/distributors/sapmachine-installer.test.ts
  25. +1 −1 __tests__/distributors/semeru-installer.test.ts
  26. +229 −0 __tests__/distributors/zulu-linux-installer.test.ts
  27. +229 −0 __tests__/distributors/zulu-windows-installer.test.ts
  28. +40 −1 __tests__/util.test.ts
  29. +1,010 −304 dist/cleanup/index.js
  30. +1,456 −325 dist/setup/index.js
  31. +59 −16 docs/advanced-usage.md
  32. +80 −80 package-lock.json
  33. +10 −11 package.json
  34. +1 −1 src/cache.ts
  35. +6 −3 src/distributions/adopt/installer.ts
  36. +10 −9 src/distributions/corretto/installer.ts
  37. +9 −1 src/distributions/distribution-factory.ts
  38. +16 −10 src/distributions/dragonwell/installer.ts
  39. +176 −0 src/distributions/graalvm/installer.ts
  40. +14 −0 src/distributions/graalvm/models.ts
  41. +6 −2 src/distributions/liberica/installer.ts
  42. +6 −2 src/distributions/microsoft/installer.ts
  43. +324 −0 src/distributions/microsoft/microsoft-openjdk-versions.json
  44. +9 −3 src/distributions/oracle/installer.ts
  45. +269 −0 src/distributions/sapmachine/installer.ts
  46. +33 −0 src/distributions/sapmachine/models.ts
  47. +14 −7 src/distributions/semeru/installer.ts
  48. +6 −3 src/distributions/temurin/installer.ts
  49. +6 −3 src/distributions/zulu/installer.ts
  50. +5 −1 src/setup-java.ts
  51. +34 −3 src/util.ts
26 changes: 13 additions & 13 deletions .github/workflows/e2e-cache.yml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-latest, windows-latest, ubuntu-latest]
os: [macos-13, windows-latest, ubuntu-latest]
steps:
- name: Checkout
uses: actions/checkout@v4
@@ -46,7 +46,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-latest, windows-latest, ubuntu-latest]
os: [macos-13, windows-latest, ubuntu-latest]
needs: gradle-save
steps:
- name: Checkout
@@ -70,7 +70,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-latest, windows-latest, ubuntu-latest]
os: [macos-13, windows-latest, ubuntu-latest]
steps:
- name: Checkout
uses: actions/checkout@v4
@@ -93,7 +93,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-latest, windows-latest, ubuntu-latest]
os: [macos-13, windows-latest, ubuntu-latest]
needs: maven-save
steps:
- name: Checkout
@@ -121,7 +121,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-latest, windows-latest, ubuntu-latest]
os: [macos-13, windows-latest, ubuntu-latest]
steps:
- name: Checkout
uses: actions/checkout@v4
@@ -132,33 +132,35 @@ jobs:
distribution: 'adopt'
java-version: '11'
cache: sbt
- name: Setup SBT
if: matrix.os == 'macos-13'
run: |
echo ""Installing SBT...""
brew install sbt
- name: Create files to cache
run: sbt update

- name: Check files to cache on macos-latest
if: matrix.os == 'macos-latest'
if: matrix.os == 'macos-13'
run: |
if [ ! -d ~/Library/Caches/Coursier ]; then
echo "::error::The ~/Library/Caches/Coursier directory does not exist unexpectedly"
exit 1
fi
- name: Check files to cache on windows-latest
if: matrix.os == 'windows-latest'
run: |
if [ ! -d ~/AppData/Local/Coursier/Cache ]; then
echo "::error::The ~/AppData/Local/Coursier/Cache directory does not exist unexpectedly"
exit 1
fi
- name: Check files to cache on ubuntu-latest
if: matrix.os == 'ubuntu-latest'
run: |
if [ ! -d ~/.cache/coursier ]; then
echo "::error::The ~/.cache/coursier directory does not exist unexpectedly"
exit 1
fi
sbt-restore:
runs-on: ${{ matrix.os }}
defaults:
@@ -168,7 +170,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-latest, windows-latest, ubuntu-latest]
os: [macos-13, windows-latest, ubuntu-latest]
needs: sbt-save
steps:
- name: Checkout
@@ -182,14 +184,13 @@ jobs:
cache: sbt

- name: Confirm that ~/Library/Caches/Coursier directory has been made
if: matrix.os == 'macos-latest'
if: matrix.os == 'macos-13'
run: |
if [ ! -d ~/Library/Caches/Coursier ]; then
echo "::error::The ~/Library/Caches/Coursier directory does not exist unexpectedly"
exit 1
fi
ls ~/Library/Caches/Coursier
- name: Confirm that ~/AppData/Local/Coursier/Cache directory has been made
if: matrix.os == 'windows-latest'
run: |
@@ -198,7 +199,6 @@ jobs:
exit 1
fi
ls ~/AppData/Local/Coursier/Cache
- name: Confirm that ~/.cache/coursier directory has been made
if: matrix.os == 'ubuntu-latest'
run: |
Loading