actions/setup-java
2
0
Fork 0
mirror of https://github.com/actions/setup-java.git synced 2025-04-20 09:56:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

rename adoptium to adopt

Browse source
This commit is contained in:
Maxim Lobanov 2021-03-11 10:55:59 +03:00
parent 2ff07ea962
commit 491094cc4c
3 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
.github/workflows/e2e-versions.yml vendored
View file

@ -19,7 +19,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
os: [macos-latest, windows-latest, ubuntu-latest] os: [macos-latest, windows-latest, ubuntu-latest]
distribution: ['adoptium', 'zulu'] distribution: ['adopt', 'zulu']
version: ['8', '11', '15'] version: ['8', '11', '15']
steps: steps:
- name: Checkout - name: Checkout
@ -42,19 +42,19 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
os: [macos-latest, windows-latest, ubuntu-latest] os: [macos-latest, windows-latest, ubuntu-latest]
distribution: ['adoptium', 'zulu'] distribution: ['adopt', 'zulu']
version: version:
- '11.0' - '11.0'
- '8.0.282' - '8.0.282'
- '11.0.2+7' - '11.0.2+7'
include: include:
- distribution: 'adoptium' - distribution: 'adopt'
version: '12.0.2+10.1' version: '12.0.2+10.1'
os: macos-latest os: macos-latest
- distribution: 'adoptium' - distribution: 'adopt'
version: '12.0.2+10.1' version: '12.0.2+10.1'
os: windows-latest os: windows-latest
- distribution: 'adoptium' - distribution: 'adopt'
version: '12.0.2+10.1' version: '12.0.2+10.1'
os: ubuntu-latest os: ubuntu-latest
steps: steps:
@ -89,8 +89,8 @@ jobs:
java-version: ${{ matrix.version }} java-version: ${{ matrix.version }}
distribution: zulu distribution: zulu
setup-java-ea-versions-adoptium: setup-java-ea-versions-adopt:
name: adoptium ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }} name: adopt ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }}
needs: setup-java-major-minor-versions needs: setup-java-major-minor-versions
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
strategy: strategy:
@ -106,7 +106,7 @@ jobs:
id: setup-java id: setup-java
with: with:
java-version: ${{ matrix.version }} java-version: ${{ matrix.version }}
distribution: adoptium distribution: adopt
setup-java-custom-package-type: setup-java-custom-package-type:
name: ${{ matrix.distribution }} ${{ matrix.version }} (${{ matrix.java-package }}-x64) - ${{ matrix.os }} name: ${{ matrix.distribution }} ${{ matrix.version }} (${{ matrix.java-package }}-x64) - ${{ matrix.os }}
@ -116,7 +116,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
os: [macos-latest, windows-latest, ubuntu-latest] os: [macos-latest, windows-latest, ubuntu-latest]
distribution: ['adoptium', 'zulu'] distribution: ['adopt', 'zulu']
java-package: ['jre'] java-package: ['jre']
version: version:
- '15.0' - '15.0'

0
__tests__/data/adoptium.json → __tests__/data/adopt.json
View file

16
__tests__/distributors/adoptium-installer.test.ts → __tests__/distributors/adopt-installer.test.ts
View file

@ -2,10 +2,10 @@ import { HttpClient } from '@actions/http-client';
import * as semver from 'semver'; import * as semver from 'semver';
import { AdoptiumDistribution } from '../../src/distributions/adoptium/installer'; import { AdoptDistribution } from '../../src/distributions/adopt/installer';
import { JavaInstallerOptions } from '../../src/distributions/base-models'; import { JavaInstallerOptions } from '../../src/distributions/base-models';
let manifestData = require('../data/adoptium.json') as []; let manifestData = require('../data/adopt.json') as [];
describe('getAvailableVersions', () => { describe('getAvailableVersions', () => {
let spyHttpClient: jest.SpyInstance; let spyHttpClient: jest.SpyInstance;
@ -45,7 +45,7 @@ describe('getAvailableVersions', () => {
])( ])(
'build correct url for %s', 'build correct url for %s',
async (installerOptions: JavaInstallerOptions, expectedParameters) => { async (installerOptions: JavaInstallerOptions, expectedParameters) => {
const distribution = new AdoptiumDistribution(installerOptions); const distribution = new AdoptDistribution(installerOptions);
const baseUrl = 'https://api.adoptopenjdk.net/v3/assets/version/%5B1.0,100.0%5D'; const baseUrl = 'https://api.adoptopenjdk.net/v3/assets/version/%5B1.0,100.0%5D';
const expectedUrl = `${baseUrl}?project=jdk&vendor=adoptopenjdk&heap_size=normal&jvm_impl=hotspot&sort_method=DEFAULT&sort_order=DESC&${expectedParameters}`; const expectedUrl = `${baseUrl}?project=jdk&vendor=adoptopenjdk&heap_size=normal&jvm_impl=hotspot&sort_method=DEFAULT&sort_order=DESC&${expectedParameters}`;
distribution['getPlatformOption'] = () => 'mac'; distribution['getPlatformOption'] = () => 'mac';
@ -76,7 +76,7 @@ describe('getAvailableVersions', () => {
result: [] result: []
}); });
const distribution = new AdoptiumDistribution({ const distribution = new AdoptDistribution({
version: '11', version: '11',
arch: 'x64', arch: 'x64',
packageType: 'jdk' packageType: 'jdk'
@ -101,7 +101,7 @@ describe('findPackageForDownload', () => {
['15.0.1+9', '15.0.1+9'], ['15.0.1+9', '15.0.1+9'],
['15.0.1+9.1', '15.0.1+9.1'] ['15.0.1+9.1', '15.0.1+9.1']
])('version is resolved correctly %s -> %s', async (input, expected) => { ])('version is resolved correctly %s -> %s', async (input, expected) => {
const distribution = new AdoptiumDistribution({ const distribution = new AdoptDistribution({
version: '11', version: '11',
arch: 'x64', arch: 'x64',
packageType: 'jdk' packageType: 'jdk'
@ -112,7 +112,7 @@ describe('findPackageForDownload', () => {
}); });
it('version is found but binaries list is empty', async () => { it('version is found but binaries list is empty', async () => {
const distribution = new AdoptiumDistribution({ const distribution = new AdoptDistribution({
version: '11', version: '11',
arch: 'x64', arch: 'x64',
packageType: 'jdk' packageType: 'jdk'
@ -124,7 +124,7 @@ describe('findPackageForDownload', () => {
}); });
it('version is not found', async () => { it('version is not found', async () => {
const distribution = new AdoptiumDistribution({ const distribution = new AdoptDistribution({
version: '11', version: '11',
arch: 'x64', arch: 'x64',
packageType: 'jdk' packageType: 'jdk'
@ -136,7 +136,7 @@ describe('findPackageForDownload', () => {
}); });
it('version list is empty', async () => { it('version list is empty', async () => {
const distribution = new AdoptiumDistribution({ const distribution = new AdoptDistribution({
version: '11', version: '11',
arch: 'x64', arch: 'x64',
packageType: 'jdk' packageType: 'jdk'