aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgatecat <gatecat@ds0.me>2022-03-17 20:57:56 +0000
committerGitHub <noreply@github.com>2022-03-17 20:57:56 +0000
commit8e9d0a6e09348c8898233ad8cce4026144d23ae9 (patch)
treef6f89178f844653cb0a97092429447f0a308153e
parent14d53dfec8dba93996f5c2877d60f6ed167d14fb (diff)
parent29654c52be93df192ce3191b39e2d4ae57120d08 (diff)
downloadnextpnr-8e9d0a6e09348c8898233ad8cce4026144d23ae9.tar.gz
nextpnr-8e9d0a6e09348c8898233ad8cce4026144d23ae9.tar.bz2
nextpnr-8e9d0a6e09348c8898233ad8cce4026144d23ae9.zip
Merge pull request #954 from YosysHQ/gatecat/rapidwright-update
ci: Fixes for latest RapidWright
-rwxr-xr-x.github/ci/build_interchange.sh3
-rw-r--r--.github/workflows/interchange_ci.yml2
2 files changed, 3 insertions, 2 deletions
diff --git a/.github/ci/build_interchange.sh b/.github/ci/build_interchange.sh
index 674bd5c1..3976ce4e 100755
--- a/.github/ci/build_interchange.sh
+++ b/.github/ci/build_interchange.sh
@@ -48,7 +48,8 @@ function get_dependencies {
# Install RapidWright
git clone https://github.com/Xilinx/RapidWright.git ${RAPIDWRIGHT_PATH}
pushd ${RAPIDWRIGHT_PATH}
- make update_jars
+ ./gradlew updateJars --no-watch-fs
+ make compile
popd
fi
}
diff --git a/.github/workflows/interchange_ci.yml b/.github/workflows/interchange_ci.yml
index 16b50205..27b19c5a 100644
--- a/.github/workflows/interchange_ci.yml
+++ b/.github/workflows/interchange_ci.yml
@@ -16,7 +16,7 @@ jobs:
- name: Install
run: |
sudo apt-get update
- sudo apt-get install git make cmake libboost-all-dev python3-dev libeigen3-dev tcl-dev clang bison flex swig
+ sudo apt-get install git make cmake libboost-all-dev python3-dev libeigen3-dev tcl-dev clang bison flex swig locales libtinfo-dev
- name: ccache
uses: hendrikmuhs/ccache-action@v1