Skip to content

Commit

Permalink
fix: deployer to ignore extra semver GEO-1090 (#828)
Browse files Browse the repository at this point in the history
  • Loading branch information
sukanya-rath authored Oct 29, 2024
1 parent 1106d22 commit 601f54b
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/.deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ jobs:
- name: Package HELM Chart
shell: bash
run: |
# remove the excess part from semver, for example: x.x.x_* -> x.x.x
semver=$(echo ${{ inputs.semver }} | cut -d'_' -f1)
echo "Semver: $semver"
helm package -u --app-version="${{ inputs.tag }}" --version=${{ inputs.semver }} ./${{ inputs.directory }}
- name: Deploy to OpenShift
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/cd-to-prod-on-workflow-dispatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,18 @@ on:
tag:
description: "The Docker Tag to deploy, it would be the latest tagged version that you want to deploy from TEST to PROD."
required: true
is_hotfix:
description: "Is this a hotfix deployment?"
required: false
default: false
type: boolean
concurrency:
group: ${{ github.workflow }}
cancel-in-progress: true

jobs:
image-promotions-to-prod: # This is just for adding another tag to the image to reflect which docker tag is deployed to PROD.
if: ${{ !github.event.inputs.is_hotfix }}
name: Image Promotions to PROD
runs-on: ubuntu-22.04
permissions:
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/cd-to-test-on-workflow-dispatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,18 @@ on:
tag:
description: "The Docker Tag to deploy, it would be the latest tagged version that you want to deploy from dev to TEST."
required: true

is_hotfix:
description: "Is this a hotfix deployment?"
required: false
default: false
type: boolean
concurrency:
group: ${{ github.workflow }}
cancel-in-progress: true

jobs:
image-promotions-to-test: # This is just for adding another tag to the image to reflect which docker tag is deployed to TEST.
if: ${{ !github.event.inputs.is_hotfix }}
name: Image Promotions to TEST
runs-on: ubuntu-22.04
permissions:
Expand Down
2 changes: 1 addition & 1 deletion admin-frontend/src/components/Header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
@click="redirectToLogout()"
data-testid="logout-btn"
>
Logout
Logouts
</v-btn>

<!-- Navbar content -->
Expand Down

0 comments on commit 601f54b

Please sign in to comment.