Merge branch 'main' into feature/management-api

sevensolutions · Sep 7, 2024 · a244507 · a244507
2 parents 44e0f1e + 8121e11
commit a244507
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,6 +5,8 @@ on:
  branches: [ "main" ]
  pull_request:
  branches: [ "main" ]
+ # Allows you to run this workflow manually from the Actions tab
+ workflow_dispatch:
 
 jobs:
  build:

diff --git a/src/NomadIIS.Tests/NomadIISFixture.cs b/src/NomadIIS.Tests/NomadIISFixture.cs
@@ -47,7 +47,13 @@ public async Task InitializeAsync ()
  {
  var nomadDirectory = Path.GetFullPath( @"..\..\..\..\..\nomad" );
  var dataDirectory = Path.Combine( nomadDirectory, "data" );
- var pluginDirectory = Path.GetFullPath( @"..\..\..\..\NomadIIS\bin\Debug\net8.0" );
+
+ var pluginDir = Environment.GetEnvironmentVariable( "TEST_PLUGIN_DIRECTORY" );
+ if ( string.IsNullOrEmpty( pluginDir ) )
+ pluginDir = @"..\..\..\..\NomadIIS\bin\Debug\net8.0";
+
+ var pluginDirectory = Path.GetFullPath( pluginDir );
+
 #if MANAGEMENT_API
  var configFile = Path.GetFullPath( @"Data\configs\with_api.hcl" );
 #else