diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e1e1c2eb..fa13f148 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,7 +32,7 @@ jobs: id: get-package-version working-directory: ./libwasmvm run: | - VERSION=$(cargo tree -i wasmvm | grep -oE "[0-9]+(\.[0-9]+){2}[\+\-][0-9]+(\.[0-9]+){2}(-[0-9a-zA-Z.]+)*(\+[0-9a-zA-Z.\-]+)*") + VERSION=$(cargo tree -i wasmvm | grep -oE "[0-9]+(\.[0-9]+){2}-[0-9]+(\.[0-9]+){2}(-[0-9a-zA-Z.]+)*(\+[0-9a-zA-Z.\-]+)*") echo ::set-output name=version::v$VERSION push-tag: # if the version does not exist as git tag, push it diff --git a/CHANGELOG.md b/CHANGELOG.md index ba2f96c0..32b17fc3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [[1.1.1-0.11.6](https://github.com/Finschia/wasmvm/compare/v1.1.1+0.11.5...v1.1.1-0.11.6)] - 2023-10-18 +### Changes +* revert: use pre-release versioning and set version to 1.1.1-0.11.6 ([#130](https://github.com/Finschia/wasmvm/pull/130)) + ## [[1.1.1+0.11.5](https://github.com/Finschia/wasmvm/compare/v1.1.1-0.11.4-rc1...v1.1.1+0.11.5)] - 2023-10-5 ### Changes * set version to 1.1.1+0.11.5 for applying v1.1.9+0.8.1 ([#128](https://github.com/Finschia/wasmvm/pull/128)) diff --git a/devtools/set_version.sh b/devtools/set_version.sh index fec4115e..8f2a0492 100755 --- a/devtools/set_version.sh +++ b/devtools/set_version.sh @@ -31,7 +31,7 @@ if [[ -n "$CHANGES_IN_REPO" ]]; then fi NEW="$1" -OLD=$(cargo tree -i wasmvm --manifest-path libwasmvm/Cargo.toml | grep -oE "[0-9]+(\.[0-9]+){2}[\+\-][0-9]+(\.[0-9]+){2}(-[0-9a-zA-Z.]+)*(\+[0-9a-zA-Z.\-]+)*") +OLD=$(cargo tree -i wasmvm --manifest-path libwasmvm/Cargo.toml | grep -oE "[0-9]+(\.[0-9]+){2}-[0-9]+(\.[0-9]+){2}(-[0-9a-zA-Z.]+)*(\+[0-9a-zA-Z.\-]+)*") echo "Updating old version $OLD to new version $NEW ..." CARGO_TOML="libwasmvm/Cargo.toml" diff --git a/internal/api/libwasmvm.aarch64.so b/internal/api/libwasmvm.aarch64.so index 844721e5..a72eb226 100755 Binary files a/internal/api/libwasmvm.aarch64.so and b/internal/api/libwasmvm.aarch64.so differ diff --git a/internal/api/libwasmvm.dylib b/internal/api/libwasmvm.dylib index f1cf95bc..042b7ca1 100755 Binary files a/internal/api/libwasmvm.dylib and b/internal/api/libwasmvm.dylib differ diff --git a/internal/api/libwasmvm.x86_64.so b/internal/api/libwasmvm.x86_64.so index b814a339..9238366a 100755 Binary files a/internal/api/libwasmvm.x86_64.so and b/internal/api/libwasmvm.x86_64.so differ diff --git a/internal/api/version_test.go b/internal/api/version_test.go index b205d69c..a4bfec28 100644 --- a/internal/api/version_test.go +++ b/internal/api/version_test.go @@ -10,5 +10,5 @@ import ( func TestLibwasmvmVersion(t *testing.T) { version, err := LibwasmvmVersion() require.NoError(t, err) - require.Regexp(t, regexp.MustCompile("^([0-9]+)\\.([0-9]+)\\.([0-9]+)([+-][a-z0-9.\\-]+)?$"), version) + require.Regexp(t, regexp.MustCompile("^([0-9]+)\\.([0-9]+)\\.([0-9]+)(-[a-z0-9.\\-]+)?$"), version) } diff --git a/lib_test.go b/lib_test.go index 68a8d152..80f04163 100644 --- a/lib_test.go +++ b/lib_test.go @@ -281,5 +281,5 @@ func TestGetMetrics(t *testing.T) { func TestLibwasmvmVersion(t *testing.T) { version, err := LibwasmvmVersion() require.NoError(t, err) - require.Equal(t, "1.1.1+0.11.5", version) + require.Equal(t, "1.1.1-0.11.6", version) } diff --git a/libwasmvm/Cargo.lock b/libwasmvm/Cargo.lock index b33b1770..5ad5c41d 100644 --- a/libwasmvm/Cargo.lock +++ b/libwasmvm/Cargo.lock @@ -1942,7 +1942,7 @@ checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a" [[package]] name = "wasmvm" -version = "1.1.1+0.11.5" +version = "1.1.1-0.11.6" dependencies = [ "cbindgen", "cosmwasm-std", diff --git a/libwasmvm/Cargo.toml b/libwasmvm/Cargo.toml index 847aa7b1..37a0db94 100644 --- a/libwasmvm/Cargo.toml +++ b/libwasmvm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmvm" -version = "1.1.1+0.11.5" +version = "1.1.1-0.11.6" publish = false authors = ["Finschia Foundation"] edition = "2021" diff --git a/libwasmvm/src/version.rs b/libwasmvm/src/version.rs index 7275a19d..152ee2b6 100644 --- a/libwasmvm/src/version.rs +++ b/libwasmvm/src/version.rs @@ -27,7 +27,7 @@ mod tests { let version_str = unsafe { CStr::from_ptr(version_ptr) }.to_str().unwrap(); // assert_eq!(version_str, "1.2.3"); - let mut parts = version_str.split('+'); + let mut parts = version_str.split('-'); let version_core = parts.next().unwrap(); let components = version_core.split('.').collect::>(); assert_eq!(components.len(), 3);