Skip to content

Commit 7fe70e2

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 832063e + c442f13 commit 7fe70e2

File tree

260 files changed

+19733
-9905
lines changed

Some content is hidden

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

260 files changed

+19733
-9905
lines changed

.clang-format

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ BreakConstructorInitializersBeforeComma: false
4444
BreakConstructorInitializers: BeforeColon
4545
BreakAfterJavaFieldAnnotations: false
4646
BreakStringLiterals: true
47-
ColumnLimit: 120
47+
ColumnLimit: 0
4848
CommentPragmas: '^ IWYU pragma:'
4949
CompactNamespaces: false
5050
ConstructorInitializerAllOnOneLineOrOnePerLine: false
@@ -91,7 +91,7 @@ PenaltyExcessCharacter: 1000000
9191
PenaltyReturnTypeOnItsOwnLine: 60
9292
PointerAlignment: Right
9393
RawStringFormats:
94-
- Delimiter: pb
94+
- Delimiters: [pb]
9595
Language: TextProto
9696
BasedOnStyle: google
9797
ReflowComments: true
@@ -111,4 +111,3 @@ SpacesInSquareBrackets: false
111111
Standard: Cpp11
112112
TabWidth: 8
113113
UseTab: Never
114-
...

.devcontainer/devcontainer.json

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
2+
// README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-dockerfile
3+
{
4+
"name": "Norns RPiOS Dockerfile",
5+
"build": {
6+
"context": "..",
7+
"dockerfile": "../Dockerfile",
8+
"cacheFrom": "ghcr.io/monome/norns-ci:latest"
9+
},
10+
"runArgs": [
11+
"--platform=linux/arm/v8"
12+
],
13+
"workspaceMount": "source=${localWorkspaceFolder},target=/norns-build,type=bind,consistency=cached",
14+
"workspaceFolder": "/norns-build",
15+
"updateRemoteUserUID": true,
16+
"customizations": {
17+
"vscode": {
18+
"settings": {
19+
"tasks": {
20+
"version": "2.0.0",
21+
"tasks": [
22+
{
23+
"label": "Configure and build with waf (Release)",
24+
"type": "shell",
25+
"group": "build",
26+
"command": "./waf configure --release && ./waf build --release"
27+
}
28+
]
29+
}
30+
}
31+
}
32+
}
33+
}

.github/workflows/compile.yml

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
name: compile
2+
3+
on:
4+
push:
5+
branches: [main]
6+
pull_request:
7+
branches: [main]
8+
workflow_dispatch:
9+
10+
jobs:
11+
compile-norns:
12+
runs-on: ubuntu-24.04-arm
13+
steps:
14+
- uses: actions/checkout@v4
15+
with:
16+
submodules: recursive
17+
- name: compile norns
18+
uses: addnab/docker-run-action@v3
19+
with:
20+
image: robbielyman/norns-ci:latest
21+
options: -v ${{ github.workspace }}:/norns-build
22+
run: |
23+
./waf configure --release && ./waf build --release
24+
25+
lint-lua:
26+
runs-on: ubuntu-latest
27+
steps:
28+
- uses: actions/checkout@v4
29+
- name: install luacheck
30+
run: |
31+
sudo apt-get update -qq
32+
sudo apt-get install -y lua5.3 liblua5.3-dev luarocks
33+
sudo luarocks --lua-version=5.3 install luacheck
34+
- name: lint lua code
35+
run: luacheck lua/ --codes
36+
37+
clang-format-check:
38+
runs-on: ubuntu-24.04
39+
steps:
40+
- uses: actions/checkout@v4
41+
- name: install clang-format
42+
run: |
43+
sudo apt-get update -qq
44+
sudo apt-get install -y clang-format
45+
- name: run clang-format script
46+
run: |
47+
chmod +x clang-format.sh
48+
./clang-format.sh
49+
- name: check for formatting changes
50+
run: |
51+
if ! git diff --exit-code --quiet; then
52+
echo -e "❌ clang-format check - C/C++ code formatting needs attention"
53+
echo ""
54+
echo -e "\033[3mthese files requiring formatting\033[0m"
55+
git diff --name-only | grep -E '\.(c|cpp|h)$' | while read file; do
56+
echo "- $file"
57+
done
58+
echo ""
59+
echo -e "\033[3mto update formatting, run locally\033[0m"
60+
echo "./clang-format.sh"
61+
echo "git add ."
62+
echo "git commit -m 'fix: apply clang-format'"
63+
exit 1
64+
else
65+
echo "✅ clang-format check - all C/C++ code is properly formatted"
66+
fi

.github/workflows/test.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: test
2+
3+
on:
4+
push:
5+
branches: [main]
6+
pull_request:
7+
branches: [main]
8+
workflow_dispatch:
9+
jobs:
10+
test-lua:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v4
14+
- name: install lua
15+
run: |
16+
sudo apt-get update -qq
17+
sudo apt-get install -y lua5.3
18+
- name: run lua tests
19+
run: ./test-lua.sh

0 commit comments

Comments
 (0)