Merge pull request #16 from 3dwardch3ng/develop

release
This commit is contained in:
2024-08-30 11:24:17 +10:00
committed by GitHub
4 changed files with 27 additions and 21 deletions

View File

@@ -27,6 +27,11 @@ jobs:
git config --global user.name "3dwardch3ng" git config --global user.name "3dwardch3ng"
git config --global core.autocrlf input git config --global core.autocrlf input
- name: Start release - name: Start release
env:
NEXUS_USERNAME: 'edward'
NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
SNAPSHOT_DEPLOYMENT_REPOSITORY_URL: ${{ secrets.SNAPSHOT_DEPLOYMENT_REPOSITORY_URL }}
RELEASE_DEPLOYMENT_REPOSITORY_URL: ${{ secrets.RELEASE_DEPLOYMENT_REPOSITORY_URL }}
run: | run: |
mvn gitflow:release-start -B -DpushRemote=true -DallowSnapshots=true \ mvn gitflow:release-start -B -DpushRemote=true -DallowSnapshots=true \
-P homelab \ -P homelab \
@@ -37,7 +42,6 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
NEXUS_USERNAME: 'edward' NEXUS_USERNAME: 'edward'
NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
DEPLOYMENT_REPOSITORY_ID: ${{ secrets.DEPLOYMENT_REPOSITORY_ID }}
SNAPSHOT_DEPLOYMENT_REPOSITORY_URL: ${{ secrets.SNAPSHOT_DEPLOYMENT_REPOSITORY_URL }} SNAPSHOT_DEPLOYMENT_REPOSITORY_URL: ${{ secrets.SNAPSHOT_DEPLOYMENT_REPOSITORY_URL }}
RELEASE_DEPLOYMENT_REPOSITORY_URL: ${{ secrets.RELEASE_DEPLOYMENT_REPOSITORY_URL }} RELEASE_DEPLOYMENT_REPOSITORY_URL: ${{ secrets.RELEASE_DEPLOYMENT_REPOSITORY_URL }}
run: | run: |
@@ -45,10 +49,14 @@ jobs:
-P homelab \ -P homelab \
--settings=${{ github.workspace }}/.mvn/settings.xml --settings=${{ github.workspace }}/.mvn/settings.xml
- name: Finish release - name: Finish release
env:
GITHUB_ACTOR: 3dwardch3ng
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
NEXUS_USERNAME: 'edward'
NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
SNAPSHOT_DEPLOYMENT_REPOSITORY_URL: ${{ secrets.SNAPSHOT_DEPLOYMENT_REPOSITORY_URL }}
RELEASE_DEPLOYMENT_REPOSITORY_URL: ${{ secrets.RELEASE_DEPLOYMENT_REPOSITORY_URL }}
run: | run: |
mvn gitflow:release-finish -B -DpushRemote=true -DallowSnapshots=true \ mvn gitflow:release-finish -B -DpushRemote=true -DallowSnapshots=true \
-P homelab \ -P homelab \
--settings=${{ github.workspace }}/.mvn/settings.xml --settings=${{ github.workspace }}/.mvn/settings.xml
env:
GITHUB_ACTOR: 3dwardch3ng
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}

View File

@@ -23,11 +23,8 @@ jobs:
java-version: 17 java-version: 17
- name: Maven Publish - name: Maven Publish
env: env:
GITHUB_ACTOR: '3dwardch3ng'
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
NEXUS_USERNAME: 'edward' NEXUS_USERNAME: 'edward'
NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
DEPLOYMENT_REPOSITORY_ID: ${{ secrets.DEPLOYMENT_REPOSITORY_ID }}
SNAPSHOT_DEPLOYMENT_REPOSITORY_URL: ${{ secrets.SNAPSHOT_DEPLOYMENT_REPOSITORY_URL }} SNAPSHOT_DEPLOYMENT_REPOSITORY_URL: ${{ secrets.SNAPSHOT_DEPLOYMENT_REPOSITORY_URL }}
RELEASE_DEPLOYMENT_REPOSITORY_URL: ${{ secrets.RELEASE_DEPLOYMENT_REPOSITORY_URL }} RELEASE_DEPLOYMENT_REPOSITORY_URL: ${{ secrets.RELEASE_DEPLOYMENT_REPOSITORY_URL }}
run: | run: |

View File

@@ -36,18 +36,6 @@
<layout>default</layout> <layout>default</layout>
</repository> </repository>
</repositories> </repositories>
<pluginRepositories>
<pluginRepository>
<id>nexus-central</id>
<name>Home Lab Nexus Maven Central</name>
<releases>
<enabled>true</enabled>
<checksumPolicy>warn</checksumPolicy>
</releases>
<url>${env.NEXUS_CENTRAL_REPOSITORY_URL}</url>
<layout>default</layout>
</pluginRepository>
</pluginRepositories>
</profile> </profile>
</profiles> </profiles>
<servers> <servers>

15
pom.xml
View File

@@ -6,7 +6,7 @@
<groupId>sydney.cheng</groupId> <groupId>sydney.cheng</groupId>
<artifactId>ec-super-pom</artifactId> <artifactId>ec-super-pom</artifactId>
<version>1.0.1</version> <version>1.0.2-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>ec-super-pom</name> <name>ec-super-pom</name>
@@ -238,9 +238,22 @@
<gitFlowConfig> <gitFlowConfig>
<productionBranch>main</productionBranch> <productionBranch>main</productionBranch>
<developmentBranch>develop</developmentBranch> <developmentBranch>develop</developmentBranch>
<featureBranchPrefix>feature/</featureBranchPrefix>
<releaseBranchPrefix>release/</releaseBranchPrefix>
<hotfixBranchPrefix>hotfix/</hotfixBranchPrefix>
</gitFlowConfig> </gitFlowConfig>
<commitMessages>
<releaseFinishMergeMessage>[RELEASE] @{version}</releaseFinishMergeMessage>
<hotfixFinishMessage>Update for next development version [skip ci]</hotfixFinishMessage>
<releaseFinishMessage>Update for next development version [skip ci]</releaseFinishMessage>
<releaseVersionUpdateMessage>Update for next development version [skip ci]</releaseVersionUpdateMessage>
</commitMessages>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>