Skip to content

Commit

Permalink
Updated GHDL action
Browse files Browse the repository at this point in the history
  • Loading branch information
LarsAsplund committed Jan 13, 2025
1 parent 6d0f6cb commit 60159a3
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,19 +144,20 @@ jobs:
- name: '🟦 Setup MSYS2'
uses: msys2/setup-msys2@v2
with:
msystem: MINGW64
msystem: mingw64
update: true
install: mingw-w64-x86_64-python-pip
install: mingw-w64-x86_64-python-pip

- name: '🧰 Checkout'
uses: actions/checkout@v4
with:
submodules: recursive

- name: '⚙️ Setup GHDL'
uses: ghdl/setup-ghdl-ci@master
uses: ghdl/setup-ghdl@main
with:
backend: llvm
backend: mcode
runtime: mingw64

- name: '🐍 Install dependencies'
run: pip install -U tox --progress-bar off
Expand Down
2 changes: 1 addition & 1 deletion docs/ci/manual.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ There are six possible procedures to setup GHDL:

* Get and extract a tarball/zipfile from the *nightly* pre-release: `github.com/ghdl/ghdl/releases/nightly <https://github.com/ghdl/ghdl/releases/nightly>`_.

* (On GitHub Actions only) Use Action `ghdl/setup-ghdl-ci <https://github.com/ghdl/setup-ghdl-ci>`_.
* (On GitHub Actions only) Use Action `ghdl/setup-ghdl <https://github.com/ghdl/setup-ghdl>`_.

* Use one of the Docker/OCI images provided in `ghdl/docker <https://github.com/ghdl/docker>`_.

Expand Down
4 changes: 2 additions & 2 deletions docs/ci/usecases.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ This is equivalent to *lin-vunit*, but it is slightly more verbose.
lin-setup
*********

Uses *JavaScript Action* `ghdl/setup-ghdl-ci <https://github.com/ghdl/setup-ghdl-ci>`_ to install GHDL on the Ubuntu host/VM.
Uses *JavaScript Action* `ghdl/setup-ghdl <https://github.com/ghdl/setup-ghdl>`_ to install GHDL on the Ubuntu host/VM.
Then, additional system packages and Python packages are installed explicitly.

Compared to previous approaches, in this case runtime dependencies are not pre-installed. As a result, startup is slightly
Expand All @@ -42,7 +42,7 @@ slower.
win-setup
*********

Uses Actions `ghdl/setup-ghdl-ci <https://github.com/ghdl/setup-ghdl-ci>`_ and `msys2/setup-msys2 <https://github.com/msys2/setup-msys2>`_
Uses Actions `ghdl/setup-ghdl <https://github.com/ghdl/setup-ghdl>`_ and `msys2/setup-msys2 <https://github.com/msys2/setup-msys2>`_
to install latest *nightly* GHDL, other MSYS2 packages and Python packages in a *clean* MINGW64 environment.

This is the recommended approach to run tests on Windows. Action setup-msys2 caches installed packages/dependencies
Expand Down

0 comments on commit 60159a3

Please sign in to comment.