revert: use pre-release versioning and set version to 1.1.1-0.11.6

.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

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))

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"

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)
 }

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)
 }

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"

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::<Vec<_>>();
         assert_eq!(components.len(), 3);