diff --git a/.travis.settings.xml b/.github/.ci.settings.xml similarity index 100% rename from .travis.settings.xml rename to .github/.ci.settings.xml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0a01d25018..f5a5a3c3e8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,6 +7,7 @@ on: - feature/** - fix/** workflow_call: + workflow_dispatch: env: DOCKERHUB_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} @@ -48,7 +49,7 @@ jobs: needs: - prepare if: > - (github.ref_name == 'master' || contains(github.ref_name, '[release]') || github.event_name == 'pull_request') && + (github.ref_name == 'master' || contains(github.ref_name, 'release/') || github.event_name == 'pull_request') && ! contains(github.event.head_commit.message, '[skip repo]') && ! contains(github.event.head_commit.message, '[skip tests]') && ! contains(github.event.head_commit.message, '[force]') @@ -150,7 +151,7 @@ jobs: needs: - prepare if: > - ((github.ref_name == 'master' || contains(github.ref_name, '[release]') || github.event_name == 'pull_request' ) && + ((github.ref_name == 'master' || contains(github.ref_name, 'release/') || github.event_name == 'pull_request' ) && ! contains(github.event.head_commit.message, '[skip db]')) || contains(github.event.head_commit.message, '[db]') && ! contains(github.event.head_commit.message, '[skip tests]') && @@ -186,7 +187,7 @@ jobs: needs: - prepare if: > - ((github.ref_name == 'master' || contains(github.ref_name, '[release]')) && + ((github.ref_name == 'master' || contains(github.ref_name, 'release/')) && ! contains(github.event.head_commit.message, '[skip db]')) || contains(github.event.head_commit.message, '[latest db]') || contains(github.event.head_commit.message, '[db]') && @@ -219,7 +220,7 @@ jobs: needs: - prepare if: > - ((github.ref_name == 'master' || contains(github.ref_name, '[release]')) && + ((github.ref_name == 'master' || contains(github.ref_name, 'release/')) && ! contains(github.event.head_commit.message, '[skip db]')) || contains(github.event.head_commit.message, '[latest db]') || contains(github.event.head_commit.message, '[db]') && @@ -252,7 +253,7 @@ jobs: needs: - prepare if: > - ((github.ref_name == 'master' || contains(github.ref_name, '[release]') || github.event_name == 'pull_request' ) && + ((github.ref_name == 'master' || contains(github.ref_name, 'release/') || github.event_name == 'pull_request' ) && ! contains(github.event.head_commit.message, '[skip db]')) || contains(github.event.head_commit.message, '[db]') && ! contains(github.event.head_commit.message, '[skip tests]') && @@ -284,7 +285,7 @@ jobs: needs: - prepare if: > - ((github.ref_name == 'master' || contains(github.ref_name, '[release]')) && + ((github.ref_name == 'master' || contains(github.ref_name, 'release/')) && ! contains(github.event.head_commit.message, '[skip db]')) || contains(github.event.head_commit.message, '[latest db]') || contains(github.event.head_commit.message, '[db]') && @@ -408,7 +409,7 @@ jobs: needs: - prepare if: > - ((github.ref_name == 'master' || contains(github.ref_name, '[release]') || github.event_name == 'pull_request' ) && + ((github.ref_name == 'master' || contains(github.ref_name, 'release/') || github.event_name == 'pull_request' ) && ! contains(github.event.head_commit.message, '[skip tas]')) || contains(github.event.head_commit.message, '[tas]') && ! contains(github.event.head_commit.message, '[skip tests]') && @@ -510,7 +511,7 @@ jobs: needs: - prepare if: > - ((github.ref_name == 'master' || contains(github.ref_name, '[release]') || github.event_name == 'pull_request' ) && + ((github.ref_name == 'master' || contains(github.ref_name, 'release/') || github.event_name == 'pull_request' ) && ! contains(github.event.head_commit.message, '[skip ags]')) || contains(github.event.head_commit.message, '[ags]') && ! contains(github.event.head_commit.message, '[skip tests]') && @@ -550,7 +551,7 @@ jobs: needs: - prepare if: > - ((github.ref_name == 'master' || contains(github.ref_name, '[release]') || github.event_name == 'pull_request' ) && + ((github.ref_name == 'master' || contains(github.ref_name, 'release/') || github.event_name == 'pull_request' ) && ! contains(github.event.head_commit.message, '[skip ags]')) || contains(github.event.head_commit.message, '[ags on MySQL]') && ! contains(github.event.head_commit.message, '[skip tests]') && @@ -590,7 +591,7 @@ jobs: needs: - prepare if: > - ((github.ref_name == 'master' || contains(github.ref_name, '[release]') || github.event_name == 'pull_request' ) && + ((github.ref_name == 'master' || contains(github.ref_name, 'release/') || github.event_name == 'pull_request' ) && ! contains(github.event.head_commit.message, '[skip ags]')) || contains(github.event.head_commit.message, '[ags]') && ! contains(github.event.head_commit.message, '[skip tests]') && diff --git a/.github/workflows/master_release.yml b/.github/workflows/master_release.yml index de2acdcf56..f560efb000 100644 --- a/.github/workflows/master_release.yml +++ b/.github/workflows/master_release.yml @@ -47,7 +47,7 @@ jobs: username: ${{ secrets.BOT_GITHUB_USERNAME }} email: ${{ secrets.BOT_GITHUB_EMAIL }} - name: "Verify release tag" - run: bash ./scripts/travis/verify_release_tag.sh + run: bash ./scripts/ci/verify_release_tag.sh - name: "Release" run: bash ./scripts/ci/maven_release.sh env: diff --git a/scripts/ci/init.sh b/scripts/ci/init.sh index ca1081746b..74637c7d1b 100644 --- a/scripts/ci/init.sh +++ b/scripts/ci/init.sh @@ -5,7 +5,7 @@ set -vex pushd "$(dirname "${BASH_SOURCE[0]}")/../../" # Maven Setup -mkdir -p "${HOME}/.m2" && cp -f .travis.settings.xml "${HOME}/.m2/settings.xml" +mkdir -p "${HOME}/.m2" && cp -f .github/.ci.settings.xml "${HOME}/.m2/settings.xml" find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf # Docker Logins