diff --git a/.github/workflows/dependabot-automerge.yml b/.github/workflows/dependabot-automerge.yml new file mode 100644 index 0000000..c7183cc --- /dev/null +++ b/.github/workflows/dependabot-automerge.yml @@ -0,0 +1,20 @@ +# SPDX-FileCopyrightText: The maven-build-process Authors +# SPDX-License-Identifier: 0BSD + +name: Dependabot auto-merge +on: pull_request + +permissions: + contents: write + pull-requests: write + +jobs: + dependabot: + runs-on: ubuntu-latest + if: ${{ github.actor == 'dependabot[bot]' }} + steps: + - name: Enable auto-merge for Dependabot PRs + run: gh pr merge --auto --rebase "$PR_URL" + env: + PR_URL: ${{ github.event.pull_request.html_url }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3fcb0dd..cb221c9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -12,7 +12,11 @@ jobs: permissions: contents: write steps: - - uses: actions/checkout@v3 + - id: checkout + name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 - uses: ./.github/actions/managed-pom - uses: actions/cache@v3 with: @@ -20,12 +24,18 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- - - name: Create release version - id: release + - id: last_release + name: Fetch last release info + run: echo "tag=$(gh release view --json tagName --jq '.tagName')" >> $GITHUB_OUTPUT + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - id: commits + name: Count Commits + run: echo "count=$(git rev-list --count ${{ steps.last_release.outputs.tag }}..HEAD)" >> $GITHUB_OUTPUT + - id: release + name: Create release version + if: steps.commits.outputs.count > 0 run: echo "version=$(date +'%Y.%-m.%-d')" >> $GITHUB_OUTPUT - - name: Count commits in last week - id: commits - run: echo "count=$(git rev-list --count HEAD --since='last Friday')" >> $GITHUB_OUTPUT - name: Set release version if: steps.commits.outputs.count > 0 run: mvn --batch-mode --define newVersion=${{ steps.release.outputs.version }} --define generateBackupPoms=false versions:set @@ -35,13 +45,13 @@ jobs: run: echo "${{ secrets.GPG_SECRET_KEY_BASE64 }}" | base64 --decode > $GITHUB_WORKSPACE/signing.key.asc - name: Publish to Maven Central if: steps.commits.outputs.count > 0 - run: | - mvn \ - --batch-mode \ - --activate-profiles release \ - --define pgp.secretkey=keyfile:$GITHUB_WORKSPACE/signing.key.asc \ - --define pgp.passphrase=literal:${{ secrets.GPG_SECRET_KEY_PASSWORD }} \ - deploy + run: > + mvn + --batch-mode + --activate-profiles release + --define pgp.secretkey=keyfile:$GITHUB_WORKSPACE/signing.key.asc + --define pgp.passphrase=literal:${{ secrets.GPG_SECRET_KEY_PASSWORD }} + deploy env: MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }} @@ -58,7 +68,7 @@ jobs: - id: mail name: Send Mail if: steps.commits.outputs.count > 0 - uses: dawidd6/action-send-mail@v3.7.1 + uses: dawidd6/action-send-mail@v3 with: server_address: ${{ secrets.MAIL_SERVER }} server_port: ${{ secrets.MAIL_PORT }} diff --git a/.github/workflows/reuse.yml b/.github/workflows/reuse.yml index 9f943f1..2627314 100644 --- a/.github/workflows/reuse.yml +++ b/.github/workflows/reuse.yml @@ -11,6 +11,6 @@ jobs: reuse: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: REUSE Compliance Check uses: fsfe/reuse-action@v1 diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 9e4a84d..f63d448 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -9,7 +9,7 @@ jobs: update: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: ./.github/actions/managed-java - uses: actions/cache@v3 with: diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 06efd7a..75ff64c 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Clone Git Repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - uses: ./.github/actions/managed-java - name: Cache Dependencies uses: actions/cache@v3 diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 3b489a7..de3bf0a 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -2,48 +2,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 67cef22..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file