diff --git a/.github/workflows/build-and-publish-release.yml b/.github/workflows/build-and-publish-release.yml index 7e3a84d..3d403dd 100644 --- a/.github/workflows/build-and-publish-release.yml +++ b/.github/workflows/build-and-publish-release.yml @@ -5,6 +5,13 @@ on: branches: - main +env: + NEXUS_USERNAME: 'edward' + NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} + MAVEN_PUBLIC_REPOSITORY_URL: ${{ secrets.MAVEN_PUBLIC_REPOSITORY_URL }} + SNAPSHOT_DEPLOYMENT_REPOSITORY_URL: ${{ secrets.SNAPSHOT_DEPLOYMENT_REPOSITORY_URL }} + RELEASE_DEPLOYMENT_REPOSITORY_URL: ${{ secrets.RELEASE_DEPLOYMENT_REPOSITORY_URL }} + jobs: build-and-publish: runs-on: ubuntu-latest @@ -18,45 +25,55 @@ jobs: with: fetch-depth: 0 - uses: actions/setup-java@v4.2.2 + if: ${{ hashFiles('**/pom.xml') }} with: - distribution: zulu java-version: 17 + distribution: zulu + cache: 'maven' + - name: maven-settings-xml-action + uses: whelk-io/maven-settings-xml-action@v22 + with: + profiles: > + [{ + "id": "homelab", + "properties": { + "altSnapshotDeploymentRepository": "nexus-snapshot::${env.SNAPSHOT_DEPLOYMENT_REPOSITORY_URL}", + "altReleaseDeploymentRepository": "nexus-release::${env.RELEASE_DEPLOYMENT_REPOSITORY_URL}" + } + }] + repositories: > + [{ + "id": "maven-public", + "url": "${env.MAVEN_PUBLIC_REPOSITORY_URL}", + "snapshots": { + "enabled": "true" + } + }] + servers: > + [{ + "id": "nexus-snapshot", + "username": "${env.NEXUS_USERNAME}", + "password": "${env.NEXUS_PASSWORD}" + }, + { + "id": "nexus-release", + "username": "${env.NEXUS_USERNAME}", + "password": "${env.NEXUS_PASSWORD}" + }] - name: Config Git run: | git config --global user.email "edward@cheng.sydney" git config --global user.name "3dwardch3ng" git config --global core.autocrlf input - 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: | - mvn gitflow:release-start -B -DpushRemote=true -DallowSnapshots=true \ - -P homelab \ - --settings=${{ github.workspace }}/.mvn/settings.xml + mvn gitflow:release-start -B -DpushRemote=true -DallowSnapshots=true -P homelab - name: Maven Publish - 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: | - mvn -B deploy \ - -P homelab \ - --settings=${{ github.workspace }}/.mvn/settings.xml + mvn -B deploy -P homelab - 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: | - mvn gitflow:release-finish -B -DpushRemote=true -DallowSnapshots=true \ - -P homelab \ - --settings=${{ github.workspace }}/.mvn/settings.xml \ No newline at end of file + mvn gitflow:release-finish -B -DpushRemote=true -DallowSnapshots=true -P homelab \ No newline at end of file diff --git a/.github/workflows/build-and-publish-snapshot.yml b/.github/workflows/build-and-publish-snapshot.yml index 9f0a39f..73a1ad2 100644 --- a/.github/workflows/build-and-publish-snapshot.yml +++ b/.github/workflows/build-and-publish-snapshot.yml @@ -18,16 +18,47 @@ jobs: with: fetch-depth: 0 - uses: actions/setup-java@v4.2.2 + if: ${{ hashFiles('**/pom.xml') }} with: - distribution: zulu java-version: 17 + distribution: zulu + cache: 'maven' + - name: maven-settings-xml-action + uses: whelk-io/maven-settings-xml-action@v22 + with: + profiles: > + [{ + "id": "homelab", + "properties": { + "altSnapshotDeploymentRepository": "nexus-snapshot::${env.SNAPSHOT_DEPLOYMENT_REPOSITORY_URL}", + "altReleaseDeploymentRepository": "nexus-release::${env.RELEASE_DEPLOYMENT_REPOSITORY_URL}" + } + }] + repositories: > + [{ + "id": "maven-public", + "url": "${env.MAVEN_PUBLIC_REPOSITORY_URL}", + "snapshots": { + "enabled": "true" + } + }] + servers: > + [{ + "id": "nexus-snapshot", + "username": "${env.NEXUS_USERNAME}", + "password": "${env.NEXUS_PASSWORD}" + }, + { + "id": "nexus-release", + "username": "${env.NEXUS_USERNAME}", + "password": "${env.NEXUS_PASSWORD}" + }] - name: Maven Publish env: NEXUS_USERNAME: 'edward' NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} + MAVEN_PUBLIC_REPOSITORY_URL: ${{ secrets.MAVEN_PUBLIC_REPOSITORY_URL }} SNAPSHOT_DEPLOYMENT_REPOSITORY_URL: ${{ secrets.SNAPSHOT_DEPLOYMENT_REPOSITORY_URL }} RELEASE_DEPLOYMENT_REPOSITORY_URL: ${{ secrets.RELEASE_DEPLOYMENT_REPOSITORY_URL }} run: | - mvn -B deploy \ - -P homelab \ - --settings=${{ github.workspace }}/.mvn/settings.xml \ No newline at end of file + mvn -B deploy -P homelab \ No newline at end of file diff --git a/.mvn/settings.xml b/.mvn/settings.xml deleted file mode 100644 index 03ef155..0000000 --- a/.mvn/settings.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - homelab - - nexus-snapshot::${env.SNAPSHOT_DEPLOYMENT_REPOSITORY_URL} - nexus-release::${env.RELEASE_DEPLOYMENT_REPOSITORY_URL} - - - - nexus-snapshot - Home Lab Nexus Snapshot - - false - - - true - always - warn - - ${env.SNAPSHOT_DEPLOYMENT_REPOSITORY_URL} - default - - - nexus-release - Home Lab Nexus Release - - true - always - warn - - - false - - ${env.RELEASE_DEPLOYMENT_REPOSITORY_URL} - default - - - - - - - nexus-snapshot - ${env.NEXUS_USERNAME} - ${env.NEXUS_PASSWORD} - - - nexus-release - ${env.NEXUS_USERNAME} - ${env.NEXUS_PASSWORD} - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 0cc75fa..e34cff2 100644 --- a/pom.xml +++ b/pom.xml @@ -256,10 +256,6 @@ - - org.springframework.boot - spring-boot-maven-plugin -