diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 776249d1c7..237172367d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ on: - fix/** push: branches: - - feature/** +# - feature/** - fix/** workflow_call: workflow_dispatch: diff --git a/.github/workflows/master_release.yml b/.github/workflows/master_release.yml index 844783ded5..d80e18e6ac 100644 --- a/.github/workflows/master_release.yml +++ b/.github/workflows/master_release.yml @@ -5,6 +5,7 @@ on: branches: - master - release/** + - feature/ACS-3841_test_migration env: GIT_USERNAME: ${{ secrets.BOT_GITHUB_USERNAME }} @@ -30,7 +31,7 @@ jobs: always() && (needs.run_ci.result == 'skipped' || needs.run_ci.result == 'success') && (! contains(github.event.head_commit.message, '[no release]')) && - (github.ref_name == 'master' || contains(github.ref_name, 'release/')) && + (github.ref_name == 'master' || contains(github.ref_name, 'release/') || github.ref_name == 'feature/ACS-3841_test_migration') && (github.event_name != 'pull_request') steps: - uses: actions/checkout@v3 @@ -54,7 +55,7 @@ jobs: always() && (needs.run_ci.result == 'skipped' || needs.run_ci.result == 'success') && (! contains(github.event.head_commit.message, '[no downstream]')) && - ((github.ref_name == 'master' || contains(github.ref_name, 'release/')) && github.event_name != 'pull_request') + ((github.ref_name == 'master' || contains(github.ref_name, 'release/') || github.ref_name == 'feature/ACS-3841_test_migration') && github.event_name != 'pull_request') steps: - uses: actions/checkout@v3 - uses: Alfresco/acs-community-packaging/.github/actions/get-build-info@feature/ACS-3844_migrate-to-GHA diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 7ea46aa1b7..6eb14d9fd3 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 20.45-SNAPSHOT + 20.45-DEV-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index b60e5ec611..2674b1fbd5 100644 --- a/amps/ags/rm-automation/pom.xml +++ b/amps/ags/rm-automation/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 20.45-SNAPSHOT + 20.45-DEV-SNAPSHOT diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index e0f6bf31e4..e48e3da7f6 100644 --- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-automation-community-repo - 20.45-SNAPSHOT + 20.45-DEV-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 4743beb7e7..c859f5522a 100644 --- a/amps/ags/rm-community/pom.xml +++ b/amps/ags/rm-community/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 20.45-SNAPSHOT + 20.45-DEV-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 8e85cc0f94..bb552ba20d 100644 --- a/amps/ags/rm-community/rm-community-repo/pom.xml +++ b/amps/ags/rm-community/rm-community-repo/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 20.45-SNAPSHOT + 20.45-DEV-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index ce5a6d46bd..9df0b96408 100644 --- a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 20.45-SNAPSHOT + 20.45-DEV-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index a9d1866061..ef14082645 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.45-SNAPSHOT + 20.45-DEV-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 90d7cf5448..8360afe745 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 20.45-SNAPSHOT + 20.45-DEV-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 4d48e8b4e3..fb0067e7aa 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.45-SNAPSHOT + 20.45-DEV-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 9ca95416cc..970d50550b 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.45-SNAPSHOT + 20.45-DEV-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index f075a4c335..5116ac0878 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.45-SNAPSHOT + 20.45-DEV-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 51e2ecc6d3..a542433242 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 20.45-SNAPSHOT + 20.45-DEV-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 37c25ae4d7..266d8f15d3 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 20.45-SNAPSHOT + 20.45-DEV-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 59ec7e5d0e..7d5c8e5f75 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.45-SNAPSHOT + 20.45-DEV-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 9a596006c7..2aa8a0c1a7 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 20.45-SNAPSHOT + 20.45-DEV-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 6eeacfc3e9..ddce617e88 100644 --- a/packaging/tests/tas-cmis/pom.xml +++ b/packaging/tests/tas-cmis/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-tests - 20.45-SNAPSHOT + 20.45-DEV-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 6bea3a195a..d5b78f3c44 100644 --- a/packaging/tests/tas-email/pom.xml +++ b/packaging/tests/tas-email/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 20.45-SNAPSHOT + 20.45-DEV-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 3580670ea2..5c5d3098ca 100644 --- a/packaging/tests/tas-integration/pom.xml +++ b/packaging/tests/tas-integration/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 20.45-SNAPSHOT + 20.45-DEV-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 149a190861..e3080aa2e2 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 20.45-SNAPSHOT + 20.45-DEV-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index c6510867a2..a37735e54f 100644 --- a/packaging/tests/tas-webdav/pom.xml +++ b/packaging/tests/tas-webdav/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 20.45-SNAPSHOT + 20.45-DEV-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 1c8075a60c..a42b814653 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 20.45-SNAPSHOT + 20.45-DEV-SNAPSHOT diff --git a/pom.xml b/pom.xml index 9e6845e241..3a0792aa53 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 20.45-SNAPSHOT + 20.45-DEV-SNAPSHOT pom Alfresco Community Repo Parent diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 0c485a45a4..25fe944329 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.45-SNAPSHOT + 20.45-DEV-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 3b22b8a836..5bbcf1d434 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.45-SNAPSHOT + 20.45-DEV-SNAPSHOT