From 86fdf738ef6c9e0d530dd2809ba19f633306e9e7 Mon Sep 17 00:00:00 2001 From: Danilo Guanabara Date: Fri, 6 Dec 2024 16:43:48 -0300 Subject: [PATCH 1/2] chore(release): v0.1.12 --- Cargo.lock | 92 +++++++++---------- Cargo.toml | 32 +++---- cliff.toml => Cliff.toml | 8 ++ clients/bolt-sdk/package.json | 2 +- crates/bolt-cli/npm-package/package.json | 16 ++-- crates/bolt-cli/npm-package/package.json.tmpl | 2 +- docs/CHANGELOG.md | 47 ++++++++++ scripts/version-align.sh | 14 +-- 8 files changed, 134 insertions(+), 79 deletions(-) rename cliff.toml => Cliff.toml (87%) diff --git a/Cargo.lock b/Cargo.lock index daa499f..4bfb604 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -834,7 +834,7 @@ dependencies = [ [[package]] name = "bolt-attribute-bolt-arguments" -version = "0.1.11" +version = "0.1.12" dependencies = [ "proc-macro2", "quote", @@ -855,9 +855,9 @@ dependencies = [ [[package]] name = "bolt-attribute-bolt-component" -version = "0.1.11" +version = "0.1.12" dependencies = [ - "bolt-utils 0.1.11", + "bolt-utils 0.1.12", "proc-macro2", "quote", "syn 1.0.109", @@ -877,9 +877,9 @@ dependencies = [ [[package]] name = "bolt-attribute-bolt-component-deserialize" -version = "0.1.11" +version = "0.1.12" dependencies = [ - "bolt-utils 0.1.11", + "bolt-utils 0.1.12", "proc-macro2", "quote", "syn 1.0.109", @@ -898,7 +898,7 @@ dependencies = [ [[package]] name = "bolt-attribute-bolt-component-id" -version = "0.1.11" +version = "0.1.12" dependencies = [ "proc-macro2", "quote", @@ -918,7 +918,7 @@ dependencies = [ [[package]] name = "bolt-attribute-bolt-delegate" -version = "0.1.11" +version = "0.1.12" dependencies = [ "proc-macro2", "quote", @@ -938,7 +938,7 @@ dependencies = [ [[package]] name = "bolt-attribute-bolt-extra-accounts" -version = "0.1.11" +version = "0.1.12" dependencies = [ "proc-macro2", "quote", @@ -958,7 +958,7 @@ dependencies = [ [[package]] name = "bolt-attribute-bolt-program" -version = "0.1.11" +version = "0.1.12" dependencies = [ "proc-macro2", "quote", @@ -978,7 +978,7 @@ dependencies = [ [[package]] name = "bolt-attribute-bolt-system" -version = "0.1.11" +version = "0.1.12" dependencies = [ "proc-macro2", "quote", @@ -998,7 +998,7 @@ dependencies = [ [[package]] name = "bolt-attribute-bolt-system-input" -version = "0.1.11" +version = "0.1.12" dependencies = [ "proc-macro2", "quote", @@ -1007,7 +1007,7 @@ dependencies = [ [[package]] name = "bolt-cli" -version = "0.1.11" +version = "0.1.12" dependencies = [ "anchor-cli", "anchor-client", @@ -1018,7 +1018,7 @@ dependencies = [ "heck 0.5.0", "serde_json", "syn 1.0.109", - "world 0.1.11", + "world 0.1.12", ] [[package]] @@ -1033,10 +1033,10 @@ dependencies = [ [[package]] name = "bolt-component" -version = "0.1.11" +version = "0.1.12" dependencies = [ "anchor-lang", - "bolt-system 0.1.11", + "bolt-system 0.1.12", ] [[package]] @@ -1056,7 +1056,7 @@ dependencies = [ [[package]] name = "bolt-helpers-system-template" -version = "0.1.11" +version = "0.1.12" dependencies = [ "proc-macro2", "quote", @@ -1076,7 +1076,7 @@ dependencies = [ [[package]] name = "bolt-helpers-world-apply" -version = "0.1.11" +version = "0.1.12" dependencies = [ "proc-macro2", "quote", @@ -1109,24 +1109,24 @@ dependencies = [ [[package]] name = "bolt-lang" -version = "0.1.11" +version = "0.1.12" dependencies = [ "ahash 0.8.11", "anchor-lang", - "bolt-attribute-bolt-arguments 0.1.11", - "bolt-attribute-bolt-component 0.1.11", - "bolt-attribute-bolt-component-deserialize 0.1.11", - "bolt-attribute-bolt-component-id 0.1.11", - "bolt-attribute-bolt-delegate 0.1.11", - "bolt-attribute-bolt-extra-accounts 0.1.11", - "bolt-attribute-bolt-program 0.1.11", - "bolt-attribute-bolt-system 0.1.11", - "bolt-attribute-bolt-system-input 0.1.11", - "bolt-system 0.1.11", + "bolt-attribute-bolt-arguments 0.1.12", + "bolt-attribute-bolt-component 0.1.12", + "bolt-attribute-bolt-component-deserialize 0.1.12", + "bolt-attribute-bolt-component-id 0.1.12", + "bolt-attribute-bolt-delegate 0.1.12", + "bolt-attribute-bolt-extra-accounts 0.1.12", + "bolt-attribute-bolt-program 0.1.12", + "bolt-attribute-bolt-system 0.1.12", + "bolt-attribute-bolt-system-input 0.1.12", + "bolt-system 0.1.12", "ephemeral-rollups-sdk", "serde", "serde_json", - "world 0.1.11", + "world 0.1.12", ] [[package]] @@ -1141,10 +1141,10 @@ dependencies = [ [[package]] name = "bolt-system" -version = "0.1.11" +version = "0.1.12" dependencies = [ "anchor-lang", - "bolt-helpers-system-template 0.1.11", + "bolt-helpers-system-template 0.1.12", ] [[package]] @@ -1168,7 +1168,7 @@ dependencies = [ [[package]] name = "bolt-utils" -version = "0.1.11" +version = "0.1.12" dependencies = [ "proc-macro2", "quote", @@ -3488,9 +3488,9 @@ dependencies = [ [[package]] name = "position" -version = "0.1.11" +version = "0.1.12" dependencies = [ - "bolt-lang 0.1.11", + "bolt-lang 0.1.12", ] [[package]] @@ -5625,10 +5625,10 @@ dependencies = [ [[package]] name = "system-apply-velocity" -version = "0.1.11" +version = "0.1.12" dependencies = [ "anchor-spl", - "bolt-lang 0.1.11", + "bolt-lang 0.1.12", "position", "velocity", ] @@ -5656,17 +5656,17 @@ dependencies = [ [[package]] name = "system-fly" -version = "0.1.11" +version = "0.1.12" dependencies = [ - "bolt-lang 0.1.11", + "bolt-lang 0.1.12", "position", ] [[package]] name = "system-simple-movement" -version = "0.1.11" +version = "0.1.12" dependencies = [ - "bolt-lang 0.1.11", + "bolt-lang 0.1.12", "bolt-types", "serde", ] @@ -6192,9 +6192,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "velocity" -version = "0.1.11" +version = "0.1.12" dependencies = [ - "bolt-lang 0.1.11", + "bolt-lang 0.1.12", ] [[package]] @@ -6574,12 +6574,12 @@ dependencies = [ [[package]] name = "world" -version = "0.1.11" +version = "0.1.12" dependencies = [ "anchor-lang", - "bolt-component 0.1.11", - "bolt-helpers-world-apply 0.1.11", - "bolt-system 0.1.11", + "bolt-component 0.1.12", + "bolt-helpers-world-apply 0.1.12", + "bolt-system 0.1.12", "solana-security-txt", "tuple-conv", ] diff --git a/Cargo.toml b/Cargo.toml index 8aa5c8b..df85f86 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ members = [ ] [workspace.package] -version = "0.1.11" +version = "0.1.12" authors = ["Magicblock Labs "] repository = "https://github.com/magicblock-labs/bolt" homepage = "https://www.magicblock.gg/" @@ -20,21 +20,21 @@ license = "MIT" edition = "2021" [workspace.dependencies] -bolt-attribute-bolt-program = { path = "crates/bolt-lang/attribute/bolt-program", version = "=0.1.11" } -bolt-attribute-bolt-delegate = { path = "crates/bolt-lang/attribute/delegate", version = "=0.1.11" } -bolt-attribute-bolt-component = { path = "crates/bolt-lang/attribute/component", version = "=0.1.11" } -bolt-attribute-bolt-system = { path = "crates/bolt-lang/attribute/system", version = "=0.1.11"} -bolt-attribute-bolt-system-input = { path = "crates/bolt-lang/attribute/system-input", version = "=0.1.11" } -bolt-attribute-bolt-extra-accounts = { path = "crates/bolt-lang/attribute/extra-accounts", version = "=0.1.11" } -bolt-attribute-bolt-arguments = { path = "crates/bolt-lang/attribute/arguments", version = "=0.1.11" } -bolt-attribute-bolt-component-deserialize = { path = "crates/bolt-lang/attribute/component-deserialize", version = "=0.1.11" } -bolt-attribute-bolt-component-id = { path = "crates/bolt-lang/attribute/component-id", version = "=0.1.11" } -bolt-helpers-system-template = { path = "crates/bolt-helpers/attribute/system-template", version = "=0.1.11" } -bolt-helpers-world-apply = { path = "crates/bolt-helpers/attribute/world-apply", version = "=0.1.11" } -bolt-utils = { path = "crates/bolt-lang/utils", version = "=0.1.11" } -world = { path = "crates/programs/world", features = ["cpi"], version = "=0.1.11"} -bolt-system = { path = "crates/programs/bolt-system", features = ["cpi"], version = "=0.1.11"} -bolt-component = { path = "crates/programs/bolt-component", features = ["cpi"], version = "=0.1.11"} +bolt-attribute-bolt-program = { path = "crates/bolt-lang/attribute/bolt-program", version = "=0.1.12" } +bolt-attribute-bolt-delegate = { path = "crates/bolt-lang/attribute/delegate", version = "=0.1.12" } +bolt-attribute-bolt-component = { path = "crates/bolt-lang/attribute/component", version = "=0.1.12" } +bolt-attribute-bolt-system = { path = "crates/bolt-lang/attribute/system", version = "=0.1.12"} +bolt-attribute-bolt-system-input = { path = "crates/bolt-lang/attribute/system-input", version = "=0.1.12" } +bolt-attribute-bolt-extra-accounts = { path = "crates/bolt-lang/attribute/extra-accounts", version = "=0.1.12" } +bolt-attribute-bolt-arguments = { path = "crates/bolt-lang/attribute/arguments", version = "=0.1.12" } +bolt-attribute-bolt-component-deserialize = { path = "crates/bolt-lang/attribute/component-deserialize", version = "=0.1.12" } +bolt-attribute-bolt-component-id = { path = "crates/bolt-lang/attribute/component-id", version = "=0.1.12" } +bolt-helpers-system-template = { path = "crates/bolt-helpers/attribute/system-template", version = "=0.1.12" } +bolt-helpers-world-apply = { path = "crates/bolt-helpers/attribute/world-apply", version = "=0.1.12" } +bolt-utils = { path = "crates/bolt-lang/utils", version = "=0.1.12" } +world = { path = "crates/programs/world", features = ["cpi"], version = "=0.1.12"} +bolt-system = { path = "crates/programs/bolt-system", features = ["cpi"], version = "=0.1.12"} +bolt-component = { path = "crates/programs/bolt-component", features = ["cpi"], version = "=0.1.12"} ## External crates anchor-lang = { version = "=0.30.1", features = ["init-if-needed"] } diff --git a/cliff.toml b/Cliff.toml similarity index 87% rename from cliff.toml rename to Cliff.toml index 46aef45..d31e12b 100644 --- a/cliff.toml +++ b/Cliff.toml @@ -78,6 +78,14 @@ commit_parsers = [ { message = "^:art:", group = "🎨 Styling" }, { message = "^:construction_worker:", group = "πŸ‘· CI/CD" }, { message = "^:recycle:", group = "♻️ Refactor" }, + { message = "^fix", group = "πŸ› Bug Fixes" }, + { message = "^docs", group = "πŸ“š Documentation" }, + { message = "^perf", group = "⚑️ Performance" }, + { message = "^style", group = "🎨 Styling" }, + { message = "^ci", group = "πŸ‘· CI/CD" }, + { message = "^refactor", group = "♻️ Refactor" }, + { message = "^test", group = "πŸ§ͺ Testing" }, + { message = "^chore", group = "πŸ”§ Maintenance" } ] # protect breaking changes from being skipped due to matching a skipping commit_parser protect_breaking_commits = false diff --git a/clients/bolt-sdk/package.json b/clients/bolt-sdk/package.json index 4f5aeaa..199b0a7 100644 --- a/clients/bolt-sdk/package.json +++ b/clients/bolt-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@magicblock-labs/bolt-sdk", - "version": "0.1.11", + "version": "0.1.12", "description": "Bolt typescript SDK", "author": "dev@magicblock.gg", "license": "MIT", diff --git a/crates/bolt-cli/npm-package/package.json b/crates/bolt-cli/npm-package/package.json index 6a0063f..caf603a 100644 --- a/crates/bolt-cli/npm-package/package.json +++ b/crates/bolt-cli/npm-package/package.json @@ -1,6 +1,6 @@ { "name": "@magicblock-labs/bolt-cli", - "version": "0.1.11", + "version": "0.1.12", "description": "Bolt CLI tool", "homepage": "https://github.com/magicblock-labs/bolt#readme", "bugs": { @@ -27,13 +27,13 @@ "prettier": "^3.3.3" }, "optionalDependencies": { - "@magicblock-labs/bolt-cli-darwin-x64": "0.1.11", - "@magicblock-labs/bolt-cli-darwin-arm64": "0.1.11", - "@magicblock-labs/bolt-cli-linux-x86": "0.1.11", - "@magicblock-labs/bolt-cli-linux-x64": "0.1.11", - "@magicblock-labs/bolt-cli-linux-arm64": "0.1.11", - "@magicblock-labs/bolt-cli-windows-x86": "0.1.11", - "@magicblock-labs/bolt-cli-windows-x64": "0.1.11" + "@magicblock-labs/bolt-cli-darwin-x64": "0.1.12", + "@magicblock-labs/bolt-cli-darwin-arm64": "0.1.12", + "@magicblock-labs/bolt-cli-linux-x86": "0.1.12", + "@magicblock-labs/bolt-cli-linux-x64": "0.1.12", + "@magicblock-labs/bolt-cli-linux-arm64": "0.1.12", + "@magicblock-labs/bolt-cli-windows-x86": "0.1.12", + "@magicblock-labs/bolt-cli-windows-x64": "0.1.12" }, "publishConfig": { "access": "public" diff --git a/crates/bolt-cli/npm-package/package.json.tmpl b/crates/bolt-cli/npm-package/package.json.tmpl index 1df0f00..58ccb7a 100644 --- a/crates/bolt-cli/npm-package/package.json.tmpl +++ b/crates/bolt-cli/npm-package/package.json.tmpl @@ -1,7 +1,7 @@ { "name": "@magicblock-labs/${node_pkg}", "description": "Bolt CLI tool (${node_pkg})", - "version": "0.1.11", + "version": "0.1.12", "repository": { "type": "git", "url": "git+https://github.com/magicblock-labs/bolt.git" diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 6ea24cf..a99f157 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,8 +1,15 @@ +## [0.1.12] - 2024-12-06 + +### ♻️ Refactor + - Refactor: re-exporting anchor-lang (#114) + - Refactor: files structure (#113) + ## [0.1.11] - 2024-12-04 ### πŸ› Bug Fixes + - Fix: removing test caches (#100) ### πŸ“š Documentation @@ -10,14 +17,34 @@ - Reorganizing templates, using bolt.workspace an… (#95) ### ♻️ Refactor + - Refactor: Adding .template extension to template files (#107) - Fixing test template, broken after code refactor (#93) +### πŸ§ͺ Testing + - Test: test and lint scripts (#99) + - Test: running lint on pull request (#101) + - Test: adding test script (#97) + +### πŸ”§ Maintenance + ## [0.1.10] - 2024-10-05 ### πŸ‘· CI/CD ### ♻️ Refactor +## [0.1.9] - 2024-10-02 + + +### πŸ› Bug Fixes + - Fix: secret ENV variables should be read by forked PR's also (#76) + +### πŸ“š Documentation + - Docs: Fix typo in README (#77) + +### ♻️ Refactor + - Refactor: break down the cli application function to specific file (#74) + ## [0.1.8] - 2024-06-27 ### ✨️ Features @@ -43,6 +70,26 @@ Add Ephemeral Rollups manual commit instruction to the typescript sdk ## Description Upgrade Anchor dependency to 0.30.1 + +### πŸ› Bug Fixes + - Fix: removing generated files from lib and .crates files off of git (#54) + +## Problem +The `lib` and `.crates` folder files in the `bolt-sdk` were not supposed +to be git tracked + +## Solution +`git rm -r lib` and add those to `.gitignore` + - Fix: make sure CI is recompiling the /lib folder when we make changes (#53) + +## Problem +When changing the Typescript files, yarn build was not running in the +CI, leading to the CI's test succeeding even if we just introduced a +bug. + +## Solution +Make the CI run `yarn build` before testing + ### πŸ‘· CI/CD ## [0.1.5] - 2024-04-23 diff --git a/scripts/version-align.sh b/scripts/version-align.sh index 985a451..c23f8fb 100755 --- a/scripts/version-align.sh +++ b/scripts/version-align.sh @@ -25,24 +25,24 @@ sed "${sedi[@]}" "/\[workspace.dependencies\]/,/\## External crates/s/version = # Update the version in clients/bolt-sdk/package.json jq --arg version "$version" '.version = $version' clients/bolt-sdk/package.json > temp.json && mv temp.json clients/bolt-sdk/package.json -# Update the version in cli/npm-package/package.json.tmpl -jq --arg version "$version" '.version = $version' cli/npm-package/package.json.tmpl > temp.json && mv temp.json cli/npm-package/package.json.tmpl +# Update the version in crates/bolt-cli/npm-package/package.json.tmpl +jq --arg version "$version" '.version = $version' crates/bolt-cli/npm-package/package.json.tmpl > temp.json && mv temp.json crates/bolt-cli/npm-package/package.json.tmpl -# Update the main package version and all optionalDependencies versions in cli/npm-package/package.json -jq --arg version "$version" '(.version = $version) | (.optionalDependencies[] = $version)' cli/npm-package/package.json > temp.json && mv temp.json cli/npm-package/package.json +# Update the main package version and all optionalDependencies versions in crates/bolt-cli/npm-package/package.json +jq --arg version "$version" '(.version = $version) | (.optionalDependencies[] = $version)' crates/bolt-cli/npm-package/package.json > temp.json && mv temp.json crates/bolt-cli/npm-package/package.json # Potential for collisions in Cargo.lock, use cargo update to update it cargo update --workspace # Generate CHANGELOG.md -git-cliff -c cliff.toml -o docs/CHANGELOG.md -t $version +git-cliff -c Cliff.toml -o docs/CHANGELOG.md -t $version # Check if the any changes have been made to the specified files, if running with --check if [[ "$1" == "--check" ]]; then files_to_check=( "clients/bolt-sdk/package.json" - "cli/npm-package/package.json.tmpl" - "cli/npm-package/package.json" + "crates/bolt-cli/npm-package/package.json.tmpl" + "crates/bolt-cli/npm-package/package.json" "Cargo.toml" "CHANGELOG.toml" ) From 2886770f9ca908e60b5702444d0b13cf3885ef28 Mon Sep 17 00:00:00 2001 From: Danilo Guanabara Date: Fri, 6 Dec 2024 17:55:18 -0300 Subject: [PATCH 2/2] refactor: bolt-cli reference in publish-packages --- .github/workflows/publish-packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml index 76ba7ec..96311d5 100644 --- a/.github/workflows/publish-packages.yml +++ b/.github/workflows/publish-packages.yml @@ -194,7 +194,7 @@ jobs: - name: Publish the NPM package shell: bash run: | - cd cli/npm-package + cd crates/bolt-cli/npm-package npm install npm run build cd lib