Skip to content

Commit 3af27e9

Browse files
karhamathst-nordic
authored andcommitted
ci: remove rebases from actions
We use mostly on pull_request which already checkouts merged code. Trying to align all the actions to use same approach. Signed-off-by: Kari Hamalainen <[email protected]>
1 parent 63dc325 commit 3af27e9

File tree

5 files changed

+1
-27
lines changed

5 files changed

+1
-27
lines changed

.github/workflows/compliance.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
with:
1717
git-fetch-depth: 0
1818
git-ref: ${{ github.event.pull_request.head.sha }}
19+
rebase: true
1920

2021
- name: cache-pip
2122
uses: actions/cache@2f8e54208210a422b2efd51efaa6bd6d7ca8920f # v3
@@ -38,15 +39,10 @@ jobs:
3839
BASE_REF: ${{ github.base_ref }}
3940
working-directory: ncs/nrf
4041
run: |
41-
git remote -v
4242
# Ensure there's no merge commits in the PR
4343
[[ "$(git rev-list --merges --count origin/${BASE_REF}..)" == "0" ]] || \
4444
(echo "::error ::Merge commits not allowed, rebase instead";false)
4545
46-
git rebase origin/${BASE_REF}
47-
# debug
48-
git log --pretty=oneline | head -n 10
49-
5046
- name: Run CODEOWNERS test
5147
id: codeowners
5248
env:

.github/workflows/docbuild.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,6 @@ jobs:
3737
with:
3838
git-fetch-depth: 0
3939

40-
- name: Rebase
41-
if: github.event_name == 'pull_request'
42-
working-directory: ncs/nrf
43-
run: |
44-
git config --global user.email "[email protected]"
45-
git config --global user.name "Github Actions"
46-
git rebase origin/${{ github.base_ref }}
47-
4840
- name: cache-pip
4941
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4
5042
with:

.github/workflows/license-reusable.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ jobs:
4040
uses: nrfconnect/action-checkout-west-update@main
4141
with:
4242
git-fetch-depth: 0
43-
git-ref: ${{ github.event.pull_request.head.sha }}
4443
path: ncs/${{ inputs.path }}
4544
west-update-args: '-n zephyr bsim'
4645

@@ -59,17 +58,6 @@ jobs:
5958
pip3 install --user -U west
6059
pip3 show -f west
6160
62-
- name: Git rebase
63-
env:
64-
BASE_REF: ${{ github.base_ref }}
65-
working-directory: ncs/${{ inputs.path }}
66-
run: |
67-
git remote -v
68-
git branch
69-
git rebase origin/${BASE_REF}
70-
# debug
71-
git log --pretty=oneline | head -n 10
72-
7361
- name: West zephyr-export
7462
working-directory: ncs
7563
env:

.github/workflows/validate-pip-requirements-fixed-file.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ jobs:
1818
- name: Checkout sources
1919
uses: nrfconnect/action-checkout-west-update@main
2020
with:
21-
git-ref: ${{ github.event.pull_request.head.sha }}
2221
west-update-args: '--narrow mcuboot zephyr'
2322

2423
- name: Get python version

.github/workflows/west-commands.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ jobs:
1717
uses: nrfconnect/action-checkout-west-update@main
1818
with:
1919
path: ncs/nrf
20-
git-ref: ${{ github.event.pull_request.head.sha }}
2120
git-fetch-depth: 0
2221
- name: Install python dependencies
2322
working-directory: ncs/nrf

0 commit comments

Comments
 (0)