Skip to content

Commit c35bbda

Browse files
committed
Merge upstream/main into fix/windows-mesh-llm-2836-upstream
Signed-off-by: stevepresley <github@stevepresley.net>
2 parents 7c20745 + db7e84d commit c35bbda

95 files changed

Lines changed: 10746 additions & 1084 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/auto-tag-on-release-pr-merge.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
echo "enabled=true"
9292
echo "tag=${TAG_PREFIX}${VERSION}"
9393
if [[ "$TAG_PREFIX" == desktop-v ]]; then
94-
echo "target_sha=${{ github.event.pull_request.head.sha }}"
94+
echo "target_sha=${{ github.event.pull_request.merge_commit_sha }}"
9595
echo "desktop=true"
9696
else
9797
echo "target_sha=$GITHUB_SHA"
@@ -111,7 +111,7 @@ jobs:
111111
PR_HEAD_REF: ${{ github.event.pull_request.head.ref }}
112112
PR_BASE_REF: ${{ github.event.pull_request.base.ref }}
113113
PR_HEAD_REPO: ${{ github.event.pull_request.head.repo.full_name }}
114-
PR_PUSHER: ${{ github.event.pull_request.head.user.login }}
114+
MERGED_BY: ${{ github.event.pull_request.merged_by.login }}
115115
MERGE_SHA: ${{ github.event.pull_request.merge_commit_sha }}
116116
run: |
117117
VERSION="${VERSION#desktop-v}"
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Desktop Release Candidate
2+
3+
on:
4+
pull_request:
5+
branches: [main]
6+
7+
permissions:
8+
contents: read
9+
10+
jobs:
11+
validate:
12+
name: Desktop Release Candidate
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
16+
with:
17+
ref: ${{ github.event.pull_request.head.sha }}
18+
fetch-depth: 0
19+
persist-credentials: false
20+
- name: Validate immutable desktop candidate
21+
if: startsWith(github.event.pull_request.head.ref, 'version-bump/')
22+
env:
23+
VERSION: ${{ github.event.pull_request.head.ref }}
24+
run: |
25+
VERSION="${VERSION#version-bump/}"
26+
scripts/desktop_release.py validate --candidate HEAD --version "$VERSION" --repo "$GITHUB_REPOSITORY"

.github/workflows/prepare-desktop-release.yml

Lines changed: 0 additions & 38 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -952,5 +952,5 @@ jobs:
952952
run: gh release edit "desktop-v${VERSION}" --draft=false
953953

954954
- name: Upload latest.json to rolling release last
955-
if: ${{ env.already_published != 'true' && !contains(needs.setup.outputs.version, '-') }}
955+
if: ${{ !contains(needs.setup.outputs.version, '-') }}
956956
run: gh release upload buzz-desktop-latest latest.json --clobber

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
/dist/
44
/admin-web/dist/
55

6+
# Python cache
7+
__pycache__/
8+
*.pyc
9+
610
# lefthook-generated hook scripts (machine-specific)
711
.hooks/
812

0 commit comments

Comments
 (0)