Merge pull request #21 from swaroopar/feature/fixReleaseJob

Feature/fix release job
eclipse-xpanse · Oct 3, 2023 · 35daf3f · 35daf3f
2 parents 86431dc + e847f7e
commit 35daf3f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,15 +10,15 @@ on:
     inputs:
       ReleaseType:
         type: choice
-        description: Select the next development version
+        description: Select the version to released
         options:
           - Major Version
           - Minor Version
           - Patch Version
 
 env:
-  BOT_USER_NAME: eclipse-terraform-boot-bot
-  BOT_EMAIL_ID: terraform-boot[email protected]
+  BOT_USER_NAME: eclipse-xpanse-bot
+  BOT_EMAIL_ID: xpanse[email protected]
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
 
@@ -36,7 +36,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-          token: ${{ secrets.BOT_GITHUB_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set Up JDK 17
         uses: actions/setup-java@v3
@@ -71,7 +71,7 @@ jobs:
           version-fragment: ${{ env.VERSION_FRAGMENT }}
 
       - name: Remove SNAPSHOT from POM version
-        run: mvn versions:set -DremoveSnapshot -DgenerateBackupPoms=false
+        run: mvn versions:set -DnewVersion=${{ steps.new_version.outputs.next-version }} -DgenerateBackupPoms=false
 
       - name: Build
         run: mvn clean install -DskipTests
@@ -100,7 +100,7 @@ jobs:
         with:
           context: .
           push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.CURRENT_VERSION }}
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.new_version.outputs.next-version }}
           labels: ${{ steps.meta.outputs.labels }}
           provenance: false
 
@@ -116,7 +116,7 @@ jobs:
       - name: Release new version on GitHub
         env:
           JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          JRELEASER_PROJECT_VERSION: ${{ env.CURRENT_VERSION }}
+          JRELEASER_PROJECT_VERSION: ${{ steps.new_version.outputs.next-version }}
         uses: jreleaser/release-action@v2
         with:
           arguments: release
@@ -141,7 +141,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ github.ref }}
-          token: ${{ secrets.BOT_GITHUB_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Update next development version in POMs
         run: mvn versions:set -DnewVersion=${{ needs.release.outputs.next-version }}-SNAPSHOT -DgenerateBackupPoms=false

diff --git a/README.md b/README.md
@@ -84,14 +84,14 @@ The below property names can be changed in the following ways
 1. passing the property values to the server startup command as ``--${property-name}=${property-value}``
 2. Setting corresponding environment variables before starting the server.
 
-| property name                   | environment variable            | default value                                    | description                                                                                                           |
-|---------------------------------|---------------------------------|--------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------|
-| terraform_binary_path           | TERRAFORM_BINARY_PATH           | Terraform available on syspath                   | The path to the terraform binary                                                                                      |
-| terraform.root.module.directory | TERRAFORM_ROOT_MODULE_DIRECTORY | /tmp on Linux<br/>\AppData\Local\Temp on Windows | The path to the parent directory where all terraform module directories will be stored at as subdirs                  |
-| log.terraform.stdout.stderr     | LOG_TERRAFORM_STDOUT_STDERR     | false                                             | Controls if the command execution output must be logged. If disabled, the output is only returned in the API response |
-| terraform.log.level             | TERRAFORM_LOG_LEVEL             | INFO                                             | Controls the log level of the terraform binary. Allowed values are INFO, DEBUG, TRACE, WARN and ERROR                 |
-| authorization.token.type        | AUTHORIZATION_TOKEN_TYPE        | JWT                                      | Authorization server authentication Type, allowed values: OpaqueToken or JWT
-| authorization.server.endpoint   | AUTHORIZATION_SERVER_ENDPOINT   |                                                  | The endpoint value of the authorization server
-| authorization.api.client.id     | AUTHORIZATION_API_CLIENT_ID     |                                                  | The ID value of the authorization server API client
-| authorization.api.client.secret | AUTHORIZATION_API_CLIENT_SECRET |                                                  | The secret value of the authorization server API client
-| authorization.swagger.ui.client.id| AUTHORIZATION_SWAGGER_UI_CLIENT_ID|                                              | The ID value of the authorization server swagger-ui client
+| property name                      | environment variable               | default value                                    | description                                                                                                           |
+|------------------------------------|------------------------------------|--------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------|
+| terraform_binary_path              | TERRAFORM_BINARY_PATH              | Terraform available on syspath                   | The path to the terraform binary                                                                                      |
+| terraform.root.module.directory    | TERRAFORM_ROOT_MODULE_DIRECTORY    | /tmp on Linux<br/>\AppData\Local\Temp on Windows | The path to the parent directory where all terraform module directories will be stored at as subdirs                  |
+| log.terraform.stdout.stderr        | LOG_TERRAFORM_STDOUT_STDERR        | false                                            | Controls if the command execution output must be logged. If disabled, the output is only returned in the API response |
+| terraform.log.level                | TERRAFORM_LOG_LEVEL                | INFO                                             | Controls the log level of the terraform binary. Allowed values are INFO, DEBUG, TRACE, WARN and ERROR                 |
+| authorization.token.type           | AUTHORIZATION_TOKEN_TYPE           | JWT                                              | Authorization server authentication Type, allowed values: OpaqueToken or JWT                                          |
+| authorization.server.endpoint      | AUTHORIZATION_SERVER_ENDPOINT      |                                                  | The endpoint value of the authorization server                                                                        |
+| authorization.api.client.id        | AUTHORIZATION_API_CLIENT_ID        |                                                  | The ID value of the authorization server API client                                                                   |
+| authorization.api.client.secret    | AUTHORIZATION_API_CLIENT_SECRET    |                                                  | The secret value of the authorization server API client                                                               |
+| authorization.swagger.ui.client.id | AUTHORIZATION_SWAGGER_UI_CLIENT_ID |                                                  | The ID value of the authorization server swagger-ui client                                                            |