update npm licenses

Merge branch 'main' into v2-preview
Avoid "+" sign in Java path in v2-preview (#145 )
2021-04-05 11:46:36 +03:00 · 2021-04-05 10:42:41 +03:00 · 2021-03-27 10:56:12 +03:00 · 2021-03-24 21:30:05 +03:00 · 2021-03-22 10:51:33 +03:00 · 2021-03-17 11:04:00 +03:00
7 changed files with 21 additions and 17 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -5,6 +5,7 @@ on:
    branches:
      - main
      - releases/*
+      - v2-preview
    paths-ignore:
      - '**.md'
  pull_request:
--- a/.github/workflows/e2e-local-file.yml
+++ b/.github/workflows/e2e-local-file.yml
@ -4,6 +4,7 @@ on:
    branches:
      - main
      - releases/*
+      - v2-preview
    paths-ignore:
      - '**.md'
  pull_request:
--- a/.github/workflows/e2e-publishing.yml
+++ b/.github/workflows/e2e-publishing.yml
@ -4,6 +4,7 @@ on:
    branches:
      - main
      - releases/*
+      - v2-preview
    paths-ignore:
      - '**.md'
  pull_request:
--- a/.github/workflows/e2e-versions.yml
+++ b/.github/workflows/e2e-versions.yml
@ -4,6 +4,7 @@ on:
    branches:
      - main
      - releases/*
+      - v2-preview
    paths-ignore:
      - '**.md'
  pull_request:
--- a/README.md
+++ b/README.md
@ -24,7 +24,7 @@ Inputs `java-version` and `distribution` are mandatory. See [Supported distribut
 ```yaml
 steps:
 - uses: actions/checkout@v2
- uses: actions/setup-java@v2
+- uses: actions/setup-java@v2-preview
  with:
    distribution: 'adopt' # See 'Supported distributions' for available options
    java-version: '11'
@ -35,7 +35,7 @@ steps:
 ```yaml
 steps:
 - uses: actions/checkout@v2
- uses: actions/setup-java@v2
+- uses: actions/setup-java@v2-preview
  with:
    distribution: 'zulu' # See 'Supported distributions' for available options
    java-version: '11'
@ -68,7 +68,7 @@ For Java distributions that are not cached on Hosted images, `check-latest` alwa
 ```yaml
 steps:
 - uses: actions/checkout@v2
- uses: actions/setup-java@v2
+- uses: actions/setup-java@v2-preview
  with:
    distribution: 'adopt'
    java-version: '11'
@ -88,7 +88,7 @@ jobs:
    steps:
      - uses: actions/checkout@v2
      - name: Setup java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v2-preview
        with:
          distribution: '<distribution>'
          java-version: ${{ matrix.java }}
--- a/docs/advanced-usage.md
+++ b/docs/advanced-usage.md
@ -20,7 +20,7 @@ Inputs `java-version` and `distribution` are mandatory and needs to be provided.
 ```yaml
 steps:
 - uses: actions/checkout@v2
- uses: actions/setup-java@v2
+- uses: actions/setup-java@v2-preview
  with:
    distribution: 'adopt'
    java-version: '11'
@ -31,7 +31,7 @@ steps:
 ```yaml
 steps:
 - uses: actions/checkout@v2
- uses: actions/setup-java@v2
+- uses: actions/setup-java@v2-preview
  with:
    distribution: 'zulu'
    java-version: '11'
@ -43,7 +43,7 @@ steps:
 ```yaml
 steps:
 - uses: actions/checkout@v2
- uses: actions/setup-java@v2
+- uses: actions/setup-java@v2-preview
  with:
    distribution: '<distribution>'
    java-version: '11'
@ -57,7 +57,7 @@ steps:
 ```yaml
 steps:
 - uses: actions/checkout@v2
- uses: actions/setup-java@v2
+- uses: actions/setup-java@v2-preview
  with:
    distribution: '<distribution>'
    java-version: '11'
@ -73,7 +73,7 @@ steps:
 - run: |
    download_url="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz"
    wget -O $RUNNER_TEMP/java_package.tar.gz $download_url
- uses: actions/setup-java@v2
+- uses: actions/setup-java@v2-preview
  with:
    distribution: 'jdkFile'
    jdkFile: ${{ runner.temp }}/java_package.tar.gz
@ -97,7 +97,7 @@ jobs:
    steps:
      - uses: actions/checkout@v2
      - name: Setup java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v2-preview
        with:
          distribution: ${{ matrix.distribution }}
          java-version: ${{ matrix.java }}
@ -117,7 +117,7 @@ jobs:
    steps:
      - uses: actions/checkout@v2
      - name: Setup java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v2-preview
        with:
          distribution: 'adopt'
          java-version: ${{ matrix.java }}
@ -135,7 +135,7 @@ jobs:
    steps:
    - uses: actions/checkout@v2
    - name: Set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v2-preview
      with:
        distribution: '<distribution>'
        java-version: '11'
@ -149,7 +149,7 @@ jobs:
        GITHUB_TOKEN: ${{ github.token }} # GITHUB_TOKEN is the default env for the password

    - name: Set up Apache Maven Central
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v2-preview
      with: # running setup-java again overwrites the settings.xml
        distribution: 'adopt'
        java-version: '11'
@ -245,7 +245,7 @@ jobs:
    - uses: actions/checkout@v2

    - name: Set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v2-preview
      with:
        distribution: '<distribution>'
        java-version: '11'
@ -277,7 +277,7 @@ jobs:
    steps:
    - uses: actions/checkout@v2
    - name: Set up JDK 11 for Shared Runner
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v2-preview
      with:
        distribution: '<distribution>'
        java-version: '11'
--- a/docs/switching-to-v2.md
+++ b/docs/switching-to-v2.md
@ -5,7 +5,7 @@ Use the `zulu` keyword if you would like to continue using the same distribution
 ```yaml
 steps:
 - uses: actions/checkout@v2
- uses: actions/setup-java@v2
+- uses: actions/setup-java@v2-preview
  with:
    distribution: 'zulu'
    java-version: '11'
@ -22,7 +22,7 @@ steps:
 - run: |
    download_url="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz"
    wget -O $RUNNER_TEMP/java_package.tar.gz $download_url
- uses: actions/setup-java@v2
+- uses: actions/setup-java@v2-preview
  with:
    distribution: 'jdkFile'
    jdkFile: ${{ runner.temp }}/java_package.tar.gz
Author	SHA1	Message	Date
Maxim Lobanov	68e87bb527	update npm licenses	2021-04-05 11:46:36 +03:00
Maxim Lobanov	40763c44c9	Merge branch 'main' into v2-preview	2021-04-05 10:42:41 +03:00
Maxim Lobanov	46d5f06eb1	Avoid "+" sign in Java path in v2-preview (#145 ) * try to handle _ versions * more logs * more debug * test 1 * more fixes * fix typo * Update e2e-versions.yml * add unit-tests * remove debug info from tests * debug pre-cached versions * change e2e tests to ubuntu-latest	2021-03-27 10:56:12 +03:00
Dmitry Shibanov	022e86d5c9	Add check-latest flag (#141 ) * add changes for check-latest * run prerelease script * resolving comments * fixing tests * fix spelling * improve core.info messages * run format * run prerelease * change version to fix test * resolve comment for check-latest * Update README.md * added hosted tool cache section * Apply suggestions from code review Co-authored-by: Maxim Lobanov <v-malob@microsoft.com> Co-authored-by: Konrad Pabjan <konradpabjan@github.com>	2021-03-24 21:30:05 +03:00
Maxim Lobanov	502a6650cd	Add "Contents/Home" postfix on macOS if provider creates it (#139 ) * Update e2e-versions.yml * Update e2e-versions.yml * implement fix * Update e2e-versions.yml * Update installer.ts * fix filter logic * Update e2e-versions.yml * remove extra logic * Update e2e-versions.yml	2021-03-22 10:51:33 +03:00
Maxim Lobanov	804a60faf9	Add "overwrite-settings" input parameter (#136 ) * add overwrite-settings parameter * fix e2e tests * print debug * fix e2e tests * add comment * remove comment	2021-03-17 11:04:00 +03:00
Maxim Lobanov	7c88894700	actions/setup-java@v2 - Support different distributions (#132 ) * Implement support for custom vendors in setup-java * minor improvements * minor refactoring * Add unit tests and e2e tests * Update documentation for setup-java@v2 release * minor improvements * regenerate dist * fix comments * resolve comments * resolve comments * fix tests * Update README.md Co-authored-by: George Adams <george.adams@microsoft.com> * Apply suggestions from code review Co-authored-by: Konrad Pabjan <konradpabjan@github.com> * fix minor nitpicks * handle 4th digit * pull latest main * Update README.md * rename adoptium to adopt * rename adoptium to adopt * rename adoptium to adopt * Update README.md * make java-version and distribution required for action * update readme * fix tests * fix e2e tests Co-authored-by: George Adams <george.adams@microsoft.com> Co-authored-by: Konrad Pabjan <konradpabjan@github.com>	2021-03-15 13:39:46 +03:00