Single client

Author: danyalprout

dependency_updater/dependency_updater.go

@@ -7,6 +7,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/retry"
 	"github.com/google/go-github/v72/github"
 	"github.com/urfave/cli/v3"
+	"slices"
 	"time"
 
 	"log"
@@ -74,6 +75,9 @@ func updater(token string, repoPath string) error {
 		return fmt.Errorf("error reading versions JSON: %s", err)
 	}
 
+	client := github.NewClient(nil).WithAuthToken(token)
+	ctx := context.Background()
+
 	var dependencies Dependencies
 
 	err = json.Unmarshal(f, &dependencies)
@@ -84,8 +88,9 @@ func updater(token string, repoPath string) error {
 	for dependency := range dependencies {
 		err := retry.Do0(context.Background(), 3, retry.Fixed(1*time.Second), func() error {
 			return getAndUpdateDependency(
+				ctx,
+				client,
 				dependency,
-				token,
 				repoPath,
 				dependencies,
 			)
@@ -104,12 +109,8 @@ func updater(token string, repoPath string) error {
 	return nil
 }
 
-func getAndUpdateDependency(
-	dependencyType string,
-	token string,
-	repoPath string,
-	dependencies Dependencies) error {
-	version, commit, err := getVersionAndCommit(token, dependencies, dependencyType)
+func getAndUpdateDependency(ctx context.Context, client *github.Client, dependencyType string, repoPath string, dependencies Dependencies) error {
+	version, commit, err := getVersionAndCommit(ctx, client, dependencies, dependencyType)
 	if err != nil {
 		return err
 	}
@@ -122,14 +123,11 @@ func getAndUpdateDependency(
 	return nil
 }
 
-func getVersionAndCommit(token string, dependencies Dependencies, dependencyType string) (string, string, error) {
-	client := github.NewClient(nil).WithAuthToken(token)
-	ctx := context.Background()
+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
-	//if dependencies[dependencyType].TagPrefix != nil {
 	releases, _, err := client.Repositories.ListReleases(
 		ctx,
 		dependencies[dependencyType].Owner,
@@ -210,6 +208,8 @@ func createVersionsEnv(repoPath string, dependencies Dependencies) error {
 			dependencyPrefix, "REPO", dependencies[dependency].RepoUrl))
 	}
 
+	slices.Sort(envLines)
+
 	file, err := os.Create(repoPath + "/versions.env")
 	if err != nil {
 		return fmt.Errorf("error creating versions.env file: %s", err)

versions.env

@@ -1,20 +1,20 @@
-export NETHERMIND_TAG=1.31.11 
+export BASE_RETH_NODE_COMMIT=7fe1d4e7c74d322d2cf78df55db40e14f466cfc6 
+ export BASE_RETH_NODE_REPO=https://github.com/base/node-reth.git 
+
+ export BASE_RETH_NODE_TAG=v0.1.2 
  export NETHERMIND_COMMIT=2be1890ee4f21f921a471de058dcb57937bd9b90 
  export NETHERMIND_REPO=https://github.com/NethermindEth/nethermind.git 
 
- export OP_GETH_TAG=v1.101511.0 
+ 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_NODE_TAG=op-node/v1.13.3 
+ export OP_GETH_TAG=v1.101511.0 
  export OP_NODE_COMMIT=b1e7c63bb2ffea46771c302bcb05f72ba1a7bf61 
  export OP_NODE_REPO=https://github.com/ethereum-optimism/optimism.git 
 
- export OP_RETH_TAG=v1.4.8 
+ export OP_NODE_TAG=op-node/v1.13.3 
  export OP_RETH_COMMIT=127595e23079de2c494048d0821ea1f1107eb624 
  export OP_RETH_REPO=https://github.com/paradigmxyz/reth.git 
 
- export BASE_RETH_NODE_TAG=v0.1.2 
- export BASE_RETH_NODE_COMMIT=7fe1d4e7c74d322d2cf78df55db40e14f466cfc6 
- export BASE_RETH_NODE_REPO=https://github.com/base/node-reth.git 
-
+ export OP_RETH_TAG=v1.4.8