Skip to content

Commit 782bf21

Browse files
committed
Merged NVC into main pipeline.
1 parent 9b0f5fa commit 782bf21

File tree

2 files changed

+35
-12
lines changed

2 files changed

+35
-12
lines changed

.github/OsvvmRegression.pro

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
set ::osvvm::FailOnBuildErrors "false"
22
include ../OsvvmLibraries.pro
3-
#include ../RunAllTests.pro
4-
#include ../RunAllTestsVti.pro
3+
include ../RunAllTests.pro
4+
include ../RunAllTestsVti.pro

.github/workflows/Test.yml

Lines changed: 33 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- cron: '0 15 * * *'
99

1010
jobs:
11-
RegressionTest:
11+
GHDL:
1212
name: ${{ matrix.os.icon }}${{ matrix.os.name }} - GHDL ${{ matrix.backend }}
1313
runs-on: ${{ matrix.os.image }}
1414
strategy:
@@ -56,11 +56,6 @@ jobs:
5656
sudo apt-get update
5757
sudo apt-get install -y --no-install-recommends tcl tcllib
5858
59-
# - name: 🍏🛠️ Install tcl-tk
60-
# if: runner.os == 'macOS'
61-
# run: |
62-
# brew install tcl-tk
63-
6459
- name: 🚧 Run tests'
6560
run: |
6661
mkdir temp
@@ -71,7 +66,7 @@ jobs:
7166
- name: '📤 Upload artifact: logs'
7267
uses: actions/upload-artifact@v4
7368
with:
74-
name: log-ubuntu-ghdl-${{ matrix.backend }}
69+
name: log-${{ matrix.os.name }}-ghdl-${{ matrix.backend }}
7570
include-hidden-files: true
7671
path: |
7772
temp/*.log
@@ -86,7 +81,7 @@ jobs:
8681
- name: '📤 Upload artifact: yaml'
8782
uses: actions/upload-artifact@v4
8883
with:
89-
name: yaml-ubuntu-ghdl-${{ matrix.backend }}
84+
name: yaml-${{ matrix.os.name }}-ghdl-${{ matrix.backend }}
9085
include-hidden-files: true
9186
path: |
9287
temp/*.yml
@@ -95,17 +90,45 @@ jobs:
9590
- name: '📤 Upload artifact: xml'
9691
uses: actions/upload-artifact@v4
9792
with:
98-
name: xml-ubuntu-ghdl-${{ matrix.backend }}
93+
name: xml-${{ matrix.os.name }}-ghdl-${{ matrix.backend }}
9994
include-hidden-files: true
10095
path: |
10196
temp/*.xml
10297
if-no-files-found: error
10398

99+
NVC:
100+
name: 🪟Windows} - NVC
101+
runs-on: windows-2022
102+
103+
defaults:
104+
run:
105+
shell: "msys2 {0}"
106+
107+
steps:
108+
- name: ⏬ Checkout repository
109+
uses: actions/checkout@v4
110+
with:
111+
submodules: recursive
112+
113+
- name: 🟨 Setup MSYS2 for UCRT64
114+
uses: msys2/setup-msys2@v2
115+
with:
116+
msystem: ucrt64
117+
update: true
118+
install: git
119+
pacboy: tcl:p tcllib:p
120+
121+
- name: 🐧🛠️ Install NVC
122+
run: |
123+
NVC_VERSION="1.15.0"
124+
125+
DOWNLOAD_URL="https://github.com/nickg/nvc/releases/download/r${NVC_VERSION}/mingw-w64-ucrt-x86_64-nvc-${NVC_VERSION}.git20250111.ec21477e-1-any.pkg.tar.zst"
126+
104127
PublishTestResults:
105128
name: 📊 Publish Unit Tests Results
106129
runs-on: ubuntu-24.04
107130
needs:
108-
- RegressionTest
131+
- GHDL
109132

110133
if: always()
111134

0 commit comments

Comments
 (0)