Merge pull request #24 from jaguililla/develop

Develop

.github/workflows/release.yml

@@ -46,8 +46,10 @@ jobs:
           export REGISTRY_PASSWORD="${GITHUB_TOKEN}"
           export POM_VERSION="$(mvn help:evaluate -D expression=project.version -q -D forceStdout)"
 
-          git config --global user.name "${GIT_USERNAME}"
           ./mvnw -D image.registry=ghcr.io/jaguililla/hexagonal_spring -D spring-boot.build-image.publish=true -B deploy
+
+          git config --global user.name "${GIT_USERNAME}"
+          git config --global user.email "${GIT_USERNAME}@github.com"
           git tag -m "Release ${POM_VERSION}" "${POM_VERSION}"
           git push --tags
       - name: Publish Client

.gitlab-ci.yml

@@ -51,19 +51,26 @@ publish:
     - 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 -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 -s ci_settings.xml -f "${CLIENT_PATH}/pom.xml" -B -D ${ALT_REPOSITORY} clean deploy
+    - echo "POM_VERSION=${POM_VERSION}" >> variables.env
+  artifacts:
+    reports:
+      dotenv: variables.env
 
 release:
   stage: release
   image: registry.gitlab.com/gitlab-org/release-cli:latest
-  dependencies:
-    - publish
+  needs:
+    - job: publish
+      artifacts: true
   rules:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
   script:
-    - export POM_VERSION="$(mvn help:evaluate -D expression=project.version -q -D forceStdout)"
+    - echo "Release version ${POM_VERSION}"
   release:
     tag_name: ${POM_VERSION}
     description: Release ${POM_VERSION}
+    ref: ${POM_VERSION}