From 02b3448b30b63c980ba88f9523617eb7b3195e1f Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 10 Jan 2024 13:54:59 -0800 Subject: [PATCH] rename to make explicit node update is for site --- ...rsion.yml => update-site-node-version.yml} | 20 +++++++++---------- Makefile | 8 ++++---- .../update_go_github_version.go | 2 +- .../update_site_node_version.go} | 0 4 files changed, 15 insertions(+), 15 deletions(-) rename .github/workflows/{update-node-version.yml => update-site-node-version.yml} (69%) rename hack/update/{node_version/update_node_version.go => site_node_version/update_site_node_version.go} (100%) diff --git a/.github/workflows/update-node-version.yml b/.github/workflows/update-site-node-version.yml similarity index 69% rename from .github/workflows/update-node-version.yml rename to .github/workflows/update-site-node-version.yml index eff4eff518..c9ce968778 100644 --- a/.github/workflows/update-node-version.yml +++ b/.github/workflows/update-site-node-version.yml @@ -1,4 +1,4 @@ -name: "update-node-version" +name: "update-site-node-version" on: workflow_dispatch: schedule: @@ -11,7 +11,7 @@ permissions: contents: read jobs: - bump-node-version: + bump-site-node-version: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 @@ -19,30 +19,30 @@ jobs: with: go-version: ${{env.GO_VERSION}} cache-dependency-path: ./go.sum - - name: Bump node version - id: bumpNode + - name: Bump site node version + id: bumpSiteNode run: | echo "OLD_VERSION=$(DEP=node make get-dependency-version)" >> "$GITHUB_OUTPUT" - make update-node-version + make update-site-node-version echo "NEW_VERSION=$(DEP=node make get-dependency-version)" >> "$GITHUB_OUTPUT" # The following is to support multiline with GITHUB_OUTPUT, see https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings echo "changes<> "$GITHUB_OUTPUT" echo "$(git status --porcelain)" >> "$GITHUB_OUTPUT" echo "EOF" >> "$GITHUB_OUTPUT" - name: Create PR - if: ${{ steps.bumpNode.outputs.changes != '' }} + if: ${{ steps.bumpSiteNode.outputs.changes != '' }} uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} - commit-message: 'site: Update node from ${{ steps.bumpNode.outputs.OLD_VERSION }} to ${{ steps.bumpNode.outputs.NEW_VERSION }}' + commit-message: 'site: Update node from ${{ steps.bumpSiteNode.outputs.OLD_VERSION }} to ${{ steps.bumpSiteNode.outputs.NEW_VERSION }}' committer: minikube-bot author: minikube-bot - branch: auto_bump_node_version + branch: auto_bump_site_node_version push-to-fork: minikube-bot/minikube base: master delete-branch: true - title: 'site: Update node from ${{ steps.bumpNode.outputs.OLD_VERSION }} to ${{ steps.bumpNode.outputs.NEW_VERSION }}' + title: 'site: Update node from ${{ steps.bumpSiteNode.outputs.OLD_VERSION }} to ${{ steps.bumpSiteNode.outputs.NEW_VERSION }}' body: | The [node](https://github.com/nodejs/node) project released a new version - This PR was auto-generated by `make update-node-version` using [update-node-version.yml](https://github.com/kubernetes/minikube/tree/master/.github/workflows/update-node-version.yml) CI Workflow. + This PR was auto-generated by `make update-site-node-version` using [update-site-node-version.yml](https://github.com/kubernetes/minikube/tree/master/.github/workflows/update-site-node-version.yml) CI Workflow. diff --git a/Makefile b/Makefile index 7f56fba714..600a935337 100644 --- a/Makefile +++ b/Makefile @@ -1208,10 +1208,10 @@ update-kubectl-version: (cd hack/update/kubectl_version && \ go run update_kubectl_version.go) -.PHONY: update-node-version -update-node-version: - (cd hack/update/node_version && \ - go run update_node_version.go) +.PHONY: update-site-node-version +update-site-node-version: + (cd hack/update/site_node_version && \ + go run update_site_node_version.go) .PHONY: get-dependency-verison get-dependency-version: diff --git a/hack/update/go_github_version/update_go_github_version.go b/hack/update/go_github_version/update_go_github_version.go index 0fa38f0652..6c1371e985 100644 --- a/hack/update/go_github_version/update_go_github_version.go +++ b/hack/update/go_github_version/update_go_github_version.go @@ -67,7 +67,7 @@ func generateSchema() map[string]update.Item { "hack/update/ingress_version/update_ingress_version.go", "hack/update/kubeadm_constants/update_kubeadm_constants.go", "hack/update/kubernetes_versions_list/update_kubernetes_versions_list.go", - "hack/update/node_version/update_node_version.go", + "hack/update/site_node_version/update_site_node_version.go", "pkg/perf/monitor/github.go", } diff --git a/hack/update/node_version/update_node_version.go b/hack/update/site_node_version/update_site_node_version.go similarity index 100% rename from hack/update/node_version/update_node_version.go rename to hack/update/site_node_version/update_site_node_version.go