Skip to content

Commit 25f31f4

Browse files
committed
Merge branch 'volsa/lit' of https://github.com/plc-lang/rusty into volsa/lit
2 parents e0a8615 + 8634319 commit 25f31f4

File tree

3 files changed

+52
-52
lines changed

3 files changed

+52
-52
lines changed

.github/workflows/lit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ jobs:
1919

2020
- name: Run lit
2121
shell: bash
22-
run: ./scripts/build.sh --test
22+
run: ./scripts/build.sh --lit

.github/workflows/rust.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/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+

0 commit comments

Comments
 (0)