Skip to content

Commit fea59ba

Browse files
committed
1 parent 54b0fc5 commit fea59ba

File tree

4 files changed

+39
-6
lines changed

4 files changed

+39
-6
lines changed

documentation/releasing.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Items at the beginning of development
1212
- [ ] Check [CHANGELOG.md](https://github.com/eclipse-lsp4j/lsp4j/blob/main/CHANGELOG.md) is up to date. The changelog should have a version entry, release date, API Breakages and other information consistent with current entries in the changelog.
1313
- [ ] Check [README.md](https://github.com/eclipse-lsp4j/lsp4j/blob/main/README.md) is up to date. In particular that the planned release and which versions of DAP and LSP are support is listed.
1414
- [ ] Increment version of all feature.xml, pom.xml and any other place full version is used. (Easiest way is global find and replace, e.g. `s/0.23.0/0.24.0/g`, `s/0.22.0/0.23.0/g` and review changes.) Ensure that `-SNAPSHOT` is restored in the [gradle/versions.gradle](https://github.com/eclipse-lsp4j/lsp4j/blob/main/gradle/versions.gradle) and [releng/pom.xml](https://github.com/eclipse-lsp4j/lsp4j/blob/main/releng/pom.xml)
15-
- [ ] Enable `sh './releng/deploy-build.sh'` in [releng/build.Jenkinsfile](https://github.com/eclipse-lsp4j/lsp4j/blob/main/releng/build.Jenkinsfile)
15+
- [ ] Enable `cd releng && ./deploy-build.sh'` in [releng/build.Jenkinsfile](https://github.com/eclipse-lsp4j/lsp4j/blob/main/releng/build.Jenkinsfile)
1616
- [ ] Ensure [the CI build](https://ci.eclipse.org/lsp4j/job/lsp4j-multi-build/job/main/) is stable - it is always better to release a "Green Dot" build
1717

1818
Items in the days ahead of Release day:
@@ -30,7 +30,7 @@ Items on Release day:
3030
- [ ] Prepare the repo for release by:
3131
- [ ] removing `-SNAPSHOT` from [gradle/versions.gradle](https://github.com/eclipse-lsp4j/lsp4j/blob/main/gradle/versions.gradle)
3232
- [ ] removing `-SNAPSHOT` from [releng/pom.xml](https://github.com/eclipse-lsp4j/lsp4j/blob/main/releng/pom.xml) entries in `<dependencies>` section.
33-
- [ ] disabling `sh './releng/deploy-build.sh'` in [releng/build.Jenkinsfile](https://github.com/eclipse-lsp4j/lsp4j/blob/main/releng/build.Jenkinsfile)
33+
- [ ] disabling `cd releng && ./deploy-build.sh'` in [releng/build.Jenkinsfile](https://github.com/eclipse-lsp4j/lsp4j/blob/main/releng/build.Jenkinsfile)
3434
- see commit https://github.com/eclipse-lsp4j/lsp4j/commit/328ce8a4c89b0cd84fb62118f459b6cf79b09e90 for a past example
3535
- [ ] Push the above change
3636
- [ ] Run [the CI build](https://ci.eclipse.org/lsp4j/job/lsp4j-multi-build/job/main/)

releng/build.Jenkinsfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ pipeline {
7373
// XXX: Can release vs snapshot be detected automatically so that
7474
// the following line does not have to be commented/uncommented
7575
// on each change to/from SNAPSHOT?
76-
sh './releng/deploy-build.sh'
76+
sh 'cd releng && ./deploy-build.sh'
7777
}
7878
}
7979
}

releng/deploy-build.sh

+6-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ set -e # error out on any failed commands
55
set -x # echo all commands used for debugging purposes
66

77

8+
# This script is expected to be run with CWD of ./releng so that when maven runs below
9+
# with the -f flag the CWD of Maven is the same as the rest of ths script.
10+
811
912
SSH="ssh ${SSHUSER}"
1013
SCP="scp"
@@ -21,7 +24,7 @@ if $SSH test -e ${DOWNLOAD_MOUNT}-last; then
2124
$SSH rm -r ${DOWNLOAD_MOUNT}-last
2225
fi
2326
$SSH mkdir -p ${DOWNLOAD_MOUNT}-new
24-
$SCP -rp build/p2-repository/* "${SSHUSER}:"${DOWNLOAD_MOUNT}-new
27+
$SCP -rp ../build/p2-repository/* "${SSHUSER}:"${DOWNLOAD_MOUNT}-new
2528
if $SSH test -e ${DOWNLOAD_MOUNT}; then
2629
$SSH mv ${DOWNLOAD_MOUNT} ${DOWNLOAD_MOUNT}-last
2730
fi
@@ -31,12 +34,12 @@ $SSH mv ${DOWNLOAD_MOUNT}-new ${DOWNLOAD_MOUNT}
3134
case $BRANCH_NAME in
3235
main | release_*)
3336
# GPG Sign and Deploy to Maven Central snapshot
34-
find build/maven-repository -name '*.pom' | while read i
37+
find ../build/maven-repository -name '*.pom' | while read i
3538
do
3639
base="${i%.*}"
3740
# See https://wiki.eclipse.org/Jenkins#How_can_artifacts_be_deployed_to_OSSRH_.2F_Maven_Central.3F for more info
3841
# on the Eclipse Foundation specific settings.
39-
mvn -X \
42+
mvn -X -f gpgparameters.pom \
4043
org.apache.maven.plugins:maven-gpg-plugin:3.2.7:sign-and-deploy-file \
4144
-DpomFile=${base}.pom \
4245
-Dfile=${base}.jar \

releng/gpgparameters.pom

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<groupId>org.eclipse.lsp4j</groupId>
6+
<artifactId>gpgparameters</artifactId>
7+
<version>0.24.0-SNAPSHOT</version>
8+
<packaging>pom</packaging>
9+
10+
<!--
11+
This file is used to pass command line parameters to GPG because there is no user
12+
property that can be used. See depoy-build.sh
13+
-->
14+
15+
<build>
16+
<plugins>
17+
<plugin>
18+
<groupId>org.apache.maven.plugins</groupId>
19+
<artifactId>maven-gpg-plugin</artifactId>
20+
<version>3.2.7</version>
21+
<configuration>
22+
<gpgArguments>
23+
<arg>--pinentry-mode</arg>
24+
<arg>loopback</arg>
25+
</gpgArguments>
26+
</configuration>
27+
</plugin>
28+
</plugins>
29+
</build>
30+
</project>

0 commit comments

Comments
 (0)