You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by GitBox <gi...@apache.org> on 2020/08/20 07:56:34 UTC
[GitHub] [camel-quarkus] jamesnetherton opened a new pull request #1547: Publish SNAPSHOT builds
jamesnetherton opened a new pull request #1547:
URL: https://github.com/apache/camel-quarkus/pull/1547
I haven't set up a Jenkins build yet, but here's the `Jenkinsfile` that I propose to deploy SNAPSHOTs from each of the main project branches.
I had to settle on a slightly wacky version scheme to satisfy `CamelVersionHelper`, which seems to be used by the Camel tooling. So the build will generate:
`master` branch - 1.1.0-SNAPSHOT
`camel-master` branch - 1.1.0-CAMEL-MASTER-SNAPSHOT
`quarkus-master` branch - 1.1.0-QUARKUS-MASTER-SNAPSHOT
I also tweaked the camel-master sync job to run every day.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton merged pull request #1547: Publish SNAPSHOT builds
Posted by GitBox <gi...@apache.org>.
jamesnetherton merged pull request #1547:
URL: https://github.com/apache/camel-quarkus/pull/1547
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton commented on a change in pull request #1547: Publish SNAPSHOT builds
Posted by GitBox <gi...@apache.org>.
jamesnetherton commented on a change in pull request #1547:
URL: https://github.com/apache/camel-quarkus/pull/1547#discussion_r473771228
##########
File path: Jenkinsfile
##########
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu'
+def JDK_NAME = env.JDK_NAME ?: 'JDK 11 (latest)'
+def MAVEN_PARAMS = '-B -e -ntp'
+def VERSION_SUFFIX = "-${env.BRANCH_NAME.toUpperCase().replace('_','-')}-SNAPSHOT"
+
+if (env.BRANCH_NAME == 'camel-master') {
+ MAVEN_PARAMS += ' -Papache-snapshots'
+}
+
+if (env.BRANCH_NAME == 'quarkus-master') {
+ MAVEN_PARAMS += ' -Poss-snapshots -Dquarkus.version=999-SNAPSHOT'
+}
+
+pipeline {
+
+ agent {
+ label AGENT_LABEL
+ }
+
+ tools {
+ jdk JDK_NAME
+ }
+
+ options {
+ buildDiscarder(
+ logRotator(artifactNumToKeepStr: '5', numToKeepStr: '10')
+ )
+ disableConcurrentBuilds()
+ }
+
+ stages {
+ stage('Set version') {
+ when {
+ expression { env.BRANCH_NAME ==~ /(.*-master)/ }
+ }
+
+ steps {
+ script {
+ def VERSION = sh script: './mvnw ${MAVEN_PARAMS} help:evaluate -Dexpression=project.version -q -DforceStdout', returnStdout: true
+ def NEW_SNAPSHOT_VERSION = VERSION.replace('-SNAPSHOT', '') + VERSION_SUFFIX
+ sh "sed -i \"s/${VERSION}/${NEW_SNAPSHOT_VERSION}/g\" \$(find . -name pom.xml)"
Review comment:
I originally went with that but it wasn't setting set some of the properties in the BOMs. E.g:
```
<properties>
<camel-quarkus.version>1.1.0-SNAPSHOT</camel-quarkus.version><!-- kept in sync with project.version by the release plugin -->
</properties>
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-quarkus] ppalaga commented on a change in pull request #1547: Publish SNAPSHOT builds
Posted by GitBox <gi...@apache.org>.
ppalaga commented on a change in pull request #1547:
URL: https://github.com/apache/camel-quarkus/pull/1547#discussion_r473765063
##########
File path: Jenkinsfile
##########
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu'
+def JDK_NAME = env.JDK_NAME ?: 'JDK 11 (latest)'
+def MAVEN_PARAMS = '-B -e -ntp'
+def VERSION_SUFFIX = "-${env.BRANCH_NAME.toUpperCase().replace('_','-')}-SNAPSHOT"
+
+if (env.BRANCH_NAME == 'camel-master') {
+ MAVEN_PARAMS += ' -Papache-snapshots'
+}
+
+if (env.BRANCH_NAME == 'quarkus-master') {
+ MAVEN_PARAMS += ' -Poss-snapshots -Dquarkus.version=999-SNAPSHOT'
+}
+
+pipeline {
+
+ agent {
+ label AGENT_LABEL
+ }
+
+ tools {
+ jdk JDK_NAME
+ }
+
+ options {
+ buildDiscarder(
+ logRotator(artifactNumToKeepStr: '5', numToKeepStr: '10')
+ )
+ disableConcurrentBuilds()
+ }
+
+ stages {
+ stage('Set version') {
+ when {
+ expression { env.BRANCH_NAME ==~ /(.*-master)/ }
+ }
+
+ steps {
+ script {
+ def VERSION = sh script: './mvnw ${MAVEN_PARAMS} help:evaluate -Dexpression=project.version -q -DforceStdout', returnStdout: true
+ def NEW_SNAPSHOT_VERSION = VERSION.replace('-SNAPSHOT', '') + VERSION_SUFFIX
+ sh "sed -i \"s/${VERSION}/${NEW_SNAPSHOT_VERSION}/g\" \$(find . -name pom.xml)"
Review comment:
This would work, but isn't `mvn versions:set -DnewVersion=${NEW_SNAPSHOT_VERSION}` more reliable?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org