Merge branch 'rc/v1.0.0-rc0' into feat/bumpup_ibcgo

* rc/v1.0.0-rc0: Bump github.com/line/lbm-sdk from v0.47.0-rc2 to v0.47.0-rc3 (#162) fix: fix `release-build` ci error occurred when adding assets after tagging (#163) Signed-off-by: zemyblue <zemyblue@gmail.com> # Conflicts: # go.mod # go.sum
Finschia · Apr 3, 2023 · 81d3dfb · 81d3dfb
2 parents 3567904 + 7943c1d
commit 81d3dfb
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 43 deletions.
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
@@ -17,17 +17,17 @@ jobs:
         uses: actions/checkout@v3.1.0
       - name: "Create compressed repository source"
         run: |
-          git archive --format=tar --prefix "lbm-${{ env.VERSION }}/" HEAD | gzip -9n > lbm-${{ env.VERSION }}.tgz
-          md5sum lbm-${{ env.VERSION }}.tgz > lbm-${{ env.VERSION }}.tgz.md5
-          sha256sum lbm-${{ env.VERSION }}.tgz > lbm-${{ env.VERSION }}.tgz.sha256
+          git archive --format=tar --prefix "finschia-${{ env.VERSION }}/" HEAD | gzip -9n > finschia-${{ env.VERSION }}.tgz
+          md5sum finschia-${{ env.VERSION }}.tgz > finschia-${{ env.VERSION }}.tgz.md5
+          sha256sum finschia-${{ env.VERSION }}.tgz > finschia-${{ env.VERSION }}.tgz.sha256
       - name: "Store compressed source"
         uses: actions/upload-artifact@v3
         with:
           name: release-${{ env.VERSION }}
           path: |
-            lbm-${{ env.VERSION }}.tgz
-            lbm-${{ env.VERSION }}.tgz.md5
-            lbm-${{ env.VERSION }}.tgz.sha256
+            finschia-${{ env.VERSION }}.tgz
+            finschia-${{ env.VERSION }}.tgz.md5
+            finschia-${{ env.VERSION }}.tgz.sha256
 
   build_for_linux:
     name: "Release Build for Linux"
@@ -65,7 +65,7 @@ jobs:
         with:
           name: release-${{ env.VERSION }}
       - name: "Extract compressed repository source"
-        run: tar zxf lbm-${{ env.VERSION }}.tgz --strip-components=1
+        run: tar zxf finschia-${{ env.VERSION }}.tgz --strip-components=1
 
       - name: "Set ID=${{ env.VERSION }}-linux-${{ matrix.arch }}"
         run: echo "ID=${{ env.VERSION }}-linux-${{ matrix.arch }}" >> $GITHUB_ENV
@@ -77,16 +77,16 @@ jobs:
         run: |
           cd ./build
           ls -laF
-          md5sum lbm-${{ env.ID }}.tgz > ./lbm-${{ env.ID }}.md5
-          sha256sum lbm-${{ env.ID }}.tgz > ./lbm-${{ env.ID }}.sha256
+          md5sum finschia-${{ env.ID }}.tgz > ./finschia-${{ env.ID }}.md5
+          sha256sum finschia-${{ env.ID }}.tgz > ./finschia-${{ env.ID }}.sha256
       - name: "Store artifact: linux-${{ matrix.arch }}"
         uses: actions/upload-artifact@v3
         with:
           name: release-${{ env.VERSION }}
           path: |
-            ./build/lbm-${{ env.ID }}.tgz
-            ./build/lbm-${{ env.ID }}.md5
-            ./build/lbm-${{ env.ID }}.sha256
+            ./build/finschia-${{ env.ID }}.tgz
+            ./build/finschia-${{ env.ID }}.md5
+            ./build/finschia-${{ env.ID }}.sha256
 
 #  build_for_darwin:
 #    name: "Release Build for macOS"
@@ -121,7 +121,7 @@ jobs:
 #        with:
 #          name: release-${{ env.VERSION }}
 #      - name: "Extract compressed repository source"
-#        run: tar zxf lbm-${{ env.VERSION }}.tgz --strip-components=1
+#        run: tar zxf finschia-${{ env.VERSION }}.tgz --strip-components=1
 #
 #      - name: "Set ID=${{ env.VERSION }}-darwin-${{ matrix.arch }}"
 #        run: echo "ID=${{ env.VERSION }}-darwin-${{ matrix.arch }}" >> $GITHUB_ENV
@@ -133,16 +133,16 @@ jobs:
 #        run: |
 #          cd ./build
 #          ls -laF
-#          md5sum lbm-${{ env.ID }}.tgz > ./lbm-${{ env.ID }}.md5
-#          shasum -a 256 lbm-${{ env.ID }}.tgz > ./lbm-${{ env.ID }}.sha256
+#          md5sum finschia-${{ env.ID }}.tgz > ./finschia-${{ env.ID }}.md5
+#          shasum -a 256 finschia-${{ env.ID }}.tgz > ./finschia-${{ env.ID }}.sha256
 #      - name: "Store artifact: darwin-${{ matrix.arch }}"
 #        uses: actions/upload-artifact@v3
 #        with:
 #          name: release-${{ env.VERSION }}
 #          path: |
-#            ./build/lbm-${{ env.ID }}.tgz
-#            ./build/lbm-${{ env.ID }}.md5
-#            ./build/lbm-${{ env.ID }}.sha256
+#            ./build/finschia-${{ env.ID }}.tgz
+#            ./build/finschia-${{ env.ID }}.md5
+#            ./build/finschia-${{ env.ID }}.sha256
 
   create_release:
     name: "Create Release"
@@ -158,22 +158,22 @@ jobs:
         with:
           name: release-${{ env.VERSION }}
       - name: "Extract compressed repository source"
-        run: tar zxf lbm-${{ env.VERSION }}.tgz --strip-components=1 lbm-${{ env.VERSION }}/RELEASE_NOTE.md
+        run: tar zxf finschia-${{ env.VERSION }}.tgz --strip-components=1 finschia-${{ env.VERSION }}/RELEASE_NOTE.md
       - name: "List artifact files for debugging"
         run: "ls -laF"
       - name: "Create build report"
         run: |
-          echo "App: lbm" > build_report.txt
+          echo "App: finschia" > build_report.txt
           echo "Version: ${{ env.VERSION }}" >> build_report.txt
           echo "Commit: ${{ github.sha }}" >> build_report.txt
           echo "Checksums MD5:" >> build_report.txt
-          echo "  `cat lbm-${{ env.VERSION }}-linux-amd64.md5`" >> build_report.txt
-          echo "  `cat lbm-${{ env.VERSION }}-linux-arm64.md5`" >> build_report.txt
-          echo "  `cat lbm-${{ env.VERSION }}.tgz.md5`" >> build_report.txt
+          echo "  `cat finschia-${{ env.VERSION }}-linux-amd64.md5`" >> build_report.txt
+          echo "  `cat finschia-${{ env.VERSION }}-linux-arm64.md5`" >> build_report.txt
+          echo "  `cat finschia-${{ env.VERSION }}.tgz.md5`" >> build_report.txt
           echo "Checksums SHA256:" >> build_report.txt
-          echo "  `cat lbm-${{ env.VERSION }}-linux-amd64.sha256`" >> build_report.txt
-          echo "  `cat lbm-${{ env.VERSION }}-linux-arm64.sha256`" >> build_report.txt
-          echo "  `cat lbm-${{ env.VERSION }}.tgz.sha256`" >> build_report.txt
+          echo "  `cat finschia-${{ env.VERSION }}-linux-amd64.sha256`" >> build_report.txt
+          echo "  `cat finschia-${{ env.VERSION }}-linux-arm64.sha256`" >> build_report.txt
+          echo "  `cat finschia-${{ env.VERSION }}.tgz.sha256`" >> build_report.txt
       - name: "Create release note"
         run: |
           cat ./RELEASE_NOTE.md > release_note.txt
@@ -193,48 +193,48 @@ jobs:
           draft: true
           prerelease: false
 
-      - name: "Upload artifact: lbm-${{ env.VERSION }}-linux-amd64"
+      - name: "Upload artifact: finschia-${{ env.VERSION }}-linux-amd64"
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ github.token }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: lbm-${{ env.VERSION }}-linux-amd64.tgz
-          asset_name: lbm-${{ env.VERSION }}-linux-amd64.tgz
+          asset_path: finschia-${{ env.VERSION }}-linux-amd64.tgz
+          asset_name: finschia-${{ env.VERSION }}-linux-amd64.tgz
           asset_content_type: application/octet-stream
-      - name: "Upload artifact: lbm-${{ env.VERSION }}-linux-arm64"
+      - name: "Upload artifact: finschia-${{ env.VERSION }}-linux-arm64"
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ github.token }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: lbm-${{ env.VERSION }}-linux-arm64.tgz
-          asset_name: lbm-${{ env.VERSION }}-linux-arm64.tgz
+          asset_path: finschia-${{ env.VERSION }}-linux-arm64.tgz
+          asset_name: finschia-${{ env.VERSION }}-linux-arm64.tgz
           asset_content_type: application/octet-stream
-#      - name: "Upload artifact: lbm-${{ env.VERSION }}-dawrin-amd64"
+#      - name: "Upload artifact: finschia-${{ env.VERSION }}-dawrin-amd64"
 #        uses: actions/upload-release-asset@v1
 #        env:
 #          GITHUB_TOKEN: ${{ github.token }}
 #        with:
 #          upload_url: ${{ steps.create_release.outputs.upload_url }}
-#          asset_path: lbm-${{ env.VERSION }}-darwin-amd64.tgz
-#          asset_name: lbm-${{ env.VERSION }}-darwin-amd64.tgz
+#          asset_path: finschia-${{ env.VERSION }}-darwin-amd64.tgz
+#          asset_name: finschia-${{ env.VERSION }}-darwin-amd64.tgz
 #          asset_content_type: application/octet-stream
-#      - name: "Upload artifact: lbm-${{ env.VERSION }}-dawrin-arm64"
+#      - name: "Upload artifact: finschia-${{ env.VERSION }}-dawrin-arm64"
 #        uses: actions/upload-release-asset@v1
 #        env:
 #          GITHUB_TOKEN: ${{ github.token }}
 #        with:
 #          upload_url: ${{ steps.create_release.outputs.upload_url }}
-#          asset_path: lbm-${{ env.VERSION }}-darwin-arm64.tgz
-#          asset_name: lbm-${{ env.VERSION }}-darwin-arm64.tgz
+#          asset_path: finschia-${{ env.VERSION }}-darwin-arm64.tgz
+#          asset_name: finschia-${{ env.VERSION }}-darwin-arm64.tgz
 #          asset_content_type: application/octet-stream
       - name: "Upload artifact: compressed repository source"
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ github.token }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: lbm-${{ env.VERSION }}.tgz
-          asset_name: lbm-${{ env.VERSION }}.tgz
+          asset_path: finschia-${{ env.VERSION }}.tgz
+          asset_name: finschia-${{ env.VERSION }}.tgz
           asset_content_type: application/gzip
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -41,11 +41,13 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### Improvements
 
 ### Bug Fixes
+* (lbm-sdk) [\#162](https://github.com/line/finschia/pull/162) Bump github.com/line/lbm-sdk from v0.47.0-rc2 to v0.47.0-rc3
 
 ### Breaking Changes
 * (ibc-go)[\#164](https://github.com/line/finschia/pull/164) bump up ibc-go v3.3.2 for change ibc light client of Ostracon to Tendermint
 
 ### Build, CI
+* (ci)[\#163](https://github.com/line/finschia/pull/163) fix `release-build` ci error occurred when adding assets after tagging
 
 ### Docs
 

diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/golang/mock v1.6.0
 	github.com/gorilla/mux v1.8.0
 	github.com/line/ibc-go/v3 v3.3.2
-	github.com/line/lbm-sdk v0.47.0-rc2
+	github.com/line/lbm-sdk v0.47.0-rc3
 	github.com/line/ostracon v1.0.9
 	github.com/line/wasmd v0.1.2-0.20230403061848-514953c0b244
 	github.com/prometheus/client_golang v1.14.0

diff --git a/go.sum b/go.sum
@@ -418,8 +418,8 @@ github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-b
 github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
 github.com/line/ibc-go/v3 v3.3.2 h1:EgQ5NARjzm8oi6jyze6mfLwWQsMoNAUuq9mQh4IhsO0=
 github.com/line/ibc-go/v3 v3.3.2/go.mod h1:iIUVJLrKDzW/y1nrNQ3XyVrQ3FjNyd6fjgWTBbldAaQ=
-github.com/line/lbm-sdk v0.47.0-rc2 h1:exM5aEvqS8fdlxypxNtjXMsgIHXrUdqJMtnWAScPZ/Y=
-github.com/line/lbm-sdk v0.47.0-rc2/go.mod h1:JrjVsj1KaVtkHbAC8X3gwRIhM8A6vE2k17W6iWbNv3o=
+github.com/line/lbm-sdk v0.47.0-rc3 h1:OznYzb60gfL80T5YnZOc/laHB/U5zO7JN5KqyqGm+eY=
+github.com/line/lbm-sdk v0.47.0-rc3/go.mod h1:JrjVsj1KaVtkHbAC8X3gwRIhM8A6vE2k17W6iWbNv3o=
 github.com/line/ostracon v1.0.9 h1:LcDAQKeQyk5Q/As2Qfkqv5Sl8Tl4fUhRSuXg2q4XfAQ=
 github.com/line/ostracon v1.0.9/go.mod h1:WHeAYlDEWvR1oKxw8UVYFa9AJVa3uaGDdDxkrZA5kEY=
 github.com/line/wasmd v0.1.2-0.20230403061848-514953c0b244 h1:C+9EOgVJ6iQ0V4mJDvVLv5x/ARojW/s1mgJ5u+BVA6U=