From 68b7dc279667a87b464cafad4fb6734f6a857052 Mon Sep 17 00:00:00 2001 From: Damian Ujma <92095156+damianujma@users.noreply.github.com> Date: Thu, 13 Aug 2026 13:53:40 +0200 Subject: [PATCH] ACS-12380 Use env-load-from-yaml to read RELEASE_VERSION and DEVELOPMENT_VERSION (#1693) * ACS-12380 Use env-load-from-yaml to read RELEASE_VERSION and DEVELOPMENT_VERSION * ACS-12380 Pin action usages to an immutable commit SHA * ACS-12380 Adjust versions * ACS-12380 Resolve conflicts --- .github/release-versions.yml | 5 ++++ .github/workflows/ci.yml | 53 +++++++++++++++++++----------------- 2 files changed, 33 insertions(+), 25 deletions(-) create mode 100644 .github/release-versions.yml diff --git a/.github/release-versions.yml b/.github/release-versions.yml new file mode 100644 index 000000000..30a04ec0b --- /dev/null +++ b/.github/release-versions.yml @@ -0,0 +1,5 @@ +env: + global: + # Release version has to start with real version (23.2.0-....) for the docker image to build successfully. + - RELEASE_VERSION=26.3.0-A.7 + - DEVELOPMENT_VERSION=26.3.0-A.8-SNAPSHOT diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index db8ceba39..f308e8b58 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,10 +29,7 @@ env: QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }} TAS_ENVIRONMENT: ./tests/environment TAS_SCRIPTS: ../alfresco-community-repo/packaging/tests/scripts - # Release version has to start with real version (23.2.0-....) for the docker image to build successfully. - RELEASE_VERSION: 26.3.0-A.7 - DEVELOPMENT_VERSION: 26.3.0-A.8-SNAPSHOT - + # Note: RELEASE_VERSION and DEVELOPMENT_VERSION are now loaded from .github/release-versions.yml jobs: precommit: name: Pre-Commit checks @@ -41,12 +38,12 @@ jobs: !contains(github.event.head_commit.message, '[skip tests]') steps: - uses: actions/checkout@v4 - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.16.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@ac0009fd55b474dbf50864caa4f9da36a41e5ffe # v18.21.2 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@ac0009fd55b474dbf50864caa4f9da36a41e5ffe # v18.21.2 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@ac0009fd55b474dbf50864caa4f9da36a41e5ffe # v18.21.2 with: java-version: ${{ env.JAVA_VERSION }} - - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v8.16.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@ac0009fd55b474dbf50864caa4f9da36a41e5ffe # v18.21.2 tas_tests: name: ${{ matrix.testSuite }} TAS tests @@ -94,8 +91,8 @@ jobs: compose-file: docker-compose-minimal.yml steps: - uses: actions/checkout@v4 - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@ac0009fd55b474dbf50864caa4f9da36a41e5ffe # v18.21.2 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@ac0009fd55b474dbf50864caa4f9da36a41e5ffe # v18.21.2 with: java-version: ${{ env.JAVA_VERSION }} - name: "Init" @@ -159,8 +156,8 @@ jobs: - uses: actions/checkout@v4 with: persist-credentials: false - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v12.4.3 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v12.4.3 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@ac0009fd55b474dbf50864caa4f9da36a41e5ffe # v18.21.2 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@ac0009fd55b474dbf50864caa4f9da36a41e5ffe # v18.21.2 with: java-version: ${{ env.JAVA_VERSION }} - name: "Build" @@ -180,7 +177,7 @@ jobs: mvn -B -ntp -q install -DskipTests -f tests/testcontainers-env/pom.xml mvn -B install -ntp -f tests/tas-elasticsearch/pom.xml -P${{ matrix.profiles }} -Denvironment=default -DrunBugs=false "-Dsearch.engine.type=${{ matrix.search-engine-type }}" "-Ddatabase.type=${{ matrix.db-type }}" -Dindeximage="alfresco/alfresco-elasticsearch-batch-indexing:${BATCH_INDEXING_TAG}" -Drepoimage="alfresco-repository-databases:latest" - name: "Dump all Docker containers logs" - uses: Alfresco/alfresco-build-tools/.github/actions/docker-dump-containers-logs@v12.4.3 + uses: Alfresco/alfresco-build-tools/.github/actions/docker-dump-containers-logs@ac0009fd55b474dbf50864caa4f9da36a41e5ffe # v18.21.2 if: failure() && steps.tests.outcome == 'failure' - name: "Clean Maven cache" run: bash ./scripts/ci/cleanup_cache.sh @@ -192,8 +189,8 @@ jobs: if: "!contains(github.event.head_commit.message, '[skip tests]')" steps: - uses: actions/checkout@v4 - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@ac0009fd55b474dbf50864caa4f9da36a41e5ffe # v18.21.2 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@ac0009fd55b474dbf50864caa4f9da36a41e5ffe # v18.21.2 with: java-version: ${{ env.JAVA_VERSION }} - name: "Init" @@ -218,9 +215,9 @@ jobs: - uses: actions/checkout@v4 with: persist-credentials: false - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.16.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@ac0009fd55b474dbf50864caa4f9da36a41e5ffe # v18.21.2 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@ac0009fd55b474dbf50864caa4f9da36a41e5ffe # v18.21.2 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@ac0009fd55b474dbf50864caa4f9da36a41e5ffe # v18.21.2 with: java-version: ${{ env.JAVA_VERSION }} - name: "Build" @@ -258,9 +255,9 @@ jobs: - 5000:5000 steps: - uses: actions/checkout@v4 - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.16.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@ac0009fd55b474dbf50864caa4f9da36a41e5ffe # v18.21.2 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@ac0009fd55b474dbf50864caa4f9da36a41e5ffe # v18.21.2 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@ac0009fd55b474dbf50864caa4f9da36a41e5ffe # v18.21.2 with: java-version: ${{ env.JAVA_VERSION }} - name: Set up QEMU @@ -294,9 +291,12 @@ jobs: - uses: actions/checkout@v4 with: persist-credentials: false - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.16.0 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/env-load-from-yaml@ac0009fd55b474dbf50864caa4f9da36a41e5ffe # v18.21.2 + with: + yml_path: .github/release-versions.yml + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@ac0009fd55b474dbf50864caa4f9da36a41e5ffe # v18.21.2 + - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@ac0009fd55b474dbf50864caa4f9da36a41e5ffe # v18.21.2 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@ac0009fd55b474dbf50864caa4f9da36a41e5ffe # v18.21.2 with: java-version: ${{ env.JAVA_VERSION }} - name: Set up QEMU @@ -337,7 +337,10 @@ jobs: github.event_name != 'pull_request' steps: - uses: actions/checkout@v4 - - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/env-load-from-yaml@ac0009fd55b474dbf50864caa4f9da36a41e5ffe # v18.21.2 + with: + yml_path: .github/release-versions.yml + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@ac0009fd55b474dbf50864caa4f9da36a41e5ffe # v18.21.2 - name: "Configure AWS credentials" uses: aws-actions/configure-aws-credentials@v4 with: