You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2021/01/11 11:39:40 UTC
[camel-quarkus] branch master updated (a22d486 -> 96ad6fe)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
from a22d486 Disable fop native tests due to #2113
new af9c7fd Revert "Temporarily switch to actions/setup-java"
new 96ad6fe Switch to whitelisted action potiuk/cancel-workflow-runs
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/camel-master-cron.yaml | 8 +++----
...us-runs-cron.yaml => cancel-previous-runs.yaml} | 13 +++++-----
.github/workflows/ci-build.yaml | 28 ++++++++++------------
.github/workflows/pr-validate.yml | 4 ++--
.github/workflows/quarkus-master-cron.yaml | 8 +++----
5 files changed, 28 insertions(+), 33 deletions(-)
rename .github/workflows/{cancel-previous-runs-cron.yaml => cancel-previous-runs.yaml} (79%)
[camel-quarkus] 01/02: Revert "Temporarily switch to
actions/setup-java"
Posted by ja...@apache.org.
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
commit af9c7fd1824a915342850d008bbdec74d0fef378
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Jan 11 08:24:46 2021 +0000
Revert "Temporarily switch to actions/setup-java"
This reverts commit 3d70650aca063480d523355b1d92350f814c30d8.
---
.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 12350ed..72874d5 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: actions/setup-java@v1
+ uses: AdoptOpenJDK/install-jdk@v1
with:
- java-version: '11'
+ 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: actions/setup-java@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
index 8d31baf..e59fed3 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: actions/setup-java@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: |
@@ -130,9 +130,9 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
- name: Set up JDK 11
- uses: actions/setup-java@v1
+ uses: AdoptOpenJDK/install-jdk@v1
with:
- java-version: '11'
+ 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: actions/setup-java@v1
+ uses: AdoptOpenJDK/install-jdk@v1
with:
- java-version: ${{ matrix.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: actions/setup-java@v1
+ uses: AdoptOpenJDK/install-jdk@v1
with:
- java-version: ${{ matrix.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: actions/setup-java@v1
+ uses: AdoptOpenJDK/install-jdk@v1
with:
- java-version: ${{ matrix.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: actions/setup-java@v1
+ uses: AdoptOpenJDK/install-jdk@v1
with:
- java-version: ${{ matrix.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 837278a..bc42ec1 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: actions/setup-java@v1
+ uses: AdoptOpenJDK/install-jdk@v1
with:
- java-version: '11'
+ 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 7e4c6a1..876c87a 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: actions/setup-java@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 \
@@ -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: actions/setup-java@v1
+ uses: AdoptOpenJDK/install-jdk@v1
with:
- java-version: '11'
+ version: '11'
- name: Integration Tests
run: |
TEST_MODULES=""
[camel-quarkus] 02/02: Switch to whitelisted action
potiuk/cancel-workflow-runs
Posted by ja...@apache.org.
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
commit 96ad6fe8a64a6e39e8d6d6fa87af4d565a19101f
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Jan 11 08:52:38 2021 +0000
Switch to whitelisted action potiuk/cancel-workflow-runs
---
...el-previous-runs-cron.yaml => cancel-previous-runs.yaml} | 13 ++++++-------
.github/workflows/ci-build.yaml | 4 ----
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/.github/workflows/cancel-previous-runs-cron.yaml b/.github/workflows/cancel-previous-runs.yaml
similarity index 79%
rename from .github/workflows/cancel-previous-runs-cron.yaml
rename to .github/workflows/cancel-previous-runs.yaml
index 0fb1ab6..c427df6 100644
--- a/.github/workflows/cancel-previous-runs-cron.yaml
+++ b/.github/workflows/cancel-previous-runs.yaml
@@ -17,17 +17,16 @@
name: Cancel Stale Workflow Runs
on:
- schedule:
- # Run every 30 minutes
- - cron: '*/30 * * * *'
+ workflow_run:
+ workflows: ['Camel Quarkus CI', 'Validate PR Style']
+ types: ['requested']
jobs:
cancel-runs:
- if: github.repository == 'apache/camel-quarkus'
runs-on: ubuntu-latest
steps:
- - name: Cancel Previous Runs
- uses: n1hility/cancel-previous-runs@v2
+ - uses: potiuk/cancel-workflow-runs@v4_7
+ name: "Cancel Previous Runs"
with:
token: ${{ secrets.GITHUB_TOKEN }}
- workflow: ci-build.yaml
+ sourceRunId: ${{ github.event.workflow_run.id }}
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
index e59fed3..c219e00 100644
--- a/.github/workflows/ci-build.yaml
+++ b/.github/workflows/ci-build.yaml
@@ -55,10 +55,6 @@ 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: Check free space on disk
run: |
df -h /