Skip to content

Commit

Permalink
fix(go.mod): versions
Browse files Browse the repository at this point in the history
  • Loading branch information
ybelMekk committed Dec 2, 2024
1 parent 4b66ed4 commit 965e02f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 22 deletions.
27 changes: 7 additions & 20 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- '*.md'
- 'LICENSE.md'
env:
NAME: tokenx-jwker
NAME: jwker
FEATURE_REPOSITORY: oci://europe-north1-docker.pkg.dev/nais-io/nais/feature
GITHUB_REGISTRY: ghcr.io

Expand Down Expand Up @@ -63,35 +63,22 @@ jobs:
push: true

- name: Update values.yaml
uses: fjogeleit/yaml-update-action@main
with:
valueFile: 'charts/values.yaml'
propertyPath: 'jwker.image.tag'
value: ${{ steps.build-push-sign.outputs.version }}
commitChange: false


- name: Update Chart.yaml
uses: fjogeleit/yaml-update-action@main
with:
valueFile: 'charts/Chart.yaml'
propertyPath: 'version'
value: ${{ steps.build-push-sign.outputs.version }}
commitChange: false
run: |
yq -i '.jwker.tag = ${{ steps.build-push-sign.outputs.version }}' charts/values.yaml
- uses: azure/setup-helm@v4
name: "Setup Helm"
with:
version: "v3.15.1"
version: "v3.16.2"

- name: Build Chart
run: |-
sed -i "s/^version: .*/version: ${{ steps.build-push-sign.outputs.version }}/g" charts/Chart.yaml
yq -i '.version = ${{ steps.build-push-sign.outputs.version }}' charts/Chart.yaml
helm package charts
- name: Push Chart
run: |-
helm push ${{ env.NAME }}*.tgz ${{ env.FEATURE_REPOSITORY }}
helm push tokenx-${{ env.NAME }}*.tgz ${{ env.FEATURE_REPOSITORY }}
rollout:
needs:
Expand All @@ -102,5 +89,5 @@ jobs:
steps:
- uses: nais/fasit-deploy@v2
with:
chart: ${{ env.FEATURE_REPOSITORY }}/${{ env.NAME }}
chart: ${{ env.FEATURE_REPOSITORY }}/tokenx-${{ env.NAME }}
version: ${{ needs.build_and_push.outputs.version }}
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
golang 1.23.2
helm 3.15.1
helm 3.16.2
2 changes: 1 addition & 1 deletion charts/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ jwker:
LOG_LEVEL: "info"
TOKENDINGS_INSTANCES: ""
tokendings:
host: "tokendings.tokenx"
host: "tokendings.tokenx"

0 comments on commit 965e02f

Please sign in to comment.