diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index be4e3fc..0f1569d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -44,9 +44,12 @@ jobs: sdk env install export REGISTRY_USERNAME="${GITHUB_ACTOR}" export REGISTRY_PASSWORD="${GITHUB_TOKEN}" - export GIT_USERNAME="${GITHUB_ACTOR}" + export POM_VERSION="$(mvn help:evaluate -D expression=project.version -q -D forceStdout)" - ./mvnw -D image.registry=ghcr.io/jaguililla/hexagonal_spring -B -P publish,release + git config user.name "${GIT_USERNAME}" + ./mvnw -D image.registry=ghcr.io/jaguililla/hexagonal_spring -D spring-boot.build-image.publish=true -B deploy + git tag -m "Release ${POM_VERSION}" "${POM_VERSION}" + git push --tags - name: Publish Client env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9d8114e..bc058bd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,10 +51,10 @@ release: - export REPOSITORY="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven" - export ALT_REPOSITORY="altDeploymentRepository=gitlab::default::${REPOSITORY}" - export IMG_REGISTRY="${CI_REGISTRY}/jaguililla/hexagonal_spring" - - export POM_VERSION="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" - - ./mvnw -s ci_settings.xml -D ${ALT_REPOSITORY} -D image.registry=${IMG_REGISTRY} -B -P publish + - export POM_VERSION="$(mvn help:evaluate -D expression=project.version -q -D forceStdout)" + - ./mvnw -s ci_settings.xml -D ${ALT_REPOSITORY} -D image.registry=${IMG_REGISTRY} -D spring-boot.build-image.publish=true -B deploy - rm -rf "${CLIENT_PATH}/src/main/java/${CONTROLLERS_PATH}" - - mvn -f "${CLIENT_PATH}/pom.xml" -B -D ${ALT_REPOSITORY} clean deploy + - mvn -s ci_settings.xml -f "${CLIENT_PATH}/pom.xml" -B -D ${ALT_REPOSITORY} clean deploy release: tag_name: ${POM_VERSION} description: Release ${POM_VERSION} diff --git a/.mvn/parent.xml b/.mvn/parent.xml index 7176b6e..6cc9a6f 100644 --- a/.mvn/parent.xml +++ b/.mvn/parent.xml @@ -110,6 +110,12 @@ org.springframework.boot spring-boot-maven-plugin + + + ${env.REGISTRY_USERNAME} + ${env.REGISTRY_PASSWORD} + + ${image.registry}/${image.name}:${project.version} @@ -247,92 +253,5 @@ - - - publish - - - ${release.goal} - - - - org.springframework.boot - spring-boot-maven-plugin - - - - ${env.REGISTRY_USERNAME} - ${env.REGISTRY_PASSWORD} - - - true - - - - - - - - release - - - - - org.codehaus.mojo - exec-maven-plugin - 3.3.0 - - git - - - - - config - verify - - exec - - - - config - --global - user.name - ${env.GIT_USERNAME} - - - - - tag - verify - - exec - - - - tag - -m - Release ${project.version} - ${project.version} - - - - - push - verify - - exec - - - - push - --tags - - - - - - - - diff --git a/pom.xml b/pom.xml index 3aa9252..078f9e7 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ appointments - 0.3.2 + 0.3.3 Appointments Application to create appointments (REST API)