Skip to content

Commit e610997

Browse files
committed
Try to fix CI error
1 parent 398fbcb commit e610997

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

.github/workflows/gradle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
uses: tlylt/install-graphviz@v1
3030

3131
- name: Setup Gradle
32-
uses: gradle/gradle-build-action@v2
32+
uses: gradle/actions/setup-gradle@v4
3333

3434
- name: Fetch all micronaut-projects modules
3535
id: module-fetch

src/init.gradle

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import org.gradle.api.services.BuildService
22
import org.gradle.api.services.BuildServiceParameters
33
import org.gradle.util.GradleVersion
4+
import java.util.concurrent.locks.Lock;
5+
import java.util.concurrent.locks.ReentrantLock;
46

57
initscript {
68
repositories {
@@ -138,6 +140,8 @@ abstract class ExtractMicronautDependencies extends DefaultTask {
138140
}
139141

140142
abstract class MicronautDependenciesService implements BuildService<Params>, AutoCloseable {
143+
private final Lock lock = new ReentrantLock()
144+
141145
interface Params extends BuildServiceParameters {
142146
DirectoryProperty getOutputDir()
143147
Property<String> getGroupId()
@@ -155,7 +159,12 @@ abstract class MicronautDependenciesService implements BuildService<Params>, Aut
155159
abstract MapProperty<String, String> getProperties()
156160

157161
void addDependencies(Set<String> dependencies) {
158-
this.dependencies.addAll(dependencies)
162+
lock.lock();
163+
try {
164+
this.dependencies.addAll(dependencies)
165+
} finally {
166+
lock.unlock()
167+
}
159168
}
160169

161170
void close() {

0 commit comments

Comments
 (0)