Added new docker repo for test image. Adapted deploy script to use env var for test repo name. Modified travis references to github actions references in docs. Added changelog entry.

master
Dimitri Huisman 3 years ago
parent 58235bcc44
commit 54dd4cf224

@ -26,7 +26,8 @@ on:
# Password of docker login for pushing the images to repo $DOCKER_ORG # Password of docker login for pushing the images to repo $DOCKER_ORG
# DOCKER_ORG: ${{ secrets.DOCKER_ORG }} # DOCKER_ORG: ${{ secrets.DOCKER_ORG }}
# The docker repository where the images are pushed to. # The docker repository where the images are pushed to.
# # DOCKER_ORG_TESTS: ${{ secrets.DOCKER_ORG_TESTS }}
# The docker repository for test images. Only used for the branch TESTING (BORS try).
# Add the above secrets to your github repo to determine where the images will be pushed. # Add the above secrets to your github repo to determine where the images will be pushed.
################################################ ################################################
@ -256,6 +257,7 @@ jobs:
DOCKER_UN: ${{ secrets.Docker_Login }} DOCKER_UN: ${{ secrets.Docker_Login }}
DOCKER_PW: ${{ secrets.Docker_Password }} DOCKER_PW: ${{ secrets.Docker_Password }}
DOCKER_ORG: ${{ secrets.DOCKER_ORG }} DOCKER_ORG: ${{ secrets.DOCKER_ORG }}
DOCKER_ORG_TESTS: ${{ secrets.DOCKER_ORG_TESTS }}
MAILU_VERSION: ${{ env.BRANCH }} MAILU_VERSION: ${{ env.BRANCH }}
TRAVIS_BRANCH: ${{ env.BRANCH }} TRAVIS_BRANCH: ${{ env.BRANCH }}
TRAVIS_COMMIT_MESSAGE: ${{ github.event.head_commit.message }} TRAVIS_COMMIT_MESSAGE: ${{ github.event.head_commit.message }}

@ -178,9 +178,9 @@ In the case of a PR from a fellow team member, a single review is enough
to initiate merging. In all other cases, two approving reviews are required. to initiate merging. In all other cases, two approving reviews are required.
There is also a possibility to set the ``review/need2`` to require a second review. There is also a possibility to set the ``review/need2`` to require a second review.
After Travis successfully tests the PR and the required amount of reviews are acquired, After the Github Action workflow successfully tests the PR and the required amount of reviews are acquired,
Mergify will trigger with a ``bors r+`` command. Bors will batch any approved PR's, Mergify will trigger with a ``bors r+`` command. Bors will batch any approved PR's,
merges them with master in a staging branch where Travis builds and tests the result. merges them with master in a staging branch where the Github Action workflow builds and tests the result.
After a successful test, the actual master gets fast-forwarded to that point. After a successful test, the actual master gets fast-forwarded to that point.
System requirements System requirements
@ -201,16 +201,16 @@ us on `Matrix`_.
Test images Test images
``````````` ```````````
All PR's automatically get build by Travis, controlled by `bors-ng`_. All PR's automatically get build by a Github Action workflow, controlled by `bors-ng`_.
Some primitive auto testing is done. Some primitive auto testing is done.
The resulting images get uploaded to Docker hub, under the The resulting images get uploaded to Docker hub, under the
tag name ``mailutest/<name>:pr-<no>``. tag name ``mailuci/<name>:pr-<no>``.
For example, to test PR #500 against master, reviewers can use: For example, to test PR #500 against master, reviewers can use:
.. code-block:: bash .. code-block:: bash
export DOCKER_ORG="mailutest" export DOCKER_ORG="mailuci"
export MAILU_VERSION="pr-500" export MAILU_VERSION="pr-500"
docker-compose pull docker-compose pull
docker-compose up -d docker-compose up -d
@ -232,8 +232,8 @@ after Bors confirms a successful build.
When bors try fails When bors try fails
``````````````````` ```````````````````
Sometimes Travis fails when another PR triggers a ``bors try`` command, Sometimes the Github Action workflow fails when another PR triggers a ``bors try`` command,
before Travis cloned the git repository. before the Github Action workflow cloned the git repository.
Inspect the build log in the link provided by *bors-ng* to find out the cause. Inspect the build log in the link provided by *bors-ng* to find out the cause.
If you see something like the following error on top of the logs, If you see something like the following error on top of the logs,
feel free to write a comment with ``bors retry``. feel free to write a comment with ``bors retry``.

@ -41,7 +41,7 @@ PR Workflow
----------- -----------
All pull requests have to be against the main ``master`` branch. All pull requests have to be against the main ``master`` branch.
The PR gets build by Travis and some primitive auto-testing is done. The PR gets build by a Github Action workflow and some primitive auto-testing is done.
Test images get uploaded to a separate section in Docker hub. Test images get uploaded to a separate section in Docker hub.
Reviewers will check the PR and test the resulting images. Reviewers will check the PR and test the resulting images.
See the :ref:`testing` section for more info. See the :ref:`testing` section for more info.

@ -61,7 +61,7 @@ have to prevent pushing out something quickly.
We currently maintain a strict work flow: We currently maintain a strict work flow:
#. Someone writes a solution and sends a pull request; #. Someone writes a solution and sends a pull request;
#. We use Travis-CI for some very basic building and testing; #. We use Github actions for some very basic building and testing;
#. The pull request needs to be code-reviewed and tested by at least two members #. The pull request needs to be code-reviewed and tested by at least two members
from the contributors team. from the contributors team.

@ -5,7 +5,7 @@
# Retag in case of `bors try` # Retag in case of `bors try`
if [ "$TRAVIS_BRANCH" = "testing" ]; then if [ "$TRAVIS_BRANCH" = "testing" ]; then
export DOCKER_ORG="mailutest" export DOCKER_ORG=$DOCKER_ORG_TESTS
# Commit message is like "Try #99". # Commit message is like "Try #99".
# This sets the version tag to "pr-99" # This sets the version tag to "pr-99"
export MAILU_VERSION="pr-${TRAVIS_COMMIT_MESSAGE//[!0-9]/}" export MAILU_VERSION="pr-${TRAVIS_COMMIT_MESSAGE//[!0-9]/}"

@ -0,0 +1 @@
Switched from Travis to Github actions for CI/CD. Improved CI workflow to perform all tests in parallel.
Loading…
Cancel
Save