Skip to content

Commit 7bd6124

Browse files
its-mashMohammod Al Amin Ashik
andauthored
Fix/release workflow tag extraction (#12)
Co-authored-by: Mohammod Al Amin Ashik <alamin.ashik@sitecore.com>
1 parent 79f4470 commit 7bd6124

2 files changed

Lines changed: 16 additions & 7 deletions

File tree

.github/workflows/release.yml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ jobs:
4646
outputs:
4747
releases_created: ${{ steps.release-plz.outputs.releases_created }}
4848
version: ${{ steps.get-version.outputs.version }}
49+
tag: ${{ steps.get-version.outputs.tag }}
4950
steps:
5051
- uses: actions/checkout@v4
5152
with:
@@ -62,14 +63,19 @@ jobs:
6263
env:
6364
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6465

65-
- name: Extract version from tag
66+
- name: Extract version from releases output
6667
id: get-version
6768
if: steps.release-plz.outputs.releases_created == 'true'
69+
env:
70+
RELEASES: ${{ steps.release-plz.outputs.releases }}
6871
run: |
69-
TAG="${{ steps.release-plz.outputs.tag }}"
70-
VERSION="${TAG#v}"
72+
# Parse the releases JSON to get tag and version
73+
# Example: [{"package_name":"mcpmux","tag":"v0.1.0","version":"0.1.0"}]
74+
TAG=$(echo "$RELEASES" | jq -r '.[0].tag')
75+
VERSION=$(echo "$RELEASES" | jq -r '.[0].version')
76+
echo "tag=$TAG" >> $GITHUB_OUTPUT
7177
echo "version=$VERSION" >> $GITHUB_OUTPUT
72-
echo "Released version: $VERSION"
78+
echo "Released tag: $TAG, version: $VERSION"
7379
7480
# ─────────────────────────────────────────────────────────────
7581
# Build Release: Build Tauri app when release is created
@@ -90,7 +96,7 @@ jobs:
9096
- os: macos-latest
9197
target: aarch64-apple-darwin
9298
artifact: macos-arm
93-
- os: macos-13
99+
- os: macos-15
94100
target: x86_64-apple-darwin
95101
artifact: macos-intel
96102

@@ -128,7 +134,7 @@ jobs:
128134

129135
# Import Apple certificate for macOS signing
130136
- name: Import Apple certificate
131-
if: matrix.os == 'macos-latest' || matrix.os == 'macos-13'
137+
if: matrix.os == 'macos-latest' || matrix.os == 'macos-15'
132138
env:
133139
APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
134140
APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
@@ -160,7 +166,8 @@ jobs:
160166
APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
161167
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
162168
with:
163-
tagName: v${{ needs.release.outputs.version }}
169+
# Use tagName to find and upload to the existing release created by release-plz
170+
tagName: ${{ needs.release.outputs.tag }}
164171
releaseName: 'McpMux v${{ needs.release.outputs.version }}'
165172
releaseBody: '' # Release notes already created by release-plz
166173
releaseDraft: false

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
"scripts": {
77
"setup": "pwsh -ExecutionPolicy Bypass -File scripts/setup-dev.ps1",
88
"dev": "pnpm --filter @mcpmux/desktop dev",
9+
"dev:web": "pnpm --filter @mcpmux/desktop dev:web",
910
"build": "pnpm --filter @mcpmux/desktop build",
11+
"build:web": "pnpm --filter @mcpmux/desktop build:web",
1012
"release:key": "pnpm --filter @mcpmux/desktop tauri signer generate -w ~/.tauri/mcpmux.key",
1113
"test": "pnpm test:rust && pnpm test:ts",
1214
"test:rust": "cargo nextest run --workspace",

0 commit comments

Comments
 (0)