Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase onupdates #19

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/manifest-PR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: handle manifest PR
uses: nrfconnect/action-manifest-pr@main
uses: nrfconnect/action-manifest-pr@rebaseOnUpdates
with:
token: ${{ secrets.NCS_GITHUB_TOKEN }}
manifest-pr-title-details: ${{ github.event.pull_request.title }}
Expand Down
2 changes: 1 addition & 1 deletion samples/arch/mpu/mpu_test/src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <stdlib.h>

/* dummy PR to check workflows*/
#include <zephyr/kernel.h>
#include <zephyr/device.h>
#include <zephyr/devicetree.h>
Expand Down
3 changes: 2 additions & 1 deletion samples/basic/blinky/src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
*
* SPDX-License-Identifier: Apache-2.0
*/

/*checking if workflow rebase sdk-nrf-testing*/
/*stest12*/
#include <stdio.h>
#include <zephyr/kernel.h>
#include <zephyr/drivers/gpio.h>
Expand Down