diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index e33636ae3d..621f27e933 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -90,15 +90,15 @@ jobs: git add k8s/helm-charts && git commit -m "Setting version for helm charts" || echo "Nothing to commit" git add k8s/yaml && git commit -m "Setting version for yaml manifests" || echo "Nothing to commit" - - name: Prepare artifacts - run: | - make prep-artifacts + # - name: Prepare artifacts + # run: | + # make prep-artifacts - - name: Upload artifacts - uses: actions/upload-artifact@v3 - with: - name: artifacts - path: .release/ + # - name: Upload artifacts + # uses: actions/upload-artifact@v3 + # with: + # name: artifacts + # path: .release/ - name: Install auto-changelog tool run: | @@ -130,7 +130,7 @@ jobs: git add -A && git commit --amend --no-edit || echo "Nothing to commit" # Revert GitBook URL tags to point back to the files in the v2 branch for commits # after the release tag - git revert HEAD --no-commit && git commit --amend -m "Restore docs-gitbook code references for updates after ${RELEASE_TAG}" || echo "Nothing to commit" + git revert HEAD~1 --no-commit && git commit --amend -m "Restore docs-gitbook code references for updates after ${RELEASE_TAG}" || echo "Nothing to commit" fi - name: Generate release-notes.txt @@ -141,23 +141,23 @@ jobs: auto-changelog -l 5 --starting-version ${RELEASE_TAG} --ending-version ${RELEASE_TAG} -o release-notes.txt fi - - name: Upload release notes - uses: actions/upload-artifact@v3 - with: - name: release-notes - path: release-notes.txt + # - name: Upload release notes + # uses: actions/upload-artifact@v3 + # with: + # name: release-notes + # path: release-notes.txt - name: Push new commits to repository run: git push - - name: Create or edit release draft - run: | - # TODO: Valdiate that there is no published released (we should not get here if tag exists anyway) - gh release delete "${RELEASE_TAG}" --yes || echo "Draft does not yet exist" - gh release create "${RELEASE_TAG}" --draft \ - --title "${RELEASE_TAG}" \ - --notes-file release-notes.txt \ - --target "${RELEASE_BRANCH}" \ - .release/* - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # - name: Create or edit release draft + # run: | + # # TODO: Valdiate that there is no published released (we should not get here if tag exists anyway) + # gh release delete "${RELEASE_TAG}" --yes || echo "Draft does not yet exist" + # gh release create "${RELEASE_TAG}" --draft \ + # --title "${RELEASE_TAG}" \ + # --notes-file release-notes.txt \ + # --target "${RELEASE_BRANCH}" \ + # .release/* + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}