Skip to content

Commit

Permalink
Remove unneeded CI scripts now that all crates reside in the workspace
Browse files Browse the repository at this point in the history
Note that these script didn't include the `compile` and `runtime`
subcrates, which were also missing from the workspace hence never
checked for formatting either.
  • Loading branch information
MarijnS95 committed Jun 29, 2022
1 parent a3c4466 commit 67dd873
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 88 deletions.
34 changes: 15 additions & 19 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,15 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
- run: wget -O ispc.tar.gz https://github.com/ispc/ispc/releases/download/v${ISPC_VERSION}/ispc-v${ISPC_VERSION}-linux.tar.gz
- run: tar -xf ispc.tar.gz
- run: echo "PATH=$PATH:`pwd`/ispc-v${ISPC_VERSION}-linux/bin/" >> $GITHUB_ENV
- run: cargo build
- run: cargo test
- run: cargo doc
- run: scripts/build-examples-linux.sh
- run: curl -L https://github.com/ispc/ispc/releases/download/v${{ env.ISPC_VERSION }}/ispc-v${{ env.ISPC_VERSION }}-linux.tar.gz | tar xzv ispc-v${{ env.ISPC_VERSION }}-linux/bin/ispc
- run: realpath "ispc-v${{ env.ISPC_VERSION }}-linux/bin/" >> $GITHUB_PATH
- run: cargo build --all --all-targets --features ispc
- run: cargo test --all
- run: cargo doc --all --no-deps --document-private-items --all-features
env:
RUSTDOCFLAGS: -Dwarnings
- name: Format Core
run: cargo fmt -- --check
- name: Format Examples
run: scripts/check-examples-formatting.sh
build_mac:
runs-on: macos-latest
steps:
Expand All @@ -30,20 +28,18 @@ jobs:
with:
toolchain: stable
- run: brew install ispc
- run: cargo build
- run: cargo test
- run: scripts/build-examples-linux.sh
- run: cargo build --all --all-targets --features ispc
- run: cargo test --all
build_windows:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
- run: choco install wget
- run: wget -O LLVM-11.0.0.7z https://www.dl.dropboxusercontent.com/s/vontvxjexyk417e/LLVM-11.0.0.7z
- run: 7z x LLVM-11.0.0.7z -y;
- run: wget -O ispc.zip https://github.com/ispc/ispc/releases/download/v${env:ISPC_VERSION}/ispc-v${env:ISPC_VERSION}-windows.zip
- run: 7z x ispc.zip -y -o"ispc"
- run: scripts/build-test-windows.ps1

- run: |
curl -LO https://github.com/ispc/ispc/releases/download/v${{ env.ISPC_VERSION }}/ispc-v${{ env.ISPC_VERSION }}-windows.zip
unzip ispc-v${{ env.ISPC_VERSION }}-windows.zip bin/ispc.exe
Resolve-Path "./bin" | Add-Content -Path $env:GITHUB_PATH
- run: cargo build --all --all-targets --features ispc
- run: cargo test --all
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ ispc_compile = { path = "./compile/", version = "1.0.14" }
ispc_rt = { path = "./runtime/", version = "1.0.7" }

[workspace]
resolver = "2"
members = [
"compile",
"runtime",
Expand Down
4 changes: 2 additions & 2 deletions compile/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ exclude = [
".travis.yml",
"*.png",
".gitignore",
".github",
"scripts/*",
".github",
"scripts/*",
"examples/*"
]

Expand Down
4 changes: 2 additions & 2 deletions runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ exclude = [
".travis.yml",
"*.png",
".gitignore",
".github",
"scripts/*",
".github",
"scripts/*",
"examples/*"
]

Expand Down
18 changes: 0 additions & 18 deletions scripts/build-examples-linux.sh

This file was deleted.

33 changes: 0 additions & 33 deletions scripts/build-test-windows.ps1

This file was deleted.

14 changes: 0 additions & 14 deletions scripts/check-examples-formatting.sh

This file was deleted.

0 comments on commit 67dd873

Please sign in to comment.