Skip to content

Commit dbf8d2b

Browse files
committed
Merge branch 'main' into pacaya_fork
2 parents 8eb5b2f + 43163d8 commit dbf8d2b

Some content is hidden

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

53 files changed

+615
-187
lines changed

.github/workflows/bridge-ui.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717

1818
jobs:
1919
build-and-test:
20-
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') }}
20+
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') && github.actor != 'dependabot[bot]' }}
2121
uses: ./.github/workflows/bridge-ui--ci.yml
2222

2323
# Deployment name follow the pattern: deploy_<appname(bridge-ui)>_<network(devnet|hekla|mainnet)>_<environment(preview|production)>
@@ -37,7 +37,7 @@ jobs:
3737

3838
# Hekla testnet
3939
deploy_bridge-ui_hekla_preview:
40-
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') }}
40+
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') && github.actor != 'dependabot[bot]' }}
4141
needs: build-and-test
4242
uses: ./.github/workflows/repo--vercel-deploy.yml
4343
with:
@@ -62,7 +62,7 @@ jobs:
6262

6363
# Mainnet
6464
deploy_bridge-ui_mainnet_preview:
65-
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') }}
65+
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') && github.actor != 'dependabot[bot]' }}
6666
needs: build-and-test
6767
uses: ./.github/workflows/repo--vercel-deploy.yml
6868
with:

.github/workflows/docs-site--preview.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414

1515
jobs:
1616
deploy-docs-site-preview:
17-
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') && github.event.pull_request.head.repo.fork == false }}
17+
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') && github.event.pull_request.head.repo.fork == false && github.actor != 'dependabot[bot]' }}
1818
runs-on: [arc-runner-set]
1919
steps:
2020
- name: Install Git

.github/workflows/fork-diff--preview.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414

1515
jobs:
1616
deploy-fork-diff-preview:
17-
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') }}
17+
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') && github.actor != 'dependabot[bot]' }}
1818
runs-on: [arc-runner-set]
1919
steps:
2020
- name: Install Git

.github/workflows/guardian-prover-health-check-ui--ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on: workflow_call
44

55
jobs:
66
check-guardian-prover-health-check-ui:
7-
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') && !startsWith(github.head_ref, 'refs/heads/dependabot/') }}
87
runs-on: [taiko-runner]
98
steps:
109
- name: Cancel previous runs

.github/workflows/guardian-prover-health-check-ui.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212

1313
jobs:
1414
build-and-test:
15+
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') && github.actor != 'dependabot[bot]' }}
1516
uses: ./.github/workflows/guardian-prover-health-check-ui--ci.yml
1617

1718
# Deployment name follow the pattern: deploy_<appname(guardian-prover-health-check-ui)>_<network(devnet|hekla|mainnet)>_<environment(preview|production)>
@@ -29,7 +30,7 @@ jobs:
2930
# vercel_token: ${{ secrets.VERCEL_TOKEN }}
3031

3132
deploy_guardians-ui_hekla_preview:
32-
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') }}
33+
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') && github.actor != 'dependabot[bot]' }}
3334
needs: build-and-test
3435
uses: ./.github/workflows/repo--vercel-deploy.yml
3536
with:
@@ -41,7 +42,7 @@ jobs:
4142
vercel_token: ${{ secrets.VERCEL_TOKEN }}
4243

4344
deploy_guardians-ui_mainnet_preview:
44-
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') }}
45+
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') && github.actor != 'dependabot[bot]' }}
4546
needs: build-and-test
4647
uses: ./.github/workflows/repo--vercel-deploy.yml
4748
with:

.github/workflows/guardian-prover-health-check.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313

1414
jobs:
1515
lint-guardian-prover-health-check:
16-
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') }}
16+
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') && github.actor != 'dependabot[bot]' }}
1717
name: lint-guardian-prover-health-check
1818
runs-on: [taiko-runner]
1919
steps:
@@ -32,7 +32,7 @@ jobs:
3232
args: --config=.golangci.yml --timeout=4m
3333

3434
test-guardian-prover-health-check:
35-
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') }}
35+
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') && github.actor != 'dependabot[bot]' }}
3636
runs-on: [taiko-runner]
3737
needs: lint-guardian-prover-health-check
3838
steps:
@@ -58,7 +58,7 @@ jobs:
5858

5959
push-guardian-prover-health-check-docker-image:
6060
# Skip dependabot PRs
61-
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') && !startsWith(github.head_ref, 'refs/heads/dependabot/') && github.event.pull_request.head.repo.fork == false }}
61+
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') && github.actor != 'dependabot[bot]' && github.event.pull_request.head.repo.fork == false }}
6262
name: Build and push docker image
6363
runs-on: [taiko-runner]
6464

.github/workflows/protocol-monitors.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111

1212
jobs:
1313
deploy-protocol-monitors:
14-
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') }}
14+
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') && github.actor != 'dependabot[bot]' }}
1515
runs-on: [taiko-runner]
1616
permissions:
1717
# Give the necessary permissions for stefanzweifel/git-auto-commit-action.

.github/workflows/protocol.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222

2323
jobs:
2424
build-protocol:
25-
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') }}
25+
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') && github.actor != 'dependabot[bot]' }}
2626
runs-on: [arc-runner-set]
2727
permissions:
2828
# Give the necessary permissions for stefanzweifel/git-auto-commit-action.
@@ -76,7 +76,7 @@ jobs:
7676
pnpm test:deploy:l1
7777
7878
genesis-docker:
79-
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') }}
79+
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') && github.actor != 'dependabot[bot]' }}
8080
runs-on: [taiko-runner]
8181
permissions:
8282
# Give the necessary permissions for stefanzweifel/git-auto-commit-action.

.github/workflows/repo--typo-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [pull_request]
44

55
jobs:
66
check-for-typos:
7-
if: contains(github.event.pull_request.labels.*.name, 'option.workflow_on') || github.event.pull_request.draft == false && github.head_ref != 'release-please-*'
7+
if: ${{ contains(github.event.pull_request.labels.*.name, 'option.workflow_on') || github.event.pull_request.draft == false && github.head_ref != 'release-please-*' && github.actor != 'dependabot[bot]' }}
88
runs-on: [arc-runner-set]
99

1010
steps:

.github/workflows/snaefell-ui.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ on:
55

66
jobs:
77
build-and-test:
8+
if: ${{ github.actor != 'dependabot[bot]' }}
89
uses: ./.github/workflows/snaefell-ui--ci.yml
910

1011
# Deployment name follow the pattern: deploy_<appname(snaefell-ui)>_<network(devnet|hekla|mainnet)>_<environment(preview|production)>
1112
# The following Vercel project is not found, so disable it at least for now.
1213
deploy_snaefell-ui_mainnet_preview:
14+
if: ${{ github.actor != 'dependabot[bot]' }}
1315
needs: build-and-test
1416
uses: ./.github/workflows/repo--vercel-deploy.yml
1517
with:
@@ -21,6 +23,7 @@ jobs:
2123
vercel_token: ${{ secrets.VERCEL_TOKEN }}
2224

2325
deploy_snaefell-ui_mainnet_production:
26+
if: ${{ github.actor != 'dependabot[bot]' }}
2427
needs: build-and-test
2528
uses: ./.github/workflows/repo--vercel-deploy.yml
2629
with:

.github/workflows/taiko-client--test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313

1414
jobs:
1515
lint:
16-
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') }}
16+
if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') && github.actor != 'dependabot[bot]' }}
1717
name: Lint
1818
runs-on: [ubuntu-latest]
1919
steps:

.release-please-manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"packages/bridge-ui": "2.13.0",
3-
"packages/docs-site": "1.21.0",
3+
"packages/docs-site": "1.21.1",
44
"packages/eventindexer": "0.13.0",
55
"packages/fork-diff": "0.6.1",
66
"packages/guardian-prover-health-check": "0.1.0",
@@ -9,7 +9,7 @@
99
"packages/relayer": "0.12.0",
1010
"packages/snaefell-ui": "1.1.0",
1111
"packages/supplementary-contracts": "1.0.0",
12-
"packages/taiko-client": "0.41.1",
12+
"packages/taiko-client": "0.42.0",
1313
"packages/taikoon-ui": "1.3.0",
1414
"packages/ui-lib": "1.0.0"
1515
}

go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/ethereum-optimism/optimism v1.7.4
1515
github.com/ethereum/go-ethereum v1.14.11
1616
github.com/ethereum/hive v0.0.0-20240822135954-91829ccfb2c5
17-
github.com/go-git/go-git/v5 v5.12.0
17+
github.com/go-git/go-git/v5 v5.13.1
1818
github.com/go-resty/resty/v2 v2.16.2
1919
github.com/gomarkdown/markdown v0.0.0-20231222211730-1d6d20845b47
2020
github.com/google/uuid v1.6.0
@@ -42,8 +42,8 @@ require (
4242
gopkg.in/go-playground/assert.v1 v1.2.1
4343
gopkg.in/yaml.v3 v3.0.1
4444
gorm.io/datatypes v1.2.5
45-
gorm.io/driver/mysql v1.5.6
46-
gorm.io/gorm v1.25.11
45+
gorm.io/driver/mysql v1.5.7
46+
gorm.io/gorm v1.25.12
4747
gotest.tools v2.2.0+incompatible
4848
)
4949

@@ -55,7 +55,7 @@ require (
5555
github.com/DataDog/zstd v1.5.6-0.20230824185856-869dae002e5e // indirect
5656
github.com/KyleBanks/depth v1.2.1 // indirect
5757
github.com/Microsoft/go-winio v0.6.2 // indirect
58-
github.com/ProtonMail/go-crypto v1.0.0 // indirect
58+
github.com/ProtonMail/go-crypto v1.1.3 // indirect
5959
github.com/VictoriaMetrics/fastcache v1.12.2 // indirect
6060
github.com/andybalholm/brotli v1.1.1 // indirect
6161
github.com/aymerick/douceur v0.2.0 // indirect
@@ -81,7 +81,7 @@ require (
8181
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
8282
github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c // indirect
8383
github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect
84-
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
84+
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
8585
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
8686
github.com/distribution/reference v0.6.0 // indirect
8787
github.com/docker/docker v27.1.1+incompatible // indirect
@@ -97,7 +97,7 @@ require (
9797
github.com/fsouza/go-dockerclient v1.11.0 // indirect
9898
github.com/getsentry/sentry-go v0.27.0 // indirect
9999
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
100-
github.com/go-git/go-billy/v5 v5.5.0 // indirect
100+
github.com/go-git/go-billy/v5 v5.6.1 // indirect
101101
github.com/go-logr/logr v1.4.2 // indirect
102102
github.com/go-logr/stdr v1.2.2 // indirect
103103
github.com/go-ole/go-ole v1.3.0 // indirect
@@ -186,7 +186,7 @@ require (
186186
github.com/shirou/gopsutil/v3 v3.23.12 // indirect
187187
github.com/shoenig/go-m1cpu v0.1.6 // indirect
188188
github.com/sirupsen/logrus v1.9.3 // indirect
189-
github.com/skeema/knownhosts v1.2.2 // indirect
189+
github.com/skeema/knownhosts v1.3.0 // indirect
190190
github.com/supranational/blst v0.3.13 // indirect
191191
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
192192
github.com/thomaso-mirodin/intmath v0.0.0-20160323211736-5dc6d854e46e // indirect

0 commit comments

Comments
 (0)