Skip to content

Commit c1d9375

Browse files
dmarginiandmarginian
authored
Merge pull request #35 from directwebremoting/pipeline-changes-per-mike
Pipeline changes per Mike's suggestions
2 parents 9f55767 + d542039 commit c1d9375

File tree

4 files changed

+32
-41
lines changed

4 files changed

+32
-41
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ name: Development CI
22

33
on: [push]
44

5-
jobs:
6-
build-and-oss-deploy:
5+
jobs:
6+
build:
77
runs-on: ubuntu-16.04
88
steps:
99
- uses: actions/checkout@v2
@@ -31,21 +31,24 @@ jobs:
3131
with:
3232
path: 'core/impl/main/java/dwr-version.properties'
3333
property: 'revision'
34+
- name: Read DWR title
35+
id: read_dwr_title
36+
uses: christian-draeger/[email protected]
37+
with:
38+
path: 'core/impl/main/java/dwr-version.properties'
39+
property: 'title'
3440
- name: Set up Maven OSS Repository
3541
uses: actions/setup-java@v1
3642
with:
3743
java-version: 1.8
3844
server-id: ossrh
3945
server-username: MAVEN_USERNAME
4046
server-password: MAVEN_PASSWORD
41-
- name: Publish to Maven OSS
42-
run: mvn deploy:deploy-file -DgeneratePom=false -DrepositoryId=ossrh -Durl=https://oss.sonatype.org/content/repositories/snapshots/ -Dfile=dist/lib/dwr-${{env.DWR_VERSION}}.jar -Dtype=jar -DartifactId=dwr -DpomFile=pom.xml -Dpackaging=jar -Djavadoc=dist/lib/dwr-${{env.DWR_VERSION}}-javadoc.jar -Dsources=dist/lib/dwr-${{env.DWR_VERSION}}-sources.jar -Dfiles=dist/lib/dwr-${{env.DWR_VERSION}}-jdk14.jar -Dclassifiers=jdk14 -Dtypes=jar
47+
- name: Publish to Maven OSS
48+
if: ${{steps.read_dwr_title.outputs.value}} == "SNAPSHOT"
49+
run: mvn deploy:deploy-file -DgeneratePom=false -DrepositoryId=ossrh -Durl=https://oss.sonatype.org/content/repositories/snapshots/ -Dfile=dist/lib/dwr-${{env.DWR_VERSION}}.jar -Dtype=jar -DartifactId=dwr -DpomFile=target/pom.xml -Dpackaging=jar -Djavadoc=dist/lib/dwr-${{env.DWR_VERSION}}-javadoc.jar -Dsources=dist/lib/dwr-${{env.DWR_VERSION}}-sources.jar -Dfiles=dist/lib/dwr-${{env.DWR_VERSION}}-jdk14.jar -Dclassifiers=jdk14 -Dtypes=jar
4350
env:
4451
MAVEN_USERNAME: ${{secrets.MAVEN_USERNAME}}
4552
MAVEN_PASSWORD: ${{secrets.MAVEN_PASSWORD}}
46-
DWR_VERSION: ${{steps.read_dwr_major.outputs.value}}.${{steps.read_dwr_minor.outputs.value}}.${{steps.read_dwr_revision.outputs.value}}
47-
deploy-release:
48-
if: contains(github.ref, "release")
49-
runs-on: ubuntu-16.04
50-
steps:
51-
- run: echo "I only run if the branch has release in its name!"
53+
DWR_VERSION: ${{steps.read_dwr_major.outputs.value}}.${{steps.read_dwr_minor.outputs.value}}.${{steps.read_dwr_revision.outputs.value}}-${{steps.read_dwr_title.outputs.value}}
54+

‎build.xml‎

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,14 @@
77
<!-- File that contains local settings, you may need to edit this -->
88
<property file="build.properties" />
99

10-
<!-- environment used during CI -->
11-
<property environment="env"/>
12-
1310
<!-- Properties for Maven Deploy, Stage, Release
1411
See: https://docs.sonatype.org/display/Repository/Sonatype+OSS+Maven+Repository+Usage+Guide#SonatypeOSSMavenRepositoryUsageGuide-7c.DeploySnapshotsandStageReleaseswithAnt
1512
-->
1613
<property name="dist" location="dist" />
1714

1815
<!-- Version numbers: Duplicates the logic in VersionUtil.loadProperties() -->
1916
<property file="${source.root}/core/impl/main/java/dwr-version.properties" />
20-
<property name="version" value="${major}.${minor}.${revision}" />
21-
<property name="env.DWR_VERSION" value="${version}"/>
22-
<condition property="label" value="${version}">
23-
<equals arg1="${title}" arg2="" />
24-
</condition>
25-
<condition property="label" value="${version}.${title}">
26-
<not>
27-
<equals arg1="${title}" arg2="" />
28-
</not>
29-
</condition>
17+
<property name="version" value="${major}.${minor}.${revision}-${title}" />
3018

3119
<!-- define Maven coordinates -->
3220
<property name="groupId" value="org.directwebremoting" />
@@ -39,6 +27,12 @@
3927
<property name="dwr-maven-jdk14-jar" value="${dist}/lib/${artifactId}-${version}-jdk14.jar" />
4028
<!-- End Properties for Maven -->
4129

30+
<!-- Get build number from Github CI -->
31+
<property environment="envgithub"/>
32+
<condition property="build.number" value="${envgithub.GITHUB_RUN_ID}">
33+
<isset property="envgithub.GITHUB_RUN_ID" />
34+
</condition>
35+
4236
<target name="init">
4337
<mkdir dir="${build}" />
4438
<mkdir dir="${dist}/lib" />
@@ -83,21 +77,17 @@
8377

8478
<!-- Updates the pom.xml with the version -->
8579
<target name="setVersionInPom">
86-
<if>
87-
<isset property="env.GITHUB_RUN_ID" />
88-
<then>
89-
<replace casesensitive="false" file="pom.xml" token="{version}" value="${version}" />
90-
</then>
91-
</if>
80+
<copy file="build/pom.xml" todir="target"/>
81+
<replace casesensitive="false" file="target/pom.xml" token="{version}" value="${version}" />
9282
</target>
9383

9484
<!-- Updates the build number in dwr-version.properties with the build number from CI -->
95-
<target name="setBuildNumber" description="Update dwr-version.properties with CI build number.">
85+
<target name="updateVersionPropertiesWithBuildNumber" description="Update dwr-version.properties with CI build number.">
9686
<if>
97-
<isset property="env.GITHUB_RUN_ID" />
87+
<isset property="build.number" />
9888
<then>
9989
<propertyfile file="${target.root}/classes/main/dwr-version.properties">
100-
<entry key="build.number" value="${env.GITHUB_RUN_ID}" />
90+
<entry key="build.number" value="${build.number}" />
10191
</propertyfile>
10292
</then>
10393
</if>
@@ -106,10 +96,8 @@
10696
<!--=======================================================================-->
10797
<target name="jar" depends="prepare, source" description="Create dwr.jar">
10898
<build target="${target.root}" include="" modules="${modules}" />
109-
<!-- Set the version in the pom if a CI run -->
11099
<antcall target="setVersionInPom" />
111-
<!-- Set the build number if a CI run -->
112-
<antcall target="setBuildNumber" />
100+
<antcall target="updateVersionPropertiesWithBuildNumber" />
113101
<jar destfile="${target.root}/dwr.jar" compress="true">
114102
<fileset dir="${target.root}/classes/main" />
115103
</jar>
@@ -137,7 +125,7 @@
137125
</target>
138126

139127
<!--=======================================================================-->
140-
<target name="package" depends="war" description="Create packaged outputs: dwrdemo.war, dwr-jdk14.jar, and the source .zip">
128+
<target name="package" depends="war, updateVersionPropertiesWithBuildNumber" description="Create packaged outputs: dwrdemo.war, dwr-jdk14.jar, and the source .zip">
141129
<!-- Run retroweaver if dwr.jar has changed since we last ran it -->
142130
<taskdef name="retroweaver" classname="net.sourceforge.retroweaver.ant.RetroWeaverTask">
143131
<classpath>
@@ -174,7 +162,7 @@
174162
</if>
175163
<!-- Documentation: Javadoc and DTDDoc -->
176164
<mkdir dir="${target.root}/javadoc" />
177-
<javadoc access="public" author="true" destdir="${target.root}/javadoc" doctitle="DWR Version ${label}" use="true" splitindex="true" version="true">
165+
<javadoc access="public" author="true" destdir="${target.root}/javadoc" doctitle="DWR Version ${version}" use="true" splitindex="true" version="true">
178166
<sourcepath>
179167
<pathelement path="${source.root}/core/api/main/java" />
180168
<pathelement path="${source.root}/core/impl/main/java" />
@@ -210,7 +198,7 @@
210198
<exclude name="common/*.dtd" />
211199
</DTDDoc>
212200
<!-- Source package -->
213-
<zip destfile="${target.root}/dwr-${label}-src.zip">
201+
<zip destfile="${target.root}/dwr-${version}-src.zip">
214202
<fileset dir="${source.root}">
215203
<exclude name="target/**" />
216204
<exclude name="**/*.iml" />

‎pom.xml‎ renamed to ‎build/pom.xml‎

File renamed without changes.

‎core/impl/main/java/dwr-version.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
major=3
22
minor=0
3-
revision=3-SNAPSHOT
4-
title=dev
5-
build.number=
3+
revision=3
4+
title=SNAPSHOT
5+
# build.number property is added by CI builds

0 commit comments

Comments
 (0)