Skip to content

Commit b640bf6

Browse files
Nelson-numerical-softwareNelson-numerical-software
committed
Merge branch 'master' into format-error
2 parents 5cb4065 + df3644b commit b640bf6

File tree

2,464 files changed

+163303
-104561
lines changed

Some content is hidden

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

2,464 files changed

+163303
-104561
lines changed

‎.cargo/config.toml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[alias]
2+
format = "run --release --bin nelson-fmt"
3+
format-check = "run --release --bin nelson-fmt -- --check"
4+
update-version = "run --release --bin nelson-update-version --"

‎.github/workflows/ccpp_archlinux.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: myrotvorets/info-from-package-json-action@2.0.1
2323
id: json_version
2424
- name: Update version
25-
run: python3 $GITHUB_WORKSPACE/tools/update_version/update_version.py
25+
run: just update_version
2626
- name: Configure
2727
run: just config "-DCMAKE_BUILD_TYPE=Release -G \"Unix Makefiles\" ."
2828
- name: Build

‎.github/workflows/ccpp_fedora.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Checkout repository
1515
uses: actions/checkout@v6
1616
- name: Install dependencies
17-
run: sudo $GITHUB_WORKSPACE/tools/install_dependencies/install-fedora.sh
17+
run: $GITHUB_WORKSPACE/tools/install_dependencies/install-fedora.sh
1818
- name: Get package version
1919
uses: myrotvorets/info-from-package-json-action@2.0.1
2020
id: json_version

‎.github/workflows/prettier.yml‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,19 @@ jobs:
1212
- name: Checkout
1313
uses: actions/checkout@v6
1414

15-
- name: Install node
16-
uses: actions/setup-node@v4
17-
with:
18-
node-version: "22.14"
19-
20-
- name: npm install
15+
- name: Install clang-format-20
2116
run: |
22-
npm install
23-
- name: npm run prettier:check
17+
curl -fsSL -o /usr/local/bin/clang-format-20 \
18+
https://github.com/muttleyxd/clang-tools-static-binaries/releases/download/master-796e77c/clang-format-20_linux-amd64
19+
chmod +x /usr/local/bin/clang-format-20
20+
ln -sf /usr/local/bin/clang-format-20 /usr/local/bin/clang-format
21+
22+
- name: Install Rust
23+
uses: dtolnay/rust-toolchain@stable
24+
25+
- name: Install just
26+
uses: extractions/setup-just@v2
27+
28+
- name: Check formatting
2429
run: |
25-
npm run prettier:check
30+
just format-check

‎.github/workflows/snapcraft.yml‎

Lines changed: 84 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,95 @@
1-
name: "Snapcraft CI"
2-
3-
on: [push]
4-
1+
name: Snapcraft CI
2+
on:
3+
- push
54
jobs:
65
snapcraft_amd64:
76
name: Snapcraft x86_64
87
runs-on: ubuntu-24.04
98
timeout-minutes: 120
10-
119
steps:
12-
- name: Install dependencies
13-
run: |
14-
sudo apt-get update --fix-missing
15-
sudo apt-get install -y --fix-missing libssh-dev
16-
sudo apt upgrade;
17-
sudo apt -y install build-essential;
18-
sudo apt -y install apt-transport-https ca-certificates gnupg software-properties-common wget ;
19-
sudo apt -y install snap;
20-
- name: Setup Snapcraft
21-
run: |
22-
sudo apt install -y snapd
23-
sudo snap install core --channel=stable
24-
sudo snap install snapcraft --classic
25-
- name: Checkout
26-
uses: actions/checkout@v6
27-
- name: Get package version
28-
uses: myrotvorets/info-from-package-json-action@2.0.1
29-
id: json_version
30-
- name: Update version and build
31-
run: |
32-
python $GITHUB_WORKSPACE/tools/update_version/update_version.py
33-
NELSON_VERSION=$(grep -oP '"version": "\K[^"]+' package.json)
34-
echo $NELSON_VERSION
35-
sudo snapcraft --destructive-mode --verbose
36-
- name: Copy artifacts
37-
run: mkdir artifacts && mv ./*_amd64.snap artifacts
38-
- uses: actions/upload-artifact@v6
39-
with:
40-
name: nelson-github-action-artifacts-snapcraft-amd64-${{ steps.json_version.outputs.packageVersion }}.${{ github.run_number }}
41-
path: artifacts/
42-
- name: Install snap
43-
run: |
44-
NELSON_VERSION=$(grep -oP '"version": "\K[^"]+' package.json)
45-
echo $NELSON_VERSION
46-
sudo snap install ./artifacts/nelson_${NELSON_VERSION}_amd64.snap --dangerous
47-
- name: Tests snap
48-
run: nelson --cli -e "test_run('minimal_tests');exit"
49-
10+
- name: Install dependencies
11+
run: |
12+
sudo apt-get update --fix-missing
13+
sudo apt-get install -y --fix-missing libssh-dev
14+
sudo apt upgrade;
15+
sudo apt -y install build-essential;
16+
sudo apt -y install apt-transport-https ca-certificates gnupg software-properties-common wget ;
17+
sudo apt -y install snap;
18+
- name: Setup Snapcraft
19+
run: |
20+
sudo apt install -y snapd
21+
sudo snap install core --channel=stable
22+
sudo snap install snapcraft --classic
23+
- name: Checkout
24+
uses: actions/checkout@v6
25+
- name: Install Rust
26+
uses: dtolnay/rust-toolchain@stable
27+
- name: Install just
28+
uses: extractions/setup-just@v2
29+
- name: Get package version
30+
uses: myrotvorets/info-from-package-json-action@2.0.1
31+
id: json_version
32+
- name: Update version and build
33+
run: |
34+
just update_version
35+
NELSON_VERSION=$(grep -oP '"version": "\K[^"]+' package.json)
36+
echo $NELSON_VERSION
37+
sudo snapcraft --destructive-mode --verbose
38+
- name: Copy artifacts
39+
run: mkdir artifacts && mv ./*_amd64.snap artifacts
40+
- uses: actions/upload-artifact@v6
41+
with:
42+
name: nelson-github-action-artifacts-snapcraft-amd64-${{ steps.json_version.outputs.packageVersion }}.${{ github.run_number }}
43+
path: artifacts/
44+
- name: Install snap
45+
run: |
46+
NELSON_VERSION=$(grep -oP '"version": "\K[^"]+' package.json)
47+
echo $NELSON_VERSION
48+
sudo snap install ./artifacts/nelson_${NELSON_VERSION}_amd64.snap --dangerous
49+
- name: Tests snap
50+
run: nelson --cli -e "test_run('minimal_tests');exit"
5051
snapcraft_arm64:
5152
name: Snapcraft arm64
5253
runs-on: ubuntu-24.04-arm
5354
timeout-minutes: 120
54-
5555
steps:
56-
- name: Install dependencies
57-
run: |
58-
sudo apt-get update --fix-missing
59-
sudo apt upgrade;
60-
sudo apt -y install build-essential;
61-
sudo apt -y install apt-transport-https ca-certificates gnupg software-properties-common wget ;
62-
sudo apt -y install snap;
63-
- name: Setup Snapcraft
64-
run: |
65-
sudo apt install -y snapd
66-
sudo snap install core --channel=stable
67-
sudo snap install snapcraft --classic
68-
- name: Checkout
69-
uses: actions/checkout@v4
70-
- name: Get package version
71-
uses: myrotvorets/info-from-package-json-action@2.0.1
72-
id: json_version
73-
- name: Update version and build
74-
run: |
75-
python $GITHUB_WORKSPACE/tools/update_version/update_version.py
76-
NELSON_VERSION=$(grep -oP '"version": "\K[^"]+' package.json)
77-
echo $NELSON_VERSION
78-
sudo snapcraft --destructive-mode --verbose
79-
- name: Copy artifacts
80-
run: mkdir artifacts && mv ./*_arm64.snap artifacts
81-
- uses: actions/upload-artifact@v6
82-
with:
83-
name: nelson-github-action-artifacts-snapcraft-arm64-${{ steps.json_version.outputs.packageVersion }}.${{ github.run_number }}
84-
path: artifacts/
85-
- name: Install snap
86-
run: |
87-
NELSON_VERSION=$(grep -oP '"version": "\K[^"]+' package.json)
88-
echo $NELSON_VERSION
89-
sudo snap install ./artifacts/nelson_${NELSON_VERSION}_arm64.snap --dangerous
90-
- name: Tests snap
91-
run: nelson --cli -e "test_run('minimal_tests');exit"
56+
- name: Install dependencies
57+
run: |
58+
sudo apt-get update --fix-missing
59+
sudo apt upgrade;
60+
sudo apt -y install build-essential;
61+
sudo apt -y install apt-transport-https ca-certificates gnupg software-properties-common wget ;
62+
sudo apt -y install snap;
63+
- name: Setup Snapcraft
64+
run: |
65+
sudo apt install -y snapd
66+
sudo snap install core --channel=stable
67+
sudo snap install snapcraft --classic
68+
- name: Checkout
69+
uses: actions/checkout@v6
70+
- name: Install Rust
71+
uses: dtolnay/rust-toolchain@stable
72+
- name: Install just
73+
uses: extractions/setup-just@v2
74+
- name: Get package version
75+
uses: myrotvorets/info-from-package-json-action@2.0.1
76+
id: json_version
77+
- name: Update version and build
78+
run: |
79+
just update_version
80+
NELSON_VERSION=$(grep -oP '"version": "\K[^"]+' package.json)
81+
echo $NELSON_VERSION
82+
sudo snapcraft --destructive-mode --verbose
83+
- name: Copy artifacts
84+
run: mkdir artifacts && mv ./*_arm64.snap artifacts
85+
- uses: actions/upload-artifact@v6
86+
with:
87+
name: nelson-github-action-artifacts-snapcraft-arm64-${{ steps.json_version.outputs.packageVersion }}.${{ github.run_number }}
88+
path: artifacts/
89+
- name: Install snap
90+
run: |
91+
NELSON_VERSION=$(grep -oP '"version": "\K[^"]+' package.json)
92+
echo $NELSON_VERSION
93+
sudo snap install ./artifacts/nelson_${NELSON_VERSION}_arm64.snap --dangerous
94+
- name: Tests snap
95+
run: nelson --cli -e "test_run('minimal_tests');exit"

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
#==============================================================================
1212
# Build artifacts and directories
1313
#==============================================================================
14+
target/
15+
tools/target/
1416
build/
1517
a.out
1618
cmake_hdf5_test.out

‎.nvmrc‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.prettierignore‎

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

‎BUILDING.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,16 @@ For the most up-to-date list of dependencies and build configurations, refer to
2525

2626
## 🛠️ Code Formatting and Style
2727

28-
To maintain consistent formatting across the codebase, we use **[Prettier](https://prettier.io/)** for `.xml`, `.json`, and `.md` files.
28+
To maintain consistent formatting across the codebase, we use **[clang-format](https://clang.llvm.org/docs/ClangFormat.html)** for `.xml`, `.json`, and `.md` files.
2929

3030
Continuous integration (CI) ensures all files are properly formatted. To manually check and fix formatting, follow these steps:
3131

3232
```bash
33-
npm install
34-
npm run prettier:check
35-
npm run prettier
33+
just format
34+
just format-check
3635
```
3736

38-
Make sure **[Node.js](https://nodejs.org/en)** is installed on your system before running these commands.
37+
Make sure **[Rust](https://rust-lang.org/)** is installed on your system before running these commands.
3938

4039
---
4140

‎BUILDING_Macos.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ Then, use the following commands (in this order):
4040

4141
### 📋 Prerequisites
4242

43-
1. **Install Xcode** 🧰
44-
Required for compiling code on macOS.
43+
1. **Install Xcode** 🧰
44+
Required for compiling code on macOS.
4545
Install it via terminal:
4646

4747
```bash
@@ -75,7 +75,7 @@ You have two options to install it:
7575
brew install micromamba
7676
```
7777

78-
🔹 **Manual Installation**:
78+
🔹 **Manual Installation**:
7979
Follow the [official Micromamba guide](https://mamba.readthedocs.io/en/latest/installation/micromamba-installation.html) for advanced options.
8080

8181
---

0 commit comments

Comments
 (0)