From f6f5268a5e566636501fcd0b494afb19bd822833 Mon Sep 17 00:00:00 2001 From: Ido Heyvi Date: Tue, 12 Nov 2024 12:15:08 +0200 Subject: [PATCH] update Makefile #2 --- .github/workflows/docs-ci.yaml | 8 ++++++-- Makefile | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docs-ci.yaml b/.github/workflows/docs-ci.yaml index 9915f33..9422c1b 100644 --- a/.github/workflows/docs-ci.yaml +++ b/.github/workflows/docs-ci.yaml @@ -37,7 +37,8 @@ jobs: GH_TOKEN: ${{ secrets.GH_TOKEN_NVIDIA_CI_CD }} TAG: ${{ inputs.git_tag }} REF_NAME: ${{ github.ref_name }} - REF_TYPE: ${{ github.ref_type }} + REF_TYPE: ${{ github.ref_type }} + REF_HEAD: ${{ github.head_ref }} PR_TITLE_PREFIX: "task: update documentation for" steps: - uses: actions/checkout@v4 @@ -52,7 +53,10 @@ jobs: run: | echo "REF_TYPE:" $REF_TYPE echo "REF_NAME:" $REF_NAME + echo "REF_HEAD:" $REF_HEAD BRANCH=$REF_NAME + git pull + git checkout $REF_HEAD make api-docs helm-docs generate-docs-versions-var - name: Close any existing documentation PRs run: | @@ -74,7 +78,7 @@ jobs: gh repo sync $DOWNSTREAM_REPO_OWNER/network-operator-docs --source $UPSTREAM_REPO_OWNER/network-operator-docs --branch $UPSTREAM_DEFAULT_BRANCH git pull - git checkout test-netops-docs-workflow + git checkout $REF_HEAD git checkout -b $DOWNSTREAM_FEATURE_BRANCH git status git add docs diff --git a/Makefile b/Makefile index ce64227..7a2ff1b 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,6 @@ SRC := $(shell echo $(if $(TAG),$(TAG),$(BRANCH)) | sed 's/^v//') # Network Operator source tar location #REPO_TAR_URL ?= https://github.com/Mellanox/network-operator/archive/refs/$(if $(TAG),tags/$(TAG),heads/$(BRANCH)).tar.gz REPO_TAR_URL = https://github.com/heyvister1/network-operator/archive/refs/$(if $(TAG),tags/$(TAG),heads/$(BRANCH)).tar.gz - # release.yaml location #RELEASE_YAML_URL ?= https://raw.githubusercontent.com/Mellanox/network-operator/$(if $(TAG),$(TAG),$(BRANCH))/hack/release.yaml RELEASE_YAML_URL = https://raw.githubusercontent.com/heyvister1/network-operator/$(if $(TAG),$(TAG),$(BRANCH))/hack/release.yaml