diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7c098775..9431fa72 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,6 +28,10 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Get version from tag + id: get_version + run: echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV + - name: install dependencies (ubuntu only) if: matrix.settings.platform == 'ubuntu-22.04' # This must match the platform value defined above. run: | @@ -36,6 +40,14 @@ jobs: # webkitgtk 4.0 is for Tauri v1 - webkitgtk 4.1 is for Tauri v2. # You can remove the one that doesn't apply to your app to speed up the workflow a bit. + - name: install dependencies (windows only) + if: matrix.settings.platform == 'windows-latest' + run: | + Invoke-WebRequest -Uri https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-win64.zip -OutFile protoc.zip + Expand-Archive -Path protoc.zip -DestinationPath $Env:UserProfile\protoc + $protocPath = "$Env:UserProfile\protoc\bin\protoc.exe" + echo "PROTOC=$protocPath" >> $Env:GITHUB_ENV + - name: install dependencies (mac only) if: matrix.settings.platform == 'macos-latest' || matrix.settings.platform == 'aarch64-apple-darwin,x86_64-apple-darwin' run: | @@ -54,13 +66,6 @@ jobs: # Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds. targets: ${{ matrix.settings.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }} - - name: install dependencies (windows only) - if: matrix.settings.platform == 'windows-latest' - run: | - Invoke-WebRequest -Uri https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-win64.zip -OutFile protoc.zip - Expand-Archive -Path protoc.zip -DestinationPath $Env:UserProfile\protoc - $protocPath = "$Env:UserProfile\protoc\bin\protoc.exe" - echo "PROTOC=$protocPath" >> $Env:GITHUB_ENV - name: Rust cache uses: swatinem/rust-cache@v2 @@ -80,8 +85,8 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tagName: v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version. - releaseName: 'App v__VERSION__' + tagName: ${{ env.VERSION }} + releaseName: 'App ${{ env.VERSION }}' releaseBody: 'See the assets to download this version and install.' releaseDraft: true prerelease: false diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 565185a9..c8f79f17 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -2078,7 +2078,7 @@ dependencies = [ [[package]] name = "moras" -version = "0.2.0" +version = "1.0.0" dependencies = [ "derive_builder", "logos", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 2ef3b8e4..c2c02fed 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "moras" -version = "0.2.0" +version = "1.0.0" description = "A Tauri App" authors = ["you"] license = "" @@ -28,7 +28,7 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" strum = { version = "0.26", features = ["derive"] } strum_macros = "0.26" -tauri = { version = "1.6.2", features = [ "dialog-all", "fs-read-dir", "fs-create-dir", "fs-exists", "notification-all"] } +tauri = { version = "1.6.2", features = ["dialog-all", "fs-read-dir", "fs-create-dir", "fs-exists", "notification-all"] } tokio = { version = "1.29.1", features = ["rt-multi-thread", "macros"] } tonic = "0.11.0" ux = { git = "https://github.com/kjetilkjeka/uX.git", rev = "1081930" }