Skip to content

Commit b42ea0e

Browse files
authored
Merge pull request #1241 from slaclab/pre-release
Release Candidate v2.56.0
2 parents 27a43e8 + 06a77d4 commit b42ea0e

30 files changed

+4300
-3136
lines changed

.github/workflows/surf_ci.yml

+12-7
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
test_and_document:
2424
name: Test And Generate Documentation
25-
runs-on: ubuntu-22.04
25+
runs-on: ubuntu-24.04
2626
steps:
2727

2828
# This step checks out a copy of your repository.
@@ -32,24 +32,31 @@ jobs:
3232

3333
- uses: actions/setup-python@v4
3434
with:
35-
python-version: 3.11
35+
python-version: 3.12
3636

3737
- name: Install dependencies
3838
run: |
3939
sudo apt-get update
40-
sudo apt-get install make python3 python3-pip tclsh
40+
sudo apt-get install make python3 python3-pip tclsh ghdl
4141
sudo apt-get install doxygen doxygen-doc doxygen-latex doxygen-gui graphviz
4242
python -m pip install --upgrade pip
4343
pip install -r pip_requirements.txt
4444
git clone https://github.com/slaclab/ruckus.git
4545
pip install -r ruckus/scripts/pip_requirements.txt
4646
47-
- name: Check for trailing whitespace
47+
- name: Check for trailing whitespace and tabs
4848
run: |
49-
if grep -rnI '[[:blank:]]$' --include=\*.{vhd,v,tcl,py} .; then
49+
# Check for trailing whitespace
50+
if grep -rnI '[[:blank:]]$' --include=\*.{vhd,tcl,py} .; then
5051
echo "Error: Trailing whitespace found in the repository!"
5152
exit 1
5253
fi
54+
55+
# Check for tab characters instead of spaces
56+
if grep -rnI $'\t' --include=\*.{vhd,tcl,py} .; then
57+
echo "Error: Tab characters found in the repository! Please use spaces for indentation."
58+
exit 1
59+
fi
5360
5461
- name: Python Syntax and Linter Checking
5562
run: |
@@ -62,10 +69,8 @@ jobs:
6269

6370
- name: VHDL Regression Testing
6471
run: |
65-
./ghdl-build.sh > /dev/null 2>&1
6672
make MODULES=$PWD
6773
python -m pytest --cov -v tests/
68-
rm -rf ghdl-build
6974
7075
# # Code Coverage
7176
# - name: Code Coverage

axi/axi4/rtl/AxiReadPathFifo.vhd

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ entity AxiReadPathFifo is
3232
GEN_SYNC_FIFO_G : boolean := false;
3333

3434
-- Bit Optimizations
35-
ADDR_LSB_G : natural range 0 to 31 := 0;
35+
ADDR_LSB_G : natural range 0 to 63 := 0;
3636
ID_FIXED_EN_G : boolean := false;
3737
SIZE_FIXED_EN_G : boolean := false;
3838
BURST_FIXED_EN_G : boolean := false;

0 commit comments

Comments
 (0)