Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix CI #344

Merged
merged 3 commits into from
Jul 25, 2023
Merged

fix CI #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
798d8b8
fix CI
trabucayre Jul 25, 2023
2a3fdad
CI: added sbt
trabucayre Jul 25, 2023
814e7f4
make.py: fix STLV7325 aliexpress_stlv7325 -> sitlinv_stlv7325_v1
trabucayre Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [push, pull_request]

jobs:
build:
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
steps:
# Checkout Repository
- name: Checkout
Expand All @@ -13,12 +13,22 @@ jobs:
# Install Tools
- name: Install Tools
run: |
sudo apt-get install wget build-essential python3 verilator libevent-dev libjson-c-dev device-tree-compiler
pip3 install setuptools
pip3 install requests
pip3 install pexpect
sudo add-apt-repository -y ppa:openjdk-r/ppa
sudo apt update
sudo apt install -y wget build-essential python3 python3-pip \
verilator libevent-dev libjson-c-dev device-tree-compiler \
python3-setuptools python3-requests python3-pexpect \
python3-colorama python3-serial python3-packaging python3-yaml \
ninja-build curl apt-transport-https gnupg openjdk-8-jdk -y
sudo update-alternatives --config java
sudo update-alternatives --config javac
echo "deb https://repo.scala-sbt.org/scalasbt/debian all main" | sudo tee /etc/apt/sources.list.d/sbt.list
echo "deb https://repo.scala-sbt.org/scalasbt/debian /" | sudo tee /etc/apt/sources.list.d/sbt_old.list
curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | sudo -H gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/scalasbt-release.gpg --import
sudo chmod 644 /etc/apt/trusted.gpg.d/scalasbt-release.gpg
sudo apt update
sudo apt -y install sbt
pip3 install meson
pip3 install ninja

# Install (n)Migen / LiteX / Cores
- name: Install LiteX
Expand All @@ -29,13 +39,13 @@ jobs:
# Install RISC-V GCC
- name: Install RISC-V GCC
run: |
wget https://raw.githubusercontent.com/enjoy-digital/litex/master/litex_setup.py
python3 litex_setup.py gcc
wget https://static.dev.sifive.com/dev-tools/freedom-tools/v2020.12/riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-x86_64-linux-ubuntu14.tar.gz
tar -xf $PWD/riscv64-*.tar.gz
sudo mkdir /usr/local/riscv
sudo cp -r $PWD/../riscv64-*/* /usr/local/riscv
sudo cp -r $PWD/riscv64-*/* /usr/local/riscv

# Test
- name: Run Tests
run: |
export PATH=/usr/local/riscv/bin:$PATH
export PATH=/usr/local/riscv/bin:$HOME/.local/bin:$PATH
python3 -m unittest test.test_build
4 changes: 2 additions & 2 deletions make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,8 +363,8 @@ def __init__(self):

class STLV7325(Board):
def __init__(self):
from litex_boards.targets import aliexpress_stlv7325
Board.__init__(self, aliexpress_stlv7325.BaseSoC, soc_capabilities={
from litex_boards.targets import sitlinv_stlv7325_v1
Board.__init__(self, sitlinv_stlv7325_v1.BaseSoC, soc_capabilities={
# Communication
"serial",
# Storage
Expand Down
Loading