Skip to content

Commit a217da3

Browse files
gha: use nrf without sidewalk in manifest
final remove workarounds for sidewalk in nrf manifest nrfconnect/sdk-nrf#20901 Signed-off-by: Robert Gałat <[email protected]>
1 parent b3cbb69 commit a217da3

File tree

8 files changed

+27
-37
lines changed

8 files changed

+27
-37
lines changed

.github/workflows/on_docker_change.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- name: Get revision of nrf to use
5454
id: revision
5555
run: |
56-
REF_NAME=$(yq '.manifest.projects | map(select(.name == "nrf"))[0].revision' tmp_west.yml)
56+
REF_NAME=$(yq '.manifest.projects | map(select(.name == "nrf"))[0].revision' west.yml)
5757
echo "REF_NAME=$REF_NAME" >> $GITHUB_OUTPUT
5858
echo "Ref name: $REF_NAME"
5959

.github/workflows/run_tests.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,13 @@ jobs:
2626
uses: actions/checkout@v4
2727
with:
2828
fetch-depth: 0
29-
path: sidewalk_tmp
29+
path: sidewalk
3030

3131
- name: update NRF
3232
run: |
3333
rm -rf .west;
34-
west init -l sidewalk_tmp --mf tmp_west.yml &&
35-
west update -n -o=--depth=1 --path-cache /workdir/ &&
36-
ln -s sidewalk_tmp sidewalk
34+
west init -l sidewalk --mf west.yml &&
35+
west update -n -o=--depth=1 --path-cache /workdir/
3736
3837
- name: subsets configuration
3938
id: subsets
@@ -81,14 +80,13 @@ jobs:
8180
uses: actions/checkout@v4
8281
with:
8382
fetch-depth: 0
84-
path: sidewalk_tmp
83+
path: sidewalk
8584

8685
- name: update NRF
8786
run: |
8887
rm -rf .west;
89-
west init -l sidewalk_tmp --mf tmp_west.yml &&
90-
west update -n -o=--depth=1 --path-cache /workdir/ &&
91-
ln -s sidewalk_tmp sidewalk
88+
west init -l sidewalk --mf west.yml &&
89+
west update -n -o=--depth=1 --path-cache /workdir/
9290
9391
- name: Install Python dependencies
9492
run: |

.github/workflows/run_tests_cli.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,20 @@ jobs:
3232
run: |
3333
rm -rf pytest-sidewalk
3434
rm -rf twister-out*
35-
rm -rf sidewalk_tmp
3635
rm -rf sidewalk
3736
rm -rf .west
3837
3938
- name: Checkout
4039
uses: actions/checkout@v4
4140
with:
4241
fetch-depth: 0
43-
path: sidewalk_tmp
42+
path: sidewalk
4443

4544
- name: update NRF
4645
run: |
4746
rm -rf .west;
48-
west init -l sidewalk_tmp --mf tmp_west.yml &&
49-
west update -n -o=--depth=1 --path-cache /workdir/ &&
50-
ln -s sidewalk_tmp sidewalk
47+
west init -l sidewalk --mf west.yml &&
48+
west update -n -o=--depth=1 --path-cache /workdir/
5149
5250
- name: Replace slash with underscore
5351
id: replace

.github/workflows/run_tests_dut.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,13 @@ jobs:
4242
uses: actions/checkout@v4
4343
with:
4444
fetch-depth: 0
45-
path: sidewalk_tmp
45+
path: sidewalk
4646

4747
- name: update NRF
4848
run: |
4949
rm -rf .west;
50-
west init -l sidewalk_tmp --mf tmp_west.yml &&
51-
west update -n -o=--depth=1 --path-cache /workdir/ &&
52-
ln -s sidewalk_tmp sidewalk
50+
west init -l sidewalk --mf west.yml &&
51+
west update -n -o=--depth=1 --path-cache /workdir/
5352
5453
- name: Install Python dependencies
5554
run: |
@@ -107,22 +106,20 @@ jobs:
107106
if: always()
108107
run: |
109108
rm -rf PACKAGE_ARTIFACTS* twister-out*
110-
rm -rf sidewalk_tmp
111109
rm -rf sidewalk
112110
rm -rf .west
113111
114112
- name: Checkout
115113
uses: actions/checkout@v4
116114
with:
117115
fetch-depth: 0
118-
path: sidewalk_tmp
116+
path: sidewalk
119117

120118
- name: update NRF
121119
run: |
122120
rm -rf .west;
123-
west init -l sidewalk_tmp --mf tmp_west.yml &&
124-
west update -n -o=--depth=1 --path-cache /workdir/ &&
125-
ln -s sidewalk_tmp sidewalk
121+
west init -l sidewalk --mf west.yml &&
122+
west update -n -o=--depth=1 --path-cache /workdir/
126123
127124
- name: Replace slash with underscore
128125
id: replace

.github/workflows/samples_build.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,13 @@ jobs:
3131
uses: actions/checkout@v4
3232
with:
3333
fetch-depth: 0
34-
path: sidewalk_tmp
34+
path: sidewalk
3535

3636
- name: update NRF
3737
run: |
3838
rm -rf .west;
39-
west init -l sidewalk_tmp --mf tmp_west.yml &&
40-
west update -n -o=--depth=1 --path-cache /workdir/ &&
41-
ln -s sidewalk_tmp sidewalk
39+
west init -l sidewalk --mf west.yml &&
40+
west update -n -o=--depth=1 --path-cache /workdir/
4241
4342
- name: subsets configuration
4443
id: subsets

.github/workflows/samples_build_target.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,13 @@ jobs:
4141
uses: actions/checkout@v4
4242
with:
4343
fetch-depth: 0
44-
path: sidewalk_tmp
44+
path: sidewalk
4545

4646
- name: update NRF
4747
run: |
4848
rm -rf .west;
49-
west init -l sidewalk_tmp --mf tmp_west.yml &&
50-
west update -n -o=--depth=1 --path-cache /workdir/ &&
51-
ln -s sidewalk_tmp sidewalk
49+
west init -l sidewalk --mf west.yml &&
50+
west update -n -o=--depth=1 --path-cache /workdir/
5251
5352
- name: Install Python dependencies
5453
run: |

.github/workflows/validate_code_style.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,22 +48,21 @@ jobs:
4848
uses: actions/checkout@v4
4949
with:
5050
fetch-depth: 0
51-
path: sidewalk_tmp
51+
path: sidewalk
5252

5353
- name: Checkout
5454
if: ${{github.event_name == 'pull_request'}}
5555
uses: actions/checkout@v4
5656
with:
5757
fetch-depth: 0
58-
path: sidewalk_tmp
58+
path: sidewalk
5959
ref: ${{ github.event.pull_request.head.sha }}
6060

6161
- name: update NRF
6262
run: |
6363
rm -rf .west;
64-
west init -l sidewalk_tmp --mf tmp_west.yml &&
65-
west update -n -o=--depth=1 --path-cache /workdir/ &&
66-
ln -s sidewalk_tmp sidewalk
64+
west init -l sidewalk --mf west.yml &&
65+
west update -n -o=--depth=1 --path-cache /workdir/
6766
6867
- name: Run Compliance Tests
6968
run: |

tmp_west.yml renamed to west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ manifest:
1313
- name: nrf
1414
remote: ncs
1515
repo-path: sdk-nrf
16-
revision: 7be9bef7388fb5dda2ce2ac72efd6a5d970ba4a0
16+
revision: pull/20901/head
1717
import: true

0 commit comments

Comments
 (0)