Skip to content

Commit 78da306

Browse files
authored
Merge branch 'rc9/v0.46.0' into fix_attributekey
2 parents a7067f3 + b13f437 commit 78da306

File tree

2 files changed

+19
-2
lines changed

2 files changed

+19
-2
lines changed

.github/workflows/test.yml

+18-2
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ jobs:
5959
**/**.go
6060
go.mod
6161
go.sum
62+
.github/workflows/test.yml
6263
- name: Build
6364
run: GOOS=linux CGO_ENABLED=1 GOARCH=${{ matrix.goarch }} CC=${{ matrix.gcc }} LEDGER_ENABLED=false make build
6465

@@ -129,16 +130,23 @@ jobs:
129130
**/**.go
130131
go.mod
131132
go.sum
133+
.github/workflows/test.yml
132134
- uses: actions/download-artifact@v3
133135
with:
134136
name: "${{ github.sha }}-${{ matrix.part }}"
135137
if: env.GIT_DIFF
138+
- name: install libsodium
139+
run: |
140+
make libsodium
141+
if: env.GIT_DIFF
136142
- name: test & coverage report creation
137143
env:
138144
USE_PRELOAD: 1,4
139145
SAVE_BRANCH_LAUNCH_DEPTH: 1
146+
CGO_CFLAGS: "-I${{ github.workspace }}/tools/sodium/linux_amd64/include"
147+
CGO_LDFLAGS: "-L${{ github.workspace }}/tools/sodium/linux_amd64/lib -lsodium"
140148
run: |
141-
cat pkgs.txt.part.${{ matrix.part }} | xargs go test -mod=readonly -timeout 30m -coverprofile=${{ matrix.part }}profile.out -covermode=atomic -tags='norace ledger test_ledger_mock goleveldb libsodium'
149+
cat pkgs.txt.part.${{ matrix.part }} | xargs go test -mod=readonly -timeout 30m -coverprofile=${{ matrix.part }}profile.out -covermode=atomic -tags='norace ledger test_ledger_mock goleveldb gcc libsodium'
142150
if: env.GIT_DIFF
143151
- uses: actions/upload-artifact@v3
144152
with:
@@ -156,6 +164,7 @@ jobs:
156164
**/**.go
157165
go.mod
158166
go.sum
167+
.github/workflows/test.yml
159168
- uses: actions/download-artifact@v3
160169
with:
161170
name: "${{ github.sha }}-00-coverage"
@@ -209,17 +218,24 @@ jobs:
209218
**/**.go
210219
go.mod
211220
go.sum
221+
.github/workflows/test.yml
212222
- uses: actions/download-artifact@v3
213223
with:
214224
name: "${{ github.sha }}-${{ matrix.part }}"
215225
if: env.GIT_DIFF
226+
- name: install libsodium
227+
run: |
228+
make libsodium
229+
if: env.GIT_DIFF
216230
- name: test & coverage report creation
217231
env:
218232
USE_PREFETCH: NO
219233
USE_PRELOAD: 1,4
220234
SAVE_BRANCH_LAUNCH_DEPTH: 1
235+
CGO_CFLAGS: "-I${{ github.workspace }}/tools/sodium/linux_amd64/include"
236+
CGO_LDFLAGS: "-L${{ github.workspace }}/tools/sodium/linux_amd64/lib -lsodium"
221237
run: |
222-
xargs --arg-file=pkgs.txt.part.${{ matrix.part }} go test -mod=readonly -timeout 30m -race -tags='cgo ledger test_ledger_mock goleveldb libsodium'
238+
xargs --arg-file=pkgs.txt.part.${{ matrix.part }} go test -mod=readonly -timeout 30m -race -tags='cgo ledger test_ledger_mock goleveldb gcc libsodium'
223239
if: env.GIT_DIFF
224240
- uses: actions/upload-artifact@v3
225241
with:

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
4848
* (baseapp) [\#781](https://github.com/line/lbm-sdk/pull/781) implement method `SetOption()` in baseapp
4949
* (global) [\#782](https://github.com/line/lbm-sdk/pull/782) add unhandled return error handling
5050
* (x/collection,x/token) [\#798](https://github.com/line/lbm-sdk/pull/798) Fix x/collection ModifyContract
51+
* (ci) [\#803](https://github.com/line/lbm-sdk/pull/803) fix test flow to install libsodium
5152
* (x/collection,token) [\#784](https://github.com/line/lbm-sdk/pull/784) Make field key matching in x/token & x/collection case-sensitive
5253

5354
### Breaking Changes

0 commit comments

Comments
 (0)