Skip to content

Commit fd9524d

Browse files
authored
Merge branch 'Romanitho:main' into feature/ErrorsOnly_NotificationLevel
2 parents cf64d97 + d2bbbfd commit fd9524d

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

.github/workflows/GitFlow_Make-Release-and-Sync-to-Dev.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,16 @@ jobs:
128128
129129
<picture>![Install counter](https://img.shields.io/github/downloads/Romanitho/Winget-AutoUpdate/v${{ steps.release_version.outputs.NextSemVer }}/WAU_InstallCounter?style=flat-square&label=Total%20reported%20installations%20for%20this%20release&color=blue)</picture>
130130
131+
sync:
132+
name: Sync develop with main
133+
runs-on: ubuntu-latest
134+
needs: build
135+
steps:
136+
- name: Checkout code
137+
uses: actions/[email protected]
138+
with:
139+
fetch-depth: 0
140+
131141
# Step 5: Configure Git for merge back to develop
132142
- name: Configure Git
133143
shell: bash

.github/workflows/GitFlow_Nightly-builds.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ jobs:
3838
id: check_prs
3939
shell: powershell
4040
run: |
41-
# Find the latest tag of any type
42-
$LATEST_TAG = git for-each-ref --sort=-creatordate --format '%(refname:short)' refs/tags | Select-Object -First 1
43-
Write-Host "Latest tag: $LATEST_TAG"
41+
# Get the latest release of any type
42+
$LATEST_TAG = git tag -l --sort=-version:refname | Select-Object -First 1
43+
Write-Host "Latest release: $LATEST_TAG"
4444
4545
# Get merged PRs since last tag using Git directly
4646
$MERGED_PRS = git log --merges --grep="Merge pull request" --oneline "$LATEST_TAG..${{ env.BRANCH }}"

0 commit comments

Comments
 (0)