From 38d0bed8ebb6c5872fc54903051d146d386b721e Mon Sep 17 00:00:00 2001 From: Fabian-Lars Date: Thu, 22 Jun 2023 15:43:47 +0200 Subject: [PATCH] fix(cli): Split metadata.json per major version. (#7276) --- .github/workflows/publish-cli-rs.yml | 2 +- .scripts/covector/sync-cli-metadata.js | 10 ++++++---- tooling/cli/metadata-v2.json | 8 ++++++++ tooling/cli/metadata.json | 6 +++--- tooling/cli/src/info/mod.rs | 5 +++-- tooling/cli/src/init.rs | 2 +- tooling/cli/src/plugin/init.rs | 3 ++- 7 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 tooling/cli/metadata-v2.json diff --git a/.github/workflows/publish-cli-rs.yml b/.github/workflows/publish-cli-rs.yml index 911442eee..26e445175 100644 --- a/.github/workflows/publish-cli-rs.yml +++ b/.github/workflows/publish-cli-rs.yml @@ -87,7 +87,7 @@ jobs: run: ./.scripts/ci/pack-cli.sh - name: Get CLI version - run: echo "CLI_VERSION=$(cat tooling/cli/metadata.json | jq '."@tauri-apps/cli".version' -r)" >> $GITHUB_ENV + run: echo "CLI_VERSION=$(cat tooling/cli/metadata-v2.json | jq '."@tauri-apps/cli".version' -r)" >> $GITHUB_ENV - name: Publish release uses: softprops/action-gh-release@50195ba7f6f93d1ac97ba8332a178e008ad176aa diff --git a/.scripts/covector/sync-cli-metadata.js b/.scripts/covector/sync-cli-metadata.js index 4edef073a..26b7e41a6 100644 --- a/.scripts/covector/sync-cli-metadata.js +++ b/.scripts/covector/sync-cli-metadata.js @@ -17,8 +17,8 @@ const { resolve } = require('path') const packageNickname = process.argv[2] const filePath = packageNickname === '@tauri-apps/cli' - ? `../../../tooling/cli/metadata.json` - : `../../tooling/cli/metadata.json` + ? `../../../tooling/cli/metadata-v2.json` + : `../../tooling/cli/metadata-v2.json` const bump = process.argv[3] let index = null @@ -50,7 +50,9 @@ const inc = (version) => { } } if (bump === 'premajor') { - const pre = JSON.parse(readFileSync(resolve(filePath, '../../../.changes/pre.json'), 'utf-8')) + const pre = JSON.parse( + readFileSync(resolve(filePath, '../../../.changes/pre.json'), 'utf-8') + ) return `${v.join('.')}-${pre.tag}.0` } return v.join('.') @@ -70,5 +72,5 @@ if (packageNickname === '@tauri-apps/cli') { } writeFileSync(filePath, JSON.stringify(metadata, null, 2) + '\n') -console.log(`wrote ${version} for ${packageNickname} into metadata.json`) +console.log(`wrote ${version} for ${packageNickname} into metadata-v2.json`) console.dir(metadata) diff --git a/tooling/cli/metadata-v2.json b/tooling/cli/metadata-v2.json new file mode 100644 index 000000000..4eda896ab --- /dev/null +++ b/tooling/cli/metadata-v2.json @@ -0,0 +1,8 @@ +{ + "cli.js": { + "version": "2.0.0-alpha.10", + "node": ">= 10.0.0" + }, + "tauri": "2.0.0-alpha.10", + "tauri-build": "2.0.0-alpha.6" +} diff --git a/tooling/cli/metadata.json b/tooling/cli/metadata.json index 4eda896ab..f0ae680a8 100644 --- a/tooling/cli/metadata.json +++ b/tooling/cli/metadata.json @@ -1,8 +1,8 @@ { "cli.js": { - "version": "2.0.0-alpha.10", + "version": "1.4.0", "node": ">= 10.0.0" }, - "tauri": "2.0.0-alpha.10", - "tauri-build": "2.0.0-alpha.6" + "tauri": "1.4.0", + "tauri-build": "1.4.0" } diff --git a/tooling/cli/src/info/mod.rs b/tooling/cli/src/info/mod.rs index de123df1e..329337b12 100644 --- a/tooling/cli/src/info/mod.rs +++ b/tooling/cli/src/info/mod.rs @@ -35,7 +35,8 @@ pub struct VersionMetadata { } fn version_metadata() -> Result { - serde_json::from_str::(include_str!("../../metadata.json")).map_err(Into::into) + serde_json::from_str::(include_str!("../../metadata-v2.json")) + .map_err(Into::into) } #[cfg(not(debug_assertions))] @@ -46,7 +47,7 @@ pub(crate) fn cli_current_version() -> Result { #[cfg(not(debug_assertions))] pub(crate) fn cli_upstream_version() -> Result { let upstream_metadata = match ureq::get( - "https://raw.githubusercontent.com/tauri-apps/tauri/dev/tooling/cli/metadata.json", + "https://raw.githubusercontent.com/tauri-apps/tauri/dev/tooling/cli/metadata-v2.json", ) .timeout(std::time::Duration::from_secs(3)) .call() diff --git a/tooling/cli/src/init.rs b/tooling/cli/src/init.rs index a2dcaceec..02623d008 100644 --- a/tooling/cli/src/init.rs +++ b/tooling/cli/src/init.rs @@ -156,7 +156,7 @@ pub fn command(mut options: Options) -> Result<()> { options = options.load()?; let template_target_path = PathBuf::from(&options.directory).join("src-tauri"); - let metadata = serde_json::from_str::(include_str!("../metadata.json"))?; + let metadata = serde_json::from_str::(include_str!("../metadata-v2.json"))?; if template_target_path.exists() && !options.force { warn!( diff --git a/tooling/cli/src/plugin/init.rs b/tooling/cli/src/plugin/init.rs index 8fc572e5a..77cba7d37 100644 --- a/tooling/cli/src/plugin/init.rs +++ b/tooling/cli/src/plugin/init.rs @@ -201,7 +201,8 @@ pub fn plugin_name_data(data: &mut BTreeMap<&'static str, serde_json::Value>, pl } pub fn crates_metadata() -> Result { - serde_json::from_str::(include_str!("../../metadata.json")).map_err(Into::into) + serde_json::from_str::(include_str!("../../metadata-v2.json")) + .map_err(Into::into) } pub fn generate_android_out_file(