Skip to content

Commit

Permalink
CI: disable travis-ci
Browse files Browse the repository at this point in the history
Now that Github Actions works well enough, don't depend on travis-ci for
fvwm3 which has always been a PITA to get the correct environments
going.

travis-ci does use Docker, so this might get resurrected in the future.
  • Loading branch information
ThomasAdam committed Jun 29, 2020
1 parent 61b443a commit acac310
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 10 deletions.
File renamed without changes.
18 changes: 8 additions & 10 deletions dev-docs/DEVELOPERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,20 +78,18 @@ can take a look at it.
Alternatively, if pull-requests are not an option, then `git-send-email` can be
used, sending the relevant patchsets to the `fvwm-workers` mailing list.

### Protected branches and the use of Travis-CI
### Protected branches and the use of Github Actions

Pull-requests made will result in the use of Travis-CI being run against the
branch. This builds the copy of the pushed code in a Ubuntu environment, with
all the additional libraries FVWM could use, loaded in. Builds are made against
`gcc` and `clang`, because both those compilers cover slightly different angles
with respect to compiling. All warnings are treated as errors, and if a build
does not succeeded, ensure the code is fixed, and pushed back out on the same
branch. Rebasing is recommended; Travis-CI and Github handle this just fine.
Pull-requests made will result in the use of Github Actions being run against the
branch. This builds the copy of the pushed code in a Debian environment, with
all the additional libraries FVWM could use, loaded in. If a build fails this
check, it is recommend to fix this by rebasing the commits with the additional
fixes

The FVWM repository also treats the `master` branch as protected. This is a
[GitHub feature](https://help.github.com/articles/about-protected-branches/)
which means the `master` branch in this case cannot have changes merged into it
until Travis-CI has verified the builds do not fail.
until Github Actions has verified the builds do not fail.

This has merit since not every developer will be using the same operating
systems (Linux versus BSD for instance), and that `master` is meant to try and
Expand All @@ -112,7 +110,7 @@ If using github this process is easy, since the `Merge pull request` button
has an option to `Rebase and Merge`. This is what should be used. See also
[the documentation on Github](https://github.com/blog/2243-rebase-and-merge-pull-requests)

If this is manual (which will only work when the Travis-CI checks have
If this is manual (which will only work when the Github Actions checks have
passed), then:

```
Expand Down
9 changes: 9 additions & 0 deletions dev-docs/INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@ FVWM3 uses automake and autotools as its build process.
Dependencies
============

Docker
======

The `fvwm3` repository has a Dockerfile which can be used to build the
repository. This is the same Docker image as used by Github Actions.

Manually
========

FVWM3 has the following dependencies. It's recommended to install all
dependencies, core or optional.

Expand Down

0 comments on commit acac310

Please sign in to comment.