Merge pull request #94 from da1suk8/merge_main_394d81d

merge main(394d81d) in dynamic_link branch
Finschia · Apr 11, 2023 · 2c41676 · 2c41676
2 parents b1f173b + c4fb386
commit 2c41676
Show file tree

Hide file tree

Showing 64 changed files with 958 additions and 598 deletions.
diff --git a/.github/workflows/builds_and_tests.yml b/.github/workflows/builds_and_tests.yml
@@ -9,17 +9,17 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.57.0
+          toolchain: 1.60.0
           target: wasm32-unknown-unknown
           profile: minimal
           override: true
       - name: Checkout
         uses: actions/checkout@v2
       - name: Cache cargo
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cargo
-          key: cargocache-v2-libwasmvm_sanity-rust:1.57.0-${{ hashFiles('Cargo.lock') }}
+          key: cargocache-v2-libwasmvm_sanity-rust:1.60.0-${{ hashFiles('Cargo.lock') }}
       - name: Install shellcheck
         run: sudo apt install shellcheck
       - name: Show version information
@@ -52,7 +52,7 @@ jobs:
       - name: set up
         uses: actions/setup-go@v2
         with:
-          go-version: ^1.17.4
+          go-version: 1.17
         id: go
       - name: Checkout
         uses: actions/checkout@v2
@@ -66,7 +66,7 @@ jobs:
       - name: set up
         uses: actions/setup-go@v2
         with:
-          go-version: ^1.17.4
+          go-version: 1.17
         id: go
       - name: CHeckout
         uses: actions/checkout@v2
@@ -88,7 +88,7 @@ jobs:
       - name: set up
         uses: actions/setup-go@v2
         with:
-          go-version: ^1.17.4
+          go-version: 1.17
         id: go
       - name: Install shfmt
         run: GO111MODULE=on go install mvdan.cc/sh/v3/cmd/shfmt@v3.4.0
@@ -113,17 +113,17 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.57.0
-          target: wasm32-unknown-unknown
+          toolchain: 1.60.0
+          target: x86_64-unknown-linux-gnu
           profile: minimal
           override: true
       - name: Checkout
         uses: actions/checkout@v2
       - name: Cache cargo
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cargo
-          key: cargocache-v2-build_shared_library-rust:1.57.0-${{ hashFiles('Cargo.lock') }}
+          key: cargocache-v2-build_shared_library-rust:1.60.0-${{ hashFiles('Cargo.lock') }}
       - name: Show version information
         run: rustc --version; cargo --version; rustup --version
       - name: Create release build of libwasmvm
@@ -132,24 +132,9 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: libwasmvm
-          path: ./api/libwasmvm.x86_64.so
-
-  build_static_lib:
-    runs-on: ubuntu-latest
-    steps:
-      - name: set up
-        uses: actions/setup-go@v3.2.1
-        with:
-          go-version: 1.18
-        id: go
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Build docker image
-        run: cd builders && make docker-image-alpine
-      - name: Build & Test static library
-        run: make release-build-alpine
+          path: ./internal/api/libwasmvm.x86_64.so
 
-  test:
+  test_shared_lib:
     needs: build_shared_library
     runs-on: ubuntu-latest
     env:
@@ -159,7 +144,7 @@ jobs:
       - name: set up
         uses: actions/setup-go@v2
         with:
-          go-version: ^1.17.4
+          go-version: 1.17
         id: go
       - name: Checkout
         uses: actions/checkout@v2
@@ -169,10 +154,20 @@ jobs:
           name: libwasmvm
           path: /tmp/builds
       - name: Copy libwasmvm
-        run: cp /tmp/builds/libwasmvm.x86_64.so ./api
+        run: cp /tmp/builds/libwasmvm.x86_64.so ./internal/api
       - name: Go integration tests
         run: make test
       - name: Go tests with cgo and race condition safety checks
         run: make test-safety
       - name: Make build-go
         run: make build-go
+
+  test_static_lib:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Prepare docker image
+        run: cd builders && make docker-image-alpine
+      - name: Build static library and test
+        run: make test-alpine
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.57.0
+          toolchain: 1.60.0
           profile: minimal
           override: true
       - name: Checkout
@@ -35,12 +35,28 @@ jobs:
           VERSION=$(cargo tree -i wasmvm | grep -oE "[0-9]+(\.[0-9]+){2}-[0-9]+(\.[0-9]+){2}")
             echo ::set-output name=version::v$VERSION
 
-  build_static_lib:
-    name: Build static libraries
+  push-tag: # if the version does not exist as git tag, push it
+    name: Push Tag
     needs:
       - get-version
     if: ${{ needs.get-version.outputs.package-version != needs.get-version.outputs.latest-tag }}
     runs-on: ubuntu-latest
+    steps:
+      - name: Push Tag to GitHub
+        run: |
+          curl -s -H "Authorization: token ${GITHUB_TOKEN}" \
+          -d "{\"ref\": \"refs/tags/${{ needs.get-version.outputs.package-version }}\", \"sha\": \"${GITHUB_SHA}\"}" \
+          "https://api.github.com/repos/${GITHUB_REPOSITORY}/git/refs"
+
+  update-releases:
+    name: Update releases
+    needs:
+      - get-version
+      - push-tag     
+    if: ${{ needs.get-version.outputs.package-version != needs.get-version.outputs.latest-tag }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
       - name: set up
         uses: actions/setup-go@v3.2.1
@@ -56,40 +72,13 @@ jobs:
       - name: Collect artifacts
         run: |
           mkdir artifacts
-          cp ./api/libwasmvm_muslc.a artifacts/libwasmvm_muslc.x86_64.a
-          cp ./api/libwasmvm_muslc.aarch64.a artifacts/libwasmvm_muslc.aarch64.a
+          cp ./internal/api/libwasmvm_muslc.a ./artifacts/libwasmvm_muslc.x86_64.a
+          cp ./internal/api/libwasmvm_muslc.aarch64.a ./artifacts/libwasmvm_muslc.aarch64.a
       - name: Create checksums
-        working-directory: artifacts
+        working-directory: ./artifacts
         run: sha256sum * > checksums.txt && cat checksums.txt
-      - name: Upload static library
-        uses: actions/upload-artifact@v2
-        with:
-          name: artifacts
-          path: ./artifacts
-
-  push-tag: # if the version does not exist as git tag, push it
-    name: Push Tag
-    needs:
-      - get-version
-    if: ${{ needs.get-version.outputs.package-version != needs.get-version.outputs.latest-tag }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Push Tag to GitHub
-        run: |
-          curl -s -H "Authorization: token ${GITHUB_TOKEN}" \
-          -d "{\"ref\": \"refs/tags/${{ needs.get-version.outputs.package-version }}\", \"sha\": \"${GITHUB_SHA}\"}" \
-          "https://api.github.com/repos/${GITHUB_REPOSITORY}/git/refs"
-
-  update-releases:
-    name: Update Latest release
-    needs:
-      - push-tag
-      - build_static_lib
-    if: ${{ needs.get-version.outputs.package-version != needs.get-version.outputs.latest-tag }}
-    runs-on: ubuntu-latest
-    steps:
       - name: Create Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v0.1.13
         with:
           tag_name: ${{ needs.get-version.outputs.package-version }}
           body: ${{ github.event.pull_request.body }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,26 @@
 # Changelog
 
 
-## [[v1.0.0-0.10.0](https://github.com/line/wasmvm/compare/v0.16.3-0.9.0...v1.0.0-0.10.0)] - 2022-06-21
+## [[v1.1.1-0.11.1](https://github.com/line/wasmvm/compare/v1.1.1-0.11.0...v1.1.1-0.11.1)] - 2023-01-13
+
+### Fixes
+* add .so / .dylib file and modify Makefile ([#85](https://github.com/line/wasmvm/pull/85))
+
+## [[v1.1.1-0.11.0](https://github.com/line/wasmvm/compare/v1.0.0-0.10.0...v1.1.1-0.11.0)] - 2023-01-11
+
+### Features
+* merge upstream 1.1.1 ([#84](https://github.com/line/wasmvm/pull/84))
+
+### Fixes
+* fix: getmetrics test due to this is environment-dependent test ([#80](https://github.com/line/wasmvm/pull/80))
+
+### Changes
+* chore: remove the copied interface from tm-db ([#82](https://github.com/line/wasmvm/pull/82))
+* refactor: Revert using line/tm-db ([#77](https://github.com/line/wasmvm/pull/77))
+* ci: add release job ([#71](https://github.com/line/wasmvm/pull/71))
+* chore: Revert linux_static ([#70](https://github.com/line/wasmvm/pull/70))
+
+## [v1.0.0-0.10.0] - 2022-06-21
 
 ### Features
 
@@ -11,7 +30,7 @@
 
 * improve CHANGELOG's template and devtools/update_changlog.sh ([#60](https://github.com/line/wasmvm/pull/60))
 
-## [[0.16.3-0.9.0](https://github.com/line/wasmvm/compare/v0.14.0-0.8.0...0.16.3-0.9.0)] - 2022-03-03
+## [v0.16.3-0.9.0] - 2022-03-03
 
 ### Changes
 
@@ -24,43 +43,43 @@
 
 * fix Cargo.toml path in devtools/set_version.sh (part of [#59](https://github.com/line/wasmvm/issues/59))
 
-## [[v0.14.0-0.8.0](https://github.com/line/wasmvm/compare/v0.14.0-0.7.0...v0.14.0-0.8.0)] - 2021-10-01
+## [v0.14.0-0.8.0] - 2021-10-01
 
 ### Features
 
 * change tag name for static build ([#49](https://github.com/line/wasmvm/issues/49))
 
 
-## [[0.14.0-0.7.0](https://github.com/line/wasmvm/compare/v0.14.0-0.6.1...0.14.0-0.7.0)] - 2021-09-30
+## [v0.14.0-0.7.0] - 2021-09-30
 
 ### Features
 
 * add static linking of wasmvm ([#46](https://github.com/line/wasmvm/issues/46))
 
 
-## [[0.14.0-0.6.1](https://github.com/line/wasmvm/compare/v0.14.0-0.6.0...0.14.0-0.6.1)] - 2021-07-15
+## [v0.14.0-0.6.1] - 2021-07-15
 
 ### Fixes
 
 * rebuild shared libs to resolve compile error ([#44](https://github.com/line/wasmvm/issues/44))
 
 
-## [[v0.14.0-0.6.0](https://github.com/line/wasmvm/compare/v0.14.0-0.5.0...v0.14.0-0.6.0)] - 2021-07-12
+## [v0.14.0-0.6.0] - 2021-07-12
 
 ### Changes
 * update upstream Cosmwasm/wasmvm version to 0.14.0 (#36)
   - Please refer [CHANGELOG_OF_WASMVM_v0.14.0](https://github.com/CosmWasm/wasmvm/blob/v0.14.0/CHANGELOG.md)
 * change the depended CosmWasm/cosmwasm to line/cosmwasm
 
 
-## [[v0.14.0-0.5.0](https://github.com/line/wasmvm/compare/v0.14.0-0.4.0...v0.14.0-0.5.0)] - 2021-05-12
+## [v0.14.0-0.5.0] - 2021-05-12
 
 ### Changes
 
 * Change the module uri from github.com/CosmWasm/wasmvm to github.com/link/wasmvm ([#23](https://github.com/line/wasmvm/issues/23))
 
 
-## [[v0.14.0-0.4.0](https://github.com/line/wasmvm/compare/v0.14.0-0.3.0...v0.14.0-0.4.0)] - 2021-05-03
+## [v0.14.0-0.4.0] - 2021-05-03
 
 ### Changes
 
@@ -76,7 +95,7 @@
   The implementation of KVStore now must return a newly defined iterator rather than the `tm-db` defines.
 
 
-## [[v0.14.0-0.3.0](https://github.com/line/wasmvm/compare/v0.12.0-0.1.0...v0.14.0-0.3.0)] - 2021-04-08
+## [v0.14.0-0.3.0] - 2021-04-08
 
 ### Changes
 * Update upstream Cosmwasm/wasmvm version to 0.14.0-beta1 (#8)
@@ -85,7 +104,7 @@
 * Adjust semantic PR validation rule (#9)
 
 
-## [0.12.0-0.1.0] - 2021-02-15
+## [v0.12.0-0.1.0] - 2021-02-15
 
 ### Add
 * Add semantic.yml for semantic pull request (#6)
@@ -102,3 +121,15 @@ Initial code is based on the wasmvm v0.12.0, cosmwasm v0.12.0
 * (cosmwasm) [v0.12.0](https://github.com/CosmWasm/cosmwasm/releases/tag/v0.12.0).
 
 Please refer [CHANGELOG_OF_WASMVM_v0.12.0](https://github.com/CosmWasm/wasmvm/releases?after=v0.13.0)
+
+[Unreleased]:https://github.com/line/wasmvm/compare/v1.0.0-0.10.0...HEAD
+[v1.0.0-0.10.0]:https://github.com/line/wasmvm/compare/v0.16.3-0.9.0...v1.0.0-0.10.0
+[v0.16.3-0.9.0]:https://github.com/line/wasmvm/compare/v0.14.0-0.8.0...v0.16.3-0.9.0
+[v0.14.0-0.8.0]:https://github.com/line/wasmvm/compare/v0.14.0-0.7.0...v0.14.0-0.8.0
+[v0.14.0-0.7.0]:https://github.com/line/wasmvm/compare/v0.14.0-0.6.1...v0.14.0-0.7.0
+[v0.14.0-0.6.1]:https://github.com/line/wasmvm/compare/v0.14.0-0.6.0...v0.14.0-0.6.1
+[v0.14.0-0.6.0]:https://github.com/line/wasmvm/compare/v0.14.0-0.5.0...v0.14.0-0.6.0
+[v0.14.0-0.5.0]:https://github.com/line/wasmvm/compare/v0.14.0-0.4.0...v0.14.0-0.5.0
+[v0.14.0-0.4.0]:https://github.com/line/wasmvm/compare/v0.14.0-0.3.0...v0.14.0-0.4.0
+[v0.14.0-0.3.0]:https://github.com/line/wasmvm/compare/v0.12.0-0.1.0...v0.14.0-0.3.0
+[v0.12.0-0.1.0]:https://github.com/line/wasmvm/compare/v0.12.0...v0.12.0-0.1.0