From dce0f02bc571128308c30278cde3233f341e6a50 Mon Sep 17 00:00:00 2001 From: FabianLars Date: Wed, 3 May 2023 08:55:44 +0200 Subject: [PATCH] Rename dev branch to v1 and next branch to v2 --- .github/workflows/audit-javascript.yml | 6 ++++-- .github/workflows/audit-rust.yml | 6 ++++-- .github/workflows/covector-version-or-publish.yml | 2 +- .github/workflows/lint-javascript.yml | 6 ++++-- .github/workflows/lint-rust.yml | 8 +++++--- .github/workflows/msrv-check.yml | 8 +++++--- .github/workflows/sync.yml | 4 ++-- plugins/authenticator/README.md | 2 +- plugins/autostart/README.md | 2 +- plugins/fs-extra/README.md | 2 +- plugins/fs-watch/README.md | 2 +- plugins/localhost/README.md | 2 +- plugins/log/README.md | 2 +- plugins/persisted-scope/README.md | 2 +- plugins/positioner/README.md | 2 +- plugins/single-instance/README.md | 2 +- plugins/sql/README.md | 2 +- plugins/store/README.md | 2 +- plugins/stronghold/README.md | 2 +- plugins/upload/README.md | 2 +- plugins/websocket/README.md | 2 +- plugins/window-state/README.md | 2 +- shared/template/README.md | 2 +- 23 files changed, 41 insertions(+), 31 deletions(-) diff --git a/.github/workflows/audit-javascript.yml b/.github/workflows/audit-javascript.yml index bd84610da..19a7f4c85 100644 --- a/.github/workflows/audit-javascript.yml +++ b/.github/workflows/audit-javascript.yml @@ -6,14 +6,16 @@ on: - cron: "0 0 * * *" push: branches: - - dev + - v1 + - v2 paths: - ".github/workflows/audit-javascript.yml" - "**/pnpm-lock.yaml" - "**/package.json" pull_request: branches: - - dev + - v1 + - v2 paths: - ".github/workflows/audit-javascript.yml" - "**/pnpm-lock.yaml" diff --git a/.github/workflows/audit-rust.yml b/.github/workflows/audit-rust.yml index 7a824fa1a..1ec0225ef 100644 --- a/.github/workflows/audit-rust.yml +++ b/.github/workflows/audit-rust.yml @@ -6,14 +6,16 @@ on: - cron: "0 0 * * *" push: branches: - - dev + - v1 + - v2 paths: - ".github/workflows/audit-rust.yml" - "**/Cargo.lock" - "**/Cargo.toml" pull_request: branches: - - dev + - v1 + - v2 paths: - ".github/workflows/audit-rust.yml" - "**/Cargo.lock" diff --git a/.github/workflows/covector-version-or-publish.yml b/.github/workflows/covector-version-or-publish.yml index 14057c07a..b5c4ab7d8 100644 --- a/.github/workflows/covector-version-or-publish.yml +++ b/.github/workflows/covector-version-or-publish.yml @@ -3,7 +3,7 @@ name: version or publish on: push: branches: - - dev + - v1 jobs: version-or-publish: diff --git a/.github/workflows/lint-javascript.yml b/.github/workflows/lint-javascript.yml index 1483f288a..c2c0a1d34 100644 --- a/.github/workflows/lint-javascript.yml +++ b/.github/workflows/lint-javascript.yml @@ -3,7 +3,8 @@ name: Lint JavaScript on: push: branches: - - dev + - v1 + - v2 paths: - ".github/workflows/lint-javascript.yml" - "plugins/*/guest-js/**" @@ -13,7 +14,8 @@ on: - "**/package.json" pull_request: branches: - - dev + - v1 + - v2 paths: - ".github/workflows/lint-javascript.yml" - "plugins/*/guest-js/**" diff --git a/.github/workflows/lint-rust.yml b/.github/workflows/lint-rust.yml index da353a56a..f724e8386 100644 --- a/.github/workflows/lint-rust.yml +++ b/.github/workflows/lint-rust.yml @@ -3,14 +3,16 @@ name: Lint Rust on: push: branches: - - dev + - v1 + - v2 paths: - ".github/workflows/lint-rust.yml" - "plugins/*/src/**" - "**/Cargo.toml" pull_request: branches: - - dev + - v1 + - v2 paths: - ".github/workflows/lint-rust.yml" - "plugins/*/src/**" @@ -32,7 +34,7 @@ jobs: - name: install webkit2gtk and libudev for [authenticator] run: | sudo apt-get update - sudo apt-get install -y webkit2gtk-4.0 libudev-dev + sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libudev-dev - name: Install clippy with stable toolchain uses: dtolnay/rust-toolchain@stable diff --git a/.github/workflows/msrv-check.yml b/.github/workflows/msrv-check.yml index a603e8f07..807bbcadf 100644 --- a/.github/workflows/msrv-check.yml +++ b/.github/workflows/msrv-check.yml @@ -3,7 +3,8 @@ name: Check MSRV on: push: branches: - - dev + - v1 + - v2 paths: - ".github/workflows/msrv-check.yml" - "plugins/*/src/**" @@ -11,7 +12,8 @@ on: - "**/Cargo.lock" pull_request: branches: - - dev + - v1 + - v2 paths: - ".github/workflows/msrv-check.yml" - "plugins/*/src/**" @@ -34,7 +36,7 @@ jobs: - name: install webkit2gtk and libudev for [authenticator] run: | sudo apt-get update - sudo apt-get install -y webkit2gtk-4.0 libudev-dev + sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libudev-dev - uses: dtolnay/rust-toolchain@1.64.0 diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index 6b42bf536..82da46fc7 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -4,8 +4,8 @@ on: workflow_dispatch: push: branches: - - dev - - next + - v1 + - v2 concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/plugins/authenticator/README.md b/plugins/authenticator/README.md index 0e700f6ae..89fa6e298 100644 --- a/plugins/authenticator/README.md +++ b/plugins/authenticator/README.md @@ -20,7 +20,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: [dependencies] tauri-plugin-authenticator = "0.1" # or through git -tauri-plugin-authenticator = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "dev" } +tauri-plugin-authenticator = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } ``` You can install the JavaScript Guest bindings using your preferred JavaScript package manager: diff --git a/plugins/autostart/README.md b/plugins/autostart/README.md index 419907c37..7c9f8ddbc 100644 --- a/plugins/autostart/README.md +++ b/plugins/autostart/README.md @@ -18,7 +18,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "dev" } +tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } ``` You can install the JavaScript Guest bindings using your preferred JavaScript package manager: diff --git a/plugins/fs-extra/README.md b/plugins/fs-extra/README.md index 98d311fe8..3eeaf003d 100644 --- a/plugins/fs-extra/README.md +++ b/plugins/fs-extra/README.md @@ -18,7 +18,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-fs-extra = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "dev" } +tauri-plugin-fs-extra = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } ``` You can install the JavaScript Guest bindings using your preferred JavaScript package manager: diff --git a/plugins/fs-watch/README.md b/plugins/fs-watch/README.md index 59729b4db..29f6cc114 100644 --- a/plugins/fs-watch/README.md +++ b/plugins/fs-watch/README.md @@ -18,7 +18,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-fs-watch = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "dev" } +tauri-plugin-fs-watch = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } ``` You can install the JavaScript Guest bindings using your preferred JavaScript package manager: diff --git a/plugins/localhost/README.md b/plugins/localhost/README.md index 50665f668..3fd7797ad 100644 --- a/plugins/localhost/README.md +++ b/plugins/localhost/README.md @@ -20,7 +20,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-localhost = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "dev" } +tauri-plugin-localhost = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } portpicker = "0.1" # used in the example to pick a random free port ``` diff --git a/plugins/log/README.md b/plugins/log/README.md index fca436116..e4326f385 100644 --- a/plugins/log/README.md +++ b/plugins/log/README.md @@ -18,7 +18,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-log = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "dev" } +tauri-plugin-log = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } ``` You can install the JavaScript Guest bindings using your preferred JavaScript package manager: diff --git a/plugins/persisted-scope/README.md b/plugins/persisted-scope/README.md index 26888b598..4c38450a3 100644 --- a/plugins/persisted-scope/README.md +++ b/plugins/persisted-scope/README.md @@ -18,7 +18,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-persisted-scope = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "dev" } +tauri-plugin-persisted-scope = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } ``` ## Usage diff --git a/plugins/positioner/README.md b/plugins/positioner/README.md index 1fb9a01c5..464e3cfbb 100644 --- a/plugins/positioner/README.md +++ b/plugins/positioner/README.md @@ -22,7 +22,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: [dependencies] tauri-plugin-positioner = "1.0" # or through git -tauri-plugin-positioner = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "dev" } +tauri-plugin-positioner = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } ``` You can install the JavaScript Guest bindings using your preferred JavaScript package manager: diff --git a/plugins/single-instance/README.md b/plugins/single-instance/README.md index 595d6b176..7b265c592 100644 --- a/plugins/single-instance/README.md +++ b/plugins/single-instance/README.md @@ -18,7 +18,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "dev" } +tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } ``` ## Usage diff --git a/plugins/sql/README.md b/plugins/sql/README.md index 7ec807b16..2522848d5 100644 --- a/plugins/sql/README.md +++ b/plugins/sql/README.md @@ -19,7 +19,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies.tauri-plugin-sql] git = "https://github.com/tauri-apps/plugins-workspace" -branch = "dev" +branch = "v1" features = ["sqlite"] # or "postgres", or "mysql" ``` diff --git a/plugins/store/README.md b/plugins/store/README.md index f8ff874fd..4aef4a96f 100644 --- a/plugins/store/README.md +++ b/plugins/store/README.md @@ -18,7 +18,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "dev" } +tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } ``` You can install the JavaScript Guest bindings using your preferred JavaScript package manager: diff --git a/plugins/stronghold/README.md b/plugins/stronghold/README.md index 2b5b27904..5c486b966 100644 --- a/plugins/stronghold/README.md +++ b/plugins/stronghold/README.md @@ -18,7 +18,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-stronghold = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "dev" } +tauri-plugin-stronghold = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } ``` You can install the JavaScript Guest bindings using your preferred JavaScript package manager: diff --git a/plugins/upload/README.md b/plugins/upload/README.md index cd24a9d50..b69c8edaa 100644 --- a/plugins/upload/README.md +++ b/plugins/upload/README.md @@ -18,7 +18,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-upload = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "dev" } +tauri-plugin-upload = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } ``` You can install the JavaScript Guest bindings using your preferred JavaScript package manager: diff --git a/plugins/websocket/README.md b/plugins/websocket/README.md index 96c5c3241..7c34af4ad 100644 --- a/plugins/websocket/README.md +++ b/plugins/websocket/README.md @@ -18,7 +18,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-websocket = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "dev" } +tauri-plugin-websocket = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } ``` You can install the JavaScript Guest bindings using your preferred JavaScript package manager: diff --git a/plugins/window-state/README.md b/plugins/window-state/README.md index 90c0a0bb6..02a1bdd17 100644 --- a/plugins/window-state/README.md +++ b/plugins/window-state/README.md @@ -18,7 +18,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "dev" } +tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } ``` You can install the JavaScript Guest bindings using your preferred JavaScript package manager: diff --git a/shared/template/README.md b/shared/template/README.md index ed5545a29..413618b97 100644 --- a/shared/template/README.md +++ b/shared/template/README.md @@ -18,7 +18,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] - = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "dev" } + = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } ``` You can install the JavaScript Guest bindings using your preferred JavaScript package manager: