Skip to content

Commit

Permalink
Add release_project as optional property for multi-platform builds
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Henderson committed Sep 24, 2024
1 parent 65f0761 commit 39feb7a
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
9 changes: 9 additions & 0 deletions .github/workflows/assign-env-from-json.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dotnet-build-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/starter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 39feb7a

Please sign in to comment.