Skip to content

Commit

Permalink
Merge branch 'steveicarus:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
jbhateja authored Mar 3, 2024
2 parents 4417e37 + 52d049b commit 8ea4535
Show file tree
Hide file tree
Showing 5,437 changed files with 340,004 additions and 29,415 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
16 changes: 16 additions & 0 deletions .github/test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/usr/bin/env sh

echo "Using the bundled ivtest to run regression tests."
echo " pwd = $(pwd)"

cd ivtest

status=0

perl vvp_reg.pl || status=1

perl vpi_reg.pl || status=1

python3 vvp_reg.py || status=1

exit $status
36 changes: 36 additions & 0 deletions .github/workflows/deploy_docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@

name: Deploy documentation

on:
# Every push onto the main branch regerenates the documentation
push:
branches:
- 'master'

jobs:

do-deploy:
runs-on: ubuntu-latest
name: 'Build documentation on Linux'
steps:

- uses: actions/checkout@v2

- name: Install dependencies
run: |
sudo apt update -qq
sudo apt install -y make autoconf python3-sphinx
- name: Make Documentation
run: |
cd Documentation
make html
- name: Deploy to GitHub Pages
uses: crazy-max/ghaction-github-pages@v2
with:
target_branch: gh-pages
build_dir: Documentation/_build/html
jekyll: false
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
124 changes: 124 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
name: test

on:
# Every push onto the main branch triggers a retest.
push:
branches:
- master
# All pull_requests trigger a retest.
pull_request:

jobs:

mac:
strategy:
fail-fast: false
runs-on: macos-latest
name: '🍏 macOS'
steps:

- uses: actions/checkout@v3

- name: Install dependencies
run: |
brew install bison
pip3 install docopt
- name: Build, check and install
run: |
export PATH="/usr/local/opt/bison/bin:$PATH"
autoconf
./configure
make -j$(nproc) check
sudo make install
- name: Test
run: ./.github/test.sh


lin:
strategy:
fail-fast: false
matrix:
os: [
'20.04',
'22.04'
]
runs-on: ubuntu-${{ matrix.os }}
name: '🐧 Ubuntu ${{ matrix.os }}'
steps:

- uses: actions/checkout@v3

- name: Install dependencies
run: |
sudo apt update -qq
sudo apt install -y make g++ git bison flex gperf libreadline-dev autoconf python3-sphinx python3-docopt
- name: Build, check and install
run: |
autoconf
./configure
make -j$(nproc) check
sudo make install
- name: Test
run: ./.github/test.sh

- name: Documentation
run: |
cd Documentation
make html
win:
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
include: [
{ msystem: MINGW64, arch: x86_64 }
]
name: 🟪 ${{ matrix.msystem}} · ${{ matrix.arch }}
defaults:
run:
shell: msys2 {0}
env:
MINGW_ARCH: ${{ matrix.msystem }}
steps:

- run: git config --global core.autocrlf input
shell: bash

- uses: actions/checkout@v3

- uses: msys2/setup-msys2@v2
with:
msystem: ${{ matrix.msystem }}
update: true
install: >
git
base-devel
gperf
python-pip
mingw-w64-${{ matrix.arch }}-toolchain
- uses: actions/setup-python@v4
with:
python-version: '>=3.5'

- name: Build and check
run: |
cd msys2
makepkg-mingw --noconfirm --noprogressbar -sCLf
- name: Install
run: pacman -U --noconfirm msys2/*.zst

- name: Test
run: |
./.github/test.sh
- uses: actions/upload-artifact@v3
with:
name: ${{ matrix.msystem }}-${{ matrix.arch }}
path: msys2/*.zst
8 changes: 4 additions & 4 deletions AStatement.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef IVL_AStatement_H
#define IVL_AStatement_H
/*
* Copyright (c) 2008-2014 Stephen Williams ([email protected])
* Copyright (c) 2008-2021 Stephen Williams ([email protected])
*
* This source code is free software; you can redistribute it
* and/or modify it in source code form under the terms of the GNU
Expand Down Expand Up @@ -42,7 +42,7 @@ class AContrib : public Statement {
AContrib(PExpr*lval, PExpr*rval);
~AContrib();

virtual void dump(ostream&out, unsigned ind) const;
virtual void dump(std::ostream&out, unsigned ind) const;
virtual NetProc* elaborate(Design*des, NetScope*scope) const;

private:
Expand All @@ -68,10 +68,10 @@ class AProcess : public LineInfo {
ivl_process_type_t type() const { return type_; }
Statement*statement() { return statement_; }

map<perm_string,PExpr*> attributes;
std::map<perm_string,PExpr*> attributes;

// Dump the analog process
void dump(ostream&out, unsigned ind) const;
void dump(std::ostream&out, unsigned ind) const;

private:
ivl_process_type_t type_;
Expand Down
170 changes: 0 additions & 170 deletions BUGS.txt

This file was deleted.

2 changes: 2 additions & 0 deletions Documentation/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
_build/
!Makefile
Loading

0 comments on commit 8ea4535

Please sign in to comment.