Skip to content

Commit bb569cd

Browse files
PaebbelsPaebbels
authored
v0.4.0
2 parents 328d1a3 + eea481b commit bb569cd

File tree

10 files changed

+690
-53
lines changed

10 files changed

+690
-53
lines changed

‎.github/workflows/Pipeline.yml‎

Lines changed: 48 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
package_name: 'CLITool'
2727
python_version_list: '3.11 3.12 3.13 3.14 pypy-3.11'
2828
exclude_list: 'ubuntu-arm:* windows-arm:*'
29-
disable_list: 'windows:* macos:*' # GHDL 6.0.0-dev not yet build for macos-15 intel
29+
disable_list: 'macos:*' # GHDL 6.0.0-dev not yet build for macos-15 intel
3030

3131
UnitTesting:
3232
uses: pyTooling/Actions/.github/workflows/UnitTesting.yml@r7
@@ -37,8 +37,8 @@ jobs:
3737
jobs: ${{ needs.UnitTestingParams.outputs.python_jobs }}
3838
ubuntu_before_script: |
3939
(
40-
mkdir -p install
41-
cd install
40+
mkdir -p install-ghdl
41+
cd install-ghdl
4242
curl -L "https://github.com/ghdl/ghdl/releases/download/nightly/ghdl-mcode-6.0.0-dev-ubuntu24.04-x86_64.tar.gz" | tar -xz --strip-components 1
4343
(
4444
cd bin
@@ -49,12 +49,21 @@ jobs:
4949
sudo xargs --no-run-if-empty -a ./ubuntu.requirements -- apt-get install -y --no-install-recommends
5050
)
5151
52-
echo "GHDL_PREFIX=$(pwd)/install/lib/ghdl >> $GITHUB_ENV"
53-
echo "GHDL_PREFIX=$(pwd)/install/lib/ghdl" >> $GITHUB_ENV
52+
tee --append "${GITHUB_ENV}" <<EOF
53+
GHDL_PREFIX=$(pwd)/install-ghdl/lib/ghdl
54+
EOF
55+
56+
(
57+
mkdir -p install-nvc
58+
cd install-nvc
59+
curl -L --output "nvc.deb" "https://github.com/nickg/nvc/releases/download/r1.18.2/nvc_1.18.2-1_amd64_ubuntu-24.04.deb"
60+
sudo dpkg -i nvc.deb
61+
sudo apt-get install -f
62+
)
5463
macos_before_script: |
5564
(
56-
mkdir -p install
57-
cd install
65+
mkdir -p install-ghdl
66+
cd install-ghdl
5867
curl -L "https://github.com/ghdl/ghdl/releases/download/nightly/ghdl-mcode-6.0.0-dev-macos15-x86_64.tar.gz" | tar -xz --strip-components 1
5968
(
6069
cd bin
@@ -63,12 +72,13 @@ jobs:
6372
)
6473
)
6574
66-
echo "GHDL_PREFIX=$(pwd)/install/lib/ghdl >> $GITHUB_ENV"
67-
echo "GHDL_PREFIX=$(pwd)/install/lib/ghdl" >> $GITHUB_ENV
75+
# WORKAROUND: tee does not support --append on macos
76+
echo "GHDL_PREFIX=$(pwd)/install-ghdl/lib/ghdl >> $GITHUB_ENV"
77+
echo "GHDL_PREFIX=$(pwd)/install-ghdl/lib/ghdl" >> $GITHUB_ENV
6878
macos_arm_before_script: |
6979
(
70-
mkdir -p install
71-
cd install
80+
mkdir -p install-ghdl
81+
cd install-ghdl
7282
curl -L "https://github.com/ghdl/ghdl/releases/download/nightly/ghdl-llvm-6.0.0-dev-macos14-aarch64.tar.gz" | tar -xz --strip-components 1
7383
(
7484
cd bin
@@ -77,32 +87,46 @@ jobs:
7787
)
7888
)
7989
80-
echo "GHDL_PREFIX=$(pwd)/install/lib/ghdl >> $GITHUB_ENV"
81-
echo "GHDL_PREFIX=$(pwd)/install/lib/ghdl" >> $GITHUB_ENV
82-
# windows_before_script: |
83-
# curl -L "https://github.com/ghdl/ghdl/releases/download/nightly/ghdl-mcode-6.0.0-dev-ucrt64.zip" -o ghdl.zip
84-
# dir
85-
# mkdir install
86-
# cd install
87-
# unzip ../ghdl.zip
88-
# dir
90+
# WORKAROUND: tee does not support --append on macos
91+
echo "GHDL_PREFIX=$(pwd)/install-ghdl/lib/ghdl >> $GITHUB_ENV"
92+
echo "GHDL_PREFIX=$(pwd)/install-ghdl/lib/ghdl" >> $GITHUB_ENV
93+
windows_before_script: |
94+
curl -L --output "ghdl.zip" "https://github.com/ghdl/ghdl/releases/download/nightly/ghdl-mcode-6.0.0-dev-ucrt64.zip"
95+
mkdir install-ghdl
96+
cd install-ghdl
97+
unzip -q ../ghdl.zip
98+
#echo "Content of $((pwd).Path):"
99+
#dir
100+
cd ..
101+
echo "------------------------------------------------------"
102+
./install-ghdl/bin/ghdl.exe --version
103+
echo "------------------------------------------------------"
104+
105+
echo "GHDL_PREFIX=$((pwd).Path)\install-ghdl\lib\ghdl >> $env:GITHUB_ENV"
106+
echo "GHDL_PREFIX=$((pwd).Path)\install-ghdl\lib\ghdl" >> $env:GITHUB_ENV
107+
108+
winget install --accept-source-agreements --silent NickGasson.NVC
89109
90110
mingw64_before_script: |
91111
curl -L "https://github.com/ghdl/ghdl/releases/download/nightly/mingw-w64-x86_64-ghdl-mcode-6.0.0.dev-1-any.pkg.tar.zst" -o ghdl.pkg.tar.zst
92112
pacman -U --noconfirm ghdl.pkg.tar.zst
93113
94114
which ghdl
95115
ghdl version
96-
echo "GHDL_PREFIX=$(realpath $(dirname $(which ghdl))/../lib/ghdl) >> $GITHUB_ENV"
97-
echo "GHDL_PREFIX=$(realpath $(dirname $(which ghdl))/../lib/ghdl)" >> $GITHUB_ENV
116+
117+
tee --append "${GITHUB_ENV}" <<EOF
118+
GHDL_PREFIX=$(realpath $(dirname $(which ghdl))/../lib/ghdl)
119+
EOF
98120
ucrt64_before_script: |
99121
curl -L "https://github.com/ghdl/ghdl/releases/download/nightly/mingw-w64-ucrt-x86_64-ghdl-mcode-6.0.0.dev-1-any.pkg.tar.zst" -o ghdl.pkg.tar.zst
100122
pacman -U --noconfirm ghdl.pkg.tar.zst
101123
102124
which ghdl
103125
ghdl version
104-
echo "GHDL_PREFIX=$(realpath $(dirname $(which ghdl))/../lib/ghdl) >> $GITHUB_ENV"
105-
echo "GHDL_PREFIX=$(realpath $(dirname $(which ghdl))/../lib/ghdl)" >> $GITHUB_ENV
126+
127+
tee --append "${GITHUB_ENV}" <<EOF
128+
GHDL_PREFIX=$(realpath $(dirname $(which ghdl))/../lib/ghdl)
129+
EOF
106130
requirements: '-r tests/unit/requirements.txt'
107131
unittest_report_xml: ${{ needs.ConfigParams.outputs.unittest_report_xml }}
108132
coverage_report_html: ${{ needs.ConfigParams.outputs.coverage_report_html }}

0 commit comments

Comments
 (0)