Skip to content

Commit

Permalink
Upgrade some dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
martonbognar committed Oct 10, 2024
1 parent 62266b3 commit d70350a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
11 changes: 4 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:22.04
FROM ubuntu:24.04

# Set to noninteractive mode
ARG DEBIAN_FRONTEND=noninteractive
Expand All @@ -10,14 +10,11 @@ ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get -yqq install git lsb-release sudo vim gnupg openjdk-17-jdk verilator curl make gcc g++

################################################################################
# Install sbt (https://www.scala-sbt.org/)
# Install scala and sbt (https://www.scala-sbt.org/)
################################################################################

RUN echo "deb https://repo.scala-sbt.org/scalasbt/debian all main" | tee /etc/apt/sources.list.d/sbt.list
RUN echo "deb https://repo.scala-sbt.org/scalasbt/debian /" | tee /etc/apt/sources.list.d/sbt_old.list
RUN curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | apt-key add
RUN apt-get update
RUN apt-get -yqq install sbt
RUN curl -fL https://github.com/coursier/coursier/releases/latest/download/cs-x86_64-pc-linux.gz | gzip -d > cs && chmod +x cs && ./cs setup --yes
ENV PATH="$PATH:/root/.local/share/coursier/bin"

################################################################################
# Install GNU RISC-V toolchain
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name := "Proteus"
version := "0.1"

scalaVersion := "2.11.12"
val spinalVersion = "1.9.3"
val spinalVersion = "1.10.2a"

fork := true

Expand Down

0 comments on commit d70350a

Please sign in to comment.