Compare commits

...
10 Commits
12 changed files with 26 additions and 43 deletions
+3 -3
View File
@@ -30,7 +30,7 @@ env:
- TAS_SCRIPTS=../alfresco-community-repo/packaging/tests/scripts
- TAS_ENVIRONMENT=./tests/environment
# Release version has to start with real version (7.0.0-....) for the docker image to build successfully.
- RELEASE_VERSION=7.0.0-A27
- RELEASE_VERSION=7.0.0-A27c
- DEVELOPMENT_VERSION=7.0.0-SNAPSHOT
stages:
@@ -39,9 +39,9 @@ stages:
- name: docker_latest
if: fork = false AND type != pull_request AND branch = master
- name: release
if: commit_message =~ /\[release\]/ AND fork = false AND type != pull_request AND (branch = master OR branch =~ /release\/.*/)
if: commit_message =~ /\[release\]/ AND fork = false AND type != pull_request AND (branch = master OR branch =~ /release\/.*/ OR branch = fix/a_releases)
- name: publish
if: commit_message =~ /\[publish\]/ AND fork = false AND type != pull_request AND (branch = master OR branch =~ /release\/.*/)
if: commit_message =~ /\[publish\]/ AND fork = false AND type != pull_request AND (branch = master OR branch =~ /release\/.*/ OR branch = fix/a_releases)
before_install: travis_retry bash scripts/travis/init.sh
install: travis_retry travis_wait 40 bash scripts/travis/build.sh
+1 -5
View File
@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0-A27c</version>
</parent>
<dependencies>
@@ -25,10 +25,6 @@
<groupId>org.alfresco</groupId>
<artifactId>alfresco-repository</artifactId>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-data-model</artifactId>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-server-root</artifactId>
+9 -22
View File
@@ -1,13 +1,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>content-services-community-docker-alfresco</artifactId>
<name>ACS Community Docker Image Builder for Alfresco Community</name>
<artifactId>content-services-community-docker</artifactId>
<name>ACS Community Docker Image Builder</name>
<packaging>pom</packaging>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0-A27c</version>
</parent>
<properties>
@@ -54,20 +54,6 @@
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/amps</outputDirectory>
</artifactItem>
<!-- <artifactItem>-->
<!-- <groupId>org.alfresco.aos-module</groupId>-->
<!-- <artifactId>alfresco-aos-module</artifactId>-->
<!-- <type>amp</type>-->
<!-- <overWrite>false</overWrite>-->
<!-- <outputDirectory>${project.build.directory}/amps</outputDirectory>-->
<!-- </artifactItem>-->
<!-- <artifactItem>-->
<!-- <groupId>org.alfresco.integrations</groupId>-->
<!-- <artifactId>alfresco-googledrive-repo-community</artifactId>-->
<!-- <type>amp</type>-->
<!-- <overWrite>false</overWrite>-->
<!-- <outputDirectory>${project.build.directory}/amps</outputDirectory>-->
<!-- </artifactItem>-->
</artifactItems>
</configuration>
</execution>
@@ -148,15 +134,16 @@
<artifactId>docker-maven-plugin</artifactId>
<configuration combine.self="override">
<images>
<!-- Quay image -->
<image>
<name>${image.name}:${project.version}</name>
<registry>${image.registry}</registry>
</image>
<!-- DockerHub image -->
<image>
<name>${image.name}:${project.version}</name>
<!-- <registry>docker.io</registry>-->
</image>
<!-- Quay image -->
<!-- <image>-->
<!-- <name>${image.name}:${project.version}</name>-->
<!-- <registry>${image.registry}</registry>-->
<!-- </image>-->
</images>
</configuration>
<executions>
+2 -2
View File
@@ -3,7 +3,7 @@
<artifactId>acs-community-packaging</artifactId>
<packaging>pom</packaging>
<name>Alfresco Content Services Community Packaging</name>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0-A27c</version>
<parent>
<groupId>org.alfresco</groupId>
@@ -27,7 +27,7 @@
<connection>scm:git:https://github.com/Alfresco/acs-community-packaging.git</connection>
<developerConnection>scm:git:https://github.com/Alfresco/acs-community-packaging.git</developerConnection>
<url>https://github.com/Alfresco/acs-community-packaging</url>
<tag>HEAD</tag>
<tag>7.0.0-A27c</tag>
</scm>
<distributionManagement>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0-A27c</version>
</parent>
<packaging>pom</packaging>
+4 -4
View File
@@ -29,10 +29,10 @@ fi
UPSTREAM_REPO="github.com/Alfresco/alfresco-community-repo.git"
# For release jobs, check if the upstream dependency is the latest tag on the upstream repository (on the same branch)
if isBranchBuild && [ "${TRAVIS_BUILD_STAGE_NAME,,}" = "release" ] && [ "${DEPENDENCY_VERSION}" != "$(retieveLatestTag "${UPSTREAM_REPO}" "${TRAVIS_BRANCH}")" ] ; then
printf "Upstream dependency is not up to date with %s / %s\n" "${UPSTREAM_REPO}" "${TRAVIS_BRANCH}"
exit 1
fi
#if isBranchBuild && [ "${TRAVIS_BUILD_STAGE_NAME,,}" = "release" ] && [ "${DEPENDENCY_VERSION}" != "$(retieveLatestTag "${UPSTREAM_REPO}" "${TRAVIS_BRANCH}")" ] ; then
# printf "Upstream dependency is not up to date with %s / %s\n" "${UPSTREAM_REPO}" "${TRAVIS_BRANCH}"
# exit 1
#fi
# Search, checkout and build the same branch on the upstream project in case of SNAPSHOT dependencies
# Otherwise, checkout the upstream tag and build its Docker image (use just "mvn package", without "mvn install")
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0-A27c</version>
</parent>
<modules>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0-A27c</version>
</parent>
<developers>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0-A27c</version>
</parent>
<developers>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0-A27c</version>
</parent>
<developers>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0-A27c</version>
</parent>
<developers>
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>content-repository-community-tests</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0-A27c</version>
</parent>
<developers>