Skip to content

Commit f2472a3

Browse files
Merge branch 'main' into drogers_license
2 parents 01ee1c9 + 43d0cf1 commit f2472a3

File tree

5 files changed

+49
-13
lines changed

5 files changed

+49
-13
lines changed

.github/CODEOWNERS

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
88

99
# default owners - covers lint/config/build tooling in repo root
10-
* @soniabha-intc @scottmbaker @hyunsun @krishnajs @Ram-srini @rranjan3 @open-edge-platform/open-edge-platform-docs-write
10+
* @soniabha-intc @scottmbaker @krishnajs @Ram-srini @rranjan3 @open-edge-platform/open-edge-platform-docs-write
1111

1212
# documentation content
13-
docs/ @soniabha-intc @scottmbaker @hyunsun @krishnajs @Ram-srini @rranjan3 @pchand20 @open-edge-platform/open-edge-platform-docs-write
14-
docs/developer_guide @soniabha-intc @scottmbaker @hyunsun @krishnajs @Ram-srini @rranjan3 @open-edge-platform/open-edge-platform-docs-write
15-
README.md @soniabha-intc @scottmbaker @hyunsun @krishnajs @Ram-srini @rranjan3 @open-edge-platform/open-edge-platform-docs-write
13+
docs/ @soniabha-intc @scottmbaker @krishnajs @Ram-srini @rranjan3 @pchand20 @open-edge-platform/open-edge-platform-docs-write
14+
docs/developer_guide @soniabha-intc @scottmbaker @krishnajs @Ram-srini @rranjan3 @open-edge-platform/open-edge-platform-docs-write
15+
README.md @soniabha-intc @scottmbaker @krishnajs @Ram-srini @rranjan3 @open-edge-platform/open-edge-platform-docs-write
1616

1717
# CI files
18-
.github/ @soniabha-intc @scottmbaker @hyunsun @krishnajs @Ram-srini @rranjan3 @jouillet @adimoft @daveroge @shanedonohue @manilk1x @open-edge-platform/open-edge-platform-docs-write
18+
.github/ @soniabha-intc @scottmbaker @krishnajs @Ram-srini @rranjan3 @jouillet @adimoft @daveroge @shanedonohue @manilk1x @open-edge-platform/open-edge-platform-docs-write
1919

2020
# shared doc config
21-
docconf/ @soniabha-intc @scottmbaker @hyunsun @krishnajs @Ram-srini @rranjan3 @jouillet @open-edge-platform/open-edge-platform-docs-write
21+
docconf/ @soniabha-intc @scottmbaker @krishnajs @Ram-srini @rranjan3 @jouillet @open-edge-platform/open-edge-platform-docs-write

.github/workflows/post-merge-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
id-token: write
2323
contents: read
2424

25-
uses: open-edge-platform/orch-ci/.github/workflows/post-merge-scorecard.yml@d40dfda9598df896aa20cb1dc2c950d6444e8fa7 # 2026.0.19
25+
uses: open-edge-platform/orch-ci/.github/workflows/post-merge-scorecard.yml@bf82f7924caaac6ba2f388b6ec6ac4edd65f48ee # 2026.1.1
2626
with:
2727
project_folder: "."
2828
secrets:

.github/workflows/post-merge.yml

Lines changed: 39 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,53 @@ name: Post-Merge CI Pipeline
66

77
on: # yamllint disable-line rule:truthy
88
push:
9-
branches: ['main', 'release-[0-9]+.[0-9]+.*']
9+
branches: ['main', 'release-*']
1010
workflow_dispatch:
1111

1212
permissions:
1313
contents: read
1414

1515
jobs:
16+
pre-checks:
17+
permissions:
18+
contents: read
19+
runs-on: ubuntu-latest
20+
outputs:
21+
skip: ${{ steps.branch_check.outputs.skip }}
22+
steps:
23+
- uses: actions/checkout@v6
24+
with:
25+
persist-credentials: false
26+
- name: Validate branch name
27+
id: branch_check
28+
run: |
29+
BRANCH="${GITHUB_HEAD_REF:-${GITHUB_REF_NAME}}"
30+
echo "Branch: $BRANCH"
31+
32+
if [[ "$BRANCH" == release-* ]]; then
33+
if [[ "$BRANCH" =~ ^release-[0-9]+\.[0-9]+(\.[0-9]+)?$ ]]; then
34+
echo "✅ Valid release branch"
35+
echo "skip=false" >> $GITHUB_OUTPUT
36+
else
37+
echo "⚠️ Invalid release branch → skipping pipeline"
38+
echo "skip=true" >> $GITHUB_OUTPUT
39+
fi
40+
else
41+
echo "Not a release branch"
42+
echo "skip=false" >> $GITHUB_OUTPUT
43+
fi
44+
- name: "Verify Branch Name"
45+
if: steps.branch_check.outputs.skip != 'true'
46+
uses: open-edge-platform/orch-ci/verify-branch-name@bf82f7924caaac6ba2f388b6ec6ac4edd65f48ee # yamllint disable-line rule:line-length
47+
1648
post-merge-pipeline:
49+
needs: pre-checks
50+
if: needs.pre-checks.outputs.skip != 'true'
1751
permissions:
1852
contents: read
1953
security-events: write
2054
id-token: write
21-
uses: open-edge-platform/orch-ci/.github/workflows/post-merge.yml@d40dfda9598df896aa20cb1dc2c950d6444e8fa7 # yamllint disable-line rule:line-length
55+
uses: open-edge-platform/orch-ci/.github/workflows/post-merge.yml@bf82f7924caaac6ba2f388b6ec6ac4edd65f48ee # yamllint disable-line rule:line-length
2256
with:
2357
run_version_check: true
2458
run_dep_version_check: false
@@ -37,7 +71,9 @@ jobs:
3771
contents: read
3872
pull-requests: read
3973
issues: write
40-
uses: open-edge-platform/orch-ci/.github/workflows/publish-documentation.yml@d40dfda9598df896aa20cb1dc2c950d6444e8fa7 # yamllint disable-line rule:line-length
74+
needs: pre-checks
75+
if: needs.pre-checks.outputs.skip != 'true'
76+
uses: open-edge-platform/orch-ci/.github/workflows/publish-documentation.yml@bf82f7924caaac6ba2f388b6ec6ac4edd65f48ee # yamllint disable-line rule:line-length
4177
with:
4278
simple_mode: false
4379
branch_pattern: '^(main|release-[0-9]+\.[0-9]+.*)$'

.github/workflows/pre-merge.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ jobs:
4747
fi
4848
- name: "Verify Branch Name"
4949
if: steps.branch_check.outputs.skip != 'true'
50-
uses: open-edge-platform/orch-ci/verify-branch-name@d40dfda9598df896aa20cb1dc2c950d6444e8fa7 # yamllint disable-line rule:line-length
50+
uses: open-edge-platform/orch-ci/verify-branch-name@bf82f7924caaac6ba2f388b6ec6ac4edd65f48ee # yamllint disable-line rule:line-length
5151

5252
pre-merge-pipeline:
5353
permissions:
5454
contents: read
5555
needs: pre-checks
5656
if: needs.pre-checks.outputs.skip != 'true'
57-
uses: open-edge-platform/orch-ci/.github/workflows/pre-merge.yml@d40dfda9598df896aa20cb1dc2c950d6444e8fa7 # yamllint disable-line rule:line-length
57+
uses: open-edge-platform/orch-ci/.github/workflows/pre-merge.yml@bf82f7924caaac6ba2f388b6ec6ac4edd65f48ee # yamllint disable-line rule:line-length
5858
with:
5959
run_security_scans: false
6060
run_version_check: true

.github/workflows/publish-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
contents: read # needed for actions/checkout
1616
pull-requests: read # needed for gh pr list
1717
issues: write # needed to post PR comment
18-
uses: open-edge-platform/orch-ci/.github/workflows/publish-documentation.yml@d40dfda9598df896aa20cb1dc2c950d6444e8fa7 # yamllint disable-line rule:line-length
18+
uses: open-edge-platform/orch-ci/.github/workflows/publish-documentation.yml@bf82f7924caaac6ba2f388b6ec6ac4edd65f48ee # yamllint disable-line rule:line-length
1919
with:
2020
simple_mode: false
2121
branch_pattern: '^(main|release-[0-9]+\.[0-9]+.*)$'

0 commit comments

Comments
 (0)