Merge remote-tracking branch 'origin/1.x' into feat/resources-map

tauri-apps · Jun 27, 2023 · cc1d965 · cc1d965
2 parents d5b97f0 + dad4f54
commit cc1d965
Show file tree

Hide file tree

Showing 164 changed files with 3,850 additions and 1,526 deletions.
diff --git a/.changes/add-tauri-get-version.md b/.changes/add-tauri-get-version.md
diff --git a/.changes/add-webview-version.md b/.changes/add-webview-version.md
diff --git a/.changes/appimage-follow-symlinks.md b/.changes/appimage-follow-symlinks.md
diff --git a/.changes/cli-autoreload-mime-type.md b/.changes/cli-autoreload-mime-type.md
diff --git a/.changes/cli-disable-version-check.md b/.changes/cli-disable-version-check.md
@@ -0,0 +1,6 @@
+---
+'tauri-cli': 'patch:bug'
+'@tauri-apps/cli': 'patch:bug'
+---
+
+Removed the automatic version check of the CLI that ran after `tauri` commands which caused various issues.
diff --git a/.changes/cli-profile.md b/.changes/cli-profile.md
diff --git a/.changes/clijs-node-version-20.md b/.changes/clijs-node-version-20.md
diff --git a/.changes/config-require-literal_leading_dot.md b/.changes/config-require-literal_leading_dot.md
diff --git a/.changes/config-scope-url.md b/.changes/config-scope-url.md
diff --git a/.changes/config.json b/.changes/config.json
@@ -7,6 +7,7 @@
     "bug": "Bug Fixes",
     "pref": "Performance Improvements",
     "changes": "What's Changed",
+    "sec": "Security fixes",
     "deps": "Dependencies"
   },
   "defaultChangeTag": "changes",

diff --git a/.changes/core-asset-protocol-streaming-crash.md b/.changes/core-asset-protocol-streaming-crash.md
diff --git a/.changes/core-ipc-failed-navigation.md b/.changes/core-ipc-failed-navigation.md
diff --git a/.changes/core-navigation-handler.md b/.changes/core-navigation-handler.md
diff --git a/.changes/core-updater-204-js-event.md b/.changes/core-updater-204-js-event.md
diff --git a/.changes/fix-cursor-icon-zoomin.md b/.changes/fix-cursor-icon-zoomin.md
diff --git a/.changes/fix-feature-removal.md b/.changes/fix-feature-removal.md
diff --git a/.changes/mime-type.md b/.changes/mime-type.md
diff --git a/.changes/nsis-branding.md b/.changes/nsis-branding.md
diff --git a/.changes/nsis-custom-language-files.md b/.changes/nsis-custom-language-files.md
diff --git a/.changes/nsis-custom-template.md b/.changes/nsis-custom-template.md
diff --git a/.changes/nsis-dutch.md b/.changes/nsis-dutch.md
diff --git a/.changes/nsis-encoding.md b/.changes/nsis-encoding.md
diff --git a/.changes/nsis-install-mode-args.md b/.changes/nsis-install-mode-args.md
diff --git a/.changes/nsis-japanese.md b/.changes/nsis-japanese.md
diff --git a/.changes/nsis-korean.md b/.changes/nsis-korean.md
diff --git a/.changes/nsis-persian.md b/.changes/nsis-persian.md
diff --git a/.changes/nsis-restore-installation-path.md b/.changes/nsis-restore-installation-path.md
diff --git a/.changes/nsis-swedish.md b/.changes/nsis-swedish.md
diff --git a/.changes/nsis-turkish.md b/.changes/nsis-turkish.md
diff --git a/.changes/nsis-updater-restart.md b/.changes/nsis-updater-restart.md
diff --git a/.changes/rustls-default.md b/.changes/rustls-default.md
diff --git a/.changes/tauri-build-shortdesc-copyright.md b/.changes/tauri-build-shortdesc-copyright.md
diff --git a/.changes/tauri-info-msvc-detection.md b/.changes/tauri-info-msvc-detection.md
diff --git a/.changes/tray_get_item.md b/.changes/tray_get_item.md
diff --git a/.changes/unpin-deps.md b/.changes/unpin-deps.md
diff --git a/.changes/updater-admin-launch-fix.md b/.changes/updater-admin-launch-fix.md
@@ -0,0 +1,5 @@
+---
+'tauri': 'patch:bug'
+---
+
+On Windows, fix NSIS installers requiring administrator rights failing to be launched by updater.
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
@@ -8,7 +8,7 @@ on:
   push:
     branches:
       - dev
-      - next
+      - 1.x
   workflow_dispatch:
 
 env:

diff --git a/.github/workflows/check-change-tags.yml b/.github/workflows/check-change-tags.yml
@@ -0,0 +1,32 @@
+# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+name: check change tags
+
+on:
+  pull_request:
+    paths:
+      - '.changes/*.md'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: dorny/paths-filter@v2
+        id: filter
+        with:
+          list-files: shell
+          filters: |
+            changes:
+              - added|modified: '.changes/*.md'
+
+      - name: check
+        run: node ./.scripts/ci/check-change-tags.js ${{ steps.filter.outputs.changes_files }}
+        if: ${{ steps.filter.outputs.changes == 'true' }}
diff --git a/.github/workflows/check-generated-files.yml b/.github/workflows/check-generated-files.yml
@@ -13,16 +13,6 @@ on:
       - 'core/tauri-utils/src/config.rs'
       - 'tooling/cli/schema.json'
       - 'core/tauri-config-schema/schema.json'
-  push:
-    branches:
-      - dev
-    paths:
-      - '.github/workflows/check-generated-files.yml'
-      - 'tooling/api/src/**'
-      - 'core/tauri/scripts/bundle.global.js'
-      - 'core/tauri-utils/src/config.rs'
-      - 'tooling/cli/schema.json'
-      - 'core/tauri-config-schema/schema.json'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

diff --git a/.github/workflows/check-license-header.yml b/.github/workflows/check-license-header.yml
@@ -25,4 +25,4 @@ jobs:
               - added: '**'
       - name: check header license on new files
         if: ${{ steps.filter.outputs.added == 'true' }}
-        run: node check-license-header.js ${{ steps.filter.outputs.added_files }}
+        run: node ./.scripts/ci/check-license-header.js ${{ steps.filter.outputs.added_files }}