Skip to content

Console Output

+ export BASE_REPO=www.openmicroscopy.org
+ BASE_REPO=www.openmicroscopy.org
+ export BASE_BRANCH=master
+ BASE_BRANCH=master
+ export VERSION_LOG=/home/omero/workspace/WEBSITE-push/build/version.tsv
+ VERSION_LOG=/home/omero/workspace/WEBSITE-push/build/version.tsv
+ . build/venv/bin/activate
++ deactivate nondestructive
++ '[' -n '' ']'
++ '[' -n '' ']'
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
++ '[' -n '' ']'
++ unset VIRTUAL_ENV
++ '[' '!' nondestructive = nondestructive ']'
++ VIRTUAL_ENV=/home/omero/workspace/WEBSITE-push/build/venv
++ export VIRTUAL_ENV
++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ PATH=/home/omero/workspace/WEBSITE-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ export PATH
++ '[' -n '' ']'
++ '[' -z '' ']'
++ _OLD_VIRTUAL_PS1=
++ PS1='(venv) '
++ export PS1
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
+ '[' merge_ci '!=' null ']'
+ export PUSH_BRANCH=merge_ci
+ PUSH_BRANCH=merge_ci
+ '[' null '!=' null ']'
+ export STATUS=success-only 'MERGE_OPTIONS=-vvv --no-ask --reset --comment'
+ STATUS=success-only
+ MERGE_OPTIONS='-vvv --no-ask --reset --comment'
+ bash build/build-infra-master/recursive-merge
Merge base repository (no submodule updates)
2024-11-13 11:19:39,559 [  scc.config] DEBUG Found github.token
2024-11-13 11:19:39,561 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-11-13 11:19:39,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 11:19:40,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 11:19:40,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-11-13 11:19:40,527 [      scc.gh] DEBUG 4904 remaining from 5000 (Reset at 11:11
2024-11-13 11:19:40,528 [     scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-13 11:19:40,531 [     scc.git] DEBUG Check current status
2024-11-13 11:19:40,531 [     scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-13 11:19:40,534 [     scc.git] DEBUG 44415a4d Merge pull request #757 from melissalinkert/bf-8.0.0
2024-11-13 11:19:40,535 [     scc.git] DEBUG Calling 'git submodule status'
2024-11-13 11:19:40,575 [     scc.git] DEBUG  9dc84594733f6fd3485711a7b369dcef9e431c21 Schemas (heads/master)
2024-11-13 11:19:40,583 [     scc.git] DEBUG  6c1e198e00a4156fe9d3c8ebd9b51a616062614c _minutes (heads/master-16-g6c1e198)
2024-11-13 11:19:40,587 [  scc.config] DEBUG Found remote.origin.url
2024-11-13 11:19:41,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org HTTP/1.1" 200 None
2024-11-13 11:19:41,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-13 11:19:41,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-13 11:19:42,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-13 11:19:42,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-13 11:19:42,748 [     scc.git] DEBUG Resetting...
2024-11-13 11:19:42,748 [     scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-11-13 11:19:42,756 [     scc.git] DEBUG HEAD is now at 44415a4d Merge pull request #757 from melissalinkert/bf-8.0.0
2024-11-13 11:19:42,756 [     scc.git] DEBUG Calling 'git submodule update --recursive'
2024-11-13 11:19:42,794 [     scc.git] DEBUG Check current status
2024-11-13 11:19:42,794 [     scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-13 11:19:42,797 [     scc.git] DEBUG 44415a4d Merge pull request #757 from melissalinkert/bf-8.0.0
2024-11-13 11:19:42,798 [     scc.git] DEBUG Calling 'git submodule status'
2024-11-13 11:19:42,837 [     scc.git] DEBUG  9dc84594733f6fd3485711a7b369dcef9e431c21 Schemas (heads/master)
2024-11-13 11:19:42,846 [     scc.git] DEBUG  6c1e198e00a4156fe9d3c8ebd9b51a616062614c _minutes (heads/master-16-g6c1e198)
2024-11-13 11:19:42,846 [   scc.merge] INFO  Merging Pull Request(s) based on master
2024-11-13 11:19:42,846 [   scc.merge] INFO  Including Pull Request(s) opened by any public member of the organization
2024-11-13 11:19:42,846 [   scc.merge] INFO  Including Pull Request(s) labelled as include or dependencies
2024-11-13 11:19:42,846 [   scc.merge] INFO  Excluding Pull Request(s) staged as draft
2024-11-13 11:19:42,846 [   scc.merge] INFO  Excluding Pull Request(s) labelled as exclude or breaking
2024-11-13 11:19:42,847 [    scc.repo] DEBUG ## PRs found:
2024-11-13 11:19:43,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/pulls HTTP/1.1" 200 None
2024-11-13 11:19:43,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/760 HTTP/1.1" 200 None
2024-11-13 11:19:43,726 [    scc.repo] DEBUG   # ... Include label: dependencies
2024-11-13 11:19:43,726 [    scc.repo] DEBUG   - PR 760 dependabot[bot] 'Bump _minutes from `6c1e198` to `98b4d02`'
2024-11-13 11:19:44,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/759 HTTP/1.1" 200 None
2024-11-13 11:19:44,195 [    scc.repo] DEBUG   - PR 759 melissalinkert 'Add Bio-Formats 8.0.1 announcement and update config'
2024-11-13 11:19:44,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/758 HTTP/1.1" 200 None
2024-11-13 11:19:45,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/758/comments HTTP/1.1" 200 None
2024-11-13 11:19:45,099 [    scc.repo] DEBUG   - PR 758 pwalczysko 'Add workshops Kobe and Brno'
2024-11-13 11:19:45,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/545 HTTP/1.1" 200 None
2024-11-13 11:19:46,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/545/comments HTTP/1.1" 200 None
2024-11-13 11:19:46,068 [    scc.repo] DEBUG   - PR 545 sbesson 'Regenerate IDR PNG logos with transparent background'
2024-11-13 11:19:46,068 [    scc.repo] DEBUG ## Branches found:
2024-11-13 11:19:46,068 [     scc.git] DEBUG Get sha1 of %s
2024-11-13 11:19:46,068 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 11:19:46,072 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-13 11:19:46,075 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-13 11:19:46,075 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-13 11:19:46,079 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-13 11:19:46,082 [     scc.git] DEBUG Already up to date.

2024-11-13 11:19:46,083 [     scc.git] DEBUG Calling 'git fetch origin pull/545/head'
2024-11-13 11:19:46,447 [     scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2024-11-13 11:19:46,447 [     scc.git] DEBUG  * branch              refs/pull/545/head -> FETCH_HEAD
2024-11-13 11:19:46,465 [     scc.git] DEBUG Calling 'git fetch origin pull/758/head'
2024-11-13 11:19:46,923 [     scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2024-11-13 11:19:46,923 [     scc.git] DEBUG  * branch              refs/pull/758/head -> FETCH_HEAD
2024-11-13 11:19:46,926 [     scc.git] DEBUG Calling 'git fetch origin pull/759/head'
2024-11-13 11:19:47,232 [     scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2024-11-13 11:19:47,232 [     scc.git] DEBUG  * branch              refs/pull/759/head -> FETCH_HEAD
2024-11-13 11:19:47,243 [     scc.git] DEBUG Calling 'git fetch origin pull/760/head'
2024-11-13 11:19:47,543 [     scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2024-11-13 11:19:47,543 [     scc.git] DEBUG  * branch              refs/pull/760/head -> FETCH_HEAD
2024-11-13 11:19:47,554 [     scc.git] DEBUG ## Unique users: []
2024-11-13 11:19:47,554 [     scc.git] DEBUG Get sha1 of %s
2024-11-13 11:19:47,554 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 11:19:47,557 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...f3b02a9cd75d1c017d06a12bde07c6adce10cabd'
2024-11-13 11:19:47,568 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 11:19:47,571 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 545 (Regenerate IDR PNG logos with transparent background) f3b02a9cd75d1c017d06a12bde07c6adce10cabd'
2024-11-13 11:19:47,591 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-13 11:19:47,593 [     scc.git] DEBUG  img/logos/idr-logos.zip | Bin 17681 -> 16406 bytes
2024-11-13 11:19:47,593 [     scc.git] DEBUG  1 file changed, 0 insertions(+), 0 deletions(-)
2024-11-13 11:19:47,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 11:19:47,771 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...5336e4b546af6c21ab803150ddc7f19336c19152'
2024-11-13 11:19:47,782 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 11:19:47,785 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 758 (Add workshops Kobe and Brno) 5336e4b546af6c21ab803150ddc7f19336c19152'
2024-11-13 11:19:47,805 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-13 11:19:47,808 [     scc.git] DEBUG  _data/ome2024.json                       |  4 +-
2024-11-13 11:19:47,808 [     scc.git] DEBUG  events/index.html                        | 12 +++++
2024-11-13 11:19:47,808 [     scc.git] DEBUG  events/workshops-brno-december-2024.html | 43 ++++++++++++++++
2024-11-13 11:19:47,808 [     scc.git] DEBUG  events/workshops-kobe-november-2024.html | 84 ++++++++++++++++++++++++++++++++
2024-11-13 11:19:47,808 [     scc.git] DEBUG  4 files changed, 141 insertions(+), 2 deletions(-)
2024-11-13 11:19:47,808 [     scc.git] DEBUG  create mode 100644 events/workshops-brno-december-2024.html
2024-11-13 11:19:47,808 [     scc.git] DEBUG  create mode 100644 events/workshops-kobe-november-2024.html
2024-11-13 11:19:48,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 11:19:48,167 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...f0417e1d4af7e08704c1b8b28ac18e321d9fc1d2'
2024-11-13 11:19:48,178 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 11:19:48,182 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 759 (Add Bio-Formats 8.0.1 announcement and update config) f0417e1d4af7e08704c1b8b28ac18e321d9fc1d2'
2024-11-13 11:19:48,202 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-13 11:19:48,204 [     scc.git] DEBUG  _config.yml                            |  2 +-
2024-11-13 11:19:48,204 [     scc.git] DEBUG  _posts/2024-11-14-bio-formats-8-0-1.md | 21 +++++++++++++++++++++
2024-11-13 11:19:48,204 [     scc.git] DEBUG  bio-formats/downloads/index.html       |  2 +-
2024-11-13 11:19:48,204 [     scc.git] DEBUG  3 files changed, 23 insertions(+), 2 deletions(-)
2024-11-13 11:19:48,204 [     scc.git] DEBUG  create mode 100644 _posts/2024-11-14-bio-formats-8-0-1.md
2024-11-13 11:19:48,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 11:19:48,551 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...ac63ecb23dfeb68cb5c52fce023464f0c9f7bf2e'
2024-11-13 11:19:48,562 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 11:19:48,565 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 760 (Bump _minutes from `6c1e198` to `98b4d02`) ac63ecb23dfeb68cb5c52fce023464f0c9f7bf2e'
2024-11-13 11:19:48,584 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-13 11:19:48,586 [     scc.git] DEBUG  _minutes | 2 +-
2024-11-13 11:19:48,586 [     scc.git] DEBUG  1 file changed, 1 insertion(+), 1 deletion(-)
2024-11-13 11:19:48,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 11:19:48,954 [     scc.git] DEBUG Calling 'git submodule update'
2024-11-13 11:19:48,996 [     scc.git] DEBUG Submodule path '_minutes': checked out '98b4d0226cbbc8629b60d312178cb941d6331265'
2024-11-13 11:19:48,996 [     scc.git] DEBUG Get sha1 of %s
2024-11-13 11:19:48,996 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 11:19:48,999 [     scc.git] DEBUG Calling 'git status --porcelain'
2024-11-13 11:19:49,014 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f0638e30df0> has no local changes
2024-11-13 11:19:49,014 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone

Repository: ome/www.openmicroscopy.org
Already up to date.

Merged PRs:
  - PR 545 sbesson 'Regenerate IDR PNG logos with transparent background'
  - PR 758 pwalczysko 'Add workshops Kobe and Brno'
  - PR 759 melissalinkert 'Add Bio-Formats 8.0.1 announcement and update config'
  - PR 760 dependabot[bot] 'Bump _minutes from `6c1e198` to `98b4d02`'

Generated by WEBSITE-push#283 (https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/283/)'
2024-11-13 11:19:49,028 [     scc.git] DEBUG [detached HEAD 88eb434b] merge master -Dorg -Snone
2024-11-13 11:19:49,028 [   scc.merge] INFO  Repository: ome/www.openmicroscopy.org
2024-11-13 11:19:49,028 [   scc.merge] INFO  Already up to date.
2024-11-13 11:19:49,028 [   scc.merge] INFO  
2024-11-13 11:19:49,028 [   scc.merge] INFO  Merged PRs:
2024-11-13 11:19:49,028 [   scc.merge] INFO    - PR 545 sbesson 'Regenerate IDR PNG logos with transparent background'
2024-11-13 11:19:49,028 [   scc.merge] INFO    - PR 758 pwalczysko 'Add workshops Kobe and Brno'
2024-11-13 11:19:49,028 [   scc.merge] INFO    - PR 759 melissalinkert 'Add Bio-Formats 8.0.1 announcement and update config'
2024-11-13 11:19:49,028 [   scc.merge] INFO    - PR 760 dependabot[bot] 'Bump _minutes from `6c1e198` to `98b4d02`'
2024-11-13 11:19:49,028 [   scc.merge] INFO  
2024-11-13 11:19:49,028 [   scc.merge] DEBUG Cleaning remote branches created for merging
2024-11-13 11:19:49,028 [     scc.git] DEBUG Calling 'git remote'
Synchronizing submodule url for 'Schemas'
Synchronizing submodule url for '_minutes'
Merge all submodules2024-11-13 11:19:50,153 [  scc.config] DEBUG Found github.token
2024-11-13 11:19:50,156 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-11-13 11:19:50,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 11:19:50,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 11:19:51,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-11-13 11:19:51,137 [      scc.gh] DEBUG 4886 remaining from 5000 (Reset at 11:11
2024-11-13 11:19:51,138 [     scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-13 11:19:51,141 [     scc.git] DEBUG Check current status
2024-11-13 11:19:51,142 [     scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-13 11:19:51,145 [     scc.git] DEBUG 88eb434b merge master -Dorg -Snone
2024-11-13 11:19:51,145 [     scc.git] DEBUG Calling 'git submodule status'
2024-11-13 11:19:51,185 [     scc.git] DEBUG  9dc84594733f6fd3485711a7b369dcef9e431c21 Schemas (heads/master)
2024-11-13 11:19:51,192 [     scc.git] DEBUG  98b4d0226cbbc8629b60d312178cb941d6331265 _minutes (remotes/origin/HEAD)
2024-11-13 11:19:51,196 [  scc.config] DEBUG Found remote.origin.url
2024-11-13 11:19:51,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org HTTP/1.1" 200 None
2024-11-13 11:19:52,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-13 11:19:52,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-13 11:19:52,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-13 11:19:53,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-13 11:19:53,316 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-13 11:19:53,353 [     scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/Schemas
2024-11-13 11:19:53,353 [     scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-13 11:19:53,356 [     scc.git] DEBUG Check current status
2024-11-13 11:19:53,356 [     scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-13 11:19:53,359 [     scc.git] DEBUG 9dc8459 Generate Schemas pages
2024-11-13 11:19:53,359 [     scc.git] DEBUG Calling 'git submodule status'
2024-11-13 11:19:53,394 [  scc.config] DEBUG Found remote.origin.url
2024-11-13 11:19:53,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas HTTP/1.1" 200 None
2024-11-13 11:19:54,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-13 11:19:54,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-13 11:19:55,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-13 11:19:55,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-13 11:19:55,491 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-13 11:19:55,527 [     scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push
2024-11-13 11:19:55,528 [     scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/_minutes
2024-11-13 11:19:55,528 [     scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-11-13 11:19:55,532 [     scc.git] DEBUG Check current status
2024-11-13 11:19:55,532 [     scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-13 11:19:55,535 [     scc.git] DEBUG 98b4d02 Add notes 2024-10-15 -> 2024-11-12
2024-11-13 11:19:55,535 [     scc.git] DEBUG Calling 'git submodule status'
2024-11-13 11:19:55,571 [  scc.config] DEBUG Found remote.origin.url
2024-11-13 11:19:55,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/meeting-minutes HTTP/1.1" 200 None
2024-11-13 11:19:56,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-11-13 11:19:56,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-11-13 11:19:57,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-11-13 11:19:57,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-11-13 11:19:57,672 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-13 11:19:57,707 [     scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push
2024-11-13 11:19:57,707 [     scc.git] DEBUG Resetting...
2024-11-13 11:19:57,707 [     scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-11-13 11:19:57,715 [     scc.git] DEBUG HEAD is now at 88eb434b merge master -Dorg -Snone
2024-11-13 11:19:57,715 [     scc.git] DEBUG Calling 'git submodule update --recursive'
2024-11-13 11:19:57,752 [     scc.git] DEBUG Check current status
2024-11-13 11:19:57,752 [     scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-11-13 11:19:57,755 [     scc.git] DEBUG 88eb434b merge master -Dorg -Snone
2024-11-13 11:19:57,755 [     scc.git] DEBUG Calling 'git submodule status'
2024-11-13 11:19:57,794 [     scc.git] DEBUG  9dc84594733f6fd3485711a7b369dcef9e431c21 Schemas (heads/master)
2024-11-13 11:19:57,802 [     scc.git] DEBUG  98b4d0226cbbc8629b60d312178cb941d6331265 _minutes (remotes/origin/HEAD)
2024-11-13 11:19:57,802 [   scc.merge] INFO  Merging Pull Request(s) based on master
2024-11-13 11:19:57,802 [   scc.merge] INFO  Including Pull Request(s) opened by any public member of the organization
2024-11-13 11:19:57,802 [   scc.merge] INFO  Including Pull Request(s) labelled as include or dependencies
2024-11-13 11:19:57,802 [   scc.merge] INFO  Excluding Pull Request(s) staged as draft
2024-11-13 11:19:57,802 [   scc.merge] INFO  Excluding Pull Request(s) labelled as exclude or breaking
2024-11-13 11:19:57,802 [   scc.merge] INFO  Excluding Pull Request(s) without successful status
2024-11-13 11:19:57,803 [    scc.repo] DEBUG ## PRs found:
2024-11-13 11:19:58,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/pulls HTTP/1.1" 200 None
2024-11-13 11:19:58,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/760 HTTP/1.1" 200 None
2024-11-13 11:19:58,691 [    scc.repo] DEBUG   # ... Include label: dependencies
2024-11-13 11:19:59,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/ac63ecb23dfeb68cb5c52fce023464f0c9f7bf2e HTTP/1.1" 200 None
2024-11-13 11:19:59,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/ac63ecb23dfeb68cb5c52fce023464f0c9f7bf2e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-13 11:20:00,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/ac63ecb23dfeb68cb5c52fce023464f0c9f7bf2e/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-13 11:20:00,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/759 HTTP/1.1" 200 None
2024-11-13 11:20:01,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/f0417e1d4af7e08704c1b8b28ac18e321d9fc1d2 HTTP/1.1" 200 None
2024-11-13 11:20:01,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/f0417e1d4af7e08704c1b8b28ac18e321d9fc1d2/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-13 11:20:02,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/f0417e1d4af7e08704c1b8b28ac18e321d9fc1d2/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-13 11:20:02,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/758 HTTP/1.1" 200 None
2024-11-13 11:20:03,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/758/comments HTTP/1.1" 200 None
2024-11-13 11:20:03,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/5336e4b546af6c21ab803150ddc7f19336c19152 HTTP/1.1" 200 None
2024-11-13 11:20:04,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/5336e4b546af6c21ab803150ddc7f19336c19152/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-13 11:20:04,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/5336e4b546af6c21ab803150ddc7f19336c19152/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-13 11:20:05,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/545 HTTP/1.1" 200 None
2024-11-13 11:20:05,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/545/comments HTTP/1.1" 200 None
2024-11-13 11:20:06,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/f3b02a9cd75d1c017d06a12bde07c6adce10cabd HTTP/1.1" 200 None
2024-11-13 11:20:06,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/f3b02a9cd75d1c017d06a12bde07c6adce10cabd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-13 11:20:07,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/f3b02a9cd75d1c017d06a12bde07c6adce10cabd HTTP/1.1" 200 None
2024-11-13 11:20:07,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/statuses/f3b02a9cd75d1c017d06a12bde07c6adce10cabd?per_page=1 HTTP/1.1" 200 2
2024-11-13 11:20:07,475 [    scc.repo] DEBUG   - PR 545 sbesson 'Regenerate IDR PNG logos with transparent background'
2024-11-13 11:20:07,475 [    scc.repo] DEBUG ## Branches found:
2024-11-13 11:20:07,475 [     scc.git] DEBUG Get sha1 of %s
2024-11-13 11:20:07,475 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 11:20:07,479 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-13 11:20:07,482 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-13 11:20:07,483 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-13 11:20:07,486 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-13 11:20:07,498 [     scc.git] DEBUG Already up to date.

2024-11-13 11:20:07,499 [     scc.git] DEBUG Calling 'git fetch origin pull/545/head'
2024-11-13 11:20:07,969 [     scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2024-11-13 11:20:07,969 [     scc.git] DEBUG  * branch              refs/pull/545/head -> FETCH_HEAD
2024-11-13 11:20:07,987 [     scc.git] DEBUG ## Unique users: []
2024-11-13 11:20:07,987 [     scc.git] DEBUG Get sha1 of %s
2024-11-13 11:20:07,987 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 11:20:07,990 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...f3b02a9cd75d1c017d06a12bde07c6adce10cabd'
2024-11-13 11:20:08,002 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 11:20:08,005 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 545 (Regenerate IDR PNG logos with transparent background) f3b02a9cd75d1c017d06a12bde07c6adce10cabd'
2024-11-13 11:20:08,016 [     scc.git] DEBUG Already up to date.
2024-11-13 11:20:08,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 11:20:08,159 [     scc.git] DEBUG Calling 'git submodule update'
2024-11-13 11:20:08,193 [     scc.git] DEBUG Get sha1 of %s
2024-11-13 11:20:08,193 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 11:20:08,197 [    scc.repo] DEBUG ## PRs found:
2024-11-13 11:20:08,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas/pulls HTTP/1.1" 200 None
2024-11-13 11:20:09,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas/issues/10 HTTP/1.1" 200 None
2024-11-13 11:20:09,076 [    scc.repo] DEBUG   # ... Include label: dependencies
2024-11-13 11:20:09,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas/commits/e1257555be50189441800592768cdfbb3e9dc48c HTTP/1.1" 200 None
2024-11-13 11:20:09,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas/commits/e1257555be50189441800592768cdfbb3e9dc48c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-13 11:20:10,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas/commits/e1257555be50189441800592768cdfbb3e9dc48c HTTP/1.1" 200 None
2024-11-13 11:20:10,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas/statuses/e1257555be50189441800592768cdfbb3e9dc48c?per_page=1 HTTP/1.1" 200 2
2024-11-13 11:20:10,801 [    scc.repo] DEBUG   - PR 10 dependabot[bot] 'Bump specification from 6.3.1 to 6.3.3'
2024-11-13 11:20:10,801 [    scc.repo] DEBUG ## Branches found:
2024-11-13 11:20:10,801 [     scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/Schemas
2024-11-13 11:20:10,801 [     scc.git] DEBUG Get sha1 of %s
2024-11-13 11:20:10,801 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 11:20:10,805 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-13 11:20:10,809 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-13 11:20:10,809 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-13 11:20:10,812 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-13 11:20:10,816 [     scc.git] DEBUG Already up to date.

2024-11-13 11:20:10,816 [     scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-11-13 11:20:11,142 [     scc.git] DEBUG From https://github.com/ome/schemas
2024-11-13 11:20:11,142 [     scc.git] DEBUG  * branch            refs/pull/10/head -> FETCH_HEAD
2024-11-13 11:20:11,146 [     scc.git] DEBUG ## Unique users: []
2024-11-13 11:20:11,146 [     scc.git] DEBUG Get sha1 of %s
2024-11-13 11:20:11,146 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 11:20:11,149 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...e1257555be50189441800592768cdfbb3e9dc48c'
2024-11-13 11:20:11,153 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 11:20:11,156 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Bump specification from 6.3.1 to 6.3.3) e1257555be50189441800592768cdfbb3e9dc48c'
2024-11-13 11:20:11,165 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-13 11:20:11,167 [     scc.git] DEBUG  pom.xml | 2 +-
2024-11-13 11:20:11,167 [     scc.git] DEBUG  1 file changed, 1 insertion(+), 1 deletion(-)
2024-11-13 11:20:11,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 11:20:11,310 [     scc.git] DEBUG Calling 'git submodule update'
2024-11-13 11:20:11,344 [     scc.git] DEBUG Get sha1 of %s
2024-11-13 11:20:11,344 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 11:20:11,348 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-13 11:20:11,381 [     scc.git] DEBUG Calling 'git status --porcelain'
2024-11-13 11:20:11,386 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fd9dfa21190> has no local changes
2024-11-13 11:20:11,386 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/schemas
Already up to date.

Merged PRs:
  - PR 10 dependabot[bot] 'Bump specification from 6.3.1 to 6.3.3'

Generated by WEBSITE-push#283 (https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/283/)'
2024-11-13 11:20:11,393 [     scc.git] DEBUG [detached HEAD fd59924] merge master -Dorg -Ssuccess-only
2024-11-13 11:20:11,393 [     scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push
2024-11-13 11:20:11,394 [    scc.repo] DEBUG ## PRs found:
2024-11-13 11:20:11,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/meeting-minutes/pulls HTTP/1.1" 200 2
2024-11-13 11:20:11,715 [    scc.repo] DEBUG ## Branches found:
2024-11-13 11:20:11,715 [     scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/_minutes
2024-11-13 11:20:11,715 [     scc.git] DEBUG Get sha1 of %s
2024-11-13 11:20:11,715 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 11:20:11,718 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-13 11:20:11,722 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-13 11:20:11,722 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-13 11:20:11,725 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-13 11:20:11,729 [     scc.git] DEBUG Already up to date.

2024-11-13 11:20:11,729 [     scc.git] DEBUG ## Unique users: []
2024-11-13 11:20:11,729 [     scc.git] DEBUG Get sha1 of %s
2024-11-13 11:20:11,729 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 11:20:11,732 [     scc.git] DEBUG Calling 'git submodule update'
2024-11-13 11:20:11,766 [     scc.git] DEBUG Get sha1 of %s
2024-11-13 11:20:11,766 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-13 11:20:11,769 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-13 11:20:11,802 [     scc.git] DEBUG Calling 'git status --porcelain'
2024-11-13 11:20:11,806 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fd9df9b5d30> has no local changes
2024-11-13 11:20:11,806 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/meeting-minutes
Already up to date.


Generated by WEBSITE-push#283 (https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/283/)'
2024-11-13 11:20:11,813 [     scc.git] DEBUG [detached HEAD bcd72c3] merge master -Dorg -Ssuccess-only
2024-11-13 11:20:11,813 [     scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push
2024-11-13 11:20:11,813 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-13 11:20:11,852 [  scc.config] DEBUG Found submodule.Schemas.url
2024-11-13 11:20:12,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 11:20:12,116 [  scc.config] DEBUG Found submodule._minutes.url
2024-11-13 11:20:12,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-13 11:20:12,520 [     scc.git] DEBUG Calling 'git status --porcelain'
2024-11-13 11:20:12,535 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fd9dfa0fdf0> has local changes
2024-11-13 11:20:12,535 [     scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/www.openmicroscopy.org
Excluded PRs:
  - PR 760 dependabot[bot] 'Bump _minutes from `6c1e198` to `98b4d02`' (status: failure)
  - PR 759 melissalinkert 'Add Bio-Formats 8.0.1 announcement and update config' (status: failure)
  - PR 758 pwalczysko 'Add workshops Kobe and Brno' (status: None)
Already up to date.

Merged PRs:
  - PR 545 sbesson 'Regenerate IDR PNG logos with transparent background'

Repository: ome/schemas
Already up to date.

Merged PRs:
  - PR 10 dependabot[bot] 'Bump specification from 6.3.1 to 6.3.3'

Repository: ome/meeting-minutes
Already up to date.


Generated by WEBSITE-push#283 (https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/283/)'
2024-11-13 11:20:12,544 [     scc.git] DEBUG [detached HEAD 4ce199a4] merge master -Dorg -Ssuccess-only
2024-11-13 11:20:12,544 [   scc.merge] INFO  Repository: ome/www.openmicroscopy.org
2024-11-13 11:20:12,544 [     scc.git] DEBUG  3 files changed, 4 insertions(+), 4 deletions(-)
2024-11-13 11:20:12,544 [   scc.merge] INFO  Excluded PRs:
2024-11-13 11:20:12,544 [   scc.merge] INFO    - PR 760 dependabot[bot] 'Bump _minutes from `6c1e198` to `98b4d02`' (status: failure)
2024-11-13 11:20:12,544 [   scc.merge] INFO    - PR 759 melissalinkert 'Add Bio-Formats 8.0.1 announcement and update config' (status: failure)
2024-11-13 11:20:12,544 [   scc.merge] INFO    - PR 758 pwalczysko 'Add workshops Kobe and Brno' (status: None)
2024-11-13 11:20:12,544 [   scc.merge] INFO  Already up to date.
2024-11-13 11:20:12,544 [   scc.merge] INFO  
2024-11-13 11:20:12,544 [   scc.merge] INFO  Merged PRs:
2024-11-13 11:20:12,544 [   scc.merge] INFO    - PR 545 sbesson 'Regenerate IDR PNG logos with transparent background'
2024-11-13 11:20:12,544 [   scc.merge] INFO  
2024-11-13 11:20:12,544 [   scc.merge] INFO  Repository: ome/schemas
2024-11-13 11:20:12,544 [   scc.merge] INFO  Already up to date.
2024-11-13 11:20:12,544 [   scc.merge] INFO  
2024-11-13 11:20:12,545 [   scc.merge] INFO  Merged PRs:
2024-11-13 11:20:12,545 [   scc.merge] INFO    - PR 10 dependabot[bot] 'Bump specification from 6.3.1 to 6.3.3'
2024-11-13 11:20:12,545 [   scc.merge] INFO  
2024-11-13 11:20:12,545 [   scc.merge] INFO  Repository: ome/meeting-minutes
2024-11-13 11:20:12,545 [   scc.merge] INFO  Already up to date.
2024-11-13 11:20:12,545 [   scc.merge] INFO  
2024-11-13 11:20:12,545 [   scc.merge] INFO  
2024-11-13 11:20:12,545 [   scc.merge] DEBUG Cleaning remote branches created for merging
2024-11-13 11:20:12,545 [     scc.git] DEBUG Calling 'git remote'
2024-11-13 11:20:12,548 [     scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/Schemas
2024-11-13 11:20:12,548 [     scc.git] DEBUG Calling 'git remote'
2024-11-13 11:20:12,551 [     scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push
2024-11-13 11:20:12,551 [     scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/_minutes
2024-11-13 11:20:12,551 [     scc.git] DEBUG Calling 'git remote'
2024-11-13 11:20:12,554 [     scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push
Update component versions
python3: can't open file '/home/omero/workspace/WEBSITE-push/Schemas/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/WEBSITE-push/Schemas/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/WEBSITE-push/_minutes/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/WEBSITE-push/_minutes/setup.py': [Errno 2] No such file or directory
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Commit all component version changes
Entering 'Schemas'
Entering '_minutes'
Entering 'Schemas'
HEAD detached from 9dc8459
nothing to commit, working tree clean
Entering '_minutes'
HEAD detached from 98b4d02
nothing to commit, working tree clean
HEAD detached from 44415a4d
nothing to commit, working tree clean
2024-11-13 11:20:25,755 [    scc.push] INFO  Merged branch pushed to https://github.com/snoopycrimecop/www.openmicroscopy.org/tree/merge_ci