Skip to content

Add microsoft distribution of the JDK. #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brcrista merged 12 commits into from
Dec 8, 2021
Merged

Add microsoft distribution of the JDK. #252

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1bc2528
Add microsoft distribution of the JDK.
brendanburns Nov 18, 2021
9c1600a
Fix formatting to match prettier.
brendanburns Nov 18, 2021
2828873
Rebuild js.
brendanburns Nov 18, 2021
f073089
Fix archive suffix for Windows.
brendandburns Nov 19, 2021
434a5bf
Update src/distributions/microsoft/installer.ts
brendandburns Nov 30, 2021
3d55049
Update src/distributions/microsoft/installer.ts
brendandburns Nov 30, 2021
c3cb155
Add support for the microsoft distribution.
brendandburns Dec 7, 2021
41cb4d7
revert lockfile changes
brcrista Dec 8, 2021
50297fe
npm run format
brcrista Dec 8, 2021
bf48000
fix e2e-versions.yml
brcrista Dec 8, 2021
ef8955b
eliminate duplication in version numbers
brcrista Dec 8, 2021
d2ec614
Fix test
brcrista Dec 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix e2e-versions.yml
  • Loading branch information
@brcrista
brcrista committed Dec 8, 2021
commit bf48000b8b934cee2936b4157e12b1f7975b09be
20 changes: 7 additions & 13 deletions .github/workflows/e2e-versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,26 +177,18 @@ jobs:
run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
shell: bash

setup-java-custom-architecture:
# Only Zulu provides x86 arch for now and only for windows / ubuntu
# Only Microsoft provides arm64 for windows / ubuntu / os x
if: ${{ (matrix.distribution == 'zulu' && matrix.architecture == 'x86' && matrix.os != 'macos-latest' ) || (matrix.distribution == 'microsoft' && matrix.architecture == 'arm64') }}
# Only Liberica and Zulu provide x86
setup-java-x86:
name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-${{ matrix.architecture }}) - ${{ matrix.os }}
needs: setup-java-major-minor-versions
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
<<<<<<< HEAD
# Only Zulu and Liberica provides x86 arch for now and only for windows / ubuntu
# x86 is not supported on macOS
os: [windows-latest, ubuntu-latest]
distribution: ['zulu', 'liberica']
=======
os: [macos-latest, windows-latest, ubuntu-latest]
distribution: ['zulu', 'microsoft']
>>>>>>> Add microsoft distribution of the JDK.
distribution: ['liberica', 'zulu']
version: ['11']

@brunoborges brunoborges Dec 1, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we move up to 17?

@brendandburns brendandburns Dec 1, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As above.

@brunoborges brunoborges Dec 1, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noted.

architecture: [ 'x86', 'arm64' ]
steps:
- name: Checkout
uses: actions/checkout@v2
Expand All @@ -206,7 +198,9 @@ jobs:
with:
distribution: ${{ matrix.distribution }}
java-version: ${{ matrix.version }}
architecture: ${{ matrix.architecture }}
architecture: 'x86'
- name: Verify Java
run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
shell: bash

# Only Microsoft provides AArch64. However, GitHub-hosted runners do not support this architecture.