From b87038f9a74a31a88a3886ce98f9f516f7614244 Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Tue, 17 Aug 2021 14:42:15 +0200 Subject: [PATCH 1/2] Use Eclipse Temurin in Quarkiverse workflow templates --- .../code/quarkiverse/java/.github/workflows/build.yml | 3 ++- .../java/.github/workflows/quarkus-snapshot.tpl.qute.yaml | 3 ++- .../code/quarkiverse/java/.github/workflows/release.yml | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/build.yml b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/build.yml index 3c39045edbd1f..67fec1fd8dbb7 100644 --- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/build.yml +++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/build.yml @@ -31,8 +31,9 @@ jobs: - uses: actions/checkout@v2 - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: temurin java-version: 11 - name: Get Date diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/quarkus-snapshot.tpl.qute.yaml b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/quarkus-snapshot.tpl.qute.yaml index 9183c75611b34..76fc5e59b5d99 100644 --- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/quarkus-snapshot.tpl.qute.yaml +++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/quarkus-snapshot.tpl.qute.yaml @@ -30,8 +30,9 @@ jobs: run: sudo add-apt-repository ppa:rmescandon/yq && sudo apt update && sudo apt install yq -y - name: Set up Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: temurin java-version: ${{ env.JAVA_VERSION }} - name: Checkout repo diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/release.yml b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/release.yml index dd0246716c945..ff66a90258e05 100644 --- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/release.yml +++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/release.yml @@ -29,8 +29,10 @@ jobs: gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} passphrase: ${{ secrets.GPG_PASSPHRASE }} - - uses: actions/setup-java@v1.4.3 + - name: Set up JDK 11 + uses: actions/setup-java@v2 with: + distribution: temurin java-version: 11 - name: Cache local Maven repository From 6dfc4a7b3bcc4598eedda8e3166a14a20f7d1f6d Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Tue, 17 Aug 2021 14:44:46 +0200 Subject: [PATCH 2/2] Fix formatting issues in Quarkiverse build.yml template --- .../java/.github/workflows/build.yml | 47 +++++++++---------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/build.yml b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/build.yml index 67fec1fd8dbb7..560094a775b8c 100644 --- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/build.yml +++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/build.yml @@ -28,27 +28,26 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - - name: Set up JDK 11 - uses: actions/setup-java@v2 - with: - distribution: temurin - java-version: 11 - - - name: Get Date - id: get-date - run: | - echo "::set-output name=date::$(/bin/date -u "+%Y-%m")" - shell: bash - - name: Cache Maven Repository - id: cache-maven - uses: actions/cache@v2 - with: - path: ~/.m2/repository - # refresh cache every month to avoid unlimited growth - key: maven-repo-${{ runner.os }}-${{ steps.get-date.outputs.date }} - - - name: Build with Maven - run: mvn -B formatter:validate verify --file pom.xml - + - uses: actions/checkout@v2 + + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + distribution: temurin + java-version: 11 + + - name: Get Date + id: get-date + run: | + echo "::set-output name=date::$(/bin/date -u "+%Y-%m")" + shell: bash + - name: Cache Maven Repository + id: cache-maven + uses: actions/cache@v2 + with: + path: ~/.m2/repository + # refresh cache every month to avoid unlimited growth + key: maven-repo-${{ runner.os }}-${{ steps.get-date.outputs.date }} + + - name: Build with Maven + run: mvn -B formatter:validate verify --file pom.xml