Commit Graph

165 Commits

Author SHA1 Message Date
Anton Georgiev
23c0dc56c4 Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutton into cairosvg 2022-08-19 13:04:00 +00:00
Anton Georgiev
7c29fe7d41
build: move -j parameter ahead 2022-08-15 12:24:29 -04:00
Anton Georgiev
3174fa20a2
build: github action install to use -j skip checks 2022-08-12 15:14:14 -04:00
Anton Georgiev
d7bdc324a0 chore: pull BBB 2.5.4+ into 2.6 2022-07-21 20:25:31 +00:00
Anton Georgiev
07ccaa88fa
test: set permissions: content: read
Suggested by @naveensrinivasan
2022-07-21 15:50:18 -04:00
Anton Georgiev
4769299276 test: add bbb-html5-nodejs to github workflow 2022-07-12 16:48:17 +00:00
Anton Georgiev
3978b7d9a2 add bbb-export-annotations to be built by ci 2022-07-07 22:00:47 +00:00
Anton Georgiev
048bf7d541 fix(conf): reload nginx configuration before BBB start 2022-07-07 17:19:09 +00:00
Anton Georgiev
a4263b6d6f
Reload nginx before bbb-conf --restart 2022-07-07 10:49:31 -04:00
Anton Georgiev
b11e406d8e
test: Update automated test command for 2.6 2022-07-07 09:20:19 -04:00
Anton B
17a1b7ae78 ci: improve automated tests workflow 2022-06-08 11:25:41 -03:00
Tiago Jacobs
a120aeab63 Filter branches that CI tests will run (>=2.5.x) 2022-05-20 17:45:54 +00:00
Tiago Jacobs
ce93125d3b Add github workflow to run automated tests 2022-05-20 17:45:40 +00:00
Pedro Beschorner Marin
ec4c2735f1 Set new labels to templates and workflows 2021-04-04 14:13:14 -03:00
Lars Kiesow
dfa3fcc6e9
Automate Conflict Check for Pull Requests
This patch adds a simple GitHub Actions workflow which will
automatically check open pull requests on code changes, adding a comment
and a label if the pull request has conflicts. The label will
automatically be removed again once the conflict has been resolved.

We use this for a while now with opencast and it really helps since
people do not have to manually check if their pull requests need an
update any longer.

An example, of hoe this looks in action can be found at
https://github.com/opencast/opencast/pull/2053#issuecomment-734987582
2020-12-04 00:59:35 +01:00