Skip to content

Commit 0574bd8

Browse files
authored
feat(templates): add default app features on stable only (#627)
* feat(templates): add default app features on stable only this is because in v2 beta, the feature are not needed anymore and cane be removed * test beta projects * install webkit2gtk 4.1 * Update templates-test.yml * fmt * fix conditional files * flags in job name * Update templates-test.yml
1 parent 4a2f33b commit 0574bd8

File tree

6 files changed

+32
-11
lines changed

6 files changed

+32
-11
lines changed

.changes/v2-remove-features.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"create-tauri-app": "patch"
3+
"create-tauri-app-js": "patch"
4+
---
5+
6+
Generate tauri v2 beta tempaltes without default features in Cargo.toml as it is no longer needed.
7+

.github/workflows/templates-test.yml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
matrix:
7373
settings: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
7474

75-
name: ${{ matrix.settings.manager }} - ${{ matrix.settings.template }}
75+
name: ${{ matrix.settings.manager }} - ${{ matrix.settings.template }} ${{ matrix.settings.flags }}
7676
steps:
7777
- uses: pnpm/[email protected]
7878
if: matrix.settings.manager == 'pnpm'
@@ -100,13 +100,25 @@ jobs:
100100
cargo install --locked trunk
101101
if: matrix.settings.install_trunk
102102
103+
- name: install system dependencies
104+
if: matrix.settings.beta != true
105+
run: |
106+
sudo apt-get update
107+
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf
108+
109+
- name: install system dependencies (beta)
110+
if: matrix.settings.beta == true
111+
run: |
112+
sudo apt-get update
113+
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.1 libayatana-appindicator3-dev librsvg2-dev patchelf
114+
103115
- name: download cli artifact
104116
uses: actions/download-artifact@v3
105117

106118
- run: tar -xf create-tauri-app/create-tauri-app.tar
107119

108-
- name: bootstrap a ${{ matrix.settings.template }} project
109-
run: ./target/release/cargo-create-tauri-app tauri-app -m ${{ matrix.settings.manager }} -t ${{ matrix.settings.template }} -y
120+
- name: bootstrap a ${{ matrix.settings.template }} project (${{ matrix.settings.flags }})
121+
run: ./target/release/cargo-create-tauri-app tauri-app -m ${{ matrix.settings.manager }} -t ${{ matrix.settings.template }} ${{ matrix.settings.flags }} -y
110122

111123
- run: sed -i 's/com.tauri.dev/com.create-tauri-app.dev/g' **/tauri.conf.json
112124
working-directory: tauri-app
@@ -115,11 +127,6 @@ jobs:
115127
if: matrix.settings.install_cmd != ''
116128
working-directory: tauri-app
117129

118-
- name: install system dependencies
119-
run: |
120-
sudo apt-get update
121-
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf
122-
123130
- run: ${{ matrix.settings.run_cmd }} tauri build -b none
124131
if: matrix.settings.manager != 'npm'
125132
working-directory: tauri-app

.scripts/generate-templates-matrix.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,17 @@ matrixConfig
6969
e.startsWith(".github/workflows/templates-test.yml"),
7070
)
7171
) {
72-
outMatrix.push({
72+
const jobInfo = {
7373
template: t,
7474
install_trunk: ["yew", "sycamore", "leptos"].includes(t),
75+
beta: false,
7576
...managerInfo,
77+
};
78+
outMatrix.push(jobInfo);
79+
outMatrix.push({
80+
...jobInfo,
81+
beta: true,
82+
flags: "--beta",
7683
});
7784
}
7885
}

templates/_base_/src-tauri/Cargo.toml.lte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ tauri = { version = "2.0.0-beta", features = [] }
2323
tauri-plugin-shell = "2.0.0-beta"{% endif %}
2424
serde = { version = "1", features = ["derive"] }
2525
serde_json = "1"
26-
26+
{% if stable %}
2727
[features]
2828
# This feature is used for production builds or when a dev server is not specified, DO NOT REMOVE!!
29-
custom-protocol = ["tauri/custom-protocol"]
29+
custom-protocol = ["tauri/custom-protocol"]{% endif %}

0 commit comments

Comments
 (0)