diff --git a/_ci/release.sh b/_ci/release.sh index d9d0dce4..9cfdb0a0 100644 --- a/_ci/release.sh +++ b/_ci/release.sh @@ -5,15 +5,11 @@ PS4="\[\e[35m\]+ \[\e[m\]" set -vex pushd "$(dirname "${BASH_SOURCE[0]}")/../" -# For PR builds only execute a Dry Run of the release -[ "${PULL_REQUEST}" = "false" ] && DRY_RUN="" || DRY_RUN="-DdryRun" - # GitHub Actions CI runner work on DETACHED HEAD, so we need to checkout the release branch git checkout -B "${BRANCH_NAME}" # Run the release plugin - with "[skip ci]" in the release commit message mvn -B -Dmaven.wagon.http.pool=false \ - ${DRY_RUN} \ -Prelease \ "-Darguments=-Prelease -DskipTests -Dmaven.javadoc.skip -Dadditionalparam=-Xdoclint:none" \ release:clean release:prepare release:perform \ diff --git a/deprecated/alfresco-transformer-base/pom.xml b/deprecated/alfresco-transformer-base/pom.xml index 08d54453..ae7bb189 100644 --- a/deprecated/alfresco-transformer-base/pom.xml +++ b/deprecated/alfresco-transformer-base/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 3.0.1-SNAPSHOT + 3.0.1-A1-SNAPSHOT ../../pom.xml diff --git a/docs/build-and-release.md b/docs/build-and-release.md index e591d5c6..dba70d87 100644 --- a/docs/build-and-release.md +++ b/docs/build-and-release.md @@ -22,8 +22,6 @@ GitHub Actions CI builds differ by branch: > - alfresco/alfresco-transform-core-aio - if the commit message contains the `[release]` tag, the builds will also include the _Release_ stage; - - PR builds where the latest commit contains the `[release]` tag will execute dry runs - of the release jobs (no artifacts will be published until the PR is actually merged). * `ATS-*` / `ACS-*` branches: - regular builds which include only the _Build_ and _Tests_ stages; @@ -53,11 +51,8 @@ been generated by steps (2) and (3), then an empty commit should be created - e. > The location of the `[release]` tag in the commit message is irrelevant. - > If for any reason your PR contains multiple commits, the commit with the `[release]` - tag should be the last (newest) one. This will trigger the Release dry runs. 5. Open a new Pull Request from the `ATS-###_release_version` branch into the original -`master` / `SP/*` / `HF/*` branch and wait for a green build; the **Release** stage on the PR build - will only execute a _Dry_Run_ of the release. +`master` / `SP/*` / `HF/*` branch and wait for a green build. 6. Once it is approved, merge the PR, preferably through the **Rebase and merge** option. If the **Create a merge commit** (_Merge pull request_) or **Squash and merge** options are used, you need to ensure that the _commit message_ contains the `[release]` tag (sub-string). diff --git a/engines/aio/pom.xml b/engines/aio/pom.xml index 0b0a7fd6..b994e75a 100644 --- a/engines/aio/pom.xml +++ b/engines/aio/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 3.0.1-SNAPSHOT + 3.0.1-A1-SNAPSHOT ../../pom.xml diff --git a/engines/base/pom.xml b/engines/base/pom.xml index c6f504b5..c28210af 100644 --- a/engines/base/pom.xml +++ b/engines/base/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 3.0.1-SNAPSHOT + 3.0.1-A1-SNAPSHOT ../../pom.xml diff --git a/engines/example/pom.xml b/engines/example/pom.xml index ff2624d3..2e633a01 100644 --- a/engines/example/pom.xml +++ b/engines/example/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 3.0.1-SNAPSHOT + 3.0.1-A1-SNAPSHOT ../../pom.xml diff --git a/engines/imagemagick/pom.xml b/engines/imagemagick/pom.xml index 5581ab9d..ea5bfa29 100644 --- a/engines/imagemagick/pom.xml +++ b/engines/imagemagick/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 3.0.1-SNAPSHOT + 3.0.1-A1-SNAPSHOT ../../pom.xml diff --git a/engines/libreoffice/pom.xml b/engines/libreoffice/pom.xml index fb499389..ab7c58c3 100644 --- a/engines/libreoffice/pom.xml +++ b/engines/libreoffice/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 3.0.1-SNAPSHOT + 3.0.1-A1-SNAPSHOT ../../pom.xml diff --git a/engines/misc/pom.xml b/engines/misc/pom.xml index 9ae3e57a..b954d33b 100644 --- a/engines/misc/pom.xml +++ b/engines/misc/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 3.0.1-SNAPSHOT + 3.0.1-A1-SNAPSHOT ../../pom.xml diff --git a/engines/pdfrenderer/pom.xml b/engines/pdfrenderer/pom.xml index 70c3b4b5..37c82678 100644 --- a/engines/pdfrenderer/pom.xml +++ b/engines/pdfrenderer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 3.0.1-SNAPSHOT + 3.0.1-A1-SNAPSHOT ../../pom.xml diff --git a/engines/tika/pom.xml b/engines/tika/pom.xml index c6311270..327bc7c3 100644 --- a/engines/tika/pom.xml +++ b/engines/tika/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 3.0.1-SNAPSHOT + 3.0.1-A1-SNAPSHOT ../../pom.xml diff --git a/model/pom.xml b/model/pom.xml index c3de7127..abd5d92c 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-transform-core - 3.0.1-SNAPSHOT + 3.0.1-A1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 2f24df3f..5576cf5e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.alfresco alfresco-transform-core - 3.0.1-SNAPSHOT + 3.0.1-A1-SNAPSHOT Alfresco Transform Core pom