Merge pull request #388 from chrisbra/release-sync

pass extracted tag to winget-releaser

Author: chrisbra

.github/workflows/winget_nightly.yml

@@ -22,11 +22,13 @@ jobs:
           latest_tag=$(git describe --tags `git rev-list --tags --max-count=1`)
           echo "Latest tag: $latest_tag"
           echo "version=${latest_tag#v}" >> "$GITHUB_OUTPUT"
+          echo "tag=${latest_tag}" >> "$GITHUB_OUTPUT"
 
       - name: Run winget-releaser
         uses: vedantmgoyal9/winget-releaser@main
         with:
           identifier: vim.vim.nightly
           installers-regex: 'gvim.*(x64|x86|arm64).exe$'
           version: ${{ steps.get-version.outputs.version }}
+          release-tag: ${{ steps.get-version.outputs.tag }}
           token: ${{ secrets.WINGET_TOKEN }}

.github/workflows/winget_stable.yml

@@ -13,30 +13,30 @@ jobs:
     outputs:
       needs_update: ${{ steps.check-updates.outputs.result }}
       version: ${{ steps.get-version.outputs.version }}
+      tag: ${{ steps.get-version.outputs.tag }}
 
     steps:
       - uses: actions/checkout@v4
         with:
-          path: repo
           fetch-depth: 0  # Needed to fetch all tags
 
       - name: Get latest tag
         id: get-version
         run: |
-          cd repo
           git fetch --tags
           latest_tag=$(git describe --tags `git rev-list --tags --max-count=1`)
           echo "Latest tag: $latest_tag"
           echo "version=${latest_tag#v}" >> "$GITHUB_OUTPUT"
+          echo "tag=${latest_tag}" >> "$GITHUB_OUTPUT"
 
       - name: Check updates
         id: check-updates
         run: |
-          cd repo
           echo "result=$(scripts/do_next_stable_release.sh $URL)" >> "$GITHUB_OUTPUT"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           URL: "https://api.github.com/repos/microsoft/winget-pkgs/contents/manifests/v/vim/vim"
+          REF_NAME: ${{ steps.get-version.outputs.tag }}
 
   publish-winget-stable:
     runs-on: ubuntu-latest
@@ -49,3 +49,4 @@ jobs:
           installers-regex: 'gvim.*(x64|x86|arm64).exe$'
           token: ${{ secrets.WINGET_TOKEN }}
           version: ${{ needs.check-update-job.outputs.version }}
+          release-tag: ${{ needs.check-update-job.outputs.tag }}

scripts/do_next_stable_release.sh

@@ -6,7 +6,7 @@
 # and if the release number is smaller than the current Tag name + 100
 # return true, else false
 
-if [[ -z "$GITHUB_REF_NAME" ]]; then
+if [[ -z "$REF_NAME" ]]; then
   echo "not run in Github Actions CI, quitting"
   exit 2
 fi
@@ -22,7 +22,7 @@ DIR="$(dirname $0)"
 LAST_STABLE_RELEASE=$(${DIR}/get_last_windows_release.sh "$URL" | tr -d '.')
 LAST_STABLE_RELEASE=$(( $LAST_STABLE_RELEASE + 100))
 
-TAG_NAME=$(echo ${GITHUB_REF_NAME} |tr -d '.v')
+TAG_NAME=$(echo ${REF_NAME} |tr -d '.v')
 
 if [[ ${TAG_NAME} -ge ${LAST_STABLE_RELEASE} ]]; then
   echo "true"