Skip to content

Commit a2d79e0

Browse files
OlegHahmOlegHahm
authored
Merge branch 'master' into patch-3
2 parents 0b4d463 + 5702ca0 commit a2d79e0

11,331 files changed

Lines changed: 1197574 additions & 889441 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.circleci/config.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# CircleCI configuration file used to build and get a preview of the generated
2+
# Doxygen documentation.
3+
# Note that the job on CircleCI takes around 30 minutes to complete because
4+
# copying +19k individual files to their cloud storage is very slow.
5+
6+
version: 2
7+
8+
jobs:
9+
doc-build:
10+
docker:
11+
- image: riot/static-test-tools
12+
steps:
13+
- checkout
14+
- run: make doc
15+
- run:
16+
command: |
17+
cp -R doc/doxygen/html /doc
18+
- store_artifacts:
19+
path: /doc
20+
21+
workflows:
22+
version: 2
23+
doc-build:
24+
jobs:
25+
- doc-build

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
*.a binary
22
*.patch binary
3+
Cargo.lock binary
34
# Default conflict marker size is 7 which causes some of the headings in
45
# release-notes.txt to trigger git diff --check: 'leftover conflict marker'
56
# when the heading is exactly 7 characters long.

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ IF YOUR ISSUE IS RELATED TO SECURITY
1111
please submit it to the security mailing-list security@riot-os.org.
1212
1313
If your issue is a question related to the usage of RIOT, please submit it to
14-
the user mailing-list users@riot-os.org or to the developer mailing-list
15-
devel@riot-os.org.
14+
our forum at https://forum.riot-os.org.
1615
-->
1716

1817
#### Description

‎.github/ISSUE_TEMPLATE/security_bug.md‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
The RIOT community cares a lot about code quality.
33
Therefore, before describing what your contribution is about, we would like
44
you to make sure that your modifications are compliant with the RIOT
5-
coding conventions, see https://github.com/RIOT-OS/RIOT/wiki/Coding-conventions.
5+
coding conventions, see https://github.com/RIOT-OS/RIOT/blob/master/CODING_CONVENTIONS.md.
66
-->
77

88
### Contribution description

‎.github/labeler.yml‎

Lines changed: 156 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,156 @@
1+
"Area: arduino API":
2+
- "sys/arduino/**/*"
3+
4+
"Area: BLE":
5+
- "pkg/nimble/**/*"
6+
- "sys/net/ble/**/*"
7+
- "sys/include/net/bluetil/**/*"
8+
- "sys/include/net/skald/**/*"
9+
- "sys/include/net/skald.h"
10+
11+
"Area: boards":
12+
- "boards/**/*"
13+
14+
"Area: build system":
15+
- "Makefile.*"
16+
- "makefiles/**/*"
17+
- "**/*.mk"
18+
19+
"Area: CI":
20+
- ".circleci/**/*"
21+
- ".github/**/*.yml"
22+
- ".murdock"
23+
24+
"Area: CoAP":
25+
- "sys/net/application_layer/*coap/**/*"
26+
- "sys/include/net/*coap*/**/*"
27+
28+
"Area: core":
29+
- "core/**/*"
30+
31+
"Area: cpu":
32+
- "cpu/**/*"
33+
34+
"Area: doc":
35+
- "doc/**/*"
36+
- "**/*.md"
37+
- "**/*.txt"
38+
- "**/*.cff"
39+
40+
"Area: drivers":
41+
- "drivers/**/*"
42+
43+
"Area: examples":
44+
- "examples/**/*"
45+
46+
"Area: Kconfig":
47+
- "dist/tools/kconfiglib/**/*"
48+
- "makefiles/kconfig.mk"
49+
- "kconfigs/*"
50+
- "**/Kconfig"
51+
52+
"Area: LoRa":
53+
- "drivers/llcc68/**/*"
54+
- "drivers/sx126x/**/*"
55+
- "drivers/sx127x/**/*"
56+
- "drivers/include/llcc68.h"
57+
- "drivers/include/sx126x.h"
58+
- "drivers/include/sx127x.h"
59+
- "pkg/semtech-loramac/**/*"
60+
- "sys/net/lora/**/*"
61+
- "sys/net/gnrc/link_layer/lorawan/**/*"
62+
- "sys/include/net/lorawan/**/*"
63+
- "sys/include/net/gnrc/lorawan/**/*"
64+
- "sys/include/net/gnrc/lorawan.h"
65+
- "sys/include/net/lora.h"
66+
- "sys/include/net/loramac.h"
67+
68+
"Area: network":
69+
- "sys/net/**/*"
70+
- "sys/include/net/**/*"
71+
- "pkg/lwip/**/*"
72+
- "pkg/openthread/**/*"
73+
- "pkg/openwsn/**/*"
74+
- "pkg/paho-mqtt/**/*"
75+
76+
"Area: OTA":
77+
- "sys/suit/**/*"
78+
- "sys/include/suit/**/*"
79+
- "sys/include/suit.h"
80+
81+
"Area: pkg":
82+
- "pkg/**/*"
83+
84+
"Area: SAUL":
85+
- "drivers/saul/**/*"
86+
- "drivers/include/saul/**/*"
87+
- "drivers/include/saul.h"
88+
- "sys/saul_reg/**/*"
89+
- "sys/include/saul_reg.h"
90+
91+
"Area: sys":
92+
- "sys/**/*"
93+
94+
"Area: tests":
95+
- "tests/**/*"
96+
- "fuzzing/**/*"
97+
- "dist/pythonlibs/**/*"
98+
- "makefiles/tests/**/*"
99+
100+
"Area: timers":
101+
- "sys/*timer/**/*"
102+
- "sys/include/*timer/**/*"
103+
- "sys/include/*timer.h"
104+
105+
"Area: toolchain":
106+
- "makefiles/toolchain/**/*"
107+
108+
"Area: tools":
109+
- "dist/tools/**/*"
110+
- "dist/testbed-support/**/*"
111+
- "makefiles/tools/**/*"
112+
113+
"Area: USB":
114+
- "sys/usb/**/*"
115+
- "sys/include/usb/**/*"
116+
- "sys/include/usb.h"
117+
118+
"Platform: native":
119+
- "boards/native/**/*"
120+
- "cpu/native/**/*"
121+
122+
"Platform: ARM":
123+
- "cpu/arm7_common/**/*"
124+
- "cpu/cortexm_common/**/*"
125+
- "cpu/cc2*/**/*"
126+
- "cpu/efm32/**/*"
127+
- "cpu/kinetis/**/*"
128+
- "cpu/lm4f120/**/*"
129+
- "cpu/lpc*/**/*"
130+
- "cpu/nrf5*/**/*"
131+
- "cpu/qn908x/**/*"
132+
- "cpu/sam*/**/*"
133+
- "cpu/stellaris_common/**/*"
134+
- "cpu/stm32/**/*"
135+
- "makefiles/arch/cortexm.inc.mk"
136+
137+
"Platform: AVR":
138+
- "cpu/atmega*/**/*"
139+
- "cpu/avr8_common/**/*"
140+
- "makefiles/arch/avr8.inc.mk"
141+
142+
"Platform: ESP":
143+
- "cpu/esp*/**/*"
144+
145+
"Platform: MIPS":
146+
- "cpu/mips*/**/*"
147+
- "makefiles/arch/mips.inc.mk"
148+
149+
"Platform: MSP":
150+
- "cpu/msp*/**/*"
151+
- "makefiles/arch/msp430.inc.mk"
152+
153+
"Platform: RISC-V":
154+
- "cpu/riscv_common/**/*"
155+
- "cpu/fe310/**/*"
156+
- "makefiles/arch/riscv.inc.mk"

‎.github/workflows/check-pr.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: check-pr
2+
on:
3+
pull_request:
4+
types: [opened, reopened, labeled, unlabeled, synchronize]
5+
pull_request_review:
6+
types: [submitted, dismissed]
7+
jobs:
8+
check-labels:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: RIOT-OS/check-labels-action@v1.0.0
12+
with:
13+
access_token: ${{ secrets.GITHUB_TOKEN }}
14+
unset_labels: 'CI: needs squashing,State: waiting for other PR,Process: blocked by feature freeze'
15+
cond_labels: '(Process: needs >1 ACK,review.approvals>1),(Area: RDM,review.approvals>2)'
16+
check-commits:
17+
runs-on: ubuntu-latest
18+
if: ${{ github.base_ref }}
19+
strategy:
20+
fail-fast: false
21+
matrix:
22+
check: [commit-msg, pr_check]
23+
steps:
24+
- uses: actions/checkout@master
25+
with:
26+
# Use the SHA of the PR branch as-is, not the PR branch merged
27+
# in master (default behavior in GH actions)
28+
# See https://github.com/actions/checkout#checkout-pull-request-head-commit-instead-of-merge-commit
29+
ref: ${{ github.event.pull_request.head.sha }}
30+
fetch-depth: 0
31+
- name: Fetch base branch
32+
run:
33+
git fetch origin '${{ github.base_ref }}:${{ github.base_ref }}'
34+
- name: Run checks
35+
run: |
36+
./dist/tools/${{ matrix.check }}/check.sh "${{ github.base_ref }}"

‎.github/workflows/circleci.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: doc-build-artifact
2+
on: [status]
3+
jobs:
4+
circleci_artifacts_redirector_job:
5+
runs-on: ubuntu-latest
6+
name: Run CircleCI artifacts redirector
7+
steps:
8+
- name: GitHub Action step
9+
uses: larsoner/circleci-artifacts-redirector-action@master
10+
with:
11+
repo-token: ${{ secrets.GITHUB_TOKEN }}
12+
artifact-path: 0/doc/index.html
13+
circleci-jobs: doc-build

‎.github/workflows/labeler.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: pr-labeler
2+
3+
on:
4+
pull_request_target:
5+
types: [opened, synchronize, reopened]
6+
7+
jobs:
8+
triage:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/labeler@main
12+
with:
13+
repo-token: "${{ secrets.GITHUB_TOKEN }}"
14+
sync-labels: true

0 commit comments

Comments
 (0)