Merge pull request #24 from Keyfactor/loggingfix

Loggingfix

.github/workflows/keyfactor-starter-workflow.yml

@@ -5,22 +5,38 @@ jobs:
   call-create-github-release-workflow:
     uses: Keyfactor/actions/.github/workflows/github-release.yml@main
 
+  get-manifest-properties:
+    runs-on: windows-latest
+    outputs:
+      update_catalog: ${{ steps.read-json.outputs.prop }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Read json
+        id: read-json
+        shell: pwsh
+        run: |
+          $json = Get-Content integration-manifest.json | ConvertFrom-Json
+          echo "::set-output name=prop::$(echo $json.update_catalog)"
+
   call-dotnet-build-and-release-workflow:
     needs: [call-create-github-release-workflow]
     uses: Keyfactor/actions/.github/workflows/dotnet-build-and-release.yml@main
     with:
       release_version: ${{ needs.call-create-github-release-workflow.outputs.release_version }}
       release_url: ${{ needs.call-create-github-release-workflow.outputs.release_url }}
-      release_dir: GoDaddy/bin/Release # TODO: set build output directory to upload as a release, relative to checkout workspace
+      release_dir: GoDaddy/bin/Release
     secrets: 
       token: ${{ secrets.PRIVATE_PACKAGE_ACCESS }}
 
   call-generate-readme-workflow:
     if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
     uses: Keyfactor/actions/.github/workflows/generate-readme.yml@main
+    secrets:
+      token: ${{ secrets.APPROVE_README_PUSH }}
 
   call-update-catalog-workflow:
-    if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
+    needs: get-manifest-properties
+    if: needs.get-manifest-properties.outputs.update_catalog == 'True' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
     uses: Keyfactor/actions/.github/workflows/update-catalog.yml@main
     secrets: 
       token: ${{ secrets.SDK_SYNC_PAT }}

CHANGELOG.md

@@ -1,15 +1,21 @@
-v1.0.4/1.0.5
-- Update nuget packages
+v1.0.0:  
+- Original Version  
 
-v1.0.3
-- Code cleanup, publish to github.
+v1.0.1  
+- Added support for 5 OV and 2 EV GoDaddy products  
+- Added Renew/Reissue functionality  
 
-v1.0.2
-- Remove PEM header before returning certificates during sync and enrollment
+v1.0.2  
+- Remove PEM header before returning certificates during sync and enrollment  
 
-v1.0.1
-- Added support for 5 OV and 2 EV GoDaddy products
-- Added Renew/Reissue functionality
+v1.0.3  
+- Code cleanup, publish to github.  
 
-v1.0.0:
-- Original Version
+v1.0.4/1.0.5  
+- Update nuget packages  
+
+v1.0.6  
+- Code cleanup
+
+v1.0.7
+- Improved logging

GoDaddy.sln

@@ -8,11 +8,11 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5D9941D2-A44F-4593-A33E-F5E0C861CAEB}"
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
-		CHANGELOG.MD = CHANGELOG.MD
+		CHANGELOG.md = CHANGELOG.md
 		GoDaddy.sln.licenseheader = GoDaddy.sln.licenseheader
 		integration-manifest.json = integration-manifest.json
 		README.md = README.md
-		README.md.tpl = README.md.tpl
+		readme_source.md = readme_source.md
 	EndProjectSection
 EndProject
 Global