Skip to content

Commit

Permalink
Update actions
Browse files Browse the repository at this point in the history
  • Loading branch information
erwinc1 committed Dec 10, 2024
1 parent 30e3673 commit 0663e90
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 43 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/actions/cd/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ runs:
java-version: '17'
distribution: 'temurin'
cache: 'maven'
server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
server-username: OSSRH_USERNAME # env variable for username in deploy
server-password: OSSRH_TOKEN # env variable for token in deploy
server-id: central # Value of the distributionManagement/repository/id field of the pom.xml
server-username: MAVEN_USERNAME # env variable for username in deploy
server-password: MAVEN_TOKEN # env variable for token in deploy
gpg-private-key: ${{ inputs.gpg-key }} # Value of the GPG private key to import
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
- name: Set release version
Expand All @@ -53,8 +53,8 @@ runs:
shell: bash
run: mvn clean deploy
env:
OSSRH_USERNAME: ${{ inputs.server-username }}
OSSRH_TOKEN: ${{ inputs.server-token }}
MAVEN_USERNAME: ${{ inputs.server-username }}
MAVEN_TOKEN: ${{ inputs.server-token }}
MAVEN_GPG_PASSPHRASE: ${{ inputs.gpg-passphrase }}
- name: Set Release version env variable
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cd-major-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jobs:
new-version: '\${parsedVersion.majorVersion}.0.0'
gpg-key: ${{ secrets.GPG_KEY }}
gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }}
server-username: ${{ secrets.OSSRH_USERNAME }}
server-token: ${{ secrets.OSSRH_TOKEN }}
server-username: ${{ secrets.MAVEN_USERNAME }}
server-token: ${{ secrets.MAVEN_TOKEN }}
github-token: ${{ secrets.GITHUB_TOKEN }}
version-push-pat: ${{ secrets.VERSION_PUSH_PAT }}
bot-mail: ${{ secrets.BOT_MAIL }}
4 changes: 2 additions & 2 deletions .github/workflows/cd-minor-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jobs:
new-version: '\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.0'
gpg-key: ${{ secrets.GPG_KEY }}
gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }}
server-username: ${{ secrets.OSSRH_USERNAME }}
server-token: ${{ secrets.OSSRH_TOKEN }}
server-username: ${{ secrets.MAVEN_USERNAME }}
server-token: ${{ secrets.MAVEN_TOKEN }}
github-token: ${{ secrets.GITHUB_TOKEN }}
version-push-pat: ${{ secrets.VERSION_PUSH_PAT }}
bot-mail: ${{ secrets.BOT_MAIL }}
4 changes: 2 additions & 2 deletions .github/workflows/cd-patch-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jobs:
new-version: '\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.incrementalVersion}'
gpg-key: ${{ secrets.GPG_KEY }}
gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }}
server-username: ${{ secrets.OSSRH_USERNAME }}
server-token: ${{ secrets.OSSRH_TOKEN }}
server-username: ${{ secrets.MAVEN_USERNAME }}
server-token: ${{ secrets.MAVEN_TOKEN }}
github-token: ${{ secrets.GITHUB_TOKEN }}
version-push-pat: ${{ secrets.VERSION_PUSH_PAT }}
bot-mail: ${{ secrets.BOT_MAIL }}
7 changes: 4 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<name>Shadow Tool</name>
Expand All @@ -22,8 +23,8 @@
<connection>scm:git:git://github.com/rabobank/shadow-tool.git</connection>
<developerConnection>scm:git:ssh://[email protected]/rabobank/shadow-tool</developerConnection>
<url>https://github.com/rabobank/shadow-tool</url>
<tag>HEAD</tag>
</scm>
<tag>HEAD</tag>
</scm>

<developers>
<developer>
Expand Down
29 changes: 0 additions & 29 deletions settings.xml

This file was deleted.

0 comments on commit 0663e90

Please sign in to comment.