From a0fcc7b305344af42d2cf2745b66cd995b126d9b Mon Sep 17 00:00:00 2001 From: Dwi Siswanto Date: Fri, 9 Aug 2024 06:49:33 +0700 Subject: [PATCH] ci: pull on specific ref (#10500) Signed-off-by: Dwi Siswanto --- .github/workflows/cve2json.yml | 2 +- .github/workflows/new-templates.yml | 4 +++- .github/workflows/template-checksum.yml | 4 +--- .github/workflows/template-sign.yml | 4 ++-- .github/workflows/templateman.yml | 4 +--- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/cve2json.yml b/.github/workflows/cve2json.yml index fe87be6456..f8c1c0e4d6 100644 --- a/.github/workflows/cve2json.yml +++ b/.github/workflows/cve2json.yml @@ -27,5 +27,5 @@ jobs: message: 'chore: generate CVEs metadata 🤖' - name: Push changes run: | - git pull --rebase + git pull origin $GITHUB_REF --rebase git push origin $GITHUB_REF diff --git a/.github/workflows/new-templates.yml b/.github/workflows/new-templates.yml index 94cf670e2f..20c6638358 100644 --- a/.github/workflows/new-templates.yml +++ b/.github/workflows/new-templates.yml @@ -30,7 +30,9 @@ jobs: with: files: '${{ env.NEW_ADDITION_FILE }}' message: 'chore: generate new addition list 🤖' - - run: git push origin $GITHUB_REF + - run: | + git pull origin $GITHUB_REF --rebase + git push origin $GITHUB_REF sync: needs: new-addition diff --git a/.github/workflows/template-checksum.yml b/.github/workflows/template-checksum.yml index 089728e36c..0603480e02 100644 --- a/.github/workflows/template-checksum.yml +++ b/.github/workflows/template-checksum.yml @@ -17,8 +17,6 @@ jobs: if: github.repository == 'projectdiscovery/nuclei-templates' steps: - uses: actions/checkout@v4 - with: - fetch-depth: 0 - uses: projectdiscovery/actions/generate/checksum@v1 with: templates-directory: '${{ github.workspace }}' @@ -30,5 +28,5 @@ jobs: message: 'chore: generate templates checksum 🤖' - name: Push changes run: | - git pull --rebase + git pull origin $GITHUB_REF --rebase git push origin $GITHUB_REF diff --git a/.github/workflows/template-sign.yml b/.github/workflows/template-sign.yml index 26113f75ac..477aab0d00 100644 --- a/.github/workflows/template-sign.yml +++ b/.github/workflows/template-sign.yml @@ -28,5 +28,5 @@ jobs: message: 'chore: sign templates 🤖' - name: Push changes run: | - git pull --rebase - git push origin ${{ github.ref }} + git pull origin $GITHUB_REF --rebase + git push origin $GITHUB_REF diff --git a/.github/workflows/templateman.yml b/.github/workflows/templateman.yml index 116b3cd755..df8699bc37 100644 --- a/.github/workflows/templateman.yml +++ b/.github/workflows/templateman.yml @@ -9,8 +9,6 @@ jobs: if: github.repository == 'projectdiscovery/nuclei-templates' steps: - uses: actions/checkout@v4 - with: - fetch-depth: 0 - uses: projectdiscovery/actions/setup/templateman@v1 with: token: '${{ secrets.ACCESS_TOKEN }}' @@ -21,5 +19,5 @@ jobs: message: 'chore: update TemplateMan 🤖' - name: Push changes run: | - git pull --rebase + git pull origin $GITHUB_REF --rebase git push origin $GITHUB_REF