Skip to content

Commit 68ea067

Browse files
authored
Merge branch 'danmar:main' into main
2 parents 005e2b4 + ebc80c0 commit 68ea067

52 files changed

Lines changed: 655 additions & 3449 deletions

Some content is hidden

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

.github/workflows/format.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ jobs:
2020

2121
runs-on: ubuntu-22.04
2222

23+
env:
24+
UNCRUSTIFY_VERSION: 0.80.1
25+
2326
steps:
2427
- uses: actions/checkout@v4
2528
with:
@@ -31,17 +34,19 @@ jobs:
3134
with:
3235
path: |
3336
~/uncrustify
34-
key: ${{ runner.os }}-uncrustify
37+
key: ${{ runner.os }}-uncrustify-${{ env.UNCRUSTIFY_VERSION }}
3538

3639
- name: build uncrustify
3740
if: steps.cache-uncrustify.outputs.cache-hit != 'true'
3841
run: |
39-
wget https://github.com/uncrustify/uncrustify/archive/refs/tags/uncrustify-0.72.0.tar.gz
40-
tar xzvf uncrustify-0.72.0.tar.gz && cd uncrustify-uncrustify-0.72.0
41-
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM=3.5
42+
set -x
43+
wget https://github.com/uncrustify/uncrustify/archive/refs/tags/uncrustify-${{ env.UNCRUSTIFY_VERSION }}.tar.gz
44+
tar xzvf uncrustify-${{ env.UNCRUSTIFY_VERSION }}.tar.gz
45+
cd uncrustify-uncrustify-${{ env.UNCRUSTIFY_VERSION }}
46+
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
4247
cmake --build build -- -j$(nproc) -s
4348
mkdir ~/uncrustify
44-
cd build && cp uncrustify ~/uncrustify/
49+
cp build/uncrustify ~/uncrustify/
4550
4651
- name: Uncrustify check
4752
run: |

0 commit comments

Comments
 (0)