Skip to content

Commit

Permalink
remove the std build scripts and combine them with the default script…
Browse files Browse the repository at this point in the history
…, add release and package builds in worksflow (#879)
  • Loading branch information
ghaith authored Jun 23, 2023
1 parent 6cd333b commit 78b75b4
Show file tree
Hide file tree
Showing 7 changed files with 212 additions and 583 deletions.
46 changes: 24 additions & 22 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ jobs:
name: Test Linux
runs-on: ubuntu-latest
container: ghcr.io/plc-lang/rust-llvm:latest
needs: check
steps:
- uses: actions/checkout@v3

Expand All @@ -37,10 +36,33 @@ jobs:
echo "Build command : ./scripts/build.sh --build --test"
./scripts/build.sh --build --test
package-linux:
name: Package Linux
runs-on: ubuntu-latest
container: ghcr.io/plc-lang/rust-llvm:latest
steps:
- uses: actions/checkout@v3

- name: Release Build
shell: bash
run: |
echo "Build command : ./scripts/build.sh --build --release"
./scripts/build.sh --build --release --package \
--target x86_64-unknown-linux-gnu,aarch64-unknown-linux-gnu
- uses: actions/upload-artifact@master
with:
name: rustyc
path: target/release/rustyc

- uses: actions/upload-artifact@master
with:
name: stdlib
path: output

test-windows:
name: Test Windows
runs-on: windows-2022
needs: check
env:
toolchain-version: 1.70.0
llvm-version: 14.0.6
Expand Down Expand Up @@ -88,29 +110,10 @@ jobs:
name: rustyc.exe
path: target/release/rustyc.exe

package-std:
name: Package std
runs-on: ubuntu-latest
needs: check
container: ghcr.io/plc-lang/rust-llvm:latest
steps:
- uses: actions/checkout@v3
- name: Run Standard libs Build
run: |
./libs/stdlib/scripts/build.sh --build --package \
--target x86_64-unknown-linux-gnu,aarch64-unknown-linux-gnu \
--release
- uses: actions/upload-artifact@master
with:
name: stdlib
path: output

style:
name: Check Style
runs-on: ubuntu-latest
container: ghcr.io/plc-lang/rust-llvm:latest
needs: check
steps:
- uses: actions/checkout@v3

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

Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@ path = "src/main.rs"

[workspace]
members = ["xtask", "libs/stdlib", "rusty-derive"]
default-members = [".", "libs/stdlib", "rusty-derive"]
default-members = ["."]
Loading

0 comments on commit 78b75b4

Please sign in to comment.