Skip to content

Commit ab9c845

Browse files
committed
Merge remote-tracking branch 'origin/main' into canton
2 parents ce082cf + 4e9da50 commit ab9c845

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+5
-34810
lines changed

.github/workflows/test-makefile.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ jobs:
1212
project:
1313
- name: lib
1414
path: ./lib/
15-
- name: flakeguard
16-
path: ./tools/flakeguard/
1715
runs-on: ubuntu-latest
1816
name: ${{ matrix.project.name }} unit tests
1917
steps:

_typos.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ extend-exclude = [
44
"**/go-cache",
55
"framework/examples/myproject_cll/README.md",
66
"framework/components/blockchain/tron.go",
7-
"tools/flakeguard/e2e-flaky-test-guide.md",
8-
"tools/flakeguard/runner/**",
97
"infra/**",
108
"book/**",
119
"**/go.mod",
@@ -16,5 +14,5 @@ extend-exclude = [
1614
"wasp/HOW_IT_WORKS.md",
1715
"wasp/dashboard/**",
1816
"seth/*_test.go",
19-
"seth/dot_graph.go"
20-
]
17+
"seth/dot_graph.go",
18+
]

framework/.changeset/v0.12.6.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Bump the Aptos node image to v1.38.7

framework/components/blockchain/aptos.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import (
1717
const (
1818
DefaultAptosAPIPort = "8080"
1919
DefaultAptosFaucetPort = "8081"
20-
DefaultAptosArm64Image = "ghcr.io/friedemannf/aptos-tools:aptos-node-v1.38.6"
21-
DefaultAptosX86_64Image = "aptoslabs/tools:aptos-node-v1.38.6"
20+
DefaultAptosArm64Image = "ghcr.io/friedemannf/aptos-tools:aptos-node-v1.38.7"
21+
DefaultAptosX86_64Image = "aptoslabs/tools:aptos-node-v1.38.7"
2222
)
2323

2424
var (

tools/flakeguard/.gitignore

Lines changed: 0 additions & 12 deletions
This file was deleted.

tools/flakeguard/.tool-versions

Lines changed: 0 additions & 1 deletion
This file was deleted.

tools/flakeguard/Makefile

Lines changed: 0 additions & 19 deletions
This file was deleted.

tools/flakeguard/README.md

Lines changed: 0 additions & 167 deletions
This file was deleted.

tools/flakeguard/cmd/check_test_owners.go

Lines changed: 0 additions & 86 deletions
This file was deleted.

0 commit comments

Comments
 (0)