diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 55fca90d..b16d8577 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,13 +46,14 @@ jobs: - name: Build Dockerised CLI run: sbt cli/docker - - run: | - + - name: Test repos + shell: bash + run: | set -eu check_repo() { REPO=$1 mkdir -p .repos/$REPO - git clone https://github.com/$REPO.git .repos/$REPO + git clone https://github.com/$REPO.git .repos/$REPO && cd .repos/$REPO && git submodule update --init docker run -v $PWD/.repos/$REPO:/sources -w /sources sourcegraph/scip-java:latest scip-java index file .repos/$REPO/index.scip || (echo "$REPO SCIP index doesn't exist!"; exit 1) diff --git a/bin/docker-setup.sh b/bin/docker-setup.sh index fbd686da..843f6103 100755 --- a/bin/docker-setup.sh +++ b/bin/docker-setup.sh @@ -2,7 +2,7 @@ set -eux curl -fLo /usr/local/bin/coursier https://github.com/coursier/coursier/releases/download/v2.1.5/coursier chmod +x /usr/local/bin/coursier -coursier setup --yes +coursier setup --yes --apps coursier,sbt curl -fLo maven.zip https://archive.apache.org/dist/maven/maven-3/3.9.1/binaries/apache-maven-3.9.1-bin.zip unzip -d /opt/maven maven.zip diff --git a/build.sbt b/build.sbt index eaa153c8..f89e886c 100644 --- a/build.sbt +++ b/build.sbt @@ -591,19 +591,11 @@ lazy val fatjarPackageSettings = List[Def.Setting[_]]( oldStrategy(x) }, (Compile / Keys.`package`) := { - val slimJar = (Compile / Keys.`package`).value - val fatJar = crossTarget.value / (assembly / assemblyJarName).value - val _ = assembly.value - IO.copyFile(fatJar, slimJar, CopyOptions().withOverwrite(true)) - slimJar + assembly.value }, (Compile / packageBin / packagedArtifact) := { - val (art, slimJar) = (Compile / packageBin / packagedArtifact).value - val fatJar = - new File(crossTarget.value + "/" + (assembly / assemblyJarName).value) - val _ = assembly.value - IO.copy(List(fatJar -> slimJar), CopyOptions().withOverwrite(true)) - (art, slimJar) + val (artifact, _) = (Compile / packageBin / packagedArtifact).value + (artifact, assembly.value) }, pomPostProcess := { node => new RuleTransformer(