Skip to content

Commit d336a62

Browse files
authored
Merge branch 'VUnit:master' into feature/add-nvc-coverage
2 parents a694296 + 2be2cf6 commit d336a62

File tree

8 files changed

+37
-31
lines changed

8 files changed

+37
-31
lines changed

.github/workflows/images.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,9 @@ jobs:
5656

5757
- name: '🛳️ Build container image'
5858
run: |
59+
echo '${{ github.token }}' | docker login ghcr.io -u gha --password-stdin
5960
docker build -t ghcr.io/vunit/dev/nvc -<<EOF
60-
FROM hdlc/nvc
61+
FROM ghcr.io/nickg/nvc
6162
6263
RUN apt-get update -qq \
6364
&& DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \
@@ -66,7 +67,8 @@ jobs:
6667
&& update-ca-certificates \
6768
&& rm -rf /var/lib/apt/lists/*
6869
69-
RUN pip install -U tox colorama coverage --progress-bar off
70+
RUN python3 -m pip install -U pip --break-system-packages --progress-bar off \
71+
&& python3 -m pip install -U tox colorama coverage --break-system-packages --progress-bar off
7072
EOF
7173
7274
- name: '🛰️ Push container image to registry'

.github/workflows/push.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ jobs:
104104
fail-fast: false
105105
matrix:
106106
task: [
107-
{do: 39-acceptance},
108-
{do: 39-vcomponents},
107+
{do: 311-acceptance},
108+
{do: 311-vcomponents},
109109
]
110110
name: '🛳️ Container · ${{ matrix.task.do }} · NVC'
111111
steps:
@@ -116,7 +116,7 @@ jobs:
116116
submodules: recursive
117117

118118
- name: '🚧 Run job'
119-
uses: docker://ghcr.io/vunit/dev/nvc@sha256:e6337a2b40a2eed076ffda9a5ef0af2c676718fcc7cf0c31fcfe24505de759c4
119+
uses: docker://ghcr.io/vunit/dev/nvc
120120
with:
121121
args: tox -e py${{ matrix.task.do }}-nvc
122122

@@ -146,7 +146,7 @@ jobs:
146146
with:
147147
msystem: mingw64
148148
update: true
149-
install: mingw-w64-x86_64-python-pip
149+
install: mingw-w64-x86_64-python-pip
150150

151151
- name: '🧰 Checkout'
152152
uses: actions/checkout@v4

docs/news.d/1094.misc.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Updated contexts to include missing packages.

vunit/vhdl/com/src/com_context.vhd

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66

77
context com_context is
88
library vunit_lib;
9-
use vunit_lib.com_pkg.all;
10-
use vunit_lib.com_types_pkg.all;
11-
use vunit_lib.codec_pkg.all;
9+
1210
use vunit_lib.codec_2008p_pkg.all;
13-
use vunit_lib.com_string_pkg.all;
14-
use vunit_lib.codec_builder_pkg.all;
1511
use vunit_lib.codec_builder_2008p_pkg.all;
12+
use vunit_lib.codec_builder_pkg.all;
13+
use vunit_lib.codec_pkg.all;
14+
use vunit_lib.com_common_pkg.all;
1615
use vunit_lib.com_debug_codec_builder_pkg.all;
1716
use vunit_lib.com_deprecated_pkg.all;
18-
use vunit_lib.com_common_pkg.all;
17+
use vunit_lib.com_pkg.all;
18+
use vunit_lib.com_string_pkg.all;
19+
use vunit_lib.com_types_pkg.all;
1920
end context;

vunit/vhdl/data_types/src/data_types_context.vhd

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,18 @@
66

77
context data_types_context is
88
library vunit_lib;
9-
use vunit_lib.types_pkg.all;
9+
10+
use vunit_lib.byte_vector_ptr_pkg.all;
11+
use vunit_lib.dict_pkg.all;
12+
use vunit_lib.event_common_pkg.all;
13+
use vunit_lib.event_pkg.all;
14+
use vunit_lib.id_pkg.all;
15+
use vunit_lib.integer_array_pkg.all;
1016
use vunit_lib.integer_vector_ptr_pkg.all;
1117
use vunit_lib.integer_vector_ptr_pool_pkg.all;
12-
use vunit_lib.integer_array_pkg.all;
1318
use vunit_lib.queue_pkg.all;
1419
use vunit_lib.queue_pool_pkg.all;
1520
use vunit_lib.string_ptr_pkg.all;
1621
use vunit_lib.string_ptr_pool_pkg.all;
17-
use vunit_lib.byte_vector_ptr_pkg.all;
18-
use vunit_lib.dict_pkg.all;
22+
use vunit_lib.types_pkg.all;
1923
end context;

vunit/vhdl/data_types/test/tb_codec.vhd

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ library ieee;
2121
use ieee.std_logic_1164.all;
2222
use ieee.math_complex.all;
2323
use ieee.math_real.all;
24-
use ieee.numeric_bit.all;
25-
use ieee.numeric_std.all;
2624

2725
use std.textio.all;
2826

vunit/vhdl/verification_components/src/vc_context.vhd

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,23 @@
66

77
context vc_context is
88
library vunit_lib;
9+
context vunit_lib.com_context;
10+
911
use vunit_lib.avalon_pkg.all;
1012
use vunit_lib.avalon_stream_pkg.all;
11-
use vunit_lib.bus_master_pkg.all;
13+
use vunit_lib.axi_lite_master_pkg.all;
1214
use vunit_lib.axi_pkg.all;
1315
use vunit_lib.axi_slave_pkg.all;
1416
use vunit_lib.axi_statistics_pkg.all;
1517
use vunit_lib.axi_stream_pkg.all;
18+
use vunit_lib.bus_master_pkg.all;
1619
use vunit_lib.memory_pkg.all;
1720
use vunit_lib.memory_utils_pkg.all;
21+
use vunit_lib.signal_checker_pkg.all;
1822
use vunit_lib.stream_master_pkg.all;
1923
use vunit_lib.stream_slave_pkg.all;
2024
use vunit_lib.sync_pkg.all;
2125
use vunit_lib.uart_pkg.all;
2226
use vunit_lib.vc_pkg.all;
2327
use vunit_lib.wishbone_pkg.all;
24-
context vunit_lib.com_context;
2528
end context;

vunit/vhdl/vunit_context.vhd

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,17 @@ context vunit_context is
88
library vunit_lib;
99
context vunit_lib.data_types_context;
1010

11-
use vunit_lib.string_ops.all;
11+
use vunit_lib.ansi_pkg.all;
12+
use vunit_lib.check_pkg.all;
13+
use vunit_lib.checker_pkg.all;
1214
use vunit_lib.dictionary.all;
13-
use vunit_lib.path.all;
14-
use vunit_lib.print_pkg.all;
15+
use vunit_lib.log_handler_pkg.all;
1516
use vunit_lib.log_levels_pkg.all;
1617
use vunit_lib.logger_pkg.all;
17-
use vunit_lib.log_handler_pkg.all;
18-
use vunit_lib.id_pkg.all;
19-
use vunit_lib.ansi_pkg.all;
20-
use vunit_lib.checker_pkg.all;
21-
use vunit_lib.check_pkg.all;
22-
use vunit_lib.run_types_pkg.all;
18+
use vunit_lib.path.all;
19+
use vunit_lib.print_pkg.all;
2320
use vunit_lib.run_pkg.all;
21+
use vunit_lib.run_types_pkg.all;
2422
use vunit_lib.runner_pkg.key_t;
25-
use vunit_lib.event_common_pkg.all;
26-
use vunit_lib.event_pkg.all;
23+
use vunit_lib.string_ops.all;
2724
end context;

0 commit comments

Comments
 (0)