Skip to content

Commit

Permalink
Make building Scala client work on Github Actions (#4198)
Browse files Browse the repository at this point in the history
Fixes running `mage buildScala` on Github Actions as part of CI.

---------

Signed-off-by: Enrico Minack <github@enrico.minack.dev>
  • Loading branch information
EnricoMi authored Feb 11, 2025
1 parent 9f10719 commit 3d260a5
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
1 change: 1 addition & 0 deletions build/scala-client/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ RUN set -ex && \
apt-get clean && \
rm -rf scala-${SCALA_VERSION}.deb sbt-${SBT_VERSION}.tgz /var/lib/apt/lists/*

ENV PATH="/sbt/bin:$PATH"
COPY scripts/build-scala-client.sh /
RUN chmod +x /build-scala-client.sh

Expand Down
1 change: 1 addition & 0 deletions magefiles/scala.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,6 @@ func BuildScala() error {
"--rm",
"-v", fmt.Sprintf("%s:/build", wd),
"-w", "/build",
"--env", "HOME=/tmp",
"armada-scala-client-builder")
}
2 changes: 0 additions & 2 deletions scripts/build-scala-client.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
# This script is intended to be run under the docker container
# in the root dir of the Armada repo

export PATH=/sbt/bin:$PATH

ROOT=$(pwd)
SDIR=client/scala/scala-armada-client

Expand Down

0 comments on commit 3d260a5

Please sign in to comment.