Skip to content

Commit

Permalink
ci: Speed up morty fetching
Browse files Browse the repository at this point in the history
  • Loading branch information
micprog authored and thommythomaso committed Aug 11, 2022
1 parent a08eeee commit dfd2361
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 4 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,10 @@ jobs:
retention-days: 7

docs:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: [lint, lint-verilog]
env:
MORTY: ./morty
steps:
- uses: actions/checkout@v3
- name: Install Bender
Expand All @@ -150,7 +152,11 @@ jobs:
- name: Python Requirements
run: python3 -m pip install -r requirements.txt
- name: Install Morty
run: cargo install --git https://github.com/zarubaf/morty
run: |
curl --proto '=https' --tlsv1.2 -sLO https://github.com/pulp-platform/morty/releases/download/v0.7.0/morty-ubuntu.22.04-x86_64.tar.gz
tar -xvf morty-ubuntu.22.04-x86_64.tar.gz morty
rm -f morty-ubuntu.22.04-x86_64.tar.gz
cp morty doc
- name: Build Doc
run: make doc
- name: Pickle
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ gmon.out
.nfs*
*non-free*
bender
morty
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## Unreleased

## 0.2.3 - 11-08-2022
### Changed
Morty is now fetched as a binary distributable for building the doc in CI.

## 0.2.2 - 09-08-2022
### Changed
Add GitHub actions to lint the code as well as build the documentation. Remove the corresponding
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.2.2
0.2.3
3 changes: 2 additions & 1 deletion doc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ SPHINXBUILD ?= sphinx-build
SPHINXPROJ = iDMA
SOURCEDIR = source
BUILDDIR = build
MORTY ?= morty

all-html: morty-docs regs html

Expand All @@ -26,7 +27,7 @@ help:

# Requires an up-to-date morty installation
morty-docs:
morty $$(cat ../sources.txt | sed -e "s/+incdir+/-I /" | sed -e "s/.\//..\//" | grep "\.\.\/src/\|-I") --doc $(BUILDDIR)/html/morty
$(MORTY) $$(cat ../sources.txt | sed -e "s/+incdir+/-I /" | sed -e "s/.\//..\//" | grep "\.\.\/src/\|-I") --doc $(BUILDDIR)/html/morty

regs:
mkdir -p $(BUILDDIR)/html/regs
Expand Down

0 comments on commit dfd2361

Please sign in to comment.