From 1ddab33bb5ccc9e11f7bcd934d31f785e30a4232 Mon Sep 17 00:00:00 2001 From: mprahl Date: Thu, 11 Apr 2024 10:15:07 -0400 Subject: [PATCH] Update the version Signed-off-by: mprahl --- .github/workflows/publish.yml | 13 ++++++++----- helm/Chart.yaml | 2 +- package.json | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 4b999be..63d1d4c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -21,13 +21,16 @@ jobs: with: fetch-depth: 1 path: stolostron/magic-mirror - - name: verify helm chart version + - name: verify package and helm chart version if: ${{ startsWith(github.ref, 'refs/tags/') }} run: | - chart_version="$(yq '.appVersion' helm/Chart.yaml)" - echo "Helm chart version: ${chart_version}" - echo "Tagged version : ${{ github.ref_name }}" - [[ "${chart_version}" == "${{ github.ref_name }}" ]] + package_version="v$(jq -r '.version' package.json)" + chart_version="$(yq e '.appVersion' helm/Chart.yaml)" + echo "package.json version: ${package_version}" + echo "Helm chart version : ${chart_version}" + echo "Tagged version : ${{ github.ref_name }}" + [[ "${package_version}" == "${{ github.ref_name }}" ]] && + [[ "${chart_version}" == "${{ github.ref_name }}" ]] - name: publish image run: | IMAGE_TAG="latest" diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 01a8d38..628b93c 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -3,4 +3,4 @@ name: magic-mirror description: A Helm chart to deploy Magic Mirror type: application version: 1.0.0 -appVersion: "v1.3.0" +appVersion: "v1.3.1" diff --git a/package.json b/package.json index 76475d2..5b1c5ca 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "magic-mirror", - "version": "1.0.0", + "version": "1.3.1", "description": "GitHub App that syncs upstream repositories with forks using PRs", "engines": { "node": ">=18"