Skip to content

Commit 16ecae7

Browse files
committed
Build: Rename OneCrypto-Drivers artifacts to OneCrypto
Rename the build artifact from OneCrypto-Drivers to OneCrypto and include the build target in the zip filename (e.g., OneCrypto-DEBUG.zip, OneCrypto-RELEASE.zip). Update the publish names and staging glob to match. Signed-off-by: Doug Flick <dougflick@microsoft.com>
1 parent 76fd9d2 commit 16ecae7

4 files changed

Lines changed: 6 additions & 17 deletions

File tree

.github/workflows/build-onecrypto.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,6 @@ on:
1414
push:
1515
branches:
1616
- main
17-
paths:
18-
- 'OneCryptoPkg/**'
19-
- 'OpensslPkg/**'
20-
- 'PlatformBuild.py'
21-
- '.github/workflows/build-onecrypto.yml'
22-
- '.github/workflows/onecrypto-build-variant.yml'
23-
- '.github/workflows/onecrypto-publish-variant.yml'
2417
release:
2518
types: [published]
2619

@@ -46,9 +39,9 @@ jobs:
4639
matrix:
4740
include:
4841
- variant: accelerated
49-
publish_name: OneCrypto-Drivers-Accelerated
42+
publish_name: OneCrypto-Accelerated
5043
- variant: non-accelerated
51-
publish_name: OneCrypto-Drivers-NonAccelerated
44+
publish_name: OneCrypto-NonAccelerated
5245
uses: ./.github/workflows/onecrypto-publish-variant.yml
5346
with:
5447
variant: ${{ matrix.variant }}

.github/workflows/onecrypto-build-variant.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
run: |
5555
mkdir -p staging/Logs/DEBUG staging/Logs/RELEASE staging/PDB/DEBUG staging/PDB/RELEASE
5656
shopt -s nullglob
57-
cp Build/OneCrypto-Drivers*.zip staging/ 2>/dev/null || true
57+
cp Build/OneCrypto-*.zip staging/ 2>/dev/null || true
5858
cp -r Build/OneCryptoPkg/DEBUG_*/PDB/* staging/PDB/DEBUG/ 2>/dev/null || true
5959
cp -r Build/OneCryptoPkg/RELEASE_*/PDB/* staging/PDB/RELEASE/ 2>/dev/null || true
6060
cp Build/*.txt staging/Logs/ 2>/dev/null || true

.github/workflows/onecrypto-publish-variant.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,21 +48,17 @@ jobs:
4848

4949
- name: Package Release Zip (${{ inputs.variant }})
5050
if: github.event_name == 'release'
51-
env:
52-
VERSION_TAG: ${{ github.event.release.tag_name }}
53-
PUBLISH_NAME: ${{ inputs.publish_name }}
5451
shell: bash
5552
run: |
56-
VARIANT_LABEL="${PUBLISH_NAME#OneCrypto-Drivers-}"
5753
cd publish/${{ inputs.variant }}
58-
zip -r "../../${VERSION_TAG}-${VARIANT_LABEL}.zip" .
54+
zip -r "../../${{ inputs.publish_name }}.zip" .
5955
6056
- name: Upload Release Asset (${{ inputs.variant }})
6157
if: github.event_name == 'release'
6258
env:
6359
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6460
run: |
65-
gh release upload ${{ github.event.release.tag_name }} ${{ github.event.release.tag_name }}-*.zip
61+
gh release upload ${{ github.event.release.tag_name }} ${{ inputs.publish_name }}.zip
6662
6763
- name: Delete Intermediate Artifact (${{ inputs.variant }})
6864
uses: geekyeggo/delete-artifact@v5

OneCryptoPkg/Scripts/package_onecrypto.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ def create_package(output_name=None, version=None, architectures=None, target=No
225225

226226
# Generate output filename
227227
if not output_name:
228-
output_name = "OneCrypto-Drivers"
228+
output_name = f"OneCrypto-{targets[0]}" if len(targets) == 1 else "OneCrypto"
229229

230230
# Write output to Build directory
231231
output_zip = Path(BUILD_BASE) / f"{output_name}.zip"

0 commit comments

Comments
 (0)