Skip to content

Commit

Permalink
ACS-5039 - Changes to try push by CI
Browse files Browse the repository at this point in the history
  • Loading branch information
@wojtekswieton
wojtekswieton committed Jul 5, 2023
1 parent a54d904 commit 4b82d78
Show file tree
Hide file tree
Showing 9 changed files with 76 additions and 17 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ jobs:
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.34.0
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.34.0
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
with:
platforms: linux/amd64,linux/arm64
- name: "Login to Docker Hub"
uses: docker/login-action@v2.1.0
with:
Expand Down Expand Up @@ -158,6 +162,10 @@ jobs:
persist-credentials: false
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.34.0
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.34.0
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
with:
platforms: linux/amd64,linux/arm64
- name: "Login to Docker Hub"
uses: docker/login-action@v2.1.0
with:
Expand Down
6 changes: 3 additions & 3 deletions _ci/test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ set -vex
pushd "$(dirname "${BASH_SOURCE[0]}")/../"

# Always build the image, but only publish from the "master" branch
[ "${PULL_REQUEST}" = "false" ] && [ "${BRANCH_NAME}" = "master" ] && PROFILE="internal" || PROFILE="local"
[ "${PULL_REQUEST}" = "false" ] && [ "${BRANCH_NAME}" = "feature/ACS-5039_Transformers_multi-arch_support" ]

# If the branch is "master" and the commit is not a Pull Request then deploy the JAR SNAPSHOT artifacts
[ "${PULL_REQUEST}" = "false" ] && [ "${BRANCH_NAME}" = "master" ] && DEPLOY="deploy" || DEPLOY="verify"
#[ "${PULL_REQUEST}" = "false" ] && [ "${BRANCH_NAME}" = "master" ] && DEPLOY="deploy" || DEPLOY="verify"

# Do not deploy snapshots for alfresco-transform-core, alfresco-transformer-base and alfresco-base-t-engine
mvn -B -U -Dmaven.wagon.http.pool=false \
clean ${DEPLOY} \
-DadditionalOption=-Xdoclint:none -Dmaven.javadoc.skip=true \
-Dparent.core.deploy.skip=true -Dtransformer.base.deploy.skip=true \
"-P${PROFILE},docker-it-setup,${1}"
"-Pinternal"

docker ps -a -q | xargs -r -l docker stop ; docker ps -a -q | xargs -r -l docker rm

Expand Down
11 changes: 9 additions & 2 deletions engines/aio/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
</parent>

<properties>
<image.name>alfresco/alfresco-transform-core-aio</image.name>
<image.name>alfresco/dev</image.name>
<!--<image.name>alfresco/alfresco-transform-core-aio</image.name>-->
<image.registry>quay.io</image.registry>
<env.project_artifactId>${project.artifactId}</env.project_artifactId>
</properties>
Expand Down Expand Up @@ -336,7 +337,7 @@
<images>
<!-- QuayIO image -->
<image>
<name>${image.name}:${image.tag}</name>
<name>${image.name}:alfresco-transform-core-aio-CI</name>
<registry>${image.registry}</registry>
<build>
<contextDir>${project.basedir}</contextDir>
Expand All @@ -346,6 +347,7 @@
</build>
</image>
<!-- DockerHub image -->
<!--
<image>
<name>${image.name}:${image.tag}</name>
<build>
Expand All @@ -355,6 +357,7 @@
</buildOptions>
</build>
</image>
-->
</images>
</configuration>
<executions>
Expand Down Expand Up @@ -388,6 +391,7 @@
<configuration>
<images>
<!-- QuayIO image -->
<!--
<image>
<name>${image.name}:${project.version}</name>
<registry>${image.registry}</registry>
Expand All @@ -398,7 +402,9 @@
</buildOptions>
</build>
</image>
-->
<!-- DockerHub image -->
<!--
<image>
<name>${image.name}:${project.version}</name>
<build>
Expand All @@ -408,6 +414,7 @@
</buildOptions>
</build>
</image>
-->
</images>
</configuration>
<executions>
Expand Down
13 changes: 11 additions & 2 deletions engines/example/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
</parent>

<properties>
<image.name>alfresco/alfresco-transform-example</image.name>
<image.name>alfresco/dev</image.name>
<!--<image.name>alfresco/alfresco-transform-example</image.name>-->
<env.project_artifactId>${project.artifactId}</env.project_artifactId>
</properties>

Expand Down Expand Up @@ -210,6 +211,7 @@
<verbose>true</verbose>
<images>
<!-- Quay image -->
<!--
<image>
<name>${image.name}:${image.tag}</name>
<registry>${image.registry}</registry>
Expand All @@ -226,6 +228,7 @@
<contextDir>${project.basedir}</contextDir>
</build>
</image>
-->
</images>
</configuration>
<executions>
Expand Down Expand Up @@ -254,7 +257,7 @@
<images>
<!-- QuayIO image -->
<image>
<name>${image.name}:${image.tag}</name>
<name>${image.name}:alfresco-transform-example-CI</name>
<registry>${image.registry}</registry>
<build>
<buildx>
Expand All @@ -273,6 +276,7 @@
</build>
</image>
<!-- DockerHub image -->
<!--
<image>
<name>${image.name}:${image.tag}</name>
<build>
Expand All @@ -291,6 +295,7 @@
</buildOptions>
</build>
</image>
-->
</images>
</configuration>
<executions>
Expand Down Expand Up @@ -324,6 +329,7 @@
<configuration>
<images>
<!-- QuayIO image -->
<!--
<image>
<name>${image.name}:${project.version}</name>
<registry>${image.registry}</registry>
Expand All @@ -343,7 +349,9 @@
</buildOptions>
</build>
</image>
-->
<!-- DockerHub image -->
<!--
<image>
<name>${image.name}:${project.version}</name>
<build>
Expand All @@ -362,6 +370,7 @@
</buildOptions>
</build>
</image>
-->
</images>
</configuration>
<executions>
Expand Down
11 changes: 9 additions & 2 deletions engines/imagemagick/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
</parent>

<properties>
<image.name>alfresco/alfresco-imagemagick</image.name>
<image.name>alfresco/dev</image.name>
<!--<image.name>alfresco/alfresco-imagemagick</image.name>-->
<image.registry>quay.io</image.registry>
<env.project_artifactId>${project.artifactId}</env.project_artifactId>
</properties>
Expand Down Expand Up @@ -202,7 +203,7 @@
<images>
<!-- QuayIO image -->
<image>
<name>${image.name}:${image.tag}</name>
<name>${image.name}:alfresco-imagemagick-CI</name>
<registry>${image.registry}</registry>
<build>
<buildx>
Expand All @@ -221,6 +222,7 @@
</build>
</image>
<!-- DockerHub image -->
<!--
<image>
<name>${image.name}:${image.tag}</name>
<build>
Expand All @@ -239,6 +241,7 @@
</buildOptions>
</build>
</image>
-->
</images>
</configuration>
<executions>
Expand Down Expand Up @@ -272,6 +275,7 @@
<configuration>
<images>
<!-- QuayIO image -->
<!--
<image>
<name>${image.name}:${project.version}</name>
<registry>${image.registry}</registry>
Expand All @@ -291,7 +295,9 @@
</buildOptions>
</build>
</image>
-->
<!-- DockerHub image -->
<!--
<image>
<name>${image.name}:${project.version}</name>
<build>
Expand All @@ -310,6 +316,7 @@
</buildOptions>
</build>
</image>
-->
</images>
</configuration>
<executions>
Expand Down
11 changes: 9 additions & 2 deletions engines/libreoffice/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
</parent>

<properties>
<image.name>alfresco/alfresco-libreoffice</image.name>
<!--<image.name>alfresco/alfresco-libreoffice</image.name>-->
<image.name>alfresco/dev</image.name>
<image.registry>quay.io</image.registry>
<env.project_artifactId>${project.artifactId}</env.project_artifactId>
</properties>
Expand Down Expand Up @@ -206,7 +207,7 @@
<images>
<!-- QuayIO image -->
<image>
<name>${image.name}:${image.tag}</name>
<name>${image.name}:alfresco-libreoffice-CI</name>
<registry>${image.registry}</registry>
<build>
<contextDir>${project.basedir}</contextDir>
Expand All @@ -216,6 +217,7 @@
</build>
</image>
<!-- DockerHub image -->
<!--
<image>
<name>${image.name}:${image.tag}</name>
<build>
Expand All @@ -225,6 +227,7 @@
</buildOptions>
</build>
</image>
-->
</images>
</configuration>
<executions>
Expand Down Expand Up @@ -258,6 +261,7 @@
<configuration>
<images>
<!-- QuayIO image -->
<!--
<image>
<name>${image.name}:${project.version}</name>
<registry>${image.registry}</registry>
Expand All @@ -268,7 +272,9 @@
</buildOptions>
</build>
</image>
-->
<!-- DockerHub image -->
<!--
<image>
<name>${image.name}:${project.version}</name>
<build>
Expand All @@ -278,6 +284,7 @@
</buildOptions>
</build>
</image>
-->
</images>
</configuration>
<executions>
Expand Down
11 changes: 9 additions & 2 deletions engines/misc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
</parent>

<properties>
<image.name>alfresco/alfresco-transform-misc</image.name>
<!--<image.name>alfresco/alfresco-transform-misc</image.name>-->
<image.name>alfresco/dev</image.name>
<env.project_artifactId>${project.artifactId}</env.project_artifactId>
</properties>

Expand Down Expand Up @@ -249,7 +250,7 @@
<images>
<!-- QuayIO image -->
<image>
<name>${image.name}:${image.tag}</name>
<name>${image.name}:alfresco-transform-misc-CI</name>
<registry>${image.registry}</registry>
<build>
<buildx>
Expand All @@ -268,6 +269,7 @@
</build>
</image>
<!-- DockerHub image -->
<!--
<image>
<name>${image.name}:${image.tag}</name>
<build>
Expand All @@ -286,6 +288,7 @@
</buildOptions>
</build>
</image>
-->
</images>
</configuration>
<executions>
Expand Down Expand Up @@ -319,6 +322,7 @@
<configuration>
<images>
<!-- QuayIO image -->
<!--
<image>
<name>${image.name}:${project.version}</name>
<registry>${image.registry}</registry>
Expand All @@ -338,7 +342,9 @@
</buildOptions>
</build>
</image>
-->
<!-- DockerHub image -->
<!--
<image>
<name>${image.name}:${project.version}</name>
<build>
Expand All @@ -357,6 +363,7 @@
</buildOptions>
</build>
</image>
-->
</images>
</configuration>
<executions>
Expand Down
Loading

0 comments on commit 4b82d78

Please sign in to comment.