Skip to content

Commit a4ad766

Browse files
committed
Fix conditionals for downloadPreviousRun parameter.
1 parent d60d003 commit a4ad766

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

.github/workflows/cpp-packaging.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
build_tools:
2424
name: build-tools-${{ matrix.tools_platform }}
2525
runs-on: ${{ matrix.os }}
26-
if: (${{ github.event.inputs.downloadPublicVersion == '' }}) && (${{ github.event.inputs.downloadPreviousRun == '' }})
26+
if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }}
2727
strategy:
2828
matrix:
2929
os: [ubuntu-latest, macos-latest]
@@ -83,7 +83,7 @@ jobs:
8383
build_and_package_ios:
8484
name: build-and-package-ios
8585
runs-on: macos-latest
86-
if: (${{ github.event.inputs.downloadPublicVersion == '' }}) && (${{ github.event.inputs.downloadPreviousRun == '' }})
86+
if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }}
8787
steps:
8888
- name: fetch SDK
8989
uses: actions/[email protected]
@@ -120,7 +120,7 @@ jobs:
120120
build_and_package_android:
121121
name: build-and-package-android-${{matrix.stl}}
122122
runs-on: ubuntu-latest
123-
if: (${{ github.event.inputs.downloadPublicVersion == '' }}) && (${{ github.event.inputs.downloadPreviousRun == '' }})
123+
if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }}
124124
strategy:
125125
fail-fast: false
126126
matrix:
@@ -161,7 +161,7 @@ jobs:
161161
build_desktop:
162162
name: build-${{ matrix.sdk_platform }}-${{ matrix.architecture }}-${{ matrix.build_type }}-${{ matrix.linkage }}
163163
runs-on: ${{ matrix.os }}
164-
if: (${{ github.event.inputs.downloadPublicVersion == '' }}) && (${{ github.event.inputs.downloadPreviousRun == '' }})
164+
if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }}
165165
strategy:
166166
fail-fast: false
167167
matrix:
@@ -292,7 +292,7 @@ jobs:
292292
name: package-${{ matrix.sdk_platform }}${{ matrix.suffix }}
293293
runs-on: ${{ matrix.runs_on_platform }}
294294
needs: [build_tools, build_desktop]
295-
if: (${{ github.event.inputs.downloadPublicVersion == '' }}) && (${{ github.event.inputs.downloadPreviousRun == '' }})
295+
if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }}
296296
strategy:
297297
fail-fast: false
298298
matrix:
@@ -389,19 +389,19 @@ jobs:
389389
download_sdk_package:
390390
name: download-sdk-package
391391
runs-on: ubuntu-latest
392-
if: (${{ github.event.inputs.downloadPublicVersion != '' }}) || (${{ github.event.inputs.downloadPreviousRun != '' }})
392+
if: ${{ github.event.inputs.downloadPublicVersion != '' || github.event.inputs.downloadPreviousRun != '' }}
393393
steps:
394394
- name: fetch artifact from previous run
395395
uses: dawidd6/action-download-artifact@v2
396-
if: (${{ github.event.inputs.downloadPreviousRun != '' }})
396+
if: ${{ github.event.inputs.downloadPreviousRun != '' }}
397397
with:
398398
name: 'firebase_cpp_sdk'
399399
path: 'firebase-cpp-sdk-final'
400400
workflow: 'cpp-packaging.yml'
401401
run_id: ${{ github.event.inputs.downloadPreviousRun }}
402402

403403
- name: fetch public SDK package from web
404-
if: (${{ github.event.inputs.downloadPublicVersion != '' }}) && (${{ github.event.inputs.downloadPreviousRun == '' }})
404+
if: ${{ github.event.inputs.downloadPublicVersion != '' && github.event.inputs.downloadPreviousRun == '' }}
405405
run: |
406406
if [[ ! "${{ github.event.inputs.downloadPublicVersion }}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
407407
echo Invalid version number: "${{ github.event.inputs.downloadPublicVersion }}"
@@ -428,7 +428,7 @@ jobs:
428428
merge_packages:
429429
name: final-merge-packages
430430
runs-on: ubuntu-latest
431-
if: ${{ github.event.inputs.downloadPublicVersion == '' }}
431+
if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }}
432432
needs: [build_and_package_ios, build_and_package_android, package_desktop]
433433
steps:
434434
- name: fetch SDK
@@ -469,7 +469,7 @@ jobs:
469469
name: cleanup-artifacts
470470
runs-on: ubuntu-latest
471471
needs: [merge_packages]
472-
if: (${{ github.event.inputs.preserveIntermediateArtifacts == 0 }}) && (${{ github.event.inputs.downloadPublicVersion == '' }}) && (${{ github.event.inputs.downloadPreviousRun == '' }})
472+
if: ${{ github.event.inputs.preserveIntermediateArtifacts == 0 && github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }}
473473
steps:
474474
- uses: geekyeggo/delete-artifact@v1
475475
with:

0 commit comments

Comments
 (0)