Update build for breaking change in reusable workflow (#187)

* Update secrets authoring to work with latest changes to shared workflow
* Enable tests
* Fix broken test

.github/workflows/build.yml

@@ -38,21 +38,17 @@ jobs:
     name: Prepare Configuration
     runs-on: ubuntu-latest
     outputs:
-      RESOLVED_ENV_VARS: ${{ steps.prepareEnvVarsAndSecrets.outputs.environmentVariablesJsonBase64 }}
-      RESOLVED_SECRETS: ${{ steps.prepareEnvVarsAndSecrets.outputs.secretsJsonBase64 }}
+      RESOLVED_ENV_VARS: ${{ steps.prepareEnvVarsAndSecrets.outputs.environmentVariablesYamlBase64 }}
+      RESOLVED_SECRETS: ${{ steps.prepareEnvVarsAndSecrets.outputs.secretsYamlBase64 }}
     steps:
     # Declare any environment variables and/or secrets that need to be available inside the build process
     - uses: endjin/Endjin.RecommendedPractices.GitHubActions/actions/prepare-env-vars-and-secrets@main
       id: prepareEnvVarsAndSecrets
       with:
-        environmentVariablesJson: |
-          {
-            "BUILDVAR_NuGetPublishSource": "${{ startsWith(github.ref, 'refs/tags/') && 'https://api.nuget.org/v3/index.json' || 'https://nuget.pkg.github.com/endjin/index.json' }}"
-          }
-        secretsJson: |
-          {
-            "NUGET_API_KEY": "${{ startsWith(github.ref, 'refs/tags/') && secrets.ENDJIN_NUGET_APIKEY || secrets.ENDJIN_GITHUB_PUBLISHER_PAT }}"
-          }
+        environmentVariablesYaml: |
+          BUILDVAR_NuGetPublishSource: "${{ startsWith(github.ref, 'refs/tags/') && 'https://api.nuget.org/v3/index.json' || 'https://nuget.pkg.github.com/endjin/index.json' }}"
+        secretsYaml: |
+          NUGET_API_KEY: "${{ startsWith(github.ref, 'refs/tags/') && secrets.ENDJIN_NUGET_APIKEY || secrets.ENDJIN_GITHUB_PUBLISHER_PAT }}"
 
   build:
     needs: prepareConfig
@@ -63,4 +59,6 @@ jobs:
       forcePublish: ${{ github.event.inputs.forcePublish == 'true' }}
       skipCleanup: ${{ github.event.inputs.skipCleanup == 'true' }}
       publishPhaseEnv: ${{ needs.prepareConfig.outputs.RESOLVED_ENV_VARS }}
+    secrets:
+      compilePhaseAzureCredentials: ${{ secrets.ENDJIN_PROD_ACR_READER_CREDENTIALS }}
       publishPhaseSecrets: ${{ needs.prepareConfig.outputs.RESOLVED_SECRETS }}

Solutions/Endjin.Adr.Cli.Specs/Steps/InitSteps.cs

@@ -23,7 +23,7 @@ public void GivenIAskTheAdrCliToInitialiseANewRepoInTheDirectory(string director
     [When("I execute the adr cli")]
     public async Task WhenIExecuteTheAdrCli()
     {
-        string[] args = new string[] { "init",  this.scenarioContext.Get<string>("Directory") };
+        string[] args = new string[] { "environment", "init",  this.scenarioContext.Get<string>("Directory") };
 
         int result = await Program.Main(args).ConfigureAwait(false);
 

build.ps1

@@ -126,7 +126,7 @@ $SkipInit = $false
 $SkipVersion = $false
 $SkipBuild = $false
 $CleanBuild = $Clean
-$SkipTest = $true
+$SkipTest = $false
 $SkipTestReport = $false
 $SkipAnalysis = $false
 $SkipPackage = $false