Skip to content

Commit c87af54

Browse files
authored
fix: Always prefer tauri configs further up the file tree (#502)
* fix: add custom file search for more consistent results. This fixes issues where the action used config files in deeply nested directories instead of the correct one in the upper levels. * update target to es2021 since we run on nodejs16 * add todo * globby test drive * globby di glob * cleanup * remove sort. add another change file * remove changefile tags
1 parent 3263f6a commit c87af54

10 files changed

+107
-78
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
action: patch
3+
---
4+
5+
While looking for the tauri directory the action will now respect all gitignore files and not just the one in the root dir.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
action: patch:bug
2+
action: patch
33
---
44

55
The action now prefers release builds for the latest.json file if both, release and debug releases are enabled.

.changes/fix-self-hosted.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
action: patch:bug
2+
action: patch
33
---
44

55
Correctly detect self-hosted macOS-arm64 runners.

.changes/fix-tauri-init.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
action: patch:bug
2+
action: patch
33
---
44

55
Read config after `tauri init` command and without hardcoding the `tauri.conf.json` path, fixes action failures without error messages on repos without an existing Tauri project.

.changes/fix-tauridir-search.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
action: patch
3+
---
4+
5+
While looking for the tauri directory the action will now consistently prefer files further up in the directory levels.

dist/index.js

Lines changed: 41 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
"@actions/github": "5.1.1",
2828
"@iarna/toml": "2.2.5",
2929
"execa": "7.1.1",
30-
"glob-gitignore": "^1.0.14",
31-
"ignore": "5.2.4",
30+
"globby": "^13.2.2",
3231
"json5": "2.2.3",
3332
"lodash.merge": "^4.6.2",
3433
"string-argv": "0.3.2",

pnpm-lock.yaml

Lines changed: 39 additions & 55 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)