Merge branch 'master' into ru/chore/depr-decl-fungible

near · Aug 17, 2023 · 101b248 · 101b248
2 parents 1f2e9c6 + 6c50cae
commit 101b248
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 5 deletions.
diff --git a/.github/workflows/release-plz.yml b/.github/workflows/release-plz.yml
@@ -0,0 +1,29 @@
+name: Release-plz
+
+permissions:
+  pull-requests: write
+  contents: write
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  release-plz:
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/master'
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.CUSTOM_GITHUB_TOKEN }}
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+      - name: Run release-plz
+        uses: MarcoIeni/release-plz-action@v0.5
+        env:
+          # https://marcoieni.github.io/release-plz/github-action.html#triggering-further-workflow-runs
+          GITHUB_TOKEN: ${{ secrets.CUSTOM_GITHUB_TOKEN }}
+          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,10 +3,13 @@ members = [
     "near-sdk",
     "near-sdk-macros",
     "near-contract-standards",
-    "sys",
+    "near-sys",
 ]
 exclude = ["examples/"]
 
+[workspace.package]
+version = "4.1.1"
+
 # Special triple # comment for ci.
 [patch.crates-io]
 ### borsh = { git = "https://github.com/near/borsh-rs", branch = "master" }

diff --git a/near-contract-standards/Cargo.toml b/near-contract-standards/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "near-contract-standards"
-version = "4.1.1"
+version.workspace = true
 authors = ["Near Inc <hello@near.org>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"

diff --git a/near-sdk-macros/Cargo.toml b/near-sdk-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "near-sdk-macros"
-version = "4.1.1"
+version.workspace = true
 authors = ["Near Inc <max@nearprotocol.com>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"

diff --git a/near-sdk/Cargo.toml b/near-sdk/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "near-sdk"
-version = "4.1.1"
+version.workspace = true
 authors = ["Near Inc <max@nearprotocol.com>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"
@@ -22,7 +22,7 @@ required-features = ["abi", "unstable"]
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 near-sdk-macros = { path = "../near-sdk-macros", version = "~4.1.1" }
-near-sys = { path = "../sys", version = "0.2" }
+near-sys = { path = "../near-sys", version = "0.2" }
 base64 = "0.13"
 borsh = { version = "0.9", features = ["const-generics"] }
 bs58 = "0.4"

diff --git a/sys/Cargo.toml → near-sys/Cargo.toml b/sys/Cargo.toml → near-sys/Cargo.toml
diff --git a/sys/src/lib.rs → near-sys/src/lib.rs b/sys/src/lib.rs → near-sys/src/lib.rs
diff --git a/release-plz.toml b/release-plz.toml
@@ -0,0 +1,17 @@
+[workspace]
+# Use `near-sdk` crate CHANGELOG as top-level one
+changelog_update = false
+
+[[package]]
+name = "near-sdk"
+changelog_update = true
+changelog_path = "./CHANGELOG.md"
+changelog_include = ["near-sdk-macros"]
+
+[[package]]
+name = "near-contract-standards"
+changelog_update = true
+
+[[package]]
+name = "near-sys"
+changelog_update = true