Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Release and develop workflow as well #280

Merged
merged 2 commits into from
Jun 15, 2024
+63 −26
Merged

Fix Release and develop workflow as well #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72cd2b8
fix develop build
Freezor Jun 15, 2024
e7e5510
fix release and develop workflow
Freezor Jun 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 31 additions & 13 deletions .github/workflows/draft-prerelease-on-pushed-tag.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,15 @@ on:
tags:
- 'v*'

env:
BRANCH_SUFFIX: develop
VERSION_SUFFIX: alpha
CREATE_RELEASE_AS_DRAFT: true
CREATE_RELEASE_AS_PRERELEASE: true

jobs:
draft_develop_release:
runs-on: windows-latest

steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand All @@ -29,20 +34,20 @@ jobs:
Write-Host "The current branch is: $branch"
shell: pwsh

- name: Get the newest develop or latest tag
- name: Get the newest tag
id: get_latest_tag
run: |
$stableTags = git tag --list "*develop*" --sort=-v:refname
$stableTags = git tag --list "*$BRANCH_SUFFIX*" --sort=-v:refname
if ($stableTags) {
$newestStableTag = $stableTags | Select-Object -First 1
echo "from_tag=$newestStableTag" >> $env:GITHUB_OUTPUT
Write-Host "Latest found tag is $from_tag"
Write-Host "Latest found tag is $newestStableTag"
} else {
Write-Host "No stable tags found, fetching the latest tag."
$latestTag = git tag --list --sort=-v:refname | Select-Object -First 1
if ($latestTag) {
echo "from_tag=$latestTag" >> $env:GITHUB_OUTPUT
Write-Host "Latest found tag is $from_tag"
Write-Host "Latest found tag is $latestTag"
} else {
Write-Host "No tags found at all."
}
Expand All @@ -54,7 +59,7 @@ jobs:
id: generate_version_number
run: |
$branch = '${{ steps.extract_branch.outputs.branch }}'
$version = .\BuildVersionNumber.ps1 -suffix alpha -branch $branch -githubRunNumber ${{ github.run_number }}
$version = .\BuildVersionNumber.ps1 -suffix $VERSION_SUFFIX -branch $branch -githubRunNumber ${{ github.run_number }}
echo "version=$version" >> $env:GITHUB_OUTPUT
Write-Host "The version name to build is: $version"
shell: pwsh
Expand Down Expand Up @@ -111,29 +116,42 @@ jobs:
}
shell: pwsh

- name: Create Git tag
run: |
git config --global user.name "github-actions[bot]"
git config --global user.email "github-actions[bot]@users.noreply.github.com"
git tag ${{ steps.generate_version_number.outputs.version }}
git push origin ${{ steps.generate_version_number.outputs.version }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Generate release notes
id: generate_release_notes
uses: mikepenz/release-changelog-builder-action@v4
with:
configuration: ".github/changelog_configuration.json"
token: ${{ secrets.GITHUB_TOKEN }}
fetchReviewers: true
fetchReleaseInformation: true
fromTag: ${{ steps.generate_version_number.outputs.from_tag }}
fromTag: "${{ steps.get_latest_tag.outputs.from_tag }}"
toTag: "${{ steps.generate_version_number.outputs.version }}"
fetchViaCommits: "true"
ignorePreReleases: "false"
fetchReleaseInformation: "true"
failOnError: "true"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Create GitHub release
id: create_release
uses: actions/create-release@v1
uses: softprops/action-gh-release@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: "v${{ steps.generate_version_number.outputs.version }}"
release_name: "v${{ steps.generate_version_number.outputs.version }}"
draft: true
prerelease: true
name: "v${{ steps.generate_version_number.outputs.version }}"
draft: $CREATE_RELEASE_AS_DRAFT
prerelease: $CREATE_RELEASE_AS_PRERELEASE
body: ${{ steps.generate_release_notes.outputs.changelog }}
token: ${{ secrets.GITHUB_TOKEN }}

- name: Upload the release assets
uses: AButler/[email protected]
Expand Down
45 changes: 32 additions & 13 deletions .github/workflows/draft-release-on-merge-to-release-branch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ on:
branches:
- release

env:
BRANCH_SUFFIX: stable
VERSION_SUFFIX: alpha
CREATE_RELEASE_AS_DRAFT: true
CREATE_RELEASE_AS_PRERELEASE: false

jobs:
create-new-release:
runs-on: windows-latest
Expand All @@ -29,20 +35,20 @@ jobs:
Write-Host "The current branch is: $branch"
shell: pwsh

- name: Get the newest stable or latest tag
- name: Get the newest tag
id: get_latest_tag
run: |
$stableTags = git tag --list "*stable*" --sort=-v:refname
$stableTags = git tag --list "*$BRANCH_SUFFIX*" --sort=-v:refname
if ($stableTags) {
$newestStableTag = $stableTags | Select-Object -First 1
echo "from_tag=$newestStableTag" >> $env:GITHUB_OUTPUT
Write-Host "Latest found tag is $from_tag"
Write-Host "Latest found tag is $newestStableTag"
} else {
Write-Host "No stable tags found, fetching the latest tag."
$latestTag = git tag --list --sort=-v:refname | Select-Object -First 1
if ($latestTag) {
echo "from_tag=$latestTag" >> $env:GITHUB_OUTPUT
Write-Host "Latest found tag is $from_tag"
Write-Host "Latest found tag is $latestTag"
} else {
Write-Host "No tags found at all."
}
Expand All @@ -54,7 +60,7 @@ jobs:
id: generate_version_number
run: |
$branch = '${{ steps.extract_branch.outputs.branch }}'
$version = .\BuildVersionNumber.ps1 -suffix alpha -branch $branch -githubRunNumber ${{ github.run_number }}
$version = .\BuildVersionNumber.ps1 -suffix $VERSION_SUFFIX -branch $branch -githubRunNumber ${{ github.run_number }}
echo "version=$version" >> $env:GITHUB_OUTPUT
Write-Host "The version name to build is: $version"
shell: pwsh
Expand Down Expand Up @@ -111,33 +117,46 @@ jobs:
}
shell: pwsh

- name: Create Git tag
run: |
git config --global user.name "github-actions[bot]"
git config --global user.email "github-actions[bot]@users.noreply.github.com"
git tag ${{ steps.generate_version_number.outputs.version }}
git push origin ${{ steps.generate_version_number.outputs.version }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Generate release notes
id: generate_release_notes
uses: mikepenz/release-changelog-builder-action@v4
with:
configuration: ".github/changelog_configuration.json"
token: ${{ secrets.GITHUB_TOKEN }}
fetchReviewers: true
fetchReleaseInformation: true
fromTag: ${{ steps.generate_version_number.outputs.from_tag }}
fromTag: "${{ steps.get_latest_tag.outputs.from_tag }}"
toTag: "${{ steps.generate_version_number.outputs.version }}"
fetchViaCommits: "true"
ignorePreReleases: "false"
fetchReleaseInformation: "true"
failOnError: "true"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Create GitHub release
id: create_release
uses: actions/create-release@v1
uses: softprops/action-gh-release@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: "v${{ steps.generate_version_number.outputs.version }}"
release_name: "v${{ steps.get_latest_tag.outputs.version }}"
draft: true
prerelease: false
name: "v${{ steps.generate_version_number.outputs.version }}"
draft: $CREATE_RELEASE_AS_DRAFT
prerelease: $CREATE_RELEASE_AS_PRERELEASE
body: ${{ steps.generate_release_notes.outputs.changelog }}
token: ${{ secrets.GITHUB_TOKEN }}

- name: Upload the release assets
uses: AButler/[email protected]
with:
files: "artefacts/release/${{ steps.generate_version_number.outputs.version }}/*.zip"
repo-token: ${{ secrets.GITHUB_TOKEN }}
release-tag: "v${{ steps.generate_version_number.outputs.version }}"
release-tag: "v${{ steps.generate_version_number.outputs.version }}"
Loading