From e0ca3ac2be98f7037aef544f2578efa6fd5ee222 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Tue, 31 Mar 2020 10:36:19 -0600 Subject: [PATCH 1/3] adds missing paren that was causing build error --- PepperDashEssentials/PluginLoading/PluginLoading.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PepperDashEssentials/PluginLoading/PluginLoading.cs b/PepperDashEssentials/PluginLoading/PluginLoading.cs index e1b0f555..11a4ee32 100644 --- a/PepperDashEssentials/PluginLoading/PluginLoading.cs +++ b/PepperDashEssentials/PluginLoading/PluginLoading.cs @@ -415,7 +415,7 @@ namespace PepperDash.Essentials // Deal with any .cplz files UnzipAndMoveCplzArchives(); - if(Directory.Exists(_loadedPluginsDirectoryPath) { + if(Directory.Exists(_loadedPluginsDirectoryPath)) { // Load the assemblies from the loadedPlugins folder into the AppDomain LoadPluginAssemblies(); From dc109b3e359ddf9c75e0b3c6cd5e3314328877c6 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Tue, 31 Mar 2020 10:53:29 -0600 Subject: [PATCH 2/3] temporarily adding bugfix/* to get PR to close --- .github/workflows/docker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index ffb235e6..e95ac127 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -5,6 +5,7 @@ on: branches: - feature/* - hotfix/* + - bugfix/* - release/* - development From 661b3ef9f4fe93c719a3e5c1573156811bb17545 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Tue, 31 Mar 2020 11:12:16 -0600 Subject: [PATCH 3/3] fixes script to add bugfix prefix --- .github/scripts/GenerateVersionNumber.ps1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/scripts/GenerateVersionNumber.ps1 b/.github/scripts/GenerateVersionNumber.ps1 index 467ce883..d9406eea 100644 --- a/.github/scripts/GenerateVersionNumber.ps1 +++ b/.github/scripts/GenerateVersionNumber.ps1 @@ -39,6 +39,10 @@ switch -regex ($Env:GITHUB_REF) { $phase = 'hotfix' $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 + } }