Skip to content

Commit 78b75b4

Browse files
authored
remove the std build scripts and combine them with the default script, add release and package builds in worksflow (#879)
1 parent 6cd333b commit 78b75b4

File tree

7 files changed

+212
-583
lines changed

7 files changed

+212
-583
lines changed

.github/workflows/rust.yml

+24-22
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ jobs:
2727
name: Test Linux
2828
runs-on: ubuntu-latest
2929
container: ghcr.io/plc-lang/rust-llvm:latest
30-
needs: check
3130
steps:
3231
- uses: actions/checkout@v3
3332

@@ -37,10 +36,33 @@ jobs:
3736
echo "Build command : ./scripts/build.sh --build --test"
3837
./scripts/build.sh --build --test
3938
39+
package-linux:
40+
name: Package Linux
41+
runs-on: ubuntu-latest
42+
container: ghcr.io/plc-lang/rust-llvm:latest
43+
steps:
44+
- uses: actions/checkout@v3
45+
46+
- name: Release Build
47+
shell: bash
48+
run: |
49+
echo "Build command : ./scripts/build.sh --build --release"
50+
./scripts/build.sh --build --release --package \
51+
--target x86_64-unknown-linux-gnu,aarch64-unknown-linux-gnu
52+
53+
- uses: actions/upload-artifact@master
54+
with:
55+
name: rustyc
56+
path: target/release/rustyc
57+
58+
- uses: actions/upload-artifact@master
59+
with:
60+
name: stdlib
61+
path: output
62+
4063
test-windows:
4164
name: Test Windows
4265
runs-on: windows-2022
43-
needs: check
4466
env:
4567
toolchain-version: 1.70.0
4668
llvm-version: 14.0.6
@@ -88,29 +110,10 @@ jobs:
88110
name: rustyc.exe
89111
path: target/release/rustyc.exe
90112

91-
package-std:
92-
name: Package std
93-
runs-on: ubuntu-latest
94-
needs: check
95-
container: ghcr.io/plc-lang/rust-llvm:latest
96-
steps:
97-
- uses: actions/checkout@v3
98-
- name: Run Standard libs Build
99-
run: |
100-
./libs/stdlib/scripts/build.sh --build --package \
101-
--target x86_64-unknown-linux-gnu,aarch64-unknown-linux-gnu \
102-
--release
103-
104-
- uses: actions/upload-artifact@master
105-
with:
106-
name: stdlib
107-
path: output
108-
109113
style:
110114
name: Check Style
111115
runs-on: ubuntu-latest
112116
container: ghcr.io/plc-lang/rust-llvm:latest
113-
needs: check
114117
steps:
115118
- uses: actions/checkout@v3
116119

@@ -122,7 +125,6 @@ jobs:
122125
name: Run Coverage
123126
runs-on: ubuntu-latest
124127
container: ghcr.io/plc-lang/rust-llvm:latest
125-
needs: check
126128
steps:
127129
- uses: actions/checkout@v3
128130

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,4 @@ path = "src/main.rs"
5959

6060
[workspace]
6161
members = ["xtask", "libs/stdlib", "rusty-derive"]
62-
default-members = [".", "libs/stdlib", "rusty-derive"]
62+
default-members = ["."]

0 commit comments

Comments
 (0)