Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/desktop-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,6 @@ jobs:
runner: macos-latest
rust_target: aarch64-apple-darwin
artifact_ext: dmg
- target: x86_64-apple-darwin
runner: macos-13
rust_target: x86_64-apple-darwin
artifact_ext: dmg

steps:
- name: Checkout repository
Expand Down
27 changes: 18 additions & 9 deletions .github/workflows/release-desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ jobs:
- target: aarch64-apple-darwin
runner: macos-latest
rust_target: aarch64-apple-darwin
- target: x86_64-apple-darwin
runner: macos-13
rust_target: x86_64-apple-darwin

steps:
- name: Checkout repository
Expand Down Expand Up @@ -123,6 +120,7 @@ jobs:
path: |
desktop/.codex-temp/release-assets/
.codex-cargo-target/desktop-tauri/release/bundle/
include-hidden-files: true

merge-and-publish:
name: Merge Manifest & Publish Release
Expand Down Expand Up @@ -157,17 +155,28 @@ jobs:
$manifestDir = "merged-manifests"
New-Item -ItemType Directory -Path $manifestDir -Force

Get-ChildItem -Path "build-artifacts" -Recurse -Filter "latest.json" |
# Debug: show artifact structure (including hidden files)
Write-Host "Build artifacts structure:"
Get-ChildItem -Path "build-artifacts" -Recurse -Force | Select-Object FullName

# Find all latest.json files in artifacts
Get-ChildItem -Path "build-artifacts" -Recurse -Filter "latest.json" -Force |
ForEach-Object {
Copy-Item $_.FullName -Destination (Join-Path $manifestDir "latest-$($_.Directory.Parent.Name).json") -Force
# Use the artifact name (build-x86_64-pc-windows-msvc) as part of the filename
$artifactName = $_.FullName.Split([IO.Path]::DirectorySeparatorChar)[1]
Copy-Item $_.FullName -Destination (Join-Path $manifestDir "latest-$artifactName.json") -Force
}

# Debug: show merged manifests
Write-Host "Merged manifests directory:"
Get-ChildItem -Path $manifestDir | Select-Object Name

node scripts/merge-updater-manifests.mjs $manifestDir desktop/.codex-temp/release-assets/latest.json

- name: Collect release notes
shell: pwsh
run: |
$notesFile = Get-ChildItem -Path "build-artifacts" -Recurse -Filter "RELEASE_NOTES.md" |
$notesFile = Get-ChildItem -Path "build-artifacts" -Recurse -Filter "RELEASE_NOTES.md" -Force |
Select-Object -First 1
if ($notesFile) {
New-Item -ItemType Directory -Path "desktop/.codex-temp/release-assets" -Force
Expand All @@ -181,13 +190,13 @@ jobs:
$assets = @()

# Windows assets
Get-ChildItem -Path "build-artifacts" -Recurse -File |
Get-ChildItem -Path "build-artifacts" -Recurse -File -Force |
Where-Object { $_.Extension -in @('.exe', '.msi', '.zip', '.sig') } |
ForEach-Object { $assets += $_.FullName }

# macOS assets
Get-ChildItem -Path "build-artifacts" -Recurse -File |
Where-Object { $_.Extension -in @('.dmg', '.app', '.sig') } |
Get-ChildItem -Path "build-artifacts" -Recurse -File -Force |
Where-Object { $_.Extension -in @('.dmg', '.app', '.sig') -or $_.Name.EndsWith('.app.tar.gz') } |
ForEach-Object { $assets += $_.FullName }

# Merged manifest
Expand Down
6 changes: 3 additions & 3 deletions desktop/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jobpilot/desktop",
"version": "1.1.1",
"version": "1.1.2",
"private": true,
"type": "module",
"scripts": {
Expand All @@ -16,8 +16,8 @@
"@dnd-kit/utilities": "^3.2.2",
"@tailwindcss/postcss": "^4",
"@tanstack/react-router": "^1.0.0",
"@tauri-apps/api": "^2.0.0",
"@tauri-apps/plugin-dialog": "^2.0.0",
"@tauri-apps/api": "^2.11.0",
"@tauri-apps/plugin-dialog": "^2.7.1",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"i18next": "^25.0.0",
Expand Down
Loading
Loading