diff --git a/.github/workflows/static.yml b/.github/workflows/build.yml similarity index 53% rename from .github/workflows/static.yml rename to .github/workflows/build.yml index 3dbd855..950881e 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: "publish" +name: "build" on: pull_request @@ -6,6 +6,7 @@ jobs: publish-tauri: permissions: contents: write + pull-requests: write strategy: fail-fast: false matrix: @@ -46,12 +47,51 @@ jobs: run: yarn install # change this to npm, pnpm or bun depending on which one you use. - uses: tauri-apps/tauri-action@v0 + id: tauri env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version. - releaseName: "App v__VERSION__" + tagName: release-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version. + releaseName: "Outliner v__VERSION__" releaseBody: "See the assets to download this version and install." releaseDraft: true prerelease: false args: ${{ matrix.args }} + + - name: Upload linux assets + uses: actions/upload-artifact@v4 + if: matrix.platform == 'ubuntu-22.04' + with: + name: pr-${{github.event.pull_request.number }}-${{ matrix.platform }} + path: | + src-tauri/target/release/bundle/deb/*.deb + src-tauri/target/release/bundle/rpm/*.rpm + src-tauri/target/release/bundle/appimage/*.AppImage + + - name: Upload windows assets + uses: actions/upload-artifact@v4 + if: matrix.platform == 'windows-latest' + with: + name: pr-${{github.event.pull_request.number }}-${{ matrix.platform }} + path: | + src-tauri/target/release/bundle/msi/*.msi + src-tauri/target/release/bundle/nsis/*.exe + + - name: Upload macos assets + uses: actions/upload-artifact@v4 + if: matrix.platform == 'macos-latest' + with: + name: pr-${{github.event.pull_request.number }}-${{ matrix.platform }} + path: | + src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/*.dmg + src-tauri/target/aarch64-apple-darwin/release/bundle/macos/*.app + + - name: Comment PR + uses: thollander/actions-comment-pull-request@v3 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + comment-tag: auto-build-comment-${{ matrix.platform }} + message: | + Build for ${{ matrix.platform }} is done. + Uploaded Assets: + ${{ steps.tauri.outputs.artifactPaths }} diff --git a/package.json b/package.json index 56c0fa7..e5a1228 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "outline-browser", - "version": "0.0.1", + "version": "0.0.2", "scripts": { "dev": "npx serve public", "webpack-local": "ENVIRONMENT=development npx webpack -w", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 0157338..921199b 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -70,7 +70,7 @@ checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" [[package]] name = "app" -version = "0.1.0" +version = "0.0.0" dependencies = [ "serde", "serde_json", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 068a701..cb7eddc 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,5 @@ [package] name = "app" -version = "0.1.0" description = "A Tauri App" authors = ["you"] license = "" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index d987fc4..6a71e24 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -40,9 +40,9 @@ } } }, - "productName": "outliner", + "productName": "Outliner", "mainBinaryName": "outliner", - "version": "0.0.1", + "version": "../package.json", "identifier": "com.outliner.xangelo", "plugins": {}, "app": { @@ -60,4 +60,4 @@ "csp": null } } -} \ No newline at end of file +}