Skip to content

Commit c6c59cf

Browse files
lucasfernoglucasfernog
committed
Merge branch '1.x' into dev
2 parents c982e52 + 5f75ebb commit c6c59cf

File tree

110 files changed

+5265
-3089
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+5265
-3089
lines changed

‎.changes/bump-1.5.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
"tauri": 'patch:enhance'
3+
"tauri-bundler": 'patch:enhance'
4+
"tauri-build": 'patch:enhance'
5+
"tauri-codegen": 'patch:enhance'
6+
"tauri-macros": 'patch:enhance'
7+
"tauri-utils": 'patch:enhance'
8+
"tauri-runtime": 'patch:enhance'
9+
"tauri-runtime-wry": 'patch:enhance'
10+
"tauri-cli": 'patch:enhance'
11+
"@tauri-apps/cli": 'patch:enhance'
12+
"@tauri-apps/api": 'patch:enhance'
13+
---
14+
15+
Pull changes from Tauri 1.5 release.

‎.changes/config.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"gitSiteUrl": "https://www.github.com/tauri-apps/tauri/",
3-
"timeout": 3600000,
43
"changeTags": {
54
"feat": "New Features",
65
"enhance": "Enhancements",
@@ -271,7 +270,8 @@
271270
},
272271
"tauri-driver": {
273272
"path": "./tooling/webdriver",
274-
"manager": "rust"
273+
"manager": "rust",
274+
"postversion": "cargo check"
275275
}
276276
}
277277
}

‎.changes/nsis-german.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'tauri-bundler': 'patch:enhance'
3+
---
4+
5+
Added German language support to the NSIS bundler.

‎.github/workflows/audit.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
- cron: '0 0 * * *'
1111
push:
1212
paths:
13+
- '.github/workflows/audit.yml'
1314
- '**/Cargo.lock'
1415
- '**/Cargo.toml'
1516
- '**/package.json'
@@ -33,6 +34,11 @@ jobs:
3334
runs-on: ubuntu-latest
3435
steps:
3536
- uses: actions/checkout@v4
36-
- name: yarn audit
37+
- name: audit workspace
38+
run: yarn audit
39+
- name: audit @tauri-apps/api
40+
working-directory: tooling/api
41+
run: yarn audit
42+
- name: audit @tauri-apps/cli
3743
working-directory: tooling/cli/node
3844
run: yarn audit

‎.github/workflows/check-generated-files.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ jobs:
3232
filters: |
3333
api:
3434
- 'tooling/api/src/**'
35-
- 'tooling/api/docs/js-api.json'
3635
- 'core/tauri/scripts/bundle.global.js'
3736
schema:
3837
- 'core/tauri-utils/src/config.rs'
@@ -50,9 +49,7 @@ jobs:
5049
working-directory: tooling/api
5150
run: yarn && yarn build
5251
- name: check api
53-
run: |
54-
git restore tooling/api/docs/js-api.json
55-
./.scripts/ci/has-diff.sh
52+
run: ./.scripts/ci/has-diff.sh
5653

5754
schema:
5855
runs-on: ubuntu-latest

‎.github/workflows/covector-version-or-publish-v1.yml‎

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
2+
# SPDX-License-Identifier: Apache-2.0
3+
# SPDX-License-Identifier: MIT
4+
5+
name: covector version or publish
6+
7+
on:
8+
push:
9+
branches:
10+
- 1.x
11+
12+
jobs:
13+
run-integration-tests:
14+
runs-on: ${{ matrix.platform }}
15+
16+
strategy:
17+
fail-fast: false
18+
matrix:
19+
platform: [ubuntu-latest, macos-latest, windows-latest]
20+
21+
steps:
22+
- uses: actions/checkout@v2
23+
with:
24+
fetch-depth: 0
25+
- name: install stable
26+
uses: actions-rs/toolchain@v1
27+
with:
28+
toolchain: stable
29+
- name: install Linux dependencies
30+
if: matrix.platform == 'ubuntu-latest'
31+
run: |
32+
sudo apt-get update
33+
sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev libfuse2
34+
35+
- uses: Swatinem/rust-cache@v2
36+
with:
37+
workspaces: |
38+
core -> ../target
39+
tooling/cli
40+
41+
- name: build CLI
42+
uses: actions-rs/cargo@v1
43+
with:
44+
command: build
45+
args: --manifest-path ./tooling/cli/Cargo.toml
46+
47+
- name: run integration tests
48+
run: cargo test --test '*' -- --ignored
49+
50+
- name: run CLI tests
51+
timeout-minutes: 30
52+
run: |
53+
cd ./tooling/cli/node
54+
yarn
55+
yarn build
56+
yarn test
57+
58+
version-or-publish:
59+
runs-on: ubuntu-latest
60+
timeout-minutes: 65
61+
outputs:
62+
change: ${{ steps.covector.outputs.change }}
63+
commandRan: ${{ steps.covector.outputs.commandRan }}
64+
successfulPublish: ${{ steps.covector.outputs.successfulPublish }}
65+
needs:
66+
- run-integration-tests
67+
68+
steps:
69+
- uses: actions/checkout@v2
70+
with:
71+
fetch-depth: 0
72+
- uses: actions/setup-node@v2
73+
with:
74+
node-version: 14
75+
registry-url: 'https://registry.npmjs.org'
76+
cache: yarn
77+
cache-dependency-path: tooling/*/yarn.lock
78+
79+
- name: cargo login
80+
run: cargo login ${{ secrets.ORG_CRATES_IO_TOKEN }}
81+
- name: git config
82+
run: |
83+
git config --global user.name "${{ github.event.pusher.name }}"
84+
git config --global user.email "${{ github.event.pusher.email }}"
85+
86+
- name: covector version or publish (publish when no change files present)
87+
uses: jbolda/covector/packages/action@covector-v0
88+
id: covector
89+
env:
90+
NODE_AUTH_TOKEN: ${{ secrets.ORG_NPM_TOKEN }}
91+
CARGO_AUDIT_OPTIONS: ${{ secrets.CARGO_AUDIT_OPTIONS }}
92+
with:
93+
token: ${{ secrets.GITHUB_TOKEN }}
94+
command: 'version-or-publish'
95+
createRelease: true
96+
97+
- name: Create Pull Request With Versions Bumped
98+
if: steps.covector.outputs.commandRan == 'version'
99+
uses: tauri-apps/create-pull-request@v3
100+
with:
101+
token: ${{ secrets.GITHUB_TOKEN }}
102+
branch: release/version-updates-v1
103+
title: Apply Version Updates From Current Changes (v1)
104+
commit-message: 'apply version updates'
105+
labels: 'version updates'
106+
body: ${{ steps.covector.outputs.change }}
107+
108+
- name: Trigger doc update
109+
if: |
110+
steps.covector.outputs.successfulPublish == 'true' &&
111+
steps.covector.outputs.packagesPublished != ''
112+
uses: peter-evans/repository-dispatch@v1
113+
with:
114+
token: ${{ secrets.ORG_TAURI_BOT_PAT }}
115+
repository: tauri-apps/tauri-docs
116+
event-type: update-docs
117+
118+
- name: Get `@tauri-apps/cli` release id
119+
id: cliReleaseId
120+
if: |
121+
steps.covector.outputs.successfulPublish == 'true' &&
122+
contains(steps.covector.outputs.packagesPublished, '@tauri-apps/cli')
123+
run: |
124+
echo '${{ steps.covector.outputs }}' > output.json
125+
id=$(jq '.["-tauri-apps-cli-releaseId"]' < output.json)
126+
rm output.json
127+
echo "cliReleaseId=$id" >> "$GITHUB_OUTPUT"
128+
129+
- name: Trigger `@tauri-apps/cli` publishing workflow
130+
if: |
131+
steps.covector.outputs.successfulPublish == 'true' &&
132+
contains(steps.covector.outputs.packagesPublished, '@tauri-apps/cli')
133+
uses: peter-evans/repository-dispatch@v1
134+
with:
135+
token: ${{ secrets.ORG_TAURI_BOT_PAT }}
136+
repository: tauri-apps/tauri
137+
event-type: publish-js-cli
138+
client-payload: '{"releaseId": "${{ steps.cliReleaseId.outputs.cliReleaseId }}" }'
139+
140+
- name: Trigger `tauri-cli` publishing workflow
141+
if: |
142+
steps.covector.outputs.successfulPublish == 'true' &&
143+
contains(steps.covector.outputs.packagesPublished, 'tauri-cli')
144+
uses: peter-evans/repository-dispatch@v1
145+
with:
146+
token: ${{ secrets.ORG_TAURI_BOT_PAT }}
147+
repository: tauri-apps/tauri
148+
event-type: publish-clirs

‎.github/workflows/covector-version-or-publish.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,13 @@ jobs:
115115
repository: tauri-apps/tauri-docs
116116
event-type: update-docs
117117

118-
- name: Get `@tauri-apps/cli` release id
119-
id: cliReleaseId
118+
- name: Process covector output
119+
id: covectorOutput
120120
if: |
121121
steps.covector.outputs.successfulPublish == 'true' &&
122122
contains(steps.covector.outputs.packagesPublished, '@tauri-apps/cli')
123123
run: |
124-
echo '${{ toJSON(steps.covector.outputs) }}' > output.json
125-
id=$(jq '.["-tauri-apps-cli-releaseId"]' < output.json)
126-
rm output.json
124+
id=$(node .scripts/covector/parse-output.js '${{ toJSON(steps.covector.outputs) }}' "-tauri-apps-cli-releaseId")
127125
echo "cliReleaseId=$id" >> "$GITHUB_OUTPUT"
128126
129127
- name: Trigger `@tauri-apps/cli` publishing workflow
@@ -135,7 +133,7 @@ jobs:
135133
token: ${{ secrets.ORG_TAURI_BOT_PAT }}
136134
repository: tauri-apps/tauri
137135
event-type: publish-js-cli
138-
client-payload: '{"releaseId": "${{ steps.cliReleaseId.outputs.cliReleaseId }}" }'
136+
client-payload: '{"releaseId": "${{ steps.covectorOutput.outputs.cliReleaseId }}" }'
139137

140138
- name: Trigger `tauri-cli` publishing workflow
141139
if: |

‎.prettierignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ dist
99
/tooling/cli/templates
1010
/tooling/cli/node
1111
/tooling/cli/schema.json
12-
/tooling/api/docs/js-api.json
1312
/core/tauri-config-schema/schema.json

‎.scripts/covector/parse-output.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/usr/bin/env node
2+
3+
// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
4+
// SPDX-License-Identifier: Apache-2.0
5+
// SPDX-License-Identifier: MIT
6+
7+
const json = process.argv[2]
8+
const field = process.argv[3]
9+
10+
const output = JSON.parse(json)
11+
console.log(output[field])

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[workspace]
2+
resolver = "2"
23
members = [
34
# core
45
"core/tauri",
@@ -13,7 +14,6 @@ members = [
1314
# integration tests
1415
"core/tests/restart",
1516
]
16-
resolver = "2"
1717

1818
exclude = [
1919
# examples that can be compiled with the tauri CLI

0 commit comments

Comments
 (0)