Skip to content

Commit a0cb3f1

Browse files
sug0sug0
committed
Merge branch 'maint-libs-0.48' into maint-1.1
2 parents db768df + f6f6e50 commit a0cb3f1

19 files changed

Lines changed: 353 additions & 325 deletions

File tree

‎.changelog/libs-v0.48.1/bug-fixes/4545-upgrade-tendermint-rs.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Upgrade tendermint-rs ([\#4545](https://github.com/anoma/namada/pull/4545))

‎.changelog/libs-v0.48.1/improvements/4472-generalize-amount-comparison.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
- Generalize the comparison of denominated amounts to
2+
support the case where gap between denominations is large.
3+
([\#4472](https://github.com/anoma/namada/pull/4472))

‎.changelog/libs-v0.48.1/summary.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Namada libs 0.48.1

‎.changelog/libs-v0.48.2/miscellaneous/4554-maint-lib-ci.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- Fix CI on maintenance branch.
2+
([\#4554](https://github.com/anoma/namada/pull/4554))

‎.changelog/libs-v0.48.2/summary.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Namada libs 0.48.2

‎.github/workflows/ci.yml‎

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ env:
3737
NAMADA_MASP_PARAMS_DIR: /masp/.masp-params
3838
LEDGER_APP_VERSION: "3.0.1"
3939
ROLE: arn:aws:iam::375643557360:role/github-runners-ci-shared
40+
SCCACHE_ERROR_LOG: /tmp/sccache_log.txt
4041

4142
jobs:
4243
changelog:
@@ -56,7 +57,7 @@ jobs:
5657

5758
rust-docs:
5859
container:
59-
image: ghcr.io/heliaxdev/namada-ci:namada-main
60+
image: ghcr.io/heliaxdev/namada-ci:namada-v1.1.4
6061
runs-on: [self-hosted, 4vcpu-8ram-ubuntu22-namada-x86]
6162
timeout-minutes: 20
6263

@@ -74,7 +75,7 @@ jobs:
7475
env:
7576
RUNS_ON_S3_BUCKET_CACHE: ${{ env.CACHE_BUCKET }}
7677
with:
77-
path: /usr/local/cargo
78+
path: /root/.cargo
7879
key: /cache/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
7980
- name: Start sccache server
8081
id: sccache
@@ -90,7 +91,7 @@ jobs:
9091

9192
lints:
9293
container:
93-
image: ghcr.io/heliaxdev/namada-ci:namada-main
94+
image: ghcr.io/heliaxdev/namada-ci:namada-v1.1.4
9495
runs-on: [self-hosted, 8vcpu-16ram-ubuntu22-namada-x86]
9596
timeout-minutes: 15
9697

@@ -108,7 +109,7 @@ jobs:
108109
env:
109110
RUNS_ON_S3_BUCKET_CACHE: ${{ env.CACHE_BUCKET }}
110111
with:
111-
path: /usr/local/cargo
112+
path: /root/.cargo
112113
key: /cache/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
113114
- name: Start sccache server
114115
id: sccache
@@ -128,7 +129,7 @@ jobs:
128129
timeout-minutes: 10
129130
runs-on: [self-hosted, 4vcpu-8ram-ubuntu22-namada-x86]
130131
container:
131-
image: ghcr.io/heliaxdev/namada-ci:wasm-main
132+
image: ghcr.io/heliaxdev/namada-ci:wasm-v1.1.4
132133
strategy:
133134
fail-fast: true
134135
matrix:
@@ -159,7 +160,7 @@ jobs:
159160
env:
160161
RUNS_ON_S3_BUCKET_CACHE: ${{ env.CACHE_BUCKET }}
161162
with:
162-
path: /usr/local/cargo
163+
path: /root/.cargo
163164
key: /cache/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
164165
- name: Build ${{ matrix.make.name }}
165166
run: make ${{ matrix.make.command }}
@@ -175,7 +176,7 @@ jobs:
175176
test-wasm:
176177
timeout-minutes: 30
177178
container:
178-
image: ghcr.io/heliaxdev/namada-ci:namada-main
179+
image: ghcr.io/heliaxdev/namada-ci:namada-v1.1.4
179180
runs-on: [self-hosted, 4vcpu-8ram-ubuntu22-namada-x86]
180181
needs: [build-wasm]
181182

@@ -193,7 +194,7 @@ jobs:
193194
env:
194195
RUNS_ON_S3_BUCKET_CACHE: ${{ env.CACHE_BUCKET }}
195196
with:
196-
path: /usr/local/cargo
197+
path: /root/.cargo
197198
key: /cache/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
198199
- name: Download wasm artifacts
199200
uses: actions/download-artifact@v4
@@ -222,7 +223,7 @@ jobs:
222223
test-unit:
223224
runs-on: [self-hosted, 8vcpu-16ram-ubuntu22-namada-x86]
224225
container:
225-
image: ghcr.io/heliaxdev/namada-ci:namada-main
226+
image: ghcr.io/heliaxdev/namada-ci:namada-v1.1.4
226227
timeout-minutes: 20
227228
needs: [build-wasm]
228229

@@ -240,7 +241,7 @@ jobs:
240241
env:
241242
RUNS_ON_S3_BUCKET_CACHE: ${{ env.CACHE_BUCKET }}
242243
with:
243-
path: /usr/local/cargo
244+
path: /root/.cargo
244245
key: /cache/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
245246
- name: Start sccache server
246247
id: sccache
@@ -275,7 +276,7 @@ jobs:
275276
check-packages:
276277
runs-on: [self-hosted, 8vcpu-16ram-ubuntu22-namada-x86]
277278
container:
278-
image: ghcr.io/heliaxdev/namada-ci:namada-main
279+
image: ghcr.io/heliaxdev/namada-ci:namada-v1.1.4
279280
timeout-minutes: 15
280281

281282
steps:
@@ -292,7 +293,7 @@ jobs:
292293
env:
293294
RUNS_ON_S3_BUCKET_CACHE: ${{ env.CACHE_BUCKET }}
294295
with:
295-
path: /usr/local/cargo
296+
path: /root/.cargo
296297
key: /cache/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
297298
- name: Start sccache server
298299
id: sccache
@@ -311,8 +312,8 @@ jobs:
311312
test-integration:
312313
runs-on: [self-hosted, 8vcpu-16ram-ubuntu22-namada-x86]
313314
container:
314-
image: ghcr.io/heliaxdev/namada-ci:namada-main
315-
timeout-minutes: 25
315+
image: ghcr.io/heliaxdev/namada-ci:namada-v1.1.4
316+
timeout-minutes: 35
316317
needs: [build-wasm]
317318

318319
steps:
@@ -329,7 +330,7 @@ jobs:
329330
env:
330331
RUNS_ON_S3_BUCKET_CACHE: ${{ env.CACHE_BUCKET }}
331332
with:
332-
path: /usr/local/cargo
333+
path: /root/.cargo
333334
key: /cache/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
334335
- name: Start sccache server
335336
id: sccache
@@ -364,7 +365,7 @@ jobs:
364365
check-benchmarks:
365366
runs-on: [self-hosted, 16vcpu-32ram-ubuntu22-namada-x86]
366367
container:
367-
image: ghcr.io/heliaxdev/namada-ci:namada-main
368+
image: ghcr.io/heliaxdev/namada-ci:namada-v1.1.4
368369
if: github.event.pull_request.draft == false || contains(github.head_ref, 'mergify/merge-queue') || contains(github.ref_name, 'mergify/merge-queue')
369370
timeout-minutes: 35
370371
needs: [build-wasm]
@@ -383,7 +384,7 @@ jobs:
383384
env:
384385
RUNS_ON_S3_BUCKET_CACHE: ${{ env.CACHE_BUCKET }}
385386
with:
386-
path: /usr/local/cargo
387+
path: /root/.cargo
387388
key: /cache/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
388389
- name: Start sccache server
389390
id: sccache
@@ -412,7 +413,7 @@ jobs:
412413
build-binaries:
413414
runs-on: [self-hosted, 16vcpu-32ram-ubuntu22-namada-x86]
414415
container:
415-
image: ghcr.io/heliaxdev/namada-ci:namada-main
416+
image: ghcr.io/heliaxdev/namada-ci:namada-v1.1.4
416417
timeout-minutes: 25
417418

418419
steps:
@@ -429,7 +430,7 @@ jobs:
429430
env:
430431
RUNS_ON_S3_BUCKET_CACHE: ${{ env.CACHE_BUCKET }}
431432
with:
432-
path: /usr/local/cargo
433+
path: /root/.cargo
433434
key: /cache/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
434435
- name: Start sccache server
435436
id: sccache
@@ -463,7 +464,7 @@ jobs:
463464
test-e2e:
464465
runs-on: [self-hosted, 4vcpu-8ram-ubuntu22-namada-x86]
465466
container:
466-
image: ghcr.io/heliaxdev/namada-ci:namada-main
467+
image: ghcr.io/heliaxdev/namada-ci:namada-v1.1.4
467468
if: github.event.pull_request.draft == false || contains(github.head_ref, 'mergify/merge-queue') || contains(github.ref_name, 'mergify/merge-queue')
468469
needs: [build-wasm, build-binaries]
469470
timeout-minutes: 50
@@ -491,7 +492,7 @@ jobs:
491492
env:
492493
RUNS_ON_S3_BUCKET_CACHE: ${{ env.CACHE_BUCKET }}
493494
with:
494-
path: /usr/local/cargo
495+
path: /root/.cargo
495496
key: /cache/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
496497
- name: Start sccache server
497498
id: sccache
@@ -562,7 +563,7 @@ jobs:
562563
runs-on: [ubuntu-latest]
563564
timeout-minutes: 10
564565
if: ${{ github.event.pull_request.head.repo.full_name == 'anoma/namada' }}
565-
needs: [test-unit, test-integration]
566+
needs: [test-unit, test-integration, test-wasm]
566567

567568
steps:
568569
- name: Download unit coverage artifacts
@@ -607,6 +608,14 @@ jobs:
607608
sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 10
608609
sudo apt-get update
609610
make deps
611+
- name: Install cmake 3.28.0
612+
run: |
613+
apt-get remove --purge -y cmake && apt-get autoremove -y
614+
wget https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0-linux-x86_64.tar.gz
615+
tar -xzf cmake-3.28.0-linux-x86_64.tar.gz && sudo mv cmake-3.28.0-linux-x86_64/ /usr/local/cmake
616+
sudo ln -sf /usr/local/cmake/bin/* /usr/local/bin/
617+
rm -rf cmake-3.28.0-linux-x86_64.tar.gz
618+
cmake --version
610619
- name: Install rust
611620
uses: actions-rs/toolchain@v1
612621
with:
@@ -626,7 +635,7 @@ jobs:
626635
test-e2e-with-device-automation:
627636
runs-on: [self-hosted, 4vcpu-8ram-ubuntu22-namada-x86]
628637
container:
629-
image: ghcr.io/heliaxdev/namada-ci:namada-main
638+
image: ghcr.io/heliaxdev/namada-ci:namada-v1.1.4
630639
if: github.event.pull_request.draft == false || contains(github.head_ref, 'mergify/merge-queue') || contains(github.ref_name, 'mergify/merge-queue')
631640
needs: [build-wasm, build-binaries]
632641
timeout-minutes: 50
@@ -645,7 +654,7 @@ jobs:
645654
env:
646655
RUNS_ON_S3_BUCKET_CACHE: ${{ env.CACHE_BUCKET }}
647656
with:
648-
path: /usr/local/cargo
657+
path: /root/.cargo
649658
key: /cache/${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}-${{ env.NIGHTLY }}
650659
- name: Start sccache server
651660
id: sccache

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- "v[0-9]+.[0-9]+.[0-9]+"
77
- "v[0-9]+.[0-9]+.[0-9]+-[a-z]+"
88
branches:
9-
- '*-rc[0-9]*'
9+
- '[0-9]+.[0-9]+.[0-9]+-rc.[0-9]*'
1010
workflow_dispatch:
1111
inputs:
1212
tag:
@@ -26,7 +26,7 @@ jobs:
2626
wasm:
2727
runs-on: [ubuntu-latest]
2828
container:
29-
image: ghcr.io/heliaxdev/namada-ci:wasm-main
29+
image: ghcr.io/heliaxdev/namada-ci:wasm-v1.1.4
3030
options: --user 1001
3131
steps:
3232
- name: Checkout repo

‎CHANGELOG.md‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,29 @@ Namada v1.0.0 is the first stable release of the Namada apps.
4949
- updated namada libraries to libs-v0.46.1
5050
([\#4123](https://github.com/anoma/namada/pull/4123))
5151

52+
## libs-v0.48.2
53+
54+
Namada libs 0.48.2
55+
56+
### MISCELLANEOUS
57+
58+
- Fix CI on maintenance branch.
59+
([\#4554](https://github.com/anoma/namada/pull/4554))
60+
61+
## libs-v0.48.1
62+
63+
Namada libs 0.48.1
64+
65+
### BUG FIXES
66+
67+
- Upgrade tendermint-rs ([\#4545](https://github.com/anoma/namada/pull/4545))
68+
69+
### IMPROVEMENTS
70+
71+
- Generalize the comparison of denominated amounts to
72+
support the case where gap between denominations is large.
73+
([\#4472](https://github.com/anoma/namada/pull/4472))
74+
5275
## libs-v0.48.0
5376

5477
Namada libraries v0.48.0 major release.
@@ -1288,9 +1311,6 @@ Namada 0.33.0 is a minor release that contains various new features, improvement
12881311

12891312
- move query_ibc_tokens and lookup_ibc_token_alias to sdk
12901313
([\#2729](https://github.com/anoma/namada/issues/2729))
1291-
1292-
### SDK
1293-
12941314
- Add a new method to the sdk to change a validator consensus key.
12951315
([\#3037](https://github.com/anoma/namada/pull/3037))
12961316
- Improve the function to update an enstablished address via the sdk.

0 commit comments

Comments
 (0)