Skip to content

Commit f5d24c0

Browse files
Copilotbasilevs
andauthored
Swap maven.repo.local: remove from Jenkins, add to GHA to test hypothesis
Agent-Logs-Url: https://github.com/eclipse-rcptt/org.eclipse.rcptt/sessions/f21385de-4601-4802-b156-c2461e6f1417 Co-authored-by: basilevs <650857+basilevs@users.noreply.github.com>
1 parent ebe6488 commit f5d24c0

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

.github/workflows/verify.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- name: Maven and Java version
4646
run: mvn --version
4747
- name: Build
48-
run: ./build.sh -DforceContextQualifier=`date '+%Y%m%d%H%M'` -DbuildUrl=file://`pwd` --errors --batch-mode --no-transfer-progress
48+
run: ./build.sh -Dmaven.repo.local=`pwd`/m2 -DforceContextQualifier=`date '+%Y%m%d%H%M'` -DbuildUrl=file://`pwd` --errors --batch-mode --no-transfer-progress
4949
- name: List all files
5050
if: always()
5151
run: find . > files.txt
@@ -86,7 +86,7 @@ jobs:
8686
with:
8787
if-no-files-found: error
8888
name: maven-plugin
89-
path: /root/.m2/repository/org/eclipse/rcptt/rcptt-*/**
89+
path: m2/org/eclipse/rcptt/rcptt-*/**
9090
- name: Archive IDE
9191
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
9292
with:
@@ -111,7 +111,7 @@ jobs:
111111
- name: Maven and Java version
112112
run: mvn --version
113113
- name: Build
114-
run: ./build.sh -PlatestPlatform -PforceContextQualifier -DforceContextQualifier=`date '+%Y%m%d%H%M'` -DbuildUrl=file://`pwd` --errors --batch-mode --no-transfer-progress
114+
run: ./build.sh -Dmaven.repo.local=`pwd`/m2 -PlatestPlatform -PforceContextQualifier -DforceContextQualifier=`date '+%Y%m%d%H%M'` -DbuildUrl=file://`pwd` --errors --batch-mode --no-transfer-progress
115115
- name: List all files
116116
if: always()
117117
run: find . > files.txt

releng/Jenkinsfile.groovy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ $SSH_DEPLOY_CONTAINER_VOLUMES
166166
mvn "releng/runner/pom.xml verify"
167167
mvn "maven-plugin/pom.xml install"
168168
}
169-
this.script.sh "./$DOC_DIR/generate-doc.sh -Dmaven.repo.local=${getWorkspace()}/m2 -B -e"
169+
this.script.sh "./$DOC_DIR/generate-doc.sh -B -e"
170170
}
171171
}
172172

@@ -185,7 +185,7 @@ $SSH_DEPLOY_CONTAINER_VOLUMES
185185
}
186186

187187
private void get_version_from_pom() {
188-
return sh_with_return("mvn -Dmaven.repo.local=${getWorkspace()}/m2 -q -Dexec.executable=echo -Dexec.args='\${project.version}' --non-recursive exec:exec -f releng/pom.xml")
188+
return sh_with_return("mvn -q -Dexec.executable=echo -Dexec.args='\${project.version}' --non-recursive exec:exec -f releng/pom.xml")
189189
}
190190

191191
private void get_version() {
@@ -230,7 +230,7 @@ $SSH_DEPLOY_CONTAINER_VOLUMES
230230
try {
231231
this.script.xvnc() {
232232
this.script.sh "mvn clean verify -B -f ${dir}/pom.xml \
233-
-Dmaven.repo.local=${getWorkspace()}/m2 -e \
233+
-e \
234234
-Dci-maven-version=2.6.0-SNAPSHOT \
235235
-DexplicitRunner=`readlink -f ${runner}` \
236236
${args}"
@@ -385,7 +385,7 @@ $SSH_DEPLOY_CONTAINER_VOLUMES
385385
}
386386

387387
private void mvn(String arguments) {
388-
sh("mvn -Dmaven.repo.local=${getWorkspace()}/m2 -Ddash.batch=200 -Dtycho.localArtifacts=ignore --errors --batch-mode --no-transfer-progress " + this.mvn_args + " " + arguments)
388+
sh("mvn -Ddash.batch=200 -Dtycho.localArtifacts=ignore --errors --batch-mode --no-transfer-progress " + this.mvn_args + " " + arguments)
389389
}
390390

391391
}

0 commit comments

Comments
 (0)