pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-16 05:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/bugfix/load-plugins-crash-with-no-plugins' into feature/ecs-1209

Browse Source
This commit is contained in:
Neil Dorin
2020-04-01 08:55:12 -06:00
parent e52259e750 661b3ef9f4
commit 1d00261b1f
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/scripts/GenerateVersionNumber.ps1 vendored
View File

@@ -39,6 +39,10 @@ switch -regex ($Env:GITHUB_REF) {
$phase = 'hotfix' $phase = 'hotfix'
$newVersionString = "{0}.{1}.{2}-{3}-{4}" -f $newVersion.Major, $newVersion.Minor, ($newVersion.Build + 1), $phase, $Env:GITHUB_RUN_NUMBER $newVersionString = "{0}.{1}.{2}-{3}-{4}" -f $newVersion.Major, $newVersion.Minor, ($newVersion.Build + 1), $phase, $Env:GITHUB_RUN_NUMBER
} }
'^refs\/heads\/bugfix\/*.' {
$phase = 'hotfix'
$newVersionString = "{0}.{1}.{2}-{3}-{4}" -f $newVersion.Major, $newVersion.Minor, ($newVersion.Build + 1), $phase, $Env:GITHUB_RUN_NUMBER
}
} }

1
.github/workflows/docker.yml vendored
View File

@@ -5,6 +5,7 @@ on:
branches: branches:
- feature/* - feature/*
- hotfix/* - hotfix/*
- bugfix/*
- release/* - release/*
- development - development