Skip to content

Commit 1544760

Browse files
committed
Gradle updates #101
1 parent 2b91738 commit 1544760

File tree

4 files changed

+38
-86
lines changed

4 files changed

+38
-86
lines changed
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Gradle Build
2+
3+
on: [ push ]
4+
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
outputs:
9+
release: ${{ steps.build-and-publish.outputs.release }}
10+
steps:
11+
- id: build-and-publish
12+
uses: enonic/release-tools/build-and-publish@master
13+
with:
14+
repoUser: ci
15+
repoPassword: ${{ secrets.ARTIFACTORY_PASSWORD }}
16+
codecovToken: ${{ secrets.CODECOV_TOKEN }}
17+
npmToken: ${{ secrets.NPM_TOKEN }}
18+
19+
release:
20+
runs-on: ubuntu-latest
21+
22+
needs: build
23+
if: needs.build.outputs.release == 'true'
24+
25+
steps:
26+
- uses: enonic/release-tools/release@master
27+
with:
28+
github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

Lines changed: 0 additions & 63 deletions
This file was deleted.

build.gradle

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ plugins {
55
id 'com.enonic.defaults' version '2.1.5'
66
id 'com.enonic.xp.base' version '3.5.2'
77
id 'com.github.node-gradle.node' version '7.1.0'
8-
id 'org.asciidoctor.jvm.convert' version '4.0.3'
9-
id "org.aim42.htmlSanityCheck" version '1.1.6'
108
}
119

1210
sourceCompatibility = JavaVersion.VERSION_11
@@ -90,26 +88,6 @@ tasks.register('npmBuild', NpmTask) {
9088
}
9189
jar.dependsOn npmBuild
9290

93-
asciidoctor {
94-
sourceDir = file('docs')
95-
outputDir = file('build/docs')
96-
97-
attributes 'source-highlighter': 'coderay'
98-
99-
resources {
100-
from(sourceDir) {
101-
include '**/images/**'
102-
include '**/media/**'
103-
}
104-
}
105-
}
106-
107-
htmlSanityCheck {
108-
dependsOn asciidoctor
109-
110-
sourceDir = tasks.asciidoctor.outputDir
111-
}
112-
11391
tasks.register('npmCheck', NpmTask) {
11492
dependsOn npmInstall
11593
args = [
@@ -152,3 +130,12 @@ jacocoTestReport {
152130
}
153131

154132
check.dependsOn jacocoTestReport
133+
134+
tasks.register('publishToNpm', NpmTask ) {
135+
onlyIf { !version.endsWith( '-SNAPSHOT' ) }
136+
args = ['publish']
137+
dependsOn npmBuild
138+
workingDir = file('build/types')
139+
}
140+
141+
publish.dependsOn publishToNpm

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
group = com.enonic.lib
22
projectName = lib-static
33
xpVersion = 7.14.0
4-
version = 2.0.0-B5
4+
version = 2.0.0-B6

0 commit comments

Comments
 (0)