Skip to content

Commit

Permalink
Bump slang to v6.0 (#195)
Browse files Browse the repository at this point in the history
* Bump slang to v6.0

* slang wrapper: Replace 1-length `vector` with `array`, reserve `vector`

* Allow using external slang

* remove centos7 build
  • Loading branch information
SpriteOvO authored Jun 11, 2024
1 parent 48db56d commit 966a496
Show file tree
Hide file tree
Showing 16 changed files with 197 additions and 205 deletions.
43 changes: 1 addition & 42 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,43 +138,6 @@ jobs:
path: veridian-ubuntu-22.04.tar.gz
if-no-files-found: error

build_centos:
name: Build Centos
runs-on: ubuntu-latest
if: ${{ ( github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
container:
image: vivekmalneedi/centos7-rust
steps:
- name: Checkout sources
uses: actions/checkout@v2

- name: cache cargo dirs
uses: actions/cache@v2
with:
path: |
~/.cargo/registry
~/.cargo/git
target
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}

- name: Run cargo build
uses: actions-rs/cargo@v1
with:
command: build
args: --release

- name: Create archive
run: |
strip target/release/veridian
cp target/release/veridian .
tar -czvf veridian-centos-7.tar.gz veridian
- uses: actions/upload-artifact@v2
with:
name: veridian-centos-7.tar.gz
path: veridian-centos-7.tar.gz
if-no-files-found: error

build_vscode:
name: Build vscode extension
runs-on: ubuntu-latest
Expand All @@ -199,15 +162,12 @@ jobs:

publish:
name: Create Release
needs: [build_ubuntu, build_centos, build_vscode]
needs: [build_ubuntu, build_vscode]
runs-on: ubuntu-latest
steps:
- uses: actions/download-artifact@v2
with:
name: veridian-ubuntu-22.04.tar.gz
- uses: actions/download-artifact@v2
with:
name: veridian-centos-7.tar.gz
- uses: actions/download-artifact@v2
with:
name: veridian.vsix
Expand All @@ -219,5 +179,4 @@ jobs:
title: nightly
files: |
veridian-ubuntu-22.04.tar.gz
veridian-centos-7.tar.gz
veridian.vsix
26 changes: 0 additions & 26 deletions .github/workflows/docker.yml

This file was deleted.

5 changes: 0 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,4 @@ tests_rtl
log_files
test.txt

veridian-slang/slang_wrapper/slang
veridian-slang/slang_wrapper/bin
veridian-slang/slang_wrapper/include
veridian-slang/slang_wrapper/lib
slang-linux.tar.gz
.vscode/
23 changes: 10 additions & 13 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 0 additions & 20 deletions dockerfiles/Dockerfile

This file was deleted.

4 changes: 2 additions & 2 deletions src/diagnostics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -360,10 +360,10 @@ mod tests {
uri.clone(),
vec![Diagnostic::new(
Range::new(Position::new(3, 13), Position::new(3, 13)),
Some(DiagnosticSeverity::ERROR),
Some(DiagnosticSeverity::WARNING),
None,
Some("slang".to_owned()),
" cannot refer to element 2 of \'logic[1:0]\'".to_owned(),
" cannot refer to element 2 of \'logic[1:0]\' [-Windex-oob]".to_owned(),
None,
None,
)],
Expand Down
25 changes: 10 additions & 15 deletions veridian-slang/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion veridian-slang/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ edition = "2018"

[build-dependencies]
bindgen = "0.58.1"
cc = { version = "1.0.68", features = ["parallel"] }
reqwest = { version = "0.12.4", features = ["blocking"] }
flate2 = "1.0.20"
tar = "0.4.35"
cmake = "0.1.50"

[dev-dependencies]
tempdir = "0.3.7"
Expand Down
Loading

0 comments on commit 966a496

Please sign in to comment.