Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/apache/camel into NO-JIRA-a…
Browse files Browse the repository at this point in the history
…dd-sparkplug-b-component
  • Loading branch information
ryan-highley committed Apr 18, 2024
2 parents 30f87d9 + 2de3e3a commit b32fb7c
Show file tree
Hide file tree
Showing 2,871 changed files with 84,172 additions and 91,474 deletions.
3 changes: 3 additions & 0 deletions .github/actions/incremental-build/incremental-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,16 @@ function main() {
if [[ ${projectRoot} = "." ]] ; then
echo "The root project is affected, so a complete build is triggered"
buildAll=true
totalAffected=1
break
elif [[ ${projectRoot} != "${lastProjectRoot}" ]] ; then
(( totalAffected ++ ))
pl="$pl,${projectRoot}"
lastProjectRoot=${projectRoot}
fi
fi
done

if [[ ${totalAffected} = 0 ]] ; then
echo "There is nothing to build"
exit 0
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/pr-build-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,15 @@ jobs:
permissions:
issues: write
runs-on: ubuntu-latest
continue-on-error: ${{ matrix.experimental }}
strategy:
matrix:
java: [ '17', '21' ]
java: ['17']
experimental: [ false ]
include:
- java: '21'
experimental: true

steps:
- uses: actions/checkout@v4
with:
Expand All @@ -55,13 +61,13 @@ jobs:
java-version: ${{ matrix.java }}
cache: 'maven'
- name: maven build
run: ./etc/scripts/regen.sh > build.log 2>&1
run: ./etc/scripts/regen.sh > build-${{ matrix.java }}.log 2>&1
- name: archive logs
uses: actions/upload-artifact@v4
if: always()
with:
name: build.log
path: build.log
path: build-${{ matrix.java }}.log
- name: Fail if there are uncommitted changes
shell: bash
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/push-build-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@ jobs:
java-version: ${{ matrix.java }}
cache: 'maven'
- name: mvn formatter and build
run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -l build.log -Dquickly package
run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -l build-${{ matrix.java }}.log -Dquickly package
- name: archive logs
uses: actions/upload-artifact@v4
if: always()
with:
name: build.log
path: build.log
path: build-${{ matrix.java }}.log
- name: Create Pull Request
uses: peter-evans/create-pull-request@v6
with:
Expand Down
Loading

0 comments on commit b32fb7c

Please sign in to comment.