Skip to content

Commit 22f3d58

Browse files
committed
ci: update latest.json generate
1 parent cf30d42 commit 22f3d58

File tree

4 files changed

+29
-33
lines changed

4 files changed

+29
-33
lines changed

.github/workflows/build-test.yml

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -218,12 +218,30 @@ jobs:
218218
with:
219219
args: --target ${{ matrix.target }}
220220

221+
- name: Rename And upload Updater(MacOS)
222+
if: matrix.target == 'x86_64-apple-darwin' || matrix.target == 'aarch64-apple-darwin'
223+
shell: bash
224+
run: |
225+
TAG=${{ needs.prepare.outputs.version }}
226+
VERSION=${TAG#v}
227+
SOURCE_DIR="src-tauri/target/${{ matrix.target }}/release/bundle/macos"
228+
TARGET_NAME="OpenList-Desktop-${VERSION}-${{ matrix.arch }}.app.tar.gz"
229+
if [ -f "$SOURCE_DIR/OpenList Desktop.app.tar.gz" ]; then
230+
mv "$SOURCE_DIR/OpenList Desktop.app.tar.gz" "$SOURCE_DIR/$TARGET_NAME"
231+
mv "$SOURCE_DIR/OpenList Desktop.app.tar.gz.sig" "$SOURCE_DIR/$TARGET_NAME.sig"
232+
fi
233+
221234
- name: Upload artifacts
222235
uses: actions/upload-artifact@v6
223236
with:
224237
name: ${{ matrix.platform }}-${{ matrix.arch }}-build
225238
path: |
226-
src-tauri/target/${{ matrix.target }}/release/bundle/**/*
239+
src-tauri/target/${{ matrix.target }}/release/bundle/**/*.sig
240+
src-tauri/target/${{ matrix.target }}/release/bundle/**/*.exe
241+
src-tauri/target/${{ matrix.target }}/release/bundle/**/*.dmg
242+
src-tauri/target/${{ matrix.target }}/release/bundle/**/*.deb
243+
src-tauri/target/${{ matrix.target }}/release/bundle/**/*.rpm
244+
src-tauri/target/${{ matrix.target }}/release/bundle/macos/*.tar.gz
227245
retention-days: 30
228246

229247
build-linux-arm:
@@ -361,11 +379,6 @@ jobs:
361379
- name: Checkout
362380
uses: actions/checkout@v6
363381

364-
- name: Download changelog
365-
uses: actions/download-artifact@v7
366-
with:
367-
name: changelog
368-
continue-on-error: true
369382

370383
- name: Download all build artifacts
371384
uses: actions/download-artifact@v7
@@ -374,38 +387,20 @@ jobs:
374387
merge-multiple: true
375388
path: artifacts
376389

377-
- name: Get release info
378-
id: release_info
390+
- name: Generate latest.json
379391
env:
380392
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
381393
run: |
382394
TAG="${{ needs.prepare.outputs.version }}"
383395
VERSION="${TAG#v}"
384-
echo "tag=$TAG" >> $GITHUB_OUTPUT
385-
echo "version=$VERSION" >> $GITHUB_OUTPUT
386-
387-
# Get release assets
388-
RELEASE_DATA=$(gh release view "$TAG" --json assets,body,publishedAt 2>/dev/null || echo "{}")
389-
echo "release_data<<EOF" >> $GITHUB_OUTPUT
390-
echo "$RELEASE_DATA" >> $GITHUB_OUTPUT
391-
echo "EOF" >> $GITHUB_OUTPUT
392-
393-
- name: Generate latest.json
394-
env:
395-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
396-
run: |
397-
TAG="${{ steps.release_info.outputs.tag }}"
398-
VERSION="${{ steps.release_info.outputs.version }}"
399396
REPO="${{ github.repository }}"
400397
BASE_URL="https://github.com/${REPO}/releases/download/${TAG}"
401398
PUB_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
402399
403-
# Read release notes from release_notes.md (priority) or changelog.md
400+
# Read release notes from release_notes.md
404401
NOTES=""
405402
if [ -f "release_notes.md" ]; then
406403
NOTES=$(cat release_notes.md | jq -Rs .)
407-
elif [ -f "changelog.md" ]; then
408-
NOTES=$(cat changelog.md | jq -Rs .)
409404
else
410405
NOTES="\"Release ${TAG}\""
411406
fi
@@ -439,15 +434,15 @@ jobs:
439434
440435
# Linux x64
441436
LINUX_X64_DEB_URL="${BASE_URL}/OpenList-Desktop_${VERSION}_amd64.deb"
442-
LINUX_X64_DEB_SIG=$(get_signature "artifacts/deb/openlist-desktop_${VERSION}_amd64.deb.sig")
437+
LINUX_X64_DEB_SIG=$(get_signature "artifacts/deb/OpenList-Desktop_${VERSION}_amd64.deb.sig")
443438
444439
# Linux arm64
445440
LINUX_ARM64_DEB_URL="${BASE_URL}/OpenList-Desktop_${VERSION}_arm64.deb"
446-
LINUX_ARM64_DEB_SIG=$(get_signature "artifacts/deb/openlist-desktop_${VERSION}_arm64.deb.sig")
441+
LINUX_ARM64_DEB_SIG=$(get_signature "artifacts/deb/OpenList-Desktop_${VERSION}_arm64.deb.sig")
447442
448443
# Linux armhf
449444
LINUX_ARMHF_DEB_URL="${BASE_URL}/OpenList-Desktop_${VERSION}_armhf.deb"
450-
LINUX_ARMHF_DEB_SIG=$(get_signature "artifacts/deb/openlist-desktop_${VERSION}_armhf.deb.sig")
445+
LINUX_ARMHF_DEB_SIG=$(get_signature "artifacts/deb/OpenList-Desktop_${VERSION}_armhf.deb.sig")
451446
452447
# Create latest.json
453448
cat > latest.json << EOF

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -466,15 +466,15 @@ jobs:
466466
467467
# Linux x64
468468
LINUX_X64_DEB_URL="${BASE_URL}/OpenList-Desktop_${VERSION}_amd64.deb"
469-
LINUX_X64_DEB_SIG=$(get_signature "artifacts/deb/openlist-desktop_${VERSION}_amd64.deb.sig")
469+
LINUX_X64_DEB_SIG=$(get_signature "artifacts/deb/OpenList-Desktop_${VERSION}_amd64.deb.sig")
470470
471471
# Linux arm64
472472
LINUX_ARM64_DEB_URL="${BASE_URL}/OpenList-Desktop_${VERSION}_arm64.deb"
473-
LINUX_ARM64_DEB_SIG=$(get_signature "artifacts/deb/openlist-desktop_${VERSION}_arm64.deb.sig")
473+
LINUX_ARM64_DEB_SIG=$(get_signature "artifacts/deb/OpenList-Desktop_${VERSION}_arm64.deb.sig")
474474
475475
# Linux armhf
476476
LINUX_ARMHF_DEB_URL="${BASE_URL}/OpenList-Desktop_${VERSION}_armhf.deb"
477-
LINUX_ARMHF_DEB_SIG=$(get_signature "artifacts/deb/openlist-desktop_${VERSION}_armhf.deb.sig")
477+
LINUX_ARMHF_DEB_SIG=$(get_signature "artifacts/deb/OpenList-Desktop_${VERSION}_armhf.deb.sig")
478478
479479
# Create latest.json
480480
cat > latest.json << EOF

src-tauri/tauri.linux.conf.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"replaces": ["openlist-desktop"]
1414
},
1515
"rpm": {
16+
"release": "1",
1617
"depends": ["openssl"],
1718
"recommends": ["rclone"],
1819
"desktopTemplate": "./packages/linux/openlist.desktop",

src-tauri/tauri.macos.conf.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
33
"identifier": "io.github.openlistteam.openlist.desktop",
4-
"productName": "OpenList Desktop",
4+
"productName": "OpenList-Desktop",
55
"app": {
66
"windows": [
77
{

0 commit comments

Comments
 (0)