Skip to content

Commit bb8bdac

Browse files
authored
Merge pull request #1238 from modelix/nodejs-task-dependencies
Fix broken publishing workflow
2 parents 3f79cd4 + 8650386 commit bb8bdac

File tree

13 files changed

+36
-10
lines changed

13 files changed

+36
-10
lines changed

.github/workflows/build.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ jobs:
2323

2424
steps:
2525
- uses: actions/checkout@v4
26+
- uses: actions/setup-node@v4
27+
with:
28+
node-version-file: '.nvmrc'
2629
- name: Set up JDK
2730
uses: actions/setup-java@v4
2831
with:
@@ -61,7 +64,7 @@ jobs:
6164
# exceeds this limit. Therefore, we combine the individual runs in the SARIF files.
6265
- uses: actions/setup-node@v4
6366
with:
64-
node-version: '20.x'
67+
node-version-file: '.nvmrc'
6568
- name: Combine SARIF files
6669
run: |
6770
npx @microsoft/sarif-multitool merge --merge-runs --output-file merged.sarif $(find . -iname '*.sarif*')

.github/workflows/docs.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ jobs:
1010
steps:
1111
- name: Checkout Project
1212
uses: actions/checkout@v4
13+
- uses: actions/setup-node@v4
14+
with:
15+
node-version-file: '.nvmrc'
1316
- name: Set up JDK
1417
uses: actions/setup-java@v4
1518
with:

.github/workflows/dry-run-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Setup Node.js
3131
uses: actions/setup-node@v4
3232
with:
33-
node-version: 20
33+
node-version-file: '.nvmrc'
3434
- name: Cache Node packages
3535
uses: actions/cache@v4
3636
with:

.github/workflows/linting.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
- uses: actions/checkout@v4
1111
- uses: actions/setup-node@v4
1212
with:
13-
node-version: 20
13+
node-version-file: '.nvmrc'
1414
- uses: actions/cache@v4
1515
with:
1616
path: node_modules

.github/workflows/mps-compatibility.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ jobs:
2828

2929
steps:
3030
- uses: actions/checkout@v4
31+
- uses: actions/setup-node@v4
32+
with:
33+
node-version-file: '.nvmrc'
3134
- name: Set up JDK
3235
uses: actions/setup-java@v4
3336
with:

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- uses: actions/checkout@v4
2727
- uses: actions/setup-node@v4
2828
with:
29-
node-version: '18.3.0'
29+
node-version-file: '.nvmrc'
3030
registry-url: 'https://artifacts.itemis.cloud/repository/npm-open/'
3131
scope: '<@modelix>'
3232
- name: Set up JDK

.github/workflows/release.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ jobs:
1515
with:
1616
fetch-depth: 0
1717
token: ${{ secrets.RELEASE_TOKEN }}
18-
- name: Setup Node.js
19-
uses: actions/setup-node@v4
18+
- uses: actions/setup-node@v4
2019
with:
21-
node-version: 20
20+
node-version-file: '.nvmrc'
2221
- name: Cache Node packages
2322
uses: actions/cache@v4
2423
with:

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
22.12.0

build-logic/src/main/kotlin/org/modelix/GenerateVersion.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ fun Project.registerVersionGenerationTask(packageName: String) {
5252
}
5353
}
5454

55+
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile>().all {
56+
dependsOn(generateVersionVariable)
57+
}
58+
5559
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
5660
dependsOn(generateVersionVariable)
5761
}

model-client/build.gradle.kts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import dev.petuska.npm.publish.task.NodeExecTask
12
import dev.petuska.npm.publish.task.NpmPackTask
23

34
plugins {
@@ -152,4 +153,6 @@ npmPublish {
152153
}
153154
}
154155

155-
tasks.named("packJsPackage") { dependsOn(":setupNodeEverywhere") }
156+
tasks.withType(NodeExecTask::class) {
157+
dependsOn(":setupNodeEverywhere")
158+
}

0 commit comments

Comments
 (0)