From 8d7af5884d0d446cc369ccaf625d2bb69148a094 Mon Sep 17 00:00:00 2001 From: JenabaBa Date: Mon, 28 Jul 2025 16:21:57 -0700 Subject: [PATCH 1/9] change workflow to use GITHUB_OUTPUT instead of env --- .github/workflows/update-dependencies.yml | 17 ++++++----------- dependency_updater/dependency_updater.go | 13 +++++++------ 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml index 5bf6945ab..56dd5fe84 100644 --- a/.github/workflows/update-dependencies.yml +++ b/.github/workflows/update-dependencies.yml @@ -26,26 +26,21 @@ jobs: run: cd dependency_updater && go build - name: run dependency updater + id: run_dependency_updater env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: cd dependency_updater && ./dependency_updater --repo ../ --github-action true - - name: load commit message/title .env file - if: ${{ hashFiles('commit_message.env') != '' }} - uses: aarcangeli/load-dotenv@2afd907c7bb1c0324d22a6192693213867e77443 # v1.1.0 - with: - filenames: 'commit_message.env' - - name: remove commit message .env - if: ${{ hashFiles('commit_message.env') != '' }} + if: ${{ steps.run_dependency_updater.outputs.TITLE != '' }} run: rm commit_message.env - name: create pull request - if: ${{ env.TITLE != '' }} + if: ${{ steps.run_dependency_updater.outputs.TITLE != '' }} uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8 with: - title: ${{ env.TITLE }} - commit-message: ${{ env.TITLE }} - body: ${{ env.DESC }} + title: ${{ steps.run_dependency_updater.outputs.TITLE }} + commit-message: ${{ steps.run_dependency_updater.outputs.TITLE }} + body: ${{ steps.run_dependency_updater.outputs.DESC }} branch: run-dependency-updater delete-branch: true \ No newline at end of file diff --git a/dependency_updater/dependency_updater.go b/dependency_updater/dependency_updater.go index f6f596f10..744754479 100644 --- a/dependency_updater/dependency_updater.go +++ b/dependency_updater/dependency_updater.go @@ -332,17 +332,18 @@ func createVersionsEnv(repoPath string, dependencies Dependencies) error { } func createGitMessageEnv(title string, description string, repoPath string) error { - file, err := os.Create(repoPath + "/commit_message.env") + file := os.Getenv("GITHUB_OUTPUT") + f, err := os.OpenFile(file, os.O_APPEND, 0644) if err != nil { - return fmt.Errorf("error creating commit_message.env file: %s", err) + return fmt.Errorf("error failed to open GITHUB_OUTPUT file: %s", err) } - defer file.Close() + defer f.Close() - envString := "export TITLE=" + title + "\nexport DESC=" + description - _, err = file.WriteString(envString) + _, err = f.WriteString("TITLE=" + title + "\n" + "DESC=" + description) if err != nil { - return fmt.Errorf("error writing to commit_message.env file: %s", err) + return fmt.Errorf("error faile to write to GITHUB_OUTPUT file: %s", err) } + return nil } From b8ec46987ada877fac4554d804b674216262ad3f Mon Sep 17 00:00:00 2001 From: JenabaBa Date: Mon, 28 Jul 2025 16:24:03 -0700 Subject: [PATCH 2/9] rollback version for testing --- .github/workflows/update-dependencies.yml | 2 +- versions.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml index 56dd5fe84..960eb6e73 100644 --- a/.github/workflows/update-dependencies.yml +++ b/.github/workflows/update-dependencies.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: - ref: main + ref: use-github-output - name: build dependency updater run: cd dependency_updater && go build diff --git a/versions.json b/versions.json index b7a88aca5..4b510a2a3 100644 --- a/versions.json +++ b/versions.json @@ -21,8 +21,8 @@ "tracking": "tag" }, "op_node": { - "tag": "op-node/v1.13.5", - "commit": "7a0ab04ea2db5421da689eb77a68e674e4ae9cfe", + "tag": "op-node/v1.13.4", + "commit": "7eedfced77eb30ae72cc8d0e7c793dd2d1b6f161", "tagPrefix": "op-node", "owner": "ethereum-optimism", "repo": "optimism", From 23dc236c1c88233bcf73bf03126f036314ae185e Mon Sep 17 00:00:00 2001 From: JenabaBa Date: Mon, 28 Jul 2025 16:24:31 -0700 Subject: [PATCH 3/9] trigger workflow run --- .github/workflows/update-dependencies.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml index 960eb6e73..66f3da4fc 100644 --- a/.github/workflows/update-dependencies.yml +++ b/.github/workflows/update-dependencies.yml @@ -1,8 +1,8 @@ name: Update Dockerfile Dependencies on: - schedule: - - cron: '0 13 * * *' - workflow_dispatch: + # schedule: + # - cron: '0 13 * * *' + pull_request: permissions: contents: write From 69a94266182743f47387bd4efffa7112a5964651 Mon Sep 17 00:00:00 2001 From: JenabaBa Date: Mon, 28 Jul 2025 16:26:56 -0700 Subject: [PATCH 4/9] remove ref checkout --- .github/workflows/update-dependencies.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml index 66f3da4fc..8a234dece 100644 --- a/.github/workflows/update-dependencies.yml +++ b/.github/workflows/update-dependencies.yml @@ -19,8 +19,6 @@ jobs: egress-policy: audit - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: use-github-output - name: build dependency updater run: cd dependency_updater && go build From d5ab62f5a1b8b3605e65ba2e5f6355c2c3d28758 Mon Sep 17 00:00:00 2001 From: JenabaBa Date: Mon, 28 Jul 2025 16:34:55 -0700 Subject: [PATCH 5/9] fix write to github_output --- dependency_updater/dependency_updater.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependency_updater/dependency_updater.go b/dependency_updater/dependency_updater.go index 744754479..0769fdca8 100644 --- a/dependency_updater/dependency_updater.go +++ b/dependency_updater/dependency_updater.go @@ -333,15 +333,15 @@ func createVersionsEnv(repoPath string, dependencies Dependencies) error { func createGitMessageEnv(title string, description string, repoPath string) error { file := os.Getenv("GITHUB_OUTPUT") - f, err := os.OpenFile(file, os.O_APPEND, 0644) + f, err := os.OpenFile(file, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644) if err != nil { return fmt.Errorf("error failed to open GITHUB_OUTPUT file: %s", err) } defer f.Close() - - _, err = f.WriteString("TITLE=" + title + "\n" + "DESC=" + description) + titleToWrite := fmt.Sprintf("%s=%s\n", "TITLE", title) + _, err = f.WriteString(titleToWrite) if err != nil { - return fmt.Errorf("error faile to write to GITHUB_OUTPUT file: %s", err) + return fmt.Errorf("error failed to write to GITHUB_OUTPUT file: %s", err) } return nil From f103885dc19f6d84ef0e71bb7694b2bf5118d642 Mon Sep 17 00:00:00 2001 From: JenabaBa Date: Mon, 28 Jul 2025 16:37:07 -0700 Subject: [PATCH 6/9] remove commit_message.env deletion --- .github/workflows/update-dependencies.yml | 4 ---- dependency_updater/dependency_updater.go | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml index 8a234dece..1fdf1e2b6 100644 --- a/.github/workflows/update-dependencies.yml +++ b/.github/workflows/update-dependencies.yml @@ -29,10 +29,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: cd dependency_updater && ./dependency_updater --repo ../ --github-action true - - name: remove commit message .env - if: ${{ steps.run_dependency_updater.outputs.TITLE != '' }} - run: rm commit_message.env - - name: create pull request if: ${{ steps.run_dependency_updater.outputs.TITLE != '' }} uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8 diff --git a/dependency_updater/dependency_updater.go b/dependency_updater/dependency_updater.go index 0769fdca8..9240272d5 100644 --- a/dependency_updater/dependency_updater.go +++ b/dependency_updater/dependency_updater.go @@ -343,6 +343,11 @@ func createGitMessageEnv(title string, description string, repoPath string) erro if err != nil { return fmt.Errorf("error failed to write to GITHUB_OUTPUT file: %s", err) } + descToWrite := fmt.Sprintf("%s=%s\n", "DESC", description) + _, err = f.WriteString(descToWrite) + if err != nil { + return fmt.Errorf("error failed to write to GITHUB_OUTPUT file: %s", err) + } return nil } From 1a54b70ac70aea796731af07b031eb7852d59f04 Mon Sep 17 00:00:00 2001 From: JenabaBa Date: Mon, 28 Jul 2025 16:40:18 -0700 Subject: [PATCH 7/9] trigger workflow run --- dependency_updater/dependency_updater.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dependency_updater/dependency_updater.go b/dependency_updater/dependency_updater.go index 9240272d5..a4861e4e9 100644 --- a/dependency_updater/dependency_updater.go +++ b/dependency_updater/dependency_updater.go @@ -338,11 +338,13 @@ func createGitMessageEnv(title string, description string, repoPath string) erro return fmt.Errorf("error failed to open GITHUB_OUTPUT file: %s", err) } defer f.Close() + titleToWrite := fmt.Sprintf("%s=%s\n", "TITLE", title) _, err = f.WriteString(titleToWrite) if err != nil { return fmt.Errorf("error failed to write to GITHUB_OUTPUT file: %s", err) } + descToWrite := fmt.Sprintf("%s=%s\n", "DESC", description) _, err = f.WriteString(descToWrite) if err != nil { From ed08a732cf7042a908620fbf2535e3aa60c72301 Mon Sep 17 00:00:00 2001 From: JenabaBa Date: Mon, 28 Jul 2025 16:55:19 -0700 Subject: [PATCH 8/9] add diff for branch tracking --- .github/workflows/update-dependencies.yml | 6 +++--- dependency_updater/dependency_updater.go | 13 +++++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml index 1fdf1e2b6..55d9a2af2 100644 --- a/.github/workflows/update-dependencies.yml +++ b/.github/workflows/update-dependencies.yml @@ -1,8 +1,8 @@ name: Update Dockerfile Dependencies on: - # schedule: - # - cron: '0 13 * * *' - pull_request: + schedule: + - cron: '0 13 * * *' + workflow_dispatch: permissions: contents: write diff --git a/dependency_updater/dependency_updater.go b/dependency_updater/dependency_updater.go index a4861e4e9..34cfbf2ba 100644 --- a/dependency_updater/dependency_updater.go +++ b/dependency_updater/dependency_updater.go @@ -164,7 +164,7 @@ func getAndUpdateDependency(ctx context.Context, client *github.Client, dependen if err != nil { return VersionUpdateInfo{}, err } - if updatedDependency != (VersionUpdateInfo{}) || dependencies[dependencyType].Tracking == "branch" { + if updatedDependency != (VersionUpdateInfo{}) { e := updateVersionTagAndCommit(commit, version, dependencyType, repoPath, dependencies) if e != nil { return VersionUpdateInfo{}, fmt.Errorf("error updating version tag and commit: %s", e) @@ -256,6 +256,15 @@ func getVersionAndCommit(ctx context.Context, client *github.Client, dependencie return "", "", VersionUpdateInfo{}, fmt.Errorf("error listing commits for "+dependencyType+": %s", err) } commit = *branchCommit[0].SHA + if dependencies[dependencyType].Commit != commit { + diff := dependencies[dependencyType].Commit + " => " + commit + updatedDependency = VersionUpdateInfo{ + dependencies[dependencyType].Repo, + dependencies[dependencyType].Tag, + commit, + diff, + } + } } if version != nil { @@ -344,7 +353,7 @@ func createGitMessageEnv(title string, description string, repoPath string) erro if err != nil { return fmt.Errorf("error failed to write to GITHUB_OUTPUT file: %s", err) } - + descToWrite := fmt.Sprintf("%s=%s\n", "DESC", description) _, err = f.WriteString(descToWrite) if err != nil { From f3842f45acf0d002fb5e50888fb01b523d10cf8c Mon Sep 17 00:00:00 2001 From: JenabaBa Date: Mon, 28 Jul 2025 16:59:19 -0700 Subject: [PATCH 9/9] revert versions.json --- versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions.json b/versions.json index 4b510a2a3..b7a88aca5 100644 --- a/versions.json +++ b/versions.json @@ -21,8 +21,8 @@ "tracking": "tag" }, "op_node": { - "tag": "op-node/v1.13.4", - "commit": "7eedfced77eb30ae72cc8d0e7c793dd2d1b6f161", + "tag": "op-node/v1.13.5", + "commit": "7a0ab04ea2db5421da689eb77a68e674e4ae9cfe", "tagPrefix": "op-node", "owner": "ethereum-optimism", "repo": "optimism",