From 4af1e6dfbf1d77278fe97ed17b2024ca6064b512 Mon Sep 17 00:00:00 2001 From: Jerod Date: Sat, 6 Dec 2025 15:04:11 -0800 Subject: [PATCH] fix(build): correctly tag release version --- .github/workflows/publish-release.yml | 8 ++++---- .github/workflows/test-on-push.yml | 9 +++++++-- .gitmodules | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 9c53e26..7a06bd7 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -61,12 +61,12 @@ jobs: shell: bash - name: Set version id - id: version-id + id: tauri-version run: echo "VERSION=$(cat ./src-tauri/tauri.conf.json | grep version | cut -d\" -f 4)" >> "$GITHUB_OUTPUT" shell: bash - name: Var check - run: echo "SHORT_SHA=${{ steps.short-sha.outputs.SHORT_SHA }}, VERSION=${{ steps.short-sha.outputs.VERSION }}" + run: echo "SHORT_SHA=${{ steps.short-sha.outputs.SHORT_SHA }}, VERSION=${{ steps.tauri-version.outputs.VERSION }}" shell: bash - name: Read SUMRY file @@ -84,8 +84,8 @@ jobs: TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} with: - tagName: app-${{ steps.short-sha.outputs.VERSION }}-${{ steps.short-sha.outputs.SHORT_SHA }} - releaseName: 'Pepo v${{ steps.short-sha.outputs.VERSION }}-${{ steps.short-sha.outputs.SHORT_SHA }}' + tagName: app-${{ steps.tauri-version.outputs.VERSION }}-${{ steps.short-sha.outputs.SHORT_SHA }} + releaseName: 'Pepo v${{ steps.tauri-version.outputs.VERSION }}-${{ steps.short-sha.outputs.SHORT_SHA }}' releaseBody: | ${{ steps.sumry.outputs.FILE }} includeUpdaterJson: true diff --git a/.github/workflows/test-on-push.yml b/.github/workflows/test-on-push.yml index e416a0d..1296db6 100644 --- a/.github/workflows/test-on-push.yml +++ b/.github/workflows/test-on-push.yml @@ -48,8 +48,13 @@ jobs: run: echo "SHORT_SHA=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT" shell: bash - - name: Sha check - run: echo "${{ steps.short-sha.outputs.SHORT_SHA }}" + - name: Set version id + id: tauri-version + run: echo "VERSION=$(cat ./src-tauri/tauri.conf.json | grep version | cut -d\" -f 4)" >> "$GITHUB_OUTPUT" + shell: bash + + - name: Var check + run: echo "SHORT_SHA=${{ steps.short-sha.outputs.SHORT_SHA }}, VERSION=${{ steps.tauri-version.outputs.VERSION }}" shell: bash - uses: tauri-apps/tauri-action@v0 diff --git a/.gitmodules b/.gitmodules index fea380c..0d120be 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "utils"] path = utils - url = git@github.com:synthlabs/utils.git + url = https://github.com/synthlabs/utils.git