Skip to content

Commit e2d6e7e

Browse files
Only install coursier and sbt in docker container (#751)
- Also remove unnecessary jar copying which caused CI flakiness
1 parent ca095a4 commit e2d6e7e

File tree

3 files changed

+8
-15
lines changed

3 files changed

+8
-15
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,14 @@ jobs:
4646
- name: Build Dockerised CLI
4747
run: sbt cli/docker
4848

49-
- run: |
50-
49+
- name: Test repos
50+
shell: bash
51+
run: |
5152
set -eu
5253
check_repo() {
5354
REPO=$1
5455
mkdir -p .repos/$REPO
55-
git clone https://github.com/$REPO.git .repos/$REPO
56+
git clone https://github.com/$REPO.git .repos/$REPO && cd .repos/$REPO && git submodule update --init
5657
5758
docker run -v $PWD/.repos/$REPO:/sources -w /sources sourcegraph/scip-java:latest scip-java index
5859
file .repos/$REPO/index.scip || (echo "$REPO SCIP index doesn't exist!"; exit 1)

bin/docker-setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -eux
33
curl -fLo /usr/local/bin/coursier https://github.com/coursier/coursier/releases/download/v2.1.5/coursier
44
chmod +x /usr/local/bin/coursier
5-
coursier setup --yes
5+
coursier setup --yes --apps coursier,sbt
66

77
curl -fLo maven.zip https://archive.apache.org/dist/maven/maven-3/3.9.1/binaries/apache-maven-3.9.1-bin.zip
88
unzip -d /opt/maven maven.zip

build.sbt

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -591,19 +591,11 @@ lazy val fatjarPackageSettings = List[Def.Setting[_]](
591591
oldStrategy(x)
592592
},
593593
(Compile / Keys.`package`) := {
594-
val slimJar = (Compile / Keys.`package`).value
595-
val fatJar = crossTarget.value / (assembly / assemblyJarName).value
596-
val _ = assembly.value
597-
IO.copyFile(fatJar, slimJar, CopyOptions().withOverwrite(true))
598-
slimJar
594+
assembly.value
599595
},
600596
(Compile / packageBin / packagedArtifact) := {
601-
val (art, slimJar) = (Compile / packageBin / packagedArtifact).value
602-
val fatJar =
603-
new File(crossTarget.value + "/" + (assembly / assemblyJarName).value)
604-
val _ = assembly.value
605-
IO.copy(List(fatJar -> slimJar), CopyOptions().withOverwrite(true))
606-
(art, slimJar)
597+
val (artifact, _) = (Compile / packageBin / packagedArtifact).value
598+
(artifact, assembly.value)
607599
},
608600
pomPostProcess := { node =>
609601
new RuleTransformer(

0 commit comments

Comments
 (0)