Skip to content

Commit 93fdbc6

Browse files
authored
merge release 3.3.0 to main
2 parents 9ad2bc1 + 68b75e6 commit 93fdbc6

5 files changed

Lines changed: 18 additions & 14 deletions

File tree

.github/workflows/assign-env-from-json.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ jobs:
105105
input-property: 'about.orchestrator.keyfactor_platform_version'
106106

107107
- name: Read release_dir property
108-
if: steps.read-type.outputs.output-value == 'orchestrator' || steps.read-type.outputs.output-value == 'ca-gateway' || steps.read-type.outputs.output-value == 'pam' || steps.read-type.outputs.output-value == 'anyca-plugin'
109108
uses: ./tools
110109
id: read-release_dir
111110
with:

.github/workflows/dotnet-build-and-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ on:
88
type: string
99
default: 1.0.0 # for non-released builds
1010
release_url:
11-
description: The url to upload a publsihed release
11+
description: The url to upload a published release
1212
required: false # leave empty for non-release build
1313
type: string
1414
release_dir:
1515
description: The relative directory inside the repo where the build artifacts to publish for release will be located
16-
required: false
16+
required: true
1717
type: string
1818
release_project:
1919
description: The relative file location for csproj
@@ -59,7 +59,7 @@ jobs:
5959
6060
echo "release_dir: ${{ inputs.release_dir }}"
6161
62-
$creatingRelease = ("${{ inputs.release_url }}".Trim().Length -gt 0) -and ("${{ inputs.release_dir }}".Trim().Length -gt 0)
62+
$creatingRelease = "${{ inputs.release_url }}".Trim().Length -gt 0
6363
echo "Flagged to create release: ${creatingRelease}"
6464
echo "CREATE_RELEASE=${creatingRelease}" | Out-File $env:GITHUB_ENV -Encoding utf8 -Append
6565

.github/workflows/github-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ on:
2020

2121
jobs:
2222
call-check-file-action:
23-
uses: keyfactor/cpr-release-checks/.github/workflows/check-files.yml@main
23+
uses: keyfactor/actions/.github/workflows/check-todos-license-headers.yml@v3
2424

2525
create-github-release-workflow:
2626
runs-on: ubuntu-latest

.github/workflows/starter.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ on:
2929

3030
jobs:
3131
call-assign-from-json-workflow:
32-
uses: Keyfactor/actions/.github/workflows/assign-env-from-json.yml@dual-platform-without-doctool
32+
uses: Keyfactor/actions/.github/workflows/assign-env-from-json.yml@v3
3333

3434
call-get-primary-language:
3535
outputs:
@@ -87,7 +87,7 @@ jobs:
8787
call-dotnet-build-and-release-workflow:
8888
needs: [call-get-primary-language, call-assign-from-json-workflow, call-create-github-release-workflow]
8989
if: needs.call-get-primary-language.outputs.primary_language == 'C#'
90-
uses: keyfactor/actions/.github/workflows/dotnet-build-and-release.yml@ab#67222-3.0-doctool
90+
uses: keyfactor/actions/.github/workflows/dotnet-build-and-release.yml@v3
9191
with:
9292
release_version: ${{ needs.call-create-github-release-workflow.outputs.release_version }}
9393
release_url: ${{ needs.call-create-github-release-workflow.outputs.release_url }}
@@ -149,13 +149,13 @@ jobs:
149149
secrets:
150150
token: ${{ secrets.token }}
151151

152-
call-polaris-scan-workflow:
153-
if: github.event_name == 'pull_request' && (startsWith(github.base_ref, 'release-') || github.base_ref == 'main')
154-
uses: Keyfactor/actions/.github/workflows/kf-polaris-scan.yml@v3
155-
with:
156-
scan_branch: ${{ github.event.pull_request.head.ref }}
157-
secrets:
158-
token: ${{ secrets.scan_token }}
152+
# call-polaris-scan-workflow:
153+
# if: github.event_name == 'pull_request' && (startsWith(github.base_ref, 'release-') || github.base_ref == 'main')
154+
# uses: Keyfactor/actions/.github/workflows/kf-polaris-scan.yml@v3
155+
# with:
156+
# scan_branch: ${{ github.event.pull_request.head.ref }}
157+
# secrets:
158+
# token: ${{ secrets.scan_token }}
159159

160160
call-post-release-workflow:
161161
needs: [call-assign-from-json-workflow, call-create-github-release-workflow]

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# 3.3.0 - tagged v3
2+
* allow any integration_type to generate a release build
3+
* update to use v3 tag throughout workflow steps
4+
* disable polaris scan (not configured correctly)
5+
16
# [3.2.0](https://github.com/Keyfactor/actions/compare/3.1.2...3.2.0) (2025-05-08)
27

38

0 commit comments

Comments
 (0)