Skip to content

Commit 521a5b4

Browse files
authored
Fix integration test check step variable values
1 parent a8931f2 commit 521a5b4

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/cpp-packaging.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -721,8 +721,8 @@ jobs:
721721
USE_EXPANDED_MATRIX=0
722722
fi
723723
if [[ "${{ github.event_name }}" == "schedule" ]]; then
724-
# reuse flag --test_pull_request=sdk to generate report
725-
generate_report=(-p test_pull_request sdk)
724+
# reuse flag --test_pull_request=nightly-packaging to generate report
725+
generate_report=(-p test_pull_request nightly-packaging)
726726
fi
727727
verbose_flag=
728728
if [[ -n "${{ github.event.inputs.verboseBuild }}" && "${{ github.event.inputs.verboseBuild }}" -ne 0 ]]; then

.github/workflows/integration_tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
- id: set_outputs
7777
run: |
7878
if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
79-
if [[ "${{ github.event.inputs.test_pull_request }}" != "sdk" ]]; then
79+
if [[ "${{ github.event.inputs.test_pull_request }}" != "nightly-packaging" ]]; then
8080
# Triggered manually
8181
echo "::set-output name=trigger::manual_trigger"
8282
if [[ "${{ github.event.inputs.use_expanded_matrix }}" == "1" ]]; then
@@ -94,7 +94,7 @@ jobs:
9494
echo "::set-output name=github_ref::refs/pull/${{github.event.inputs.test_pull_request}}/merge"
9595
echo "::set-output name=pr_number::${{ github.event.inputs.test_pull_request }}"
9696
fi
97-
elif [[ "${{ github.event.inputs.test_pull_request }}" == "sdk" ]]; then
97+
elif [[ "${{ github.event.inputs.test_pull_request }}" == "nightly-packaging" ]]; then
9898
# Triggered by scheduled packaging SDK workflow.
9999
echo "::set-output name=trigger::scheduled_trigger"
100100
echo "::set-output name=github_ref::$GITHUB_SHA"
@@ -114,7 +114,7 @@ jobs:
114114
else
115115
echo "::set-output name=requested_tests::expanded"
116116
fi
117-
elif [[ "${{ github.event.action }}" == "closed" && ${{ github.event.pull_request.merged }} ]]; then
117+
elif [[ "${{ github.event.action }}" == "closed" && ${{ github.event.pull_request.merged == true }} ]]; then
118118
echo "::set-output name=trigger::postsubmit_trigger"
119119
echo "::set-output name=pr_number::${{ github.event.pull_request.number }}"
120120
echo "::set-output name=requested_tests::auto"
@@ -1087,7 +1087,7 @@ jobs:
10871087
if: needs.check_and_prepare.outputs.trigger == 'scheduled_trigger'
10881088
shell: bash
10891089
run: |
1090-
if [[ "${{ github.event.inputs.test_pull_request }}" == "sdk" ]]; then
1090+
if [[ "${{ github.event.inputs.test_pull_request }}" == "nightly-packaging" ]]; then
10911091
additional_flags=(--build_against sdk)
10921092
else
10931093
additional_flags=(--build_against repo)

0 commit comments

Comments
 (0)