Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/maven/camel-test.version-4.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jesperancinha authored Jul 15, 2024
2 parents a60162f + db857b2 commit cb5f16b
Show file tree
Hide file tree
Showing 7 changed files with 64 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2.1
jobs:
build:
docker:
- image: maven:3-eclipse-temurin-21
- image: eclipse-temurin:21-alpine

environment:
MAVEN_OPTS: -Xmx3200m
Expand Down
23 changes: 18 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,24 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "daily"
groups:
postgresql:
patterns:
- "*postgresql*"
maven:
patterns:
- "*maven*"
kotlin:
patterns:
- "*kotlin*"
jackson:
patterns:
- "jackson*"
- "*jackson*"
camel:
patterns:
- "camel*"
- "*camel*"
2 changes: 1 addition & 1 deletion .github/workflows/camel-test-drives-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- name: Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@v1.1.1
uses: dependabot/fetch-metadata@v2
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
- name: Enable auto-merge for Dependabot PRs
Expand Down
33 changes: 33 additions & 0 deletions .github/workflows/camel-test-drives-plugins-update.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Updates plugins

on:
schedule:
- cron: '0 0 * * 0'
workflow_dispatch:

jobs:
update-plugins:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: '20'

- name: Run dependency update script
run: make deps-plugins-update

- name: Create pull request
uses: peter-evans/create-pull-request@v6
with:
commit-message: Update plugins dependencies
branch: update-plugins
title: 'Update plugins'
body: |
This pull request updates the following dependencies:
- Current plugins updates
labels: dependencies
6 changes: 3 additions & 3 deletions .github/workflows/camel-test-drives-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up JDK 21
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '21'
distribution: 'temurin'
distribution: 'adopt'

- name: Build and Test
run: mvn clean install jacoco:prepare-agent package jacoco:report
6 changes: 3 additions & 3 deletions .github/workflows/camel-test-drives.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up JDK 21
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '21'
distribution: 'temurin'
distribution: 'adopt'

- name: Build and Test
run: mvn clean install jacoco:prepare-agent package jacoco:report
Expand Down
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,8 @@ build:
mvn clean install
local-pipeline: build
mvn integration-test
deps-plugins-update:
curl -sL https://raw.githubusercontent.com/jesperancinha/project-signer/master/pluginUpdatesOne.sh | bash
deps-java-update:
curl -sL https://raw.githubusercontent.com/jesperancinha/project-signer/master/javaUpdatesOne.sh | bash
deps-quick-update: deps-plugins-update deps-java-update

0 comments on commit cb5f16b

Please sign in to comment.