Replace joschi/setup-jdk with AdoptOpenJDK/install-jdk #1349

apache · Jun 20, 2020 · c56f5f6 · c56f5f6
1 parent 259f736
commit c56f5f6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/camel-master-cron.yaml b/.github/workflows/camel-master-cron.yaml
@@ -62,9 +62,9 @@ jobs:
           git rebase origin/master
           git rev-parse origin/master > ~/build-data/master-sha.txt
       - name: Set up JDK 11
-        uses: joschi/setup-jdk@v1
+        uses: AdoptOpenJDK/install-jdk@v1
         with:
-          java-version: 11
+          version: '11'
       - name: Build Camel Quarkus
         run: |
           ./mvnw -B -ntp clean install -Papache-snapshots -pl '!docs'
@@ -125,9 +125,9 @@ jobs:
           sudo wget -O /usr/local/bin/yq "https://github.com/mikefarah/yq/releases/download/3.2.1/yq_linux_amd64"
           sudo chmod +x /usr/local/bin/yq
       - name: Set up JDK 11
-        uses: joschi/setup-jdk@v1
+        uses: AdoptOpenJDK/install-jdk@v1
         with:
-          java-version: 11
+          version: '11'
       - name: Integration Tests
         run: |
           TEST_MODULES=""

diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
@@ -74,9 +74,9 @@ jobs:
         run: |
           echo '::set-env name=BRANCH_OPTIONS::-Poss-snapshots -Dquarkus.version=999-SNAPSHOT'
       - name: Set up JDK 11
-        uses: joschi/setup-jdk@v1
+        uses: AdoptOpenJDK/install-jdk@v1
         with:
-          java-version: 11
+          version: '11'
       - name: Build Quarkus
         if: github.ref == 'refs/heads/quarkus-master' || github.base_ref == 'quarkus-master'
         run: |
@@ -129,9 +129,9 @@ jobs:
           echo '::set-env name=BRANCH_OPTIONS::-Poss-snapshots -Dquarkus.version=999-SNAPSHOT'
       - uses: actions/checkout@v2
       - name: Set up JDK ${{ matrix.java }}
-        uses: joschi/setup-jdk@v1
+        uses: AdoptOpenJDK/install-jdk@v1
         with:
-          java-version: ${{ matrix.java }}
+          version: ${{ matrix.java }}
       - name: Download Maven Repo
         uses: actions/download-artifact@v1
         with:
@@ -166,9 +166,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Set up JDK 11
-        uses: joschi/setup-jdk@v1
+        uses: AdoptOpenJDK/install-jdk@v1
         with:
-          java-version: 11
+          version: '11'
       - name: Download Maven Repo
         uses: actions/download-artifact@v1
         with:

diff --git a/.github/workflows/pr-validate.yml b/.github/workflows/pr-validate.yml
@@ -46,9 +46,9 @@ jobs:
         echo '::set-env name=BRANCH_OPTIONS::-Poss-snapshots'
     - uses: actions/checkout@v1
     - name: Set up JDK 11
-      uses: joschi/setup-jdk@v1
+      uses: AdoptOpenJDK/install-jdk@v1
       with:
-        java-version: 11
+        version: '11'
     - name: mvn validate
       run: |
         ./mvnw ${BRANCH_OPTIONS} -fae -ntp \

diff --git a/.github/workflows/quarkus-master-cron.yaml b/.github/workflows/quarkus-master-cron.yaml
@@ -62,9 +62,9 @@ jobs:
           git rebase origin/master
           git rev-parse origin/master > ~/build-data/master-sha.txt
       - name: Set up JDK 11
-        uses: joschi/setup-jdk@v1
+        uses: AdoptOpenJDK/install-jdk@v1
         with:
-          java-version: 11
+          version: '11'
       - name: Build Quarkus
         run: |
           git clone --depth 1 --branch master https://github.com/quarkusio/quarkus.git \
@@ -134,9 +134,9 @@ jobs:
           sudo wget -O /usr/local/bin/yq "https://github.com/mikefarah/yq/releases/download/3.2.1/yq_linux_amd64"
           sudo chmod +x /usr/local/bin/yq
       - name: Set up JDK 11
-        uses: joschi/setup-jdk@v1
+        uses: AdoptOpenJDK/install-jdk@v1
         with:
-          java-version: 11
+          version: '11'
       - name: Integration Tests
         run: |
           TEST_MODULES=""