Skip to content

Commit 5b50945

Browse files
authored
Remove duplicate repo owner and fix smoke test requirement (nginx#5791)
1 parent bd325f4 commit 5b50945

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -754,13 +754,15 @@ jobs:
754754
if: ${{ always() }}
755755
runs-on: ubuntu-22.04
756756
name: Final CI Results
757-
needs: [tag-stable]
757+
needs: [tag-stable, smoke-tests]
758758
steps:
759759
- run: |
760-
result="${{ needs.tag-stable.result }}"
761-
if [[ $result == "success" || $result == "skipped" ]]; then
762-
exit 0
763-
else
760+
tagResult="${{ needs.tag-stable.result }}"
761+
smokeResult="${{ needs.smoke-tests.result }}"
762+
if [[ $tagResult != "success" && $tagResult != "skipped" ]]; then
763+
exit 1
764+
fi
765+
if [[ $smokeResult != "success" && $smokeResult != "skipped" ]]; then
764766
exit 1
765767
fi
766768

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -413,12 +413,12 @@ jobs:
413413
run: |
414414
milestone_number=$(gh api \
415415
-H "Accept: application/vnd.github.v3+json" \
416-
/repos/${{ github.repository_owner }}/${{ github.repository }}/milestones \
416+
/repos/${{ github.repository }}/milestones \
417417
| jq --arg version ${{ inputs.nic_version }} -r \
418418
'.[] | select(.title == $version) | .number')
419419
if ! ${{ inputs.dry_run }}
420420
gh api --method PATCH -H "Accept: application/vnd.github.v3+json" \
421-
/repos/${{ github.repository_owner }}/${{ github.repository }}/milestones/${milestone_number} \
421+
/repos/${{ github.repository }}/milestones/${milestone_number} \
422422
else
423423
echo "Skipping closing Github Release milestone, DRY_RUN"
424424
fi
@@ -431,7 +431,7 @@ jobs:
431431
release_id=$(gh api \
432432
-H "Accept: application/vnd.github.v3+json" \
433433
-H "X-GitHub-Api-Version: 2022-11-28" \
434-
/repos/${{ github.repository_owner }}/${{ github.repository }}/releases \
434+
/repos/${{ github.repository }}/releases \
435435
| jq --arg version ${{ inputs.nic_version }} -r \
436436
'.[] | select(.name == $version) | .id')
437437
echo "release_id=${release_id}" >> $GITHUB_OUTPUT

0 commit comments

Comments
 (0)