From 39feb7af48a3cce1259ae51622121636f3ebe48d Mon Sep 17 00:00:00 2001 From: Michael Henderson Date: Tue, 24 Sep 2024 13:39:19 -0700 Subject: [PATCH] Add release_project as optional property for multi-platform builds --- .github/workflows/assign-env-from-json.yml | 9 +++++++++ .github/workflows/dotnet-build-and-release.yml | 2 +- .github/workflows/starter.yml | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/assign-env-from-json.yml b/.github/workflows/assign-env-from-json.yml index 0889566..7405b59 100644 --- a/.github/workflows/assign-env-from-json.yml +++ b/.github/workflows/assign-env-from-json.yml @@ -28,6 +28,7 @@ jobs: update_catalog: ${{ steps.read-update_catalog.outputs.output-value }} UOFramework: ${{ steps.read-UOFramework.outputs.output-value }} description: ${{ steps.read-description.outputs.output-value }} + release_project: ${{ steps.read-release_project.outputs.output-value }} name: Set workflow variables from integration-manifest.json steps: - name: checkout-json-file @@ -60,6 +61,14 @@ jobs: input-file: 'src/integration-manifest.json' input-property: 'integration_type' + - name: Read release_project property + uses: ./tools + id: read-release_project + with: + input-file: 'src/integration-manifest.json' + input-property: 'release_project' + required-value: 'false' + - name: Read update_catalog property uses: ./tools id: read-update_catalog diff --git a/.github/workflows/dotnet-build-and-release.yml b/.github/workflows/dotnet-build-and-release.yml index 9d7547e..d9bac09 100644 --- a/.github/workflows/dotnet-build-and-release.yml +++ b/.github/workflows/dotnet-build-and-release.yml @@ -92,7 +92,7 @@ jobs: - name: Read Target Frameworks shell: pwsh run: | - [xml]$csproj = Get-Content "${{ inputs.release_folder }}\project.csproj" + [xml]$csproj = Get-Content "${{ inputs.release_project }}" $targetFrameworks = $csproj.Project.PropertyGroup.TargetFrameworks if ($targetFrameworks -eq $null) { $targetFrameworks = $csproj.Project.PropertyGroup.TargetFramework diff --git a/.github/workflows/starter.yml b/.github/workflows/starter.yml index d723349..bbd49ea 100644 --- a/.github/workflows/starter.yml +++ b/.github/workflows/starter.yml @@ -29,7 +29,7 @@ on: jobs: call-assign-from-json-workflow: - uses: Keyfactor/actions/.github/workflows/assign-env-from-json.yml@v3 + uses: Keyfactor/actions/.github/workflows/assign-env-from-json.yml@dual-platform-without-doctool call-get-primary-language: outputs: