Skip to content

Commit 38d0bed

Browse files
authored
fix(cli): Split metadata.json per major version. (tauri-apps#7276)
1 parent 0ef9c6b commit 38d0bed

File tree

7 files changed

+24
-12
lines changed

7 files changed

+24
-12
lines changed

.github/workflows/publish-cli-rs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
run: ./.scripts/ci/pack-cli.sh
8888

8989
- name: Get CLI version
90-
run: echo "CLI_VERSION=$(cat tooling/cli/metadata.json | jq '."@tauri-apps/cli".version' -r)" >> $GITHUB_ENV
90+
run: echo "CLI_VERSION=$(cat tooling/cli/metadata-v2.json | jq '."@tauri-apps/cli".version' -r)" >> $GITHUB_ENV
9191

9292
- name: Publish release
9393
uses: softprops/action-gh-release@50195ba7f6f93d1ac97ba8332a178e008ad176aa

.scripts/covector/sync-cli-metadata.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ const { resolve } = require('path')
1717
const packageNickname = process.argv[2]
1818
const filePath =
1919
packageNickname === '@tauri-apps/cli'
20-
? `../../../tooling/cli/metadata.json`
21-
: `../../tooling/cli/metadata.json`
20+
? `../../../tooling/cli/metadata-v2.json`
21+
: `../../tooling/cli/metadata-v2.json`
2222
const bump = process.argv[3]
2323
let index = null
2424

@@ -50,7 +50,9 @@ const inc = (version) => {
5050
}
5151
}
5252
if (bump === 'premajor') {
53-
const pre = JSON.parse(readFileSync(resolve(filePath, '../../../.changes/pre.json'), 'utf-8'))
53+
const pre = JSON.parse(
54+
readFileSync(resolve(filePath, '../../../.changes/pre.json'), 'utf-8')
55+
)
5456
return `${v.join('.')}-${pre.tag}.0`
5557
}
5658
return v.join('.')
@@ -70,5 +72,5 @@ if (packageNickname === '@tauri-apps/cli') {
7072
}
7173

7274
writeFileSync(filePath, JSON.stringify(metadata, null, 2) + '\n')
73-
console.log(`wrote ${version} for ${packageNickname} into metadata.json`)
75+
console.log(`wrote ${version} for ${packageNickname} into metadata-v2.json`)
7476
console.dir(metadata)

tooling/cli/metadata-v2.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"cli.js": {
3+
"version": "2.0.0-alpha.10",
4+
"node": ">= 10.0.0"
5+
},
6+
"tauri": "2.0.0-alpha.10",
7+
"tauri-build": "2.0.0-alpha.6"
8+
}

tooling/cli/metadata.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"cli.js": {
3-
"version": "2.0.0-alpha.10",
3+
"version": "1.4.0",
44
"node": ">= 10.0.0"
55
},
6-
"tauri": "2.0.0-alpha.10",
7-
"tauri-build": "2.0.0-alpha.6"
6+
"tauri": "1.4.0",
7+
"tauri-build": "1.4.0"
88
}

tooling/cli/src/info/mod.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ pub struct VersionMetadata {
3535
}
3636

3737
fn version_metadata() -> Result<VersionMetadata> {
38-
serde_json::from_str::<VersionMetadata>(include_str!("../../metadata.json")).map_err(Into::into)
38+
serde_json::from_str::<VersionMetadata>(include_str!("../../metadata-v2.json"))
39+
.map_err(Into::into)
3940
}
4041

4142
#[cfg(not(debug_assertions))]
@@ -46,7 +47,7 @@ pub(crate) fn cli_current_version() -> Result<String> {
4647
#[cfg(not(debug_assertions))]
4748
pub(crate) fn cli_upstream_version() -> Result<String> {
4849
let upstream_metadata = match ureq::get(
49-
"https://raw.githubusercontent.com/tauri-apps/tauri/dev/tooling/cli/metadata.json",
50+
"https://raw.githubusercontent.com/tauri-apps/tauri/dev/tooling/cli/metadata-v2.json",
5051
)
5152
.timeout(std::time::Duration::from_secs(3))
5253
.call()

tooling/cli/src/init.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ pub fn command(mut options: Options) -> Result<()> {
156156
options = options.load()?;
157157

158158
let template_target_path = PathBuf::from(&options.directory).join("src-tauri");
159-
let metadata = serde_json::from_str::<VersionMetadata>(include_str!("../metadata.json"))?;
159+
let metadata = serde_json::from_str::<VersionMetadata>(include_str!("../metadata-v2.json"))?;
160160

161161
if template_target_path.exists() && !options.force {
162162
warn!(

tooling/cli/src/plugin/init.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,8 @@ pub fn plugin_name_data(data: &mut BTreeMap<&'static str, serde_json::Value>, pl
201201
}
202202

203203
pub fn crates_metadata() -> Result<VersionMetadata> {
204-
serde_json::from_str::<VersionMetadata>(include_str!("../../metadata.json")).map_err(Into::into)
204+
serde_json::from_str::<VersionMetadata>(include_str!("../../metadata-v2.json"))
205+
.map_err(Into::into)
205206
}
206207

207208
pub fn generate_android_out_file(

0 commit comments

Comments
 (0)