From 54135b1355b28611489c662d042d1db602e5a06e Mon Sep 17 00:00:00 2001 From: dieynaba ba Date: Fri, 20 Jun 2025 12:11:44 -0700 Subject: [PATCH 1/4] add pagination --- dependency_updater/dependency_updater.go | 43 +++++++++++++++--------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/dependency_updater/dependency_updater.go b/dependency_updater/dependency_updater.go index cbecd717e..bbdb737b4 100644 --- a/dependency_updater/dependency_updater.go +++ b/dependency_updater/dependency_updater.go @@ -124,28 +124,39 @@ func getAndUpdateDependency(ctx context.Context, client *github.Client, dependen } func getVersionAndCommit(ctx context.Context, client *github.Client, dependencies Dependencies, dependencyType string) (string, string, error) { - var version *github.RepositoryRelease var err error - // handle dependencies with prefix - releases, _, err := client.Repositories.ListReleases( - ctx, - dependencies[dependencyType].Owner, - dependencies[dependencyType].Repo, - nil) + foundPrefixVersion := false + options := &github.ListOptions{Page: 1} - if err != nil { - return "", "", fmt.Errorf("error getting releases: %s", err) - } + for { + releases, resp, err := client.Repositories.ListReleases( + ctx, + dependencies[dependencyType].Owner, + dependencies[dependencyType].Repo, + options) - if dependencies[dependencyType].TagPrefix == "" { - version = releases[0] - } else { - for release := range releases { - if strings.HasPrefix(*releases[release].TagName, dependencies[dependencyType].TagPrefix) { - version = releases[release] + if err != nil { + return "", "", fmt.Errorf("error getting releases: %s", err) + } + + if dependencies[dependencyType].TagPrefix == "" { + version = releases[0] + break + } else if resp.NextPage == 0 { + break + } else { + for release := range releases { + if strings.HasPrefix(*releases[release].TagName, dependencies[dependencyType].TagPrefix) { + version = releases[release] + foundPrefixVersion = true + break + } + } + if foundPrefixVersion { break } + options.Page = resp.NextPage } } From 0c7d7f8d3963fc255ecef586dfc94c27e7002089 Mon Sep 17 00:00:00 2001 From: dieynaba ba Date: Fri, 20 Jun 2025 12:25:48 -0700 Subject: [PATCH 2/4] change if block order --- dependency_updater/dependency_updater.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependency_updater/dependency_updater.go b/dependency_updater/dependency_updater.go index bbdb737b4..65634f745 100644 --- a/dependency_updater/dependency_updater.go +++ b/dependency_updater/dependency_updater.go @@ -143,9 +143,7 @@ func getVersionAndCommit(ctx context.Context, client *github.Client, dependencie if dependencies[dependencyType].TagPrefix == "" { version = releases[0] break - } else if resp.NextPage == 0 { - break - } else { + } else if dependencies[dependencyType].TagPrefix != ""{ for release := range releases { if strings.HasPrefix(*releases[release].TagName, dependencies[dependencyType].TagPrefix) { version = releases[release] @@ -157,6 +155,8 @@ func getVersionAndCommit(ctx context.Context, client *github.Client, dependencie break } options.Page = resp.NextPage + } else if resp.NextPage == 0 { + break } } From dd7c521e1fcc18a7360d3035f9de20f7ab78fece Mon Sep 17 00:00:00 2001 From: dieynaba ba Date: Mon, 23 Jun 2025 10:25:49 -0700 Subject: [PATCH 3/4] update versions.json + op-node version --- dependency_updater/dependency_updater.go | 9 +++++---- versions.env | 4 ++-- versions.json | 19 ++----------------- 3 files changed, 9 insertions(+), 23 deletions(-) diff --git a/dependency_updater/dependency_updater.go b/dependency_updater/dependency_updater.go index 65634f745..332802e8f 100644 --- a/dependency_updater/dependency_updater.go +++ b/dependency_updater/dependency_updater.go @@ -16,11 +16,8 @@ import ( ) type Info struct { - RepoUrl string `json:"repoUrl"` Tag string `json:"tag"` Commit string `json:"commit"` - CommitUrl string `json:"commitUrl"` - VersionUrl string `json:"versionUrl"` TagPrefix string `json:"tagPrefix,omitempty"` Owner string `json:"owner` Repo string `json:"repo` @@ -207,6 +204,10 @@ func createVersionsEnv(repoPath string, dependencies Dependencies) error { envLines := []string{} for dependency := range dependencies { + repoUrl := "https://github.com/" + + dependencies[dependency].Owner + "/" + + dependencies[dependency].Repo + ".git" + dependencyPrefix := strings.ToUpper(dependency) envLines = append(envLines, fmt.Sprintf("export %s_%s=%s", @@ -216,7 +217,7 @@ func createVersionsEnv(repoPath string, dependencies Dependencies) error { dependencyPrefix, "COMMIT", dependencies[dependency].Commit)) envLines = append(envLines, fmt.Sprintf("export %s_%s=%s", - dependencyPrefix, "REPO", dependencies[dependency].RepoUrl)) + dependencyPrefix, "REPO", repoUrl)) } slices.Sort(envLines) diff --git a/versions.env b/versions.env index f3a6e9bf8..2e120f408 100644 --- a/versions.env +++ b/versions.env @@ -7,9 +7,9 @@ export NETHERMIND_TAG=1.31.11 export OP_GETH_COMMIT=68075997f33907401a93216aa426514c5ddc8870 export OP_GETH_REPO=https://github.com/ethereum-optimism/op-geth.git export OP_GETH_TAG=v1.101511.0 -export OP_NODE_COMMIT=b1e7c63bb2ffea46771c302bcb05f72ba1a7bf61 +export OP_NODE_COMMIT=7eedfced77eb30ae72cc8d0e7c793dd2d1b6f161 export OP_NODE_REPO=https://github.com/ethereum-optimism/optimism.git -export OP_NODE_TAG=op-node/v1.13.3 +export OP_NODE_TAG=op-node/v1.13.4 export OP_RETH_COMMIT=127595e23079de2c494048d0821ea1f1107eb624 export OP_RETH_REPO=https://github.com/paradigmxyz/reth.git export OP_RETH_TAG=v1.4.8 \ No newline at end of file diff --git a/versions.json b/versions.json index 196909b22..e3f653bdc 100644 --- a/versions.json +++ b/versions.json @@ -1,47 +1,32 @@ { "base_reth_node": { - "repoUrl": "https://github.com/base/node-reth.git", "tag": "v0.1.2", "commit": "7fe1d4e7c74d322d2cf78df55db40e14f466cfc6", - "commitUrl": "https://api.github.com/repos/base/node-reth/commits/", - "versionUrl": "https://api.github.com/repos/base/node-reth/releases", "Owner": "base", "Repo": "node-reth" }, "nethermind": { - "repoUrl": "https://github.com/NethermindEth/nethermind.git", "tag": "1.31.11", "commit": "2be1890ee4f21f921a471de058dcb57937bd9b90", - "commitUrl": "https://api.github.com/repos/NethermindEth/nethermind/commits/", - "versionUrl": "https://api.github.com/repos/NethermindEth/nethermind/releases", "Owner": "NethermindEth", "Repo": "nethermind" }, "op_geth": { - "repoUrl": "https://github.com/ethereum-optimism/op-geth.git", "tag": "v1.101511.0", "commit": "68075997f33907401a93216aa426514c5ddc8870", - "commitUrl": "https://api.github.com/repos/ethereum-optimism/op-geth/commits/", - "versionUrl": "https://api.github.com/repos/ethereum-optimism/op-geth/releases", "Owner": "ethereum-optimism", "Repo": "op-geth" }, "op_node": { - "repoUrl": "https://github.com/ethereum-optimism/optimism.git", - "tag": "op-node/v1.13.3", - "commit": "b1e7c63bb2ffea46771c302bcb05f72ba1a7bf61", - "commitUrl": "https://api.github.com/repos/ethereum-optimism/optimism/commits/", - "versionUrl": "https://api.github.com/repos/ethereum-optimism/optimism/releases", + "tag": "op-node/v1.13.4", + "commit": "7eedfced77eb30ae72cc8d0e7c793dd2d1b6f161", "tagPrefix": "op-node", "Owner": "ethereum-optimism", "Repo": "optimism" }, "op_reth": { - "repoUrl": "https://github.com/paradigmxyz/reth.git", "tag": "v1.4.8", "commit": "127595e23079de2c494048d0821ea1f1107eb624", - "commitUrl": "https://api.github.com/repos/paradigmxyz/reth/commits/", - "versionUrl": "https://api.github.com/repos/paradigmxyz/reth/releases", "Owner": "paradigmxyz", "Repo": "reth" } From 5fdd8859bed414d0f3292938fabb7086e649f659 Mon Sep 17 00:00:00 2001 From: dieynaba ba Date: Tue, 1 Jul 2025 15:11:14 -0700 Subject: [PATCH 4/4] fix json --- versions.json | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/versions.json b/versions.json index 6dbe9ee9e..86c6dd8f8 100644 --- a/versions.json +++ b/versions.json @@ -1,19 +1,13 @@ { "base_reth_node": { - "repoUrl": "https://github.com/base/node-reth.git", "tag": "v0.1.3", "commit": "f28c2751a0737d7617e52253a9e81070b87290b5", - "commitUrl": "https://api.github.com/repos/base/node-reth/commits/", - "versionUrl": "https://api.github.com/repos/base/node-reth/releases", "Owner": "base", "Repo": "node-reth" }, "nethermind": { - "repoUrl": "https://github.com/NethermindEth/nethermind.git", "tag": "1.32.2", "commit": "d3e7eb98b28d0b9c7b58a9fb45e83b640b2e17e6", - "commitUrl": "https://api.github.com/repos/NethermindEth/nethermind/commits/", - "versionUrl": "https://api.github.com/repos/NethermindEth/nethermind/releases", "Owner": "NethermindEth", "Repo": "nethermind" }, @@ -24,21 +18,15 @@ "Repo": "op-geth" }, "op_node": { - "repoUrl": "https://github.com/ethereum-optimism/optimism.git", "tag": "op-node/v1.13.4", "commit": "7eedfced77eb30ae72cc8d0e7c793dd2d1b6f161", - "commitUrl": "https://api.github.com/repos/ethereum-optimism/optimism/commits/", - "versionUrl": "https://api.github.com/repos/ethereum-optimism/optimism/releases", "tagPrefix": "op-node", "Owner": "ethereum-optimism", "Repo": "optimism" }, "op_reth": { - "repoUrl": "https://github.com/paradigmxyz/reth.git", "tag": "v1.5.0", "commit": "61e38f9af154fe91e776d8f5e449d20a1571e8cf", - "commitUrl": "https://api.github.com/repos/paradigmxyz/reth/commits/", - "versionUrl": "https://api.github.com/repos/paradigmxyz/reth/releases", "Owner": "paradigmxyz", "Repo": "reth" }