Skip to content

Commit

Permalink
Merge pull request #237 from grvvy/ci_platform_fix
Browse files Browse the repository at this point in the history
ci: add platform definition
  • Loading branch information
mossmann authored Apr 9, 2024
2 parents c8a38f7 + a0b9be0 commit fb1fea6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,8 @@ USER jenkins
# add to PATH for pip/source package installations
ENV PATH="/root/.local/bin:/oss-cad-suite/bin:$PATH"

# add the Cynthion board rev
ENV LUNA_PLATFORM="cynthion.gateware.platform:CynthionPlatformRev0D4"

# Inform Docker that the container is listening on port 8080 at runtime
EXPOSE 8080
2 changes: 2 additions & 0 deletions ci-scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ set -e
python3 -m venv testing-venv
source testing-venv/bin/activate
pip install .[dev]
pip install "cynthion @ git+https://github.com/greatscottgadgets/cynthion/#subdirectory=cynthion/python/"
pip install "amaranth-stdio @ git+https://github.com/amaranth-lang/amaranth-stdio@4a14bb17"
deactivate
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ description = "Amaranth HDL framework for FPGA-based USB solutions"
readme = "README.md"
requires-python = "~=3.8"
dependencies = [
"apollo-fpga>=0.0.5",
"apollo_fpga @ git+https://github.com/greatscottgadgets/apollo.git", # temporarily pull from git until apollo release
"libusb1>1.9.2",
"pyserial>=3.5",
"pyusb>1.1.1",
Expand Down

0 comments on commit fb1fea6

Please sign in to comment.