From b0a018c6d6d7533c13ee24640d8eaf54715a6071 Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Thu, 18 Jul 2024 14:20:55 +0200
Subject: [PATCH] Ignore duplicates in sourcesJar
---
.gitlab-ci.yml | 2 +-
tlatools/build.gradle | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f2d90b427..eb9c706ab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
image: eclipse-temurin:8
variables:
- GRADLE_ARGS: --no-daemon --warning-mode=all
+ GRADLE_ARGS: --no-daemon --stacktrace --warning-mode=all
GRADLE_USER_HOME: "$CI_PROJECT_DIR/.gradle"
cache:
diff --git a/tlatools/build.gradle b/tlatools/build.gradle
index 0fd5da00e..c6120d4d2 100644
--- a/tlatools/build.gradle
+++ b/tlatools/build.gradle
@@ -53,6 +53,8 @@ if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')
task sourcesJar(type: Jar) {
classifier = 'sources'
from sourceSets.main.allSource
+ // Ignore duplicates because the same directory is used for sources and resources.
+ duplicatesStrategy = DuplicatesStrategy.EXCLUDE
}
artifacts {
--
GitLab