Skip to content

Commit 632b56f

Browse files
committed
fixup! [nrf noup] ci: enable custom base for manifest-PR
1 parent 0437b97 commit 632b56f

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

.github/workflows/manifest-PR.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,26 @@ on:
1111
jobs:
1212
call-manifest-pr-action:
1313
runs-on: ubuntu-latest
14-
env:
15-
TARGET_BASE_BRANCH: ${{ github.event.pull_request.base.ref == 'v3.7.99-ncs1-branch' && 'v2.8-branch' || 'main' }}
14+
# env:
15+
# TARGET_BASE_BRANCH: ${{ github.event.pull_request.base.ref == 'v3.7.99-ncs1-branch' && 'v2.8-branch' || 'main' }}
1616
# myjson: '{"v3.7.99-ncs1-branch" : "v2.8-branch", "v3.7.99-ncs1-branch": "v2.7-branch"}'
1717
steps:
1818
# - name: set TARGET_BASE_BRANCH
1919
# # run: echo "github.event.pull_request.base.ref=${{ github.event.pull_request.base.ref }}
2020
# run: echo "TARGET_BASE_BRANCH=${{ fromJSON(env.myjson)[env.var_foo] }}" >> $GITHUB_ENV
2121

22-
- name: read TARGET_BASE_BRANCH
23-
run: echo "TARGET_BASE_BRANCH=$TARGET_BASE_BRANCH"
22+
# - name: read TARGET_BASE_BRANCH
23+
# run: echo "TARGET_BASE_BRANCH=$TARGET_BASE_BRANCH"
2424

2525

2626
# if: contains(['SNAPSHOT'],env.BUILD_VERSION)
2727
# run: echo '{{ github.event.pull_request.base.ref}}'
2828

29-
# - name: handle manifest PR
30-
# uses: thst-nordic/action-manifest-pr@add_release_branches
31-
# with:
32-
# token: ${{ secrets.NCS_GITHUB_TOKEN }}
33-
# manifest-pr-title-details: ${{ github.event.pull_request.title }}
34-
# target-repo: nrfconnect/sdk-nrf-testing
35-
# forked-repo: nordicbuilder/sdk-nrf-testing
36-
# base-branch: ${{ TARGET_BASE_BRANCH }}
29+
- name: handle manifest PR
30+
uses: thst-nordic/action-manifest-pr@add_release_branches
31+
with:
32+
token: ${{ secrets.NCS_GITHUB_TOKEN }}
33+
manifest-pr-title-details: ${{ github.event.pull_request.title }}
34+
target-repo: nrfconnect/sdk-nrf-testing
35+
forked-repo: nordicbuilder/sdk-nrf-testing
36+
base-branch: ${{ github.event.pull_request.base.ref == 'v3.7.99-ncs1-branch' && 'v2.8-branch' || 'main' }}

0 commit comments

Comments
 (0)