Skip to content

Commit

Permalink
Merge branch 'tauri-apps-dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Puyodead1 committed Feb 28, 2024
2 parents a3689f6 + 4105fa7 commit 69cfd1e
Show file tree
Hide file tree
Showing 18 changed files with 579 additions and 236 deletions.
5 changes: 0 additions & 5 deletions .changes/add-version-output.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changes/allow-binaries-without-artifacts.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"action": patch
---

tauri-action can now successfully build binaries even if they don't have any artifacts (`bundle.active: false`)
5 changes: 0 additions & 5 deletions .changes/drop-vue-cli-support.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/fix-member-globs.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changes/name-ver-init.md

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/test-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
projectPath: ./__fixtures__/example-with-tauri
includeDebug: true
includeRelease: false
tagName: example-with-tauri-v__VERSION__
tagName: ${{ github.event.pull_request.head.repo.full_name == github.repository && 'example-with-tauri-v__VERSION__' || '' }}
releaseName: 'Release example with preconfigured Tauri app v__VERSION__'
releaseBody: 'See the assets to download this version and install.'
releaseDraft: true
Expand All @@ -92,7 +92,7 @@ jobs:
appVersion: ../package.json # relative to tauri.conf.json
includeDebug: true
includeRelease: false
tagName: example-v__VERSION__
tagName: ${{ github.event.pull_request.head.repo.full_name == github.repository && 'example-v__VERSION__' || '' }}
releaseName: 'Release example app v__VERSION__'
releaseBody: 'See the assets to download this version and install.'
releaseDraft: true
Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Changelog

## \[0.5.0]

- [`d618a42`](https://www.github.com/tauri-apps/tauri-action/commit/d618a422b9e0fbca4fd2436be4f6368453c45a7e)([#645](https://www.github.com/tauri-apps/tauri-action/pull/645)) The action added `appVersion` parameter to facilitate easy access to the current application version in action output.
- [`cb393bf`](https://www.github.com/tauri-apps/tauri-action/commit/cb393bfe3b4fb834693989499769ff8fc24ada26)([#611](https://www.github.com/tauri-apps/tauri-action/pull/611)) **Breaking:** The action no longer supports `vue-cli-plugin-tauri` since it was deprecated like `vue-cli` itself. Please migrate to `@tauri-apps/cli`.
- [`b87a544`](https://www.github.com/tauri-apps/tauri-action/commit/b87a544c7a8ad25f6ff41f0a4a20b8f711056008)([#626](https://www.github.com/tauri-apps/tauri-action/pull/626)) The action now correctly handles glob patterns in the workspace.members config (example: `members = ["bin/*"]`).
- [`0ae6017`](https://www.github.com/tauri-apps/tauri-action/commit/0ae60177b83b43bbaa0da921afe7262787a0441a)([#684](https://www.github.com/tauri-apps/tauri-action/pull/684)) The action now correctly handles the wix version after the build of the app in case the version includes a `+` or `-` character.
- [`b862ca0`](https://www.github.com/tauri-apps/tauri-action/commit/b862ca088ab308dee6bf035f4003f1f446e11438)([#602](https://www.github.com/tauri-apps/tauri-action/pull/602)) **Breaking:** The action no longer tries to read a package.json file for the app name and version when initializing a tauri app. Use the `appName` and `appVersion` input arguments or the `--config` flag.
- [`1fb5053`](https://www.github.com/tauri-apps/tauri-action/commit/1fb5053d19d6a3c1c5a2b1d39e3d5ce2bf448ca5)([#657](https://www.github.com/tauri-apps/tauri-action/pull/657)) The action now always packages the macOS `.app` bundle into a `.tar.gz` archive even if the action is not configured to upload anything.
- [`27089ad`](https://www.github.com/tauri-apps/tauri-action/commit/27089ade7a1c5a985c91b23424bd5017b8148595)([#659](https://www.github.com/tauri-apps/tauri-action/pull/659)) The action now reads `build.target` from `.cargo/config` toml to get the correct `target` directory.
- [`37e9ece`](https://www.github.com/tauri-apps/tauri-action/commit/37e9ece68aebd830aaa7c14c7602d700d8513f6a)([#651](https://www.github.com/tauri-apps/tauri-action/pull/651)) Add support for RPM bundle artifacts, introduced in [email protected]
- [`81921ba`](https://www.github.com/tauri-apps/tauri-action/commit/81921ba9d3c8163235d21b262dd0c3ad3fb19029)([#702](https://www.github.com/tauri-apps/tauri-action/pull/702)) Add support for Tauri's new config structure introduced in `2.0.0-beta.0`.

## \[0.4.5]

- [`2b7cd25`](https://www.github.com/tauri-apps/tauri-action/commit/2b7cd25a7d13b4d3bb90a8b0d4423686466120d4)([#598](https://www.github.com/tauri-apps/tauri-action/pull/598)) Fix path resolution for `build.target-dir` if the `.cargo` folder is not in the current working dir.
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ These inputs allow you to modify the GitHub release.
| `artifactPaths` | The paths of the generated artifacts |
| `appVersion` | The version of the app |

## Caveats
## Tips and Caveats

- You can use this Action on a repo that doesn't have Tauri configured. We automatically initialize Tauri before building, and configure it to use your Web artifacts.
- You can configure the project initialization with the `distPath` and `iconPath` options.
Expand All @@ -135,6 +135,7 @@ These inputs allow you to modify the GitHub release.
- Usually it will work without it, but the action will install and use a global `@tauri-apps/cli` installation instead of your project's CLI which can cause issues if you also configured `tauriScript` or if you have multiple `tauri.conf.json` files in your repo.
- Additionally, relative paths provided via the `--config` flag will be resolved relative to the `projectPath` to match Tauri's behavior.
- If you create the release yourself and provide a `releaseId` but do not set `tagName`, the download url for updater bundles in `latest.json` will point to `releases/latest/download/<bundle>` which can cause issues if your repo contains releases that do not include updater bundles.
- If you only want to build the app without having the action upload any assets, for example if you want to only use [`actions/upload-artifact`](https://github.com/actions/upload-artifact), simply omit `tagName`, `releaseName` and `releaseId`.

## Partners

Expand Down
12 changes: 6 additions & 6 deletions dist/index.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions examples/test-build-only.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ jobs:
- name: install frontend dependencies
run: yarn install # change this to npm or pnpm depending on which one you use

# If tagName and releaseId are omitted tauri-action will only build the app and won't try to upload any asstes.
- uses: tauri-apps/tauri-action@v0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tauri-action",
"version": "0.4.5",
"version": "0.5.0",
"description": "Tauri GitHub Action",
"contributors": [
"Tauri Programme within The Commons Conservancy"
Expand Down Expand Up @@ -34,18 +34,18 @@
"tslib": "2.6.2"
},
"devDependencies": {
"@types/node": "20.10.5",
"@typescript-eslint/eslint-plugin": "6.15.0",
"@typescript-eslint/parser": "6.15.0",
"@types/node": "20.11.20",
"@typescript-eslint/eslint-plugin": "7.1.0",
"@typescript-eslint/parser": "7.1.0",
"@vercel/ncc": "0.38.1",
"covector": "0.10.2",
"eslint": "8.56.0",
"eslint": "8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-config-standard-with-typescript": "43.0.0",
"eslint-config-standard-with-typescript": "43.0.1",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-n": "16.4.0",
"eslint-plugin-n": "16.6.2",
"eslint-plugin-promise": "6.1.1",
"prettier": "3.1.1",
"prettier": "3.2.5",
"typescript": "5.3.3"
},
"engines": {
Expand Down
Loading

0 comments on commit 69cfd1e

Please sign in to comment.