This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new 3d70650 Temporarily switch to actions/setup-java
3d70650 is described below
commit 3d70650aca063480d523355b1d92350f814c30d8
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Wed Jan 6 07:48:40 2021 +0000
Temporarily switch to actions/setup-java
---
.github/workflows/camel-master-cron.yaml | 8 ++++----
.github/workflows/ci-build.yaml | 32 +++++++++++++++---------------
.github/workflows/pr-validate.yml | 4 ++--
.github/workflows/quarkus-master-cron.yaml | 8 ++++----
4 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/.github/workflows/camel-master-cron.yaml
b/.github/workflows/camel-master-cron.yaml
index 72874d5..12350ed 100644
--- 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: AdoptOpenJDK/install-jdk@v1
+ uses: actions/setup-java@v1
with:
- version: '11'
+ java-version: '11'
- name: Build Camel Quarkus
run: |
./mvnw ${MAVEN_ARGS} clean install -Papache-snapshots -pl '!docs'
@@ -126,9 +126,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: AdoptOpenJDK/install-jdk@v1
+ uses: actions/setup-java@v1
with:
- version: '11'
+ java-version: '11'
- name: Integration Tests
run: |
TEST_MODULES=""
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
index e59fed3..8d31baf 100644
--- a/.github/workflows/ci-build.yaml
+++ b/.github/workflows/ci-build.yaml
@@ -55,10 +55,10 @@ jobs:
outputs:
matrix: ${{ steps.set-native-matrix.outputs.matrix }}
steps:
- - name: Cancel Previous Runs
- uses: n1hility/cancel-previous-runs@v2
- with:
- token: ${{ secrets.GITHUB_TOKEN }}
+ # - name: Cancel Previous Runs
+ # uses: n1hility/cancel-previous-runs@v2
+ # with:
+ # token: ${{ secrets.GITHUB_TOKEN }}
- name: Check free space on disk
run: |
df -h /
@@ -71,9 +71,9 @@ jobs:
run: |
echo "BRANCH_OPTIONS=-Poss-snapshots -Dquarkus.version=999-SNAPSHOT"
>> $GITHUB_ENV
- name: Set up JDK 11
- uses: AdoptOpenJDK/install-jdk@v1
+ uses: actions/setup-java@v1
with:
- version: '11'
+ java-version: '11'
- name: Build Quarkus
if: github.ref == 'refs/heads/quarkus-master' || github.base_ref ==
'quarkus-master'
run: |
@@ -130,9 +130,9 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
- name: Set up JDK 11
- uses: AdoptOpenJDK/install-jdk@v1
+ uses: actions/setup-java@v1
with:
- version: '11'
+ java-version: '11'
- name: Download Maven Repo
uses: actions/download-artifact@v2
with:
@@ -199,9 +199,9 @@ jobs:
echo "BRANCH_OPTIONS=-Poss-snapshots -Dquarkus.version=999-SNAPSHOT"
>> $GITHUB_ENV
- uses: actions/checkout@v2
- name: Set up JDK ${{ matrix.java }}
- uses: AdoptOpenJDK/install-jdk@v1
+ uses: actions/setup-java@v1
with:
- version: ${{ matrix.java }}
+ java-version: ${{ matrix.java }}
- name: Download Maven Repo
uses: actions/download-artifact@v2
with:
@@ -252,9 +252,9 @@ jobs:
echo "BRANCH_OPTIONS=-Poss-snapshots -Dquarkus.version=999-SNAPSHOT"
>> $GITHUB_ENV
- uses: actions/checkout@v2
- name: Set up JDK ${{ matrix.java }}
- uses: AdoptOpenJDK/install-jdk@v1
+ uses: actions/setup-java@v1
with:
- version: ${{ matrix.java }}
+ java-version: ${{ matrix.java }}
- name: Download Maven Repo
uses: actions/download-artifact@v2
with:
@@ -294,9 +294,9 @@ jobs:
echo "BRANCH_OPTIONS=-Poss-snapshots -Dquarkus.version=999-SNAPSHOT"
>> $GITHUB_ENV
- uses: actions/checkout@v2
- name: Set up JDK ${{ matrix.java }}
- uses: AdoptOpenJDK/install-jdk@v1
+ uses: actions/setup-java@v1
with:
- version: ${{ matrix.java }}
+ java-version: ${{ matrix.java }}
- name: Download Maven Repo
uses: actions/download-artifact@v2
with:
@@ -343,9 +343,9 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
- name: Set up JDK 11
- uses: AdoptOpenJDK/install-jdk@v1
+ uses: actions/setup-java@v1
with:
- version: ${{ matrix.java }}
+ java-version: ${{ matrix.java }}
- name: Download Maven Repo
uses: actions/download-artifact@v2
with:
diff --git a/.github/workflows/pr-validate.yml
b/.github/workflows/pr-validate.yml
index bc42ec1..837278a 100644
--- a/.github/workflows/pr-validate.yml
+++ b/.github/workflows/pr-validate.yml
@@ -51,9 +51,9 @@ jobs:
echo "BRANCH_OPTIONS=-Poss-snapshots" >> $GITHUB_ENV
- uses: actions/checkout@v1
- name: Set up JDK 11
- uses: AdoptOpenJDK/install-jdk@v1
+ uses: actions/setup-java@v1
with:
- version: '11'
+ java-version: '11'
- name: mvn validate
run: |
./mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} -fae \
diff --git a/.github/workflows/quarkus-master-cron.yaml
b/.github/workflows/quarkus-master-cron.yaml
index 876c87a..7e4c6a1 100644
--- 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: AdoptOpenJDK/install-jdk@v1
+ uses: actions/setup-java@v1
with:
- version: '11'
+ java-version: '11'
- name: Build Quarkus
run: |
git clone --depth 1 --branch master
https://github.com/quarkusio/quarkus.git \
@@ -135,9 +135,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: AdoptOpenJDK/install-jdk@v1
+ uses: actions/setup-java@v1
with:
- version: '11'
+ java-version: '11'
- name: Integration Tests
run: |
TEST_MODULES=""
