Skip to content

Commit 706350f

Browse files
authored
Merge branch 'dev' into feature/fix-windows-vcpkg-rename-error
2 parents 1ad1722 + 7e1d453 commit 706350f

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

.github/workflows/cpp-packaging.yml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
name: CPP binary SDK packaging
22
on:
3+
push:
4+
branches:
5+
# Run a full packaging step any time a new branch is merged into dev.
6+
- dev
37
workflow_dispatch:
48
inputs:
59
commitIdToPackage:
@@ -40,9 +44,12 @@ jobs:
4044
echo "::warning ::Using commit ID '${{ github.event.inputs.commitIdToPackage }}' for building and packaging SDK and tests."
4145
fi
4246
fi
43-
if [[ "${{ github.event.inputs.preserveIntermediateArtifacts }}" != "0" ]]; then
44-
echo "::warning ::Intermediate artifacts will be preserved."
45-
fi
47+
48+
- name: log if preserving intermediate artifacts
49+
if: |
50+
github.event.inputs.preserveIntermediateArtifacts != 0 && github.event.inputs.preserveIntermediateArtifacts != '' &&
51+
github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == ''
52+
run: echo "::warning ::Intermediate artifacts will be preserved."
4653

4754
build_tools:
4855
name: build-tools-${{ matrix.tools_platform }}
@@ -536,7 +543,12 @@ jobs:
536543
name: cleanup-artifacts
537544
runs-on: ubuntu-latest
538545
needs: [merge_packages]
539-
if: ${{ github.event.inputs.preserveIntermediateArtifacts == 0 && github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }}
546+
if: |
547+
(
548+
(github.event.inputs.preserveIntermediateArtifacts == 0 || github.event.inputs.preserveIntermediateArtifacts == '')
549+
&& github.event.inputs.downloadPublicVersion == ''
550+
&& github.event.inputs.downloadPreviousRun == ''
551+
)
540552
steps:
541553
- uses: geekyeggo/delete-artifact@v1
542554
with:

0 commit comments

Comments
 (0)