Skip to content

Commit ebde7d3

Browse files
authored
Merge branch 'PLC-lang:master' into master
2 parents cec8a58 + ef09b87 commit ebde7d3

File tree

473 files changed

+5559
-2972
lines changed

Some content is hidden

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

473 files changed

+5559
-2972
lines changed

.config/nextest.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[profile.ci.junit]
2+
path = "junit.xml"

.github/workflows/rust.yml renamed to .github/workflows/linux.yml

Lines changed: 1 addition & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build
1+
name: Build Linux
22

33
on:
44
# Triggers the workflow on push or pull request events but only for the master branch
@@ -63,56 +63,6 @@ jobs:
6363
name: stdlib
6464
path: output
6565

66-
test-windows:
67-
name: Test Windows
68-
runs-on: windows-2022
69-
env:
70-
toolchain-version: 1.77.0
71-
llvm-version: 14.0.6
72-
steps:
73-
74-
- uses: actions/checkout@v3
75-
76-
- name: Install Rust
77-
uses: dtolnay/rust-toolchain@master
78-
with:
79-
toolchain: ${{ env.toolchain-version }}
80-
81-
- name: Install LLVM
82-
uses: ghaith/install-llvm-action@latest
83-
with:
84-
version: ${{ env.llvm-version }}
85-
directory: "./llvm"
86-
87-
- name: Cargo test (Unit)
88-
uses: actions-rs/cargo@v1
89-
with:
90-
command: test
91-
args: --lib -- --nocapture
92-
93-
- name: Cargo test (Correctness)
94-
uses: actions-rs/cargo@v1
95-
with:
96-
command: test
97-
args: correctness -- --nocapture --test-threads=1
98-
99-
- name: Cargo test (Integration)
100-
uses: actions-rs/cargo@v1
101-
with:
102-
command: test
103-
args: integration -- --nocapture --test-threads=1
104-
105-
- name: Release Build
106-
uses: actions-rs/cargo@v1
107-
with:
108-
command: build
109-
args: --release
110-
111-
- uses: actions/upload-artifact@master
112-
with:
113-
name: plc.exe
114-
path: target/release/plc.exe
115-
11666
style:
11767
name: Check Style
11868
runs-on: ubuntu-latest

.github/workflows/lit.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Build
2+
3+
on:
4+
# Triggers the workflow on push or pull request events but only for the master branch
5+
push:
6+
pull_request:
7+
branches: [ master ]
8+
9+
# Allows you to run this workflow manually from the Actions tab
10+
workflow_dispatch:
11+
12+
jobs:
13+
lit-linux-debug:
14+
name: lit tests (Linux, debug build)
15+
runs-on: ubuntu-latest
16+
container: ghcr.io/plc-lang/rust-llvm:latest
17+
steps:
18+
- uses: actions/checkout@v3
19+
20+
- name: Run `build.sh --lit`
21+
shell: bash
22+
run: |
23+
./scripts/build.sh --lit
24+
25+
lit-linux-release:
26+
name: lit tests (Linux, release build)
27+
runs-on: ubuntu-latest
28+
container: ghcr.io/plc-lang/rust-llvm:latest
29+
steps:
30+
- uses: actions/checkout@v3
31+
32+
- name: Run `build.sh --lit --release`
33+
shell: bash
34+
run: |
35+
./scripts/build.sh --lit --release

.github/workflows/windows.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Build Windows
2+
3+
on:
4+
# Triggers the workflow on push or pull request events but only for the master branch
5+
push:
6+
pull_request:
7+
branches: [ master ]
8+
9+
# Allows you to run this workflow manually from the Actions tab
10+
workflow_dispatch:
11+
12+
jobs:
13+
build:
14+
name: Windows Build
15+
runs-on: windows-2022
16+
env:
17+
toolchain-version: 1.77.0
18+
llvm-version: 14.0.6
19+
steps:
20+
21+
- uses: actions/checkout@v3
22+
23+
- name: Install Rust
24+
uses: dtolnay/rust-toolchain@master
25+
with:
26+
toolchain: ${{ env.toolchain-version }}
27+
28+
- name: Install LLVM
29+
uses: ghaith/install-llvm-action@latest
30+
with:
31+
version: ${{ env.llvm-version }}
32+
directory: "./llvm"
33+
34+
- name: Cargo test (Unit)
35+
run: cargo test --lib -- --nocapture
36+
37+
- name: Cargo test (Correctness)
38+
run: cargo test correctness -- --nocapture --test-threads=1
39+
40+
- name: Cargo test (Integration)
41+
run: cargo test integration -- --nocapture --test-threads=1
42+
43+
- name: Release Build
44+
run: cargo build --release --workspace
45+
46+
- uses: actions/upload-artifact@master
47+
with:
48+
name: plc.exe
49+
path: target/release/plc.exe
50+

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,7 @@
1111
*.a
1212
*.elf
1313
*.out
14+
15+
# Garbage generated by llvm-lit
16+
tests/lit/**/*.txt
17+
tests/lit/**/Output/

Cargo.lock

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
# RuSTy
22

3-
[![Rust Build](https://github.com/PLC-lang/rusty/actions/workflows/rust.yml/badge.svg)](https://github.com/PLC-lang/ruSTy/actions)
3+
[![Linux Build](https://github.com/PLC-lang/rusty/actions/workflows/linux.yml/badge.svg)](https://github.com/PLC-lang/ruSTy/actions)
4+
[![Windows Build](https://github.com/PLC-lang/rusty/actions/workflows/windows.yml/badge.svg)](https://github.com/PLC-lang/rusty/actions/workflows/windows.yml)
5+
[![Documentation](https://github.com/PLC-lang/rusty/actions/workflows/doc.yml/badge.svg)](https://plc-lang.github.io/rusty)
46
[![codecov](https://codecov.io/gh/PLC-lang/rusty/branch/master/graph/badge.svg?token=7ZZ5XZYE9V)](https://codecov.io/gh/PLC-lang/rusty)
7+
[![Metrics](https://github.com/PLC-lang/rusty/actions/workflows/metrics.yml/badge.svg)](https://plc-lang.github.io/metrics)
8+
59
[![Lines of Code](https://tokei.rs/b1/github/PLC-lang/rusty)](https://github.com/XAMPPRocky/tokei)
610

711
[Structured text](https://en.wikipedia.org/wiki/Structured_text) compiler written in Rust

book/src/SUMMARY.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
- [Writing ST Programs]()
99
- [Libraries](libraries.md)
1010
- [External Functions](libraries/external_functions.md)
11+
- [API guidelines](./libraries/api_lib_guide.md)
1112
- [Using in external programs]()
1213

1314
- [POUs](./pous.md)

0 commit comments

Comments
 (0)