Skip to content

Commit e766980

Browse files
authored
Merge branch 'main' into dependabot/maven/com.fasterxml.jackson.dataformat-jackson-dataformat-yaml-2.19.1
2 parents b8b3ad6 + dae1dc3 commit e766980

File tree

99 files changed

+1409
-71
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+1409
-71
lines changed

.changeset/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.0
1+
0.2.0

.changeset/cyan-sloths-unite.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/dependabot-0596f93.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"changesets": patch
3+
---
4+
5+
- org.junit.jupiter:junit-jupiter-api, org.junit.jupiter:junit-jupiter-params:

.changeset/dependabot-4fb901f.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"changesets": patch
3+
---
4+
5+
- com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:

.changeset/dependabot-ba06d2e.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"changesets": patch
3+
---
4+
5+
- org.semver4j:semver4j:

.changeset/dependabot-f86f984.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"changesets": patch
3+
---
4+
5+
- org.apache.maven:maven-plugin-api, org.apache.maven:maven-core, org.apache.maven:maven-artifact, org.apache.maven:maven-compat, org.apache.maven.plugins:maven-invoker-plugin, com.diffplug.spotless:spotless-maven-plugin, org.apache.maven.plugins:maven-gpg-plugin:

.changeset/few-coins-pump.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/legal-parents-scream.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"changesets": minor
3+
---
4+
5+
Add support for handling dependency updates separately from other changesets, so that they can be presented in a more organised way.
6+
7+
This is utilized by setting the update type to `dependency` in place of major/minor/patch.

.changeset/red-poets-heal.md

Lines changed: 0 additions & 7 deletions
This file was deleted.
Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
1-
# Enable auto-merge for Dependabot PRs for minor and patch
2-
# Based off of https://docs.github.com/en/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions#enable-auto-merge-on-a-pull-request
3-
name: Create changesets for Dependabot
4-
on: pull_request
1+
# Add changesets for Dependabot PRs
2+
name: Dependabot Changesets
3+
on:
4+
pull_request: {}
55

66
permissions:
7+
pull-requests: read
78
contents: write
8-
pull-requests: write
99

1010
jobs:
11-
dependabot:
11+
generate-changeset:
1212
runs-on: ubuntu-latest
1313
if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'FortnoxAB/changesets-java'
1414
steps:
15-
- name: Dependabot metadata
16-
id: dependabot-metadata
17-
uses: dependabot/fetch-metadata@v2
15+
- uses: actions/checkout@v4
16+
17+
- name: Set up JDK 17
18+
uses: actions/setup-java@v4
1819
with:
19-
skip-verification: true
20-
- name: Debug
20+
java-version: '17'
21+
distribution: 'temurin'
22+
cache: maven
23+
24+
- uses: FortnoxAB/changesets-java-dependabot-action@main
25+
26+
- name: Validate
2127
shell: bash
2228
run: |
23-
echo "dependency-names: ${{ steps.dependabot-metadata.outputs.dependency-names }}"
24-
echo "new-version: ${{ steps.dependabot-metadata.outputs.new-version }}"
25-
echo "${{ toJSON(steps.dependabot-metadata.outputs) }}"
26-
27-
# Fake adding a changeset so we see that it runs with the correct parameters
28-
echo "./mvnw se.fortnox.changesets:changesets-maven-plugin:add -DchangesetLevel=dependency -DchangesetContent=\"- ${{ steps.dependabot-metadata.outputs.dependency-names }}: ${{ steps.dependabot-metadata.outputs.new-version }}\""
29-
29+
ls -l .changeset
30+
git status

0 commit comments

Comments
 (0)