diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 95710e18bb..1aff10ecde 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -266,7 +266,7 @@ jobs: bash ./scripts/ci/init.sh bash ./scripts/ci/build.sh - name: "Set transformers tag" - run: echo "TRANSFORMERS_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-core.version -q -DforceStdout)" >> $GITHUB_ENV + run: echo "TRANSFORMERS_TAG=latest" >> $GITHUB_ENV - name: "Set up the environment" timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d @@ -862,7 +862,7 @@ jobs: - name: "Init" run: bash ./scripts/ci/init.sh - name: "Set transformers tag" - run: echo "TRANSFORMERS_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-core.version -q -DforceStdout)" >> $GITHUB_ENV + run: echo "TRANSFORMERS_TAG=latest" >> $GITHUB_ENV - name: "Set the host IP" run: echo "HOST_IP=$(hostname -I | cut -f1 -d' ')" >> $GITHUB_ENV - name: "Generate Keystores and Truststores for Mutual TLS configuration" diff --git a/packaging/tests/scripts/start-compose.sh b/packaging/tests/scripts/start-compose.sh index 3036c56947..60987fe373 100755 --- a/packaging/tests/scripts/start-compose.sh +++ b/packaging/tests/scripts/start-compose.sh @@ -39,7 +39,7 @@ fi echo "Starting ACS stack in ${DOCKER_COMPOSE_PATH}" -export TRANSFORMERS_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-core.version -q -DforceStdout) +export TRANSFORMERS_TAG=latest export TRANSFORM_ROUTER_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-service.version -q -DforceStdout) docker compose ${DOCKER_COMPOSES} --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") up -d diff --git a/pom.xml b/pom.xml index 6c13291307..e1fca9a6e2 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ 7.0.2 5.23.0 5.23.0 - 5.1.7 + 5.1.8-SNAPSHOT 4.1.7 7.1 1.0.2 diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh index 6b25a69374..4e607e8b89 100644 --- a/scripts/ci/build.sh +++ b/scripts/ci/build.sh @@ -6,6 +6,11 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../../" source "$(dirname "${BASH_SOURCE[0]}")/build_functions.sh" +GIT_REPO="github.com/Alfresco/alfresco-transform-core.git" +BRANCH="MNT-24883-libreoffice-header-fix" + +buildCoreAio "${GIT_REPO}" "${BRANCH}" + if [[ -n ${BUILD_PROFILES} ]]; then PROFILES="${BUILD_PROFILES}" elif [[ "${REQUIRES_LOCAL_IMAGES}" == "true" ]]; then diff --git a/scripts/ci/build_functions.sh b/scripts/ci/build_functions.sh index cb72ee6852..accc797c99 100644 --- a/scripts/ci/build_functions.sh +++ b/scripts/ci/build_functions.sh @@ -184,4 +184,14 @@ function retieveLatestTag() { rm -rf "${LOCAL_PATH}" } +function buildCoreAio() { + local GIT_REPO="${1}" + local BRANCH="${2}" + cloneRepo "${GIT_REPO}" "${BRANCH}" + + pushd "$(dirname "${BASH_SOURCE[0]}")/../../../" + cd "$(basename "${GIT_REPO%.git}")" + mvn -B -V -q clean install -DskipTests -Dmaven.javadoc.skip=true -Plocal + popd +} set -vx \ No newline at end of file diff --git a/scripts/ci/docker-compose/docker-compose.yaml b/scripts/ci/docker-compose/docker-compose.yaml index 22a6d27f54..3248212912 100644 --- a/scripts/ci/docker-compose/docker-compose.yaml +++ b/scripts/ci/docker-compose/docker-compose.yaml @@ -26,7 +26,7 @@ services: - "61616:61616" # OpenWire mtls-transform-core-aio: profiles: ["with-mtls-transform-core-aio"] - image: quay.io/alfresco/alfresco-transform-core-aio:${TRANSFORMERS_TAG} + image: alfresco/alfresco-transform-core-aio:${TRANSFORMERS_TAG} hostname: transform-core-aio ports: - 8090:8090