diff --git a/.ci-scripts/deploy-docs.sh b/.ci-scripts/deploy-docs.sh index bde02d5b2..1f8635ab9 100755 --- a/.ci-scripts/deploy-docs.sh +++ b/.ci-scripts/deploy-docs.sh @@ -38,7 +38,7 @@ GIT_CHASH=$(git rev-parse HEAD) cd "$DOCS_DIR" git init --quiet -git config user.name "Travis CI" +git config user.name "qTox bot" git config user.email "qTox@users.noreply.github.com" git add . diff --git a/.ci-scripts/deploy-gitstats.sh b/.ci-scripts/deploy-gitstats.sh index 3e40bf251..ef196e040 100755 --- a/.ci-scripts/deploy-gitstats.sh +++ b/.ci-scripts/deploy-gitstats.sh @@ -19,7 +19,7 @@ cd "$GITSTATS_DIR" COMMIT=$(cd qTox && git describe) git init --quiet -git config user.name "Travis CI" +git config user.name "qTox bot" git config user.email "qTox@users.noreply.github.com" git add . diff --git a/.ci-scripts/verify-commit-format.sh b/.ci-scripts/verify-commit-format.sh index 45abc5e88..1e983d655 100755 --- a/.ci-scripts/verify-commit-format.sh +++ b/.ci-scripts/verify-commit-format.sh @@ -21,5 +21,5 @@ set -eu -o pipefail # Verify commit messages readarray -t COMMITS <<<$(curl -s ${GITHUB_CONTEXT} | jq -r '.[0,-1].sha') -TRAVIS_COMMIT_RANGE="${COMMITS[0]}..${COMMITS[1]}" -bash ./verify-commit-messages.sh "$TRAVIS_COMMIT_RANGE" +COMMIT_RANGE="${COMMITS[0]}..${COMMITS[1]}" +bash ./verify-commit-messages.sh "$COMMIT_RANGE" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 56f866ba8..851126bfe 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -40,11 +40,11 @@ it still will be there next time you might need it. `:-)` * Provide **version** information (you can find version numbers in menu `Settings → About`): ``` -OS: -qTox version: -Commit hash: -toxcore: -Qt: +OS: +qTox version: +Commit hash: +toxcore: +Qt: ``` * Provide **steps** to reproduce the problem, it will be easier to pinpoint the fault. @@ -268,7 +268,7 @@ For example: * `i18n` – something has been made translatable * `build` – change affects build system / scripts, e.g. `CMakeLists.txt`, `simple_make.sh`, etc. -* `travis` – change affects Travis CI +* `ci` – change affects CI * `CONTRIBUTING` – change to the contributing guidelines Since people were abusing length of the scope, it's limited to 12 characters. diff --git a/MAINTAINING.md b/MAINTAINING.md index 88c971695..4788212e5 100644 --- a/MAINTAINING.md +++ b/MAINTAINING.md @@ -63,7 +63,7 @@ git config --global alias.logs 'log --show-signature' make sure it's up to date with qTox/qTox, then e.g. `./merge-pr.sh 1234`. You don't have to use it, but then you're running into risk of breaking - travis build of master & other PRs, since it verifies all commit messages, + CI build of master & other PRs, since it verifies all commit messages, indlucing merge messages. Risk, that can be avoided when one doesn't type manually merge message :wink: @@ -83,10 +83,8 @@ git config --global alias.logs 'log --show-signature' # Continous Integration -qTox nightly builds can be found in [qTox-nightly-release]. Should one build -fail, it is important to restart the whole Travis CI build and not just a -single job. The tool managing the nightly builds deletes all build artifacts -on any job failure, so all need to be rebuilt. +All CI is done through GitHub actions. Nightly builds are published to +qTox/qTox releases. # Issues @@ -231,8 +229,7 @@ To get translations into qTox: - Create and GPG-sign the tar.lz and tar.gz archives using [`./tools/create-tarballs.sh`] script, and upload both archives plus both - signature files to the github release that was created by a Travis OSX - release job. + signature files to the github draft release that was created by CI. - Download the binaries that are part of the draft release, sign them in in detached and ascii armored mode, e.g. `gpg -a -b `, and upload the signatures to the draft release. diff --git a/README.md b/README.md index b6d74e1a8..067b08bd0 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,6 @@ GPLv3+ - -Travis CI - Translate on Weblate @@ -83,7 +80,6 @@ The next steps are: * move all toxcore abstractions into their own subproject * write basic tests for this Core * format the code base -* rework our TravisCI setup for faster PR checks * rethink our Issue tracker The current state is tracked in the [Code cleanup] project.