Skip to content

Commit

Permalink
POS-2821: GHE fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
marcello33 committed Feb 6, 2025
1 parent 51af82c commit aba9811
Show file tree
Hide file tree
Showing 11 changed files with 902 additions and 169 deletions.
1 change: 0 additions & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ In case this PR includes changes that must be applied only to a subset of nodes,

- [ ] I have added at least 2 reviewer or the whole pos-v1 team
- [ ] I have added sufficient documentation in code
- [ ] I will be resolving comments - if any - by pushing each fix in a separate commit and linking the commit hash in the comment reply
- [ ] Created a task in Jira and informed the team for implementation in Erigon client (if applicable)
- [ ] Includes RPC methods changes, and the Notion documentation has been updated

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- uses: actions/setup-go@v5
with:
go-version: 1.22.x
go-version: 1.23.x

- name: Install dependencies on Linux
if: runner.os == 'Linux'
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
- uses: actions/setup-go@v5
with:
go-version: 1.22.x
go-version: 1.23.x

- name: Install dependencies on Linux
if: runner.os == 'Linux'
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
- uses: actions/setup-go@v5
with:
go-version: 1.22.x
go-version: 1.23.x

- name: Install dependencies on Linux
if: runner.os == 'Linux'
Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:
- uses: actions/setup-go@v5
with:
go-version: 1.22.x
go-version: 1.23.x

- name: Install dependencies on Linux
if: runner.os == 'Linux'
Expand Down Expand Up @@ -196,7 +196,7 @@ jobs:
- uses: actions/setup-go@v5
with:
go-version: 1.22.x
go-version: 1.23.x

- name: Checkout matic-cli
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Go
uses: actions/setup-go@v5
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/govuln.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ jobs:
name: Run govuln check and Publish
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Running govulncheck
uses: Templum/[email protected].0
uses: Templum/[email protected].2
continue-on-error: true
env:
DEBUG: "true"
with:
go-version: 1.22
go-version: 1.23
package: ./...
github-token: ${{ secrets.GITHUB_TOKEN }}
fail-on-vuln: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/packager_deb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@master
with:
go-version: 1.22.1
go-version: 1.23.2
# Variables
- name: Adding TAG to ENV
run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV
Expand Down Expand Up @@ -126,4 +126,4 @@ jobs:
prerelease: true
files: |
packaging/deb/bor**.deb
packaging/deb/bor**.deb.checksum
packaging/deb/bor**.deb.checksum
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Set up Go
uses: actions/setup-go@master
with:
go-version: 1.22.x
go-version: 1.23.x

- name: Prepare
id: prepare
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rpm_arm_packager.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@master
with:
go-version: 1.22.1
go-version: 1.23.2
- name: Adding TAG to ENV
run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rpm_packager.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@master
with:
go-version: 1.22.1
go-version: 1.23.2
- name: Adding TAG to ENV
run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
pull-requests: write

steps:
- uses: actions/stale@v5
- uses: actions/stale@v9
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'This issue is stale because it has been open 14 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
Expand Down
10 changes: 4 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/ethereum/go-ethereum

go 1.22

toolchain go1.22.1
go 1.23.2

require (
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.2
Expand Down Expand Up @@ -223,7 +221,7 @@ require (
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-multierror v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/huandu/xstrings v1.3.2 // indirect
Expand Down Expand Up @@ -288,7 +286,7 @@ require (
go.opentelemetry.io/otel/trace v1.27.0
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
google.golang.org/api v0.169.0 // indirect
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
)

replace github.com/cosmos/cosmos-sdk => github.com/maticnetwork/cosmos-sdk v0.38.4
Expand All @@ -297,7 +295,7 @@ replace github.com/tendermint/tendermint => github.com/maticnetwork/tendermint v

replace github.com/tendermint/tm-db => github.com/tendermint/tm-db v0.2.0

replace github.com/ethereum/go-ethereum => github.com/maticnetwork/bor v1.3.2
replace github.com/ethereum/go-ethereum => github.com/maticnetwork/bor v1.5.5

replace github.com/Masterminds/goutils => github.com/Masterminds/goutils v1.1.1

Expand Down
Loading

0 comments on commit aba9811

Please sign in to comment.