Skip to content

Commit ba5692a

Browse files
committed
build: force resolve of snapshot from github
1 parent 05b3a10 commit ba5692a

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ jobs:
2525
sbt-runner-version: '1.10.11'
2626
- name: Build
2727
shell: bash
28+
env:
29+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2830
run: sbt -v assembly
2931
- name: Test
3032
shell: bash

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ resolvers ++= Seq(
8181
Resolver.mavenLocal,
8282
"eXist-db Releases" at "https://repo.exist-db.org/repository/exist-db/",
8383
"Github Package Registry" at "https://maven.pkg.github.com/exist-db/exist",
84-
"eXist-db Snapshots" at "https://repo.exist-db.org/repository/exist-db-snapshots/"
84+
// "eXist-db Snapshots" at "https://repo.exist-db.org/repository/exist-db-snapshots/"
8585
)
8686

8787
javacOptions ++= Seq("-source", "21", "-target", "21")
@@ -121,8 +121,8 @@ Compile / packageBin / packageOptions += {
121121
// assembly merge strategy for duplicate files from dependencies
122122
assembly / assemblyMergeStrategy := {
123123
case PathList("META-INF", _*) => MergeStrategy.discard
124-
case PathList("org", "exist", "xquery", "lib", "xqsuite", "xqsuite.xql") => MergeStrategy.first
125-
case x if x.equals("module-info.class") || x.endsWith(s"${java.io.File.separatorChar}module-info.class") => MergeStrategy.discard
124+
case PathList("org", "exist", "xquery", "lib", "xqsuite", "xqsuite.xql") => MergeStrategy.first
125+
case x if x.equals("module-info.class") || x.endsWith(s"${java.io.File.separatorChar}module-info.class") => MergeStrategy.discard
126126
case x =>
127127
val oldStrategy = (assembly / assemblyMergeStrategy).value
128128
oldStrategy(x)

0 commit comments

Comments
 (0)