Skip to content

Commit

Permalink
chore: bump version to v0.7.2
Browse files Browse the repository at this point in the history
  • Loading branch information
drl990114 committed Jan 31, 2024
1 parent 1e7b8f3 commit bf169d7
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 63 deletions.
20 changes: 5 additions & 15 deletions .github/workflows/tauri-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,6 @@ jobs:
tag: ${{ github.ref_name }}
excludeTypes: 'chore,docs,style,refactor,test,ci,build'

- name: Commit CHANGELOG.md
uses: stefanzweifel/git-auto-commit-action@v4
if: matrix.os == 'windows-latest'
with:
branch: main
commit_message: 'docs: update CHANGELOG.md for ${{ github.ref_name }} [skip ci]'
file_pattern: CHANGELOG.md

- name: Rust setup
uses: dtolnay/rust-toolchain@stable
with:
Expand All @@ -79,6 +71,8 @@ jobs:
- name: Build the app
run: yarn build:desktop --target ${{ matrix.target }}
env:
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
Expand Down Expand Up @@ -127,15 +121,11 @@ jobs:
name: artifacts-aarch64
path: artifacts/aarch64

# There are currently no certified Apple developers, but aarch64 will not be installed because of this.
# For now, use the x64 version instead of aarch64.
- name: Rename artifacts
run: |
cp -r "artifacts/x86_64/dmg/MarkFlowy_${{ env.version }}_x64.dmg" "artifacts/MarkFlowy_${{ env.version }}_macos_aarch64.dmg"
cp -r "artifacts/x86_64/macos/MarkFlowy.app.tar.gz" "artifacts/MarkFlowy_${{ env.version }}_macos_aarch64.app.tar.gz"
cp -r "artifacts/x86_64/macos/MarkFlowy.app.tar.gz.sig" "artifacts/MarkFlowy_${{ env.version }}_macos_aarch64.app.tar.gz.sig"
rm -rf "artifacts/aarch64/dmg/MarkFlowy_${{ env.version }}_aarch64.dmg"
mv "artifacts/aarch64/dmg/MarkFlowy_${{ env.version }}_aarch64.dmg" "artifacts/MarkFlowy_${{ env.version }}_macos_aarch64.dmg"
mv "artifacts/aarch64/macos/MarkFlowy.app.tar.gz" "artifacts/MarkFlowy_${{ env.version }}_macos_aarch64.app.tar.gz"
mv "artifacts/aarch64/macos/MarkFlowy.app.tar.gz.sig" "artifacts/MarkFlowy_${{ env.version }}_macos_aarch64.app.tar.gz.sig"
mv "artifacts/x86_64/dmg/MarkFlowy_${{ env.version }}_x64.dmg" "artifacts/MarkFlowy_${{ env.version }}_macos_x86_64.dmg"
mv "artifacts/x86_64/macos/MarkFlowy.app.tar.gz" "artifacts/MarkFlowy_${{ env.version }}_macos_x86_64.app.tar.gz"
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion apps/desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-decorators": "^7.22.10",
"@remirror/core": "^2.0.17",
"@tauri-apps/cli": "^2.0.0-alpha.18",
"@tauri-apps/cli": "^2.0.0-alpha.21",
"@tauri-release/cli": "^0.2.5",
"@types/lodash": "^4.14.202",
"@types/node": "^20.5.7",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@rollup/plugin-node-resolve": "15.2.3",
"@rollup/plugin-terser": "0.4.4",
"@rollup/plugin-typescript": "11.1.5",
"@tauri-apps/cli": "2.0.0-alpha.18",
"@tauri-apps/cli": "2.0.0-alpha.21",
"@types/rollup-plugin-url": "^3",
"babel": "^6.23.0",
"child_process": "^1.0.2",
Expand Down
92 changes: 46 additions & 46 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6438,7 +6438,7 @@ __metadata:
"@remirror/core": "npm:^2.0.17"
"@tanstack/react-query": "npm:^5.17.9"
"@tauri-apps/api": "npm:^2.0.0-alpha.12"
"@tauri-apps/cli": "npm:^2.0.0-alpha.18"
"@tauri-apps/cli": "npm:^2.0.0-alpha.21"
"@tauri-apps/plugin-clipboard-manager": "npm:^2.0.0-alpha.5"
"@tauri-apps/plugin-dialog": "npm:^2.0.0-alpha.3"
"@tauri-apps/plugin-http": "npm:^2.0.0-alpha.6"
Expand Down Expand Up @@ -9576,90 +9576,90 @@ __metadata:
languageName: node
linkType: hard

"@tauri-apps/cli-darwin-arm64@npm:2.0.0-alpha.18":
version: 2.0.0-alpha.18
resolution: "@tauri-apps/cli-darwin-arm64@npm:2.0.0-alpha.18"
"@tauri-apps/cli-darwin-arm64@npm:2.0.0-alpha.21":
version: 2.0.0-alpha.21
resolution: "@tauri-apps/cli-darwin-arm64@npm:2.0.0-alpha.21"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard

"@tauri-apps/cli-darwin-x64@npm:2.0.0-alpha.18":
version: 2.0.0-alpha.18
resolution: "@tauri-apps/cli-darwin-x64@npm:2.0.0-alpha.18"
"@tauri-apps/cli-darwin-x64@npm:2.0.0-alpha.21":
version: 2.0.0-alpha.21
resolution: "@tauri-apps/cli-darwin-x64@npm:2.0.0-alpha.21"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard

"@tauri-apps/cli-linux-arm-gnueabihf@npm:2.0.0-alpha.18":
version: 2.0.0-alpha.18
resolution: "@tauri-apps/cli-linux-arm-gnueabihf@npm:2.0.0-alpha.18"
"@tauri-apps/cli-linux-arm-gnueabihf@npm:2.0.0-alpha.21":
version: 2.0.0-alpha.21
resolution: "@tauri-apps/cli-linux-arm-gnueabihf@npm:2.0.0-alpha.21"
conditions: os=linux & cpu=arm
languageName: node
linkType: hard

"@tauri-apps/cli-linux-arm64-gnu@npm:2.0.0-alpha.18":
version: 2.0.0-alpha.18
resolution: "@tauri-apps/cli-linux-arm64-gnu@npm:2.0.0-alpha.18"
"@tauri-apps/cli-linux-arm64-gnu@npm:2.0.0-alpha.21":
version: 2.0.0-alpha.21
resolution: "@tauri-apps/cli-linux-arm64-gnu@npm:2.0.0-alpha.21"
conditions: os=linux & cpu=arm64 & libc=glibc
languageName: node
linkType: hard

"@tauri-apps/cli-linux-arm64-musl@npm:2.0.0-alpha.18":
version: 2.0.0-alpha.18
resolution: "@tauri-apps/cli-linux-arm64-musl@npm:2.0.0-alpha.18"
"@tauri-apps/cli-linux-arm64-musl@npm:2.0.0-alpha.21":
version: 2.0.0-alpha.21
resolution: "@tauri-apps/cli-linux-arm64-musl@npm:2.0.0-alpha.21"
conditions: os=linux & cpu=arm64 & libc=musl
languageName: node
linkType: hard

"@tauri-apps/cli-linux-x64-gnu@npm:2.0.0-alpha.18":
version: 2.0.0-alpha.18
resolution: "@tauri-apps/cli-linux-x64-gnu@npm:2.0.0-alpha.18"
"@tauri-apps/cli-linux-x64-gnu@npm:2.0.0-alpha.21":
version: 2.0.0-alpha.21
resolution: "@tauri-apps/cli-linux-x64-gnu@npm:2.0.0-alpha.21"
conditions: os=linux & cpu=x64 & libc=glibc
languageName: node
linkType: hard

"@tauri-apps/cli-linux-x64-musl@npm:2.0.0-alpha.18":
version: 2.0.0-alpha.18
resolution: "@tauri-apps/cli-linux-x64-musl@npm:2.0.0-alpha.18"
"@tauri-apps/cli-linux-x64-musl@npm:2.0.0-alpha.21":
version: 2.0.0-alpha.21
resolution: "@tauri-apps/cli-linux-x64-musl@npm:2.0.0-alpha.21"
conditions: os=linux & cpu=x64 & libc=musl
languageName: node
linkType: hard

"@tauri-apps/cli-win32-arm64-msvc@npm:2.0.0-alpha.18":
version: 2.0.0-alpha.18
resolution: "@tauri-apps/cli-win32-arm64-msvc@npm:2.0.0-alpha.18"
"@tauri-apps/cli-win32-arm64-msvc@npm:2.0.0-alpha.21":
version: 2.0.0-alpha.21
resolution: "@tauri-apps/cli-win32-arm64-msvc@npm:2.0.0-alpha.21"
conditions: os=win32 & cpu=arm64
languageName: node
linkType: hard

"@tauri-apps/cli-win32-ia32-msvc@npm:2.0.0-alpha.18":
version: 2.0.0-alpha.18
resolution: "@tauri-apps/cli-win32-ia32-msvc@npm:2.0.0-alpha.18"
"@tauri-apps/cli-win32-ia32-msvc@npm:2.0.0-alpha.21":
version: 2.0.0-alpha.21
resolution: "@tauri-apps/cli-win32-ia32-msvc@npm:2.0.0-alpha.21"
conditions: os=win32 & cpu=ia32
languageName: node
linkType: hard

"@tauri-apps/cli-win32-x64-msvc@npm:2.0.0-alpha.18":
version: 2.0.0-alpha.18
resolution: "@tauri-apps/cli-win32-x64-msvc@npm:2.0.0-alpha.18"
"@tauri-apps/cli-win32-x64-msvc@npm:2.0.0-alpha.21":
version: 2.0.0-alpha.21
resolution: "@tauri-apps/cli-win32-x64-msvc@npm:2.0.0-alpha.21"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard

"@tauri-apps/cli@npm:2.0.0-alpha.18, @tauri-apps/cli@npm:^2.0.0-alpha.18":
version: 2.0.0-alpha.18
resolution: "@tauri-apps/cli@npm:2.0.0-alpha.18"
"@tauri-apps/cli@npm:2.0.0-alpha.21, @tauri-apps/cli@npm:^2.0.0-alpha.21":
version: 2.0.0-alpha.21
resolution: "@tauri-apps/cli@npm:2.0.0-alpha.21"
dependencies:
"@tauri-apps/cli-darwin-arm64": "npm:2.0.0-alpha.18"
"@tauri-apps/cli-darwin-x64": "npm:2.0.0-alpha.18"
"@tauri-apps/cli-linux-arm-gnueabihf": "npm:2.0.0-alpha.18"
"@tauri-apps/cli-linux-arm64-gnu": "npm:2.0.0-alpha.18"
"@tauri-apps/cli-linux-arm64-musl": "npm:2.0.0-alpha.18"
"@tauri-apps/cli-linux-x64-gnu": "npm:2.0.0-alpha.18"
"@tauri-apps/cli-linux-x64-musl": "npm:2.0.0-alpha.18"
"@tauri-apps/cli-win32-arm64-msvc": "npm:2.0.0-alpha.18"
"@tauri-apps/cli-win32-ia32-msvc": "npm:2.0.0-alpha.18"
"@tauri-apps/cli-win32-x64-msvc": "npm:2.0.0-alpha.18"
"@tauri-apps/cli-darwin-arm64": "npm:2.0.0-alpha.21"
"@tauri-apps/cli-darwin-x64": "npm:2.0.0-alpha.21"
"@tauri-apps/cli-linux-arm-gnueabihf": "npm:2.0.0-alpha.21"
"@tauri-apps/cli-linux-arm64-gnu": "npm:2.0.0-alpha.21"
"@tauri-apps/cli-linux-arm64-musl": "npm:2.0.0-alpha.21"
"@tauri-apps/cli-linux-x64-gnu": "npm:2.0.0-alpha.21"
"@tauri-apps/cli-linux-x64-musl": "npm:2.0.0-alpha.21"
"@tauri-apps/cli-win32-arm64-msvc": "npm:2.0.0-alpha.21"
"@tauri-apps/cli-win32-ia32-msvc": "npm:2.0.0-alpha.21"
"@tauri-apps/cli-win32-x64-msvc": "npm:2.0.0-alpha.21"
dependenciesMeta:
"@tauri-apps/cli-darwin-arm64":
optional: true
Expand All @@ -9683,7 +9683,7 @@ __metadata:
optional: true
bin:
tauri: tauri.js
checksum: 4c6b4aea73e436ee8ad567abc784dae2cabeaf6d229fbe2926744d9e818e3f0bebb9313e33a78f6d101e5c641ac41092a3b82a05528f5faafe3029862052e0ed
checksum: a3164dfb7a95229ecceda2fdc74576245a2651ca1aeaed9ac79dc29cff7f68f8657573ddec1bea202e6a7469f12bd2bb63823b6926e499bb573fb9a5a4d06826
languageName: node
linkType: hard

Expand Down Expand Up @@ -19320,7 +19320,7 @@ __metadata:
"@rollup/plugin-node-resolve": "npm:15.2.3"
"@rollup/plugin-terser": "npm:0.4.4"
"@rollup/plugin-typescript": "npm:11.1.5"
"@tauri-apps/cli": "npm:2.0.0-alpha.18"
"@tauri-apps/cli": "npm:2.0.0-alpha.21"
"@types/rollup-plugin-url": "npm:^3"
babel: "npm:^6.23.0"
child_process: "npm:^1.0.2"
Expand Down

0 comments on commit bf169d7

Please sign in to comment.