Skip to content

Commit

Permalink
compliance: testing
Browse files Browse the repository at this point in the history
Signed-off-by: Carles Cufi <[email protected]>
  • Loading branch information
carlescufi committed Oct 1, 2024
1 parent f4207dc commit 822a9ae
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 21 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/compliance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,12 @@ jobs:
run: |
git remote -v
# Ensure there's no merge commits in the PR
[[ "$(git rev-list --merges --count origin/${BASE_REF}..)" == "0" ]] || \
(echo "::error ::Merge commits not allowed, rebase instead";false)
#[[ "$(git rev-list --merges --count origin/${BASE_REF}..)" == "0" ]] || \
#(echo "::error ::Merge commits not allowed, rebase instead";false)
git rebase origin/${BASE_REF}
#git rebase origin/${BASE_REF}
# debug
echo "Git log:"
git log --pretty=oneline | head -n 10
- name: Run CODEOWNERS test
Expand Down
28 changes: 10 additions & 18 deletions .github/workflows/manifest.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Manifest

on:
pull_request_target:
pull_request:

permissions:
contents: read
Expand All @@ -19,20 +19,12 @@ jobs:
ref: ${{ github.event.pull_request.head.sha }}
fetch-depth: 0
persist-credentials: false

- name: Manifest
uses: zephyrproject-rtos/action-manifest@16c4cfa380ae2b6fa3daddb1a35032e69422a20f
with:
github-token: ${{ secrets.NCS_GITHUB_TOKEN }}
manifest-path: 'west.yml'
checkout-path: 'ncs/nrf'
label-prefix: 'manifest-'
verbosity-level: '1'

# Add one label per line. 'manifest' always adds the label 'manifest'.
# 'CI-all-test:zephyr;nrfxlib,' adds the 'CI-all-test' label when the
# zephyr module or the nrfxlib module is changed. Each line is comma-
# separated.
labels: >
manifest
dnm-labels: 'DNM'

- name: Scripts
env:
BASE_REF: ${{ github.base_ref }}
working-directory: ncs/nrf
run: |
git remote -v
echo "Git log:"
git log --pretty=oneline | head -n 10

0 comments on commit 822a9ae

Please sign in to comment.