Console Output
Skipping 93 KB..
Full Log-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 12:53:26,265 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 12:53:26,265 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 12:53:26,271 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 12:53:26,278 [ scc.git] DEBUG Already up to date.
2024-05-03 12:53:26,279 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-05-03 12:53:27,633 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-03 12:53:27,633 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-05-03 12:53:27,638 [ scc.git] DEBUG Calling 'git fetch origin pull/554/head'
2024-05-03 12:53:28,583 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-03 12:53:28,584 [ scc.git] DEBUG * branch refs/pull/554/head -> FETCH_HEAD
2024-05-03 12:53:28,588 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-05-03 12:53:29,402 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-03 12:53:29,402 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-05-03 12:53:29,407 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-05-03 12:53:30,252 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-03 12:53:30,253 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-05-03 12:53:30,256 [ scc.git] DEBUG Calling 'git fetch origin pull/561/head'
2024-05-03 12:53:30,824 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-03 12:53:30,824 [ scc.git] DEBUG * branch refs/pull/561/head -> FETCH_HEAD
2024-05-03 12:53:30,826 [ scc.git] DEBUG ## Unique users: []
2024-05-03 12:53:30,827 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:53:30,827 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:53:30,832 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7d54cb3a86d5f1c1c1f8deda3741a50ed25630'
2024-05-03 12:53:30,838 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:53:30,843 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) fb7d54cb3a86d5f1c1c1f8deda3741a50ed25630'
2024-05-03 12:53:30,900 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 12:53:30,906 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-05-03 12:53:30,906 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-05-03 12:53:30,906 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-05-03 12:53:30,906 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-05-03 12:53:30,906 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-05-03 12:53:30,906 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-05-03 12:53:30,906 [ scc.git] DEBUG src/js/views/right_panel_view.js | 69 +++++++++++++++++++++++++++-
2024-05-03 12:53:30,906 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-05-03 12:53:30,906 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-05-03 12:53:30,906 [ scc.git] DEBUG 9 files changed, 265 insertions(+), 5 deletions(-)
2024-05-03 12:53:31,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:53:31,059 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...902c4461b9479c4681e6bf71114616299e2adde5'
2024-05-03 12:53:31,070 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:53:31,075 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 554 (Update publish) 902c4461b9479c4681e6bf71114616299e2adde5'
2024-05-03 12:53:31,157 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 12:53:31,160 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++---
2024-05-03 12:53:31,160 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-05-03 12:53:31,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:53:31,484 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-03 12:53:31,492 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:53:31,497 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-03 12:53:31,815 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-03 12:53:31,815 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-05-03 12:53:31,815 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-05-03 12:53:31,816 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 12:53:31,822 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-05-03 12:53:31,822 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-05-03 12:53:31,822 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-05-03 12:53:31,822 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-05-03 12:53:31,822 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-05-03 12:53:31,822 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-05-03 12:53:31,822 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-05-03 12:53:31,822 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-05-03 12:53:31,822 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-05-03 12:53:31,822 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-05-03 12:53:31,822 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-05-03 12:53:31,822 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-05-03 12:53:31,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:53:31,978 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...385502576c168df58f51bc14bff6bd62a76fc15b'
2024-05-03 12:53:31,985 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:53:31,990 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) 385502576c168df58f51bc14bff6bd62a76fc15b'
2024-05-03 12:53:32,727 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-05-03 12:53:32,727 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-05-03 12:53:32,727 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-03 12:53:32,727 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-05-03 12:53:32,728 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 12:53:32,734 [ scc.git] DEBUG omero_figure/urls.py | 8 +++
2024-05-03 12:53:32,734 [ scc.git] DEBUG omero_figure/views.py | 69 +++++++++++++++++++++++
2024-05-03 12:53:32,734 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-05-03 12:53:32,734 [ scc.git] DEBUG src/index.html | 1 +
2024-05-03 12:53:32,734 [ scc.git] DEBUG src/js/models/figure_model.js | 29 +++++++++-
2024-05-03 12:53:32,734 [ scc.git] DEBUG src/js/models/panel_model.js | 37 +++++++++++-
2024-05-03 12:53:32,734 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-05-03 12:53:32,734 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-05-03 12:53:32,734 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-05-03 12:53:32,734 [ scc.git] DEBUG src/js/views/right_panel_view.js | 8 +++
2024-05-03 12:53:32,734 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-05-03 12:53:32,734 [ scc.git] DEBUG src/templates/image_display_options.template.html | 9 +++
2024-05-03 12:53:32,736 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-05-03 12:53:32,736 [ scc.git] DEBUG 13 files changed, 168 insertions(+), 10 deletions(-)
2024-05-03 12:53:32,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:53:32,891 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...629e2770fe996522b1be7f35fc9dc7ab18716ba8'
2024-05-03 12:53:32,898 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:53:32,903 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 561 (Bugfixes may2024) 629e2770fe996522b1be7f35fc9dc7ab18716ba8'
2024-05-03 12:53:32,919 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 12:53:32,922 [ scc.git] DEBUG src/js/views/channel_slider_view.js | 9 +++++----
2024-05-03 12:53:32,922 [ scc.git] DEBUG 1 file changed, 5 insertions(+), 4 deletions(-)
2024-05-03 12:53:33,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:53:33,299 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 12:53:33,339 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:53:33,339 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:53:33,345 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 12:53:33,380 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 12:53:33,388 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd82087fbe0> has no local changes
2024-05-03 12:53:33,388 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 554 jburel 'Update publish'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 561 will-moore 'Bugfixes may2024'
Generated by OMERO-plugins-push#53 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/)'
2024-05-03 12:53:33,396 [ scc.git] DEBUG [detached HEAD cab0a4be] merge master -Dorg -Ssuccess-only
2024-05-03 12:53:33,397 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:53:33,397 [ scc.repo] DEBUG ## PRs found:
2024-05-03 12:53:33,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-05-03 12:53:34,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-05-03 12:53:34,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-05-03 12:53:35,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-03 12:53:35,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-03 12:53:36,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-03 12:53:36,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-05-03 12:53:36,694 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-05-03 12:53:36,694 [ scc.repo] DEBUG ## Branches found:
2024-05-03 12:53:36,694 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-03 12:53:36,694 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:53:36,694 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:53:36,700 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 12:53:36,705 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 12:53:36,705 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 12:53:36,710 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 12:53:36,716 [ scc.git] DEBUG Already up to date.
2024-05-03 12:53:36,716 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-05-03 12:53:37,160 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-05-03 12:53:37,160 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-05-03 12:53:37,164 [ scc.git] DEBUG ## Unique users: []
2024-05-03 12:53:37,164 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:53:37,164 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:53:37,169 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-03 12:53:37,174 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:53:37,178 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-03 12:53:37,187 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-05-03 12:53:37,188 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 12:53:37,190 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-05-03 12:53:37,190 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-05-03 12:53:37,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:53:37,356 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 12:53:37,393 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:53:37,393 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:53:37,398 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 12:53:37,433 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 12:53:37,438 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd82084c550> has no local changes
2024-05-03 12:53:37,438 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Generated by OMERO-plugins-push#53 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/)'
2024-05-03 12:53:37,446 [ scc.git] DEBUG [detached HEAD 45ce12d] merge master -Dorg -Ssuccess-only
2024-05-03 12:53:37,446 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:53:37,446 [ scc.repo] DEBUG ## PRs found:
2024-05-03 12:53:37,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-05-03 12:53:38,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-05-03 12:53:38,326 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-03 12:53:38,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-03 12:53:39,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-03 12:53:39,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-03 12:53:40,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-03 12:53:40,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-05-03 12:53:40,956 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-03 12:53:40,956 [ scc.repo] DEBUG ## Branches found:
2024-05-03 12:53:40,956 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-03 12:53:40,956 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:53:40,956 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:53:40,962 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 12:53:40,966 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 12:53:40,966 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 12:53:40,971 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 12:53:40,980 [ scc.git] DEBUG Already up to date.
2024-05-03 12:53:40,980 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-05-03 12:53:41,377 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-05-03 12:53:41,378 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-05-03 12:53:41,382 [ scc.git] DEBUG ## Unique users: []
2024-05-03 12:53:41,382 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:53:41,382 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:53:41,387 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-05-03 12:53:41,391 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:53:41,395 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-05-03 12:53:41,405 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 12:53:41,409 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-05-03 12:53:41,410 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-05-03 12:53:41,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:53:41,573 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 12:53:41,609 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:53:41,609 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:53:41,613 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 12:53:41,647 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 12:53:41,653 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd8208509d0> has no local changes
2024-05-03 12:53:41,654 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Generated by OMERO-plugins-push#53 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/)'
2024-05-03 12:53:41,661 [ scc.git] DEBUG [detached HEAD ff3a2f5] merge master -Dorg -Ssuccess-only
2024-05-03 12:53:41,662 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:53:41,662 [ scc.repo] DEBUG ## PRs found:
2024-05-03 12:53:42,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-05-03 12:53:42,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/474 HTTP/1.1" 200 None
2024-05-03 12:53:43,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/474/comments HTTP/1.1" 200 None
2024-05-03 12:53:43,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/8a03e780c490251af547bc7f26a31af056816ad5 HTTP/1.1" 200 None
2024-05-03 12:53:44,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/8a03e780c490251af547bc7f26a31af056816ad5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-03 12:53:44,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/8a03e780c490251af547bc7f26a31af056816ad5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-03 12:53:44,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/8a03e780c490251af547bc7f26a31af056816ad5 HTTP/1.1" 200 None
2024-05-03 12:53:45,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/8a03e780c490251af547bc7f26a31af056816ad5?per_page=1 HTTP/1.1" 200 2
2024-05-03 12:53:45,394 [ scc.repo] DEBUG - PR 474 will-moore 'Img data error handling'
2024-05-03 12:53:45,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-05-03 12:53:46,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-05-03 12:53:46,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-03 12:53:47,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-03 12:53:47,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-03 12:53:48,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-03 12:53:48,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-05-03 12:53:48,646 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-03 12:53:49,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470 HTTP/1.1" 200 None
2024-05-03 12:53:49,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470/comments HTTP/1.1" 200 None
2024-05-03 12:53:50,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99 HTTP/1.1" 200 None
2024-05-03 12:53:50,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-03 12:53:51,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-03 12:53:51,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99 HTTP/1.1" 200 None
2024-05-03 12:53:51,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99?per_page=1 HTTP/1.1" 200 2
2024-05-03 12:53:51,915 [ scc.repo] DEBUG - PR 470 will-moore 'Movie playing waits for planes'
2024-05-03 12:53:52,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469 HTTP/1.1" 200 None
2024-05-03 12:53:52,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-05-03 12:53:53,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-03 12:53:54,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-03 12:53:54,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-05-03 12:53:55,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/ca8b5aabef9a5358f93add750f4cbb51c864b7fe?per_page=1 HTTP/1.1" 200 2
2024-05-03 12:53:55,012 [ scc.repo] DEBUG - PR 469 will-moore 'changelog 0.14.0'
2024-05-03 12:53:55,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-05-03 12:53:55,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-05-03 12:53:56,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-05-03 12:53:56,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-03 12:53:57,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-03 12:53:57,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-05-03 12:53:58,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/409c3429dd72d05fef895dcca6d133f8340eabf4?per_page=1 HTTP/1.1" 200 2
2024-05-03 12:53:58,343 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-05-03 12:53:58,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-05-03 12:53:59,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-05-03 12:53:59,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-03 12:54:00,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-03 12:54:00,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-03 12:54:01,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-05-03 12:54:01,146 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-05-03 12:54:01,146 [ scc.repo] DEBUG ## Branches found:
2024-05-03 12:54:01,146 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-03 12:54:01,147 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:01,147 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:01,152 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 12:54:01,156 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 12:54:01,156 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 12:54:01,162 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 12:54:01,167 [ scc.git] DEBUG Already up to date.
2024-05-03 12:54:01,167 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-05-03 12:54:01,721 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-03 12:54:01,721 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-05-03 12:54:01,725 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-05-03 12:54:03,486 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-03 12:54:03,486 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-05-03 12:54:03,491 [ scc.git] DEBUG Calling 'git fetch origin pull/469/head'
2024-05-03 12:54:03,922 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-03 12:54:03,922 [ scc.git] DEBUG * branch refs/pull/469/head -> FETCH_HEAD
2024-05-03 12:54:03,926 [ scc.git] DEBUG Calling 'git fetch origin pull/470/head'
2024-05-03 12:54:05,397 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-03 12:54:05,398 [ scc.git] DEBUG * branch refs/pull/470/head -> FETCH_HEAD
2024-05-03 12:54:05,402 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-05-03 12:54:05,893 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-03 12:54:05,894 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-05-03 12:54:05,898 [ scc.git] DEBUG Calling 'git fetch origin pull/474/head'
2024-05-03 12:54:06,941 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-03 12:54:06,941 [ scc.git] DEBUG * branch refs/pull/474/head -> FETCH_HEAD
2024-05-03 12:54:06,946 [ scc.git] DEBUG ## Unique users: []
2024-05-03 12:54:06,946 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:06,946 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:06,951 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-03 12:54:06,956 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:06,960 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-03 12:54:06,971 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 12:54:06,974 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-05-03 12:54:06,974 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-05-03 12:54:06,974 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-05-03 12:54:07,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:54:07,149 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-05-03 12:54:07,156 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:07,160 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-05-03 12:54:07,201 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 12:54:07,205 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-05-03 12:54:07,206 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-05-03 12:54:07,206 [ scc.git] DEBUG src/app/header.html | 5 +
2024-05-03 12:54:07,206 [ scc.git] DEBUG src/app/header.js | 46 ++++++++-
2024-05-03 12:54:07,206 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-05-03 12:54:07,206 [ scc.git] DEBUG src/utils/figure.js | 220 ++++++++++++++++++++++++++++++++++++++++++
2024-05-03 12:54:07,206 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 1 -
2024-05-03 12:54:07,206 [ scc.git] DEBUG 7 files changed, 294 insertions(+), 7 deletions(-)
2024-05-03 12:54:07,206 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-05-03 12:54:07,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:54:07,565 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-05-03 12:54:07,571 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:07,577 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 469 (changelog 0.14.0) ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-05-03 12:54:07,600 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 12:54:07,603 [ scc.git] DEBUG CHANGELOG.md | 9 ++++++++-
2024-05-03 12:54:07,603 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-05-03 12:54:07,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:54:07,976 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99'
2024-05-03 12:54:07,984 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:07,988 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 470 (Movie playing waits for planes) 6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99'
2024-05-03 12:54:08,068 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-05-03 12:54:08,069 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 12:54:08,075 [ scc.git] DEBUG css/app.css | 30 +++++++
2024-05-03 12:54:08,075 [ scc.git] DEBUG src/controls/dimension-slider.js | 6 +-
2024-05-03 12:54:08,075 [ scc.git] DEBUG src/events/events.js | 4 +
2024-05-03 12:54:08,075 [ scc.git] DEBUG src/index-dev.html | 6 +-
2024-05-03 12:54:08,075 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 4 +-
2024-05-03 12:54:08,075 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 165 +++++++++++++++++++++++++------------
2024-05-03 12:54:08,075 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 61 +++++++++++++-
2024-05-03 12:54:08,075 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 15 +++-
2024-05-03 12:54:08,076 [ scc.git] DEBUG 8 files changed, 228 insertions(+), 63 deletions(-)
2024-05-03 12:54:08,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:54:08,379 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-03 12:54:08,386 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:08,391 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-03 12:54:08,408 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-05-03 12:54:08,408 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 12:54:08,411 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-05-03 12:54:08,411 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-05-03 12:54:08,411 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-05-03 12:54:08,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:54:08,803 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8a03e780c490251af547bc7f26a31af056816ad5'
2024-05-03 12:54:08,811 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:08,815 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 474 (Img data error handling) 8a03e780c490251af547bc7f26a31af056816ad5'
2024-05-03 12:54:09,074 [ scc.git] DEBUG Auto-merging css/app.css
2024-05-03 12:54:09,074 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-05-03 12:54:09,074 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-05-03 12:54:09,074 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-05-03 12:54:09,074 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-05-03 12:54:09,075 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 12:54:09,079 [ scc.git] DEBUG css/app.css | 4 ++++
2024-05-03 12:54:09,079 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 18 +++++++++++-----
2024-05-03 12:54:09,079 [ scc.git] DEBUG src/app/context.js | 3 +++
2024-05-03 12:54:09,079 [ scc.git] DEBUG src/model/image_info.js | 50 +++++++++++++++++++++++++++++++++++++++++++
2024-05-03 12:54:09,079 [ scc.git] DEBUG src/utils/constants.js | 1 +
2024-05-03 12:54:09,079 [ scc.git] DEBUG 5 files changed, 71 insertions(+), 5 deletions(-)
2024-05-03 12:54:09,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:54:09,235 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 12:54:09,274 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:09,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:09,279 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 12:54:09,315 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 12:54:09,324 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd8208355b0> has no local changes
2024-05-03 12:54:09,324 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 469 will-moore 'changelog 0.14.0'
- PR 470 will-moore 'Movie playing waits for planes'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 474 will-moore 'Img data error handling'
Generated by OMERO-plugins-push#53 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/)'
2024-05-03 12:54:09,334 [ scc.git] DEBUG [detached HEAD 7549b7a] merge master -Dorg -Ssuccess-only
2024-05-03 12:54:09,334 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:54:09,334 [ scc.repo] DEBUG ## PRs found:
2024-05-03 12:54:09,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-05-03 12:54:10,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-05-03 12:54:10,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-05-03 12:54:11,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-03 12:54:11,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-03 12:54:12,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-03 12:54:12,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-03 12:54:13,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-05-03 12:54:13,220 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-05-03 12:54:13,220 [ scc.repo] DEBUG ## Branches found:
2024-05-03 12:54:13,220 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-03 12:54:13,220 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:13,221 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:13,226 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 12:54:13,230 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 12:54:13,230 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 12:54:13,235 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 12:54:13,241 [ scc.git] DEBUG Already up to date.
2024-05-03 12:54:13,241 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-05-03 12:54:13,635 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-05-03 12:54:13,636 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-05-03 12:54:13,640 [ scc.git] DEBUG ## Unique users: []
2024-05-03 12:54:13,640 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:13,640 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:13,645 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-03 12:54:13,651 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:13,656 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-03 12:54:13,665 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 12:54:13,668 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-05-03 12:54:13,668 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-05-03 12:54:13,668 [ scc.git] DEBUG requirements.txt | 2 +-
2024-05-03 12:54:13,668 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-05-03 12:54:13,668 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-05-03 12:54:13,668 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-05-03 12:54:13,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:54:13,816 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 12:54:13,854 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:13,854 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:13,860 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 12:54:13,900 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 12:54:13,907 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd82084d550> has no local changes
2024-05-03 12:54:13,907 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Generated by OMERO-plugins-push#53 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/)'
2024-05-03 12:54:13,915 [ scc.git] DEBUG [detached HEAD 003093a] merge master -Dorg -Ssuccess-only
2024-05-03 12:54:13,915 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:54:13,916 [ scc.repo] DEBUG ## PRs found:
2024-05-03 12:54:14,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-05-03 12:54:14,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-05-03 12:54:15,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-05-03 12:54:15,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-03 12:54:16,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-03 12:54:16,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-03 12:54:17,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-05-03 12:54:17,248 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-03 12:54:17,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-05-03 12:54:18,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-05-03 12:54:18,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-03 12:54:19,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-03 12:54:19,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-03 12:54:20,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-05-03 12:54:20,033 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-03 12:54:20,034 [ scc.repo] DEBUG ## Branches found:
2024-05-03 12:54:20,034 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-03 12:54:20,034 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:20,034 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:20,040 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 12:54:20,045 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 12:54:20,045 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 12:54:20,050 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 12:54:20,054 [ scc.git] DEBUG Already up to date.
2024-05-03 12:54:20,055 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-05-03 12:54:21,428 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-03 12:54:21,428 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-05-03 12:54:21,433 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-05-03 12:54:21,884 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-03 12:54:21,884 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-05-03 12:54:21,889 [ scc.git] DEBUG ## Unique users: []
2024-05-03 12:54:21,889 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:21,890 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:21,894 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-03 12:54:21,902 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:21,906 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-03 12:54:21,937 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-05-03 12:54:21,937 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-05-03 12:54:21,937 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-03 12:54:21,937 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-03 12:54:21,937 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-03 12:54:21,937 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-03 12:54:21,942 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-03 12:54:21,947 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-03 12:54:22,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:54:22,117 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-03 12:54:22,122 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-03 12:54:22,127 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#53](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-05-03 12:54:22,131 [ scc.config] DEBUG Found github.token
2024-05-03 12:54:22,131 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-05-03 12:54:22,131 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-03 12:54:22,137 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:22,141 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-03 12:54:22,157 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-03 12:54:22,157 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-03 12:54:22,157 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-05-03 12:54:22,157 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-03 12:54:22,157 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-03 12:54:22,162 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-03 12:54:22,168 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-03 12:54:22,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:54:22,532 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-03 12:54:22,538 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-03 12:54:22,542 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#53](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-05-03 12:54:22,546 [ scc.config] DEBUG Found github.token
2024-05-03 12:54:22,547 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-05-03 12:54:22,547 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 12:54:22,582 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:22,582 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:22,586 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 12:54:22,622 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 12:54:22,628 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd820835550> has no local changes
2024-05-03 12:54:22,628 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Generated by OMERO-plugins-push#53 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/)'
2024-05-03 12:54:22,636 [ scc.git] DEBUG [detached HEAD ae26754] merge master -Dorg -Ssuccess-only
2024-05-03 12:54:22,637 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:54:22,637 [ scc.repo] DEBUG ## PRs found:
2024-05-03 12:54:23,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-05-03 12:54:23,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-05-03 12:54:23,661 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-03 12:54:24,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-03 12:54:24,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-03 12:54:25,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-03 12:54:25,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-03 12:54:26,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-05-03 12:54:26,203 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-03 12:54:26,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-05-03 12:54:26,669 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-03 12:54:27,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-03 12:54:27,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-03 12:54:28,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-03 12:54:28,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-03 12:54:29,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-05-03 12:54:29,137 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-03 12:54:29,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-05-03 12:54:29,624 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-03 12:54:30,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-03 12:54:31,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-03 12:54:31,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-03 12:54:31,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-03 12:54:32,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-05-03 12:54:32,377 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-03 12:54:32,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-05-03 12:54:33,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-05-03 12:54:33,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-05-03 12:54:34,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-05-03 12:54:34,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-05-03 12:54:35,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-05-03 12:54:35,256 [ scc.repo] DEBUG ## Branches found:
2024-05-03 12:54:35,256 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-03 12:54:35,256 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:35,257 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:35,262 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 12:54:35,267 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 12:54:35,267 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 12:54:35,271 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 12:54:35,276 [ scc.git] DEBUG Already up to date.
2024-05-03 12:54:35,276 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-05-03 12:54:35,697 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-03 12:54:35,697 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-05-03 12:54:35,701 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-05-03 12:54:36,067 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-03 12:54:36,068 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-05-03 12:54:36,072 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-05-03 12:54:36,439 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-03 12:54:36,439 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-05-03 12:54:36,444 [ scc.git] DEBUG ## Unique users: []
2024-05-03 12:54:36,444 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:36,444 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:36,449 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-05-03 12:54:36,455 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:36,460 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-05-03 12:54:36,488 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 12:54:36,491 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-05-03 12:54:36,491 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-05-03 12:54:36,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:54:36,660 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-05-03 12:54:36,666 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:36,670 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 129 (Bump @babel/traverse from 7.21.4 to 7.23.2) 733f52703019d4b6d7e375c121a25c107b64dbec'
2024-05-03 12:54:36,715 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-03 12:54:36,716 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 12:54:36,718 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-05-03 12:54:36,718 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-05-03 12:54:37,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:54:37,081 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-05-03 12:54:37,087 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:37,092 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (Bump axios from 1.3.5 to 1.6.0) a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-05-03 12:54:37,102 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-03 12:54:37,103 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 12:54:37,106 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-05-03 12:54:37,106 [ scc.git] DEBUG package.json | 2 +-
2024-05-03 12:54:37,106 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-05-03 12:54:37,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:54:37,478 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 12:54:37,515 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:37,515 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:37,520 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 12:54:37,553 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 12:54:37,559 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd82084afd0> has no local changes
2024-05-03 12:54:37,559 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Generated by OMERO-plugins-push#53 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/)'
2024-05-03 12:54:37,567 [ scc.git] DEBUG [detached HEAD 4066474] merge master -Dorg -Ssuccess-only
2024-05-03 12:54:37,567 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:54:37,567 [ scc.repo] DEBUG ## PRs found:
2024-05-03 12:54:37,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-05-03 12:54:38,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-05-03 12:54:38,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-03 12:54:39,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-03 12:54:39,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-03 12:54:40,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-05-03 12:54:40,416 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-05-03 12:54:40,416 [ scc.repo] DEBUG ## Branches found:
2024-05-03 12:54:40,416 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-03 12:54:40,416 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:40,416 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:40,421 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 12:54:40,425 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 12:54:40,426 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 12:54:40,430 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 12:54:40,435 [ scc.git] DEBUG Already up to date.
2024-05-03 12:54:40,435 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-03 12:54:40,845 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-05-03 12:54:40,845 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-03 12:54:40,850 [ scc.git] DEBUG ## Unique users: []
2024-05-03 12:54:40,850 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:40,850 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:40,855 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-03 12:54:40,860 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:40,864 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-03 12:54:40,872 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 12:54:41,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:54:41,041 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 12:54:41,077 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:41,077 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:41,081 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 12:54:41,115 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 12:54:41,120 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd81079c340> has no local changes
2024-05-03 12:54:41,120 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Generated by OMERO-plugins-push#53 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/)'
2024-05-03 12:54:41,127 [ scc.git] DEBUG [detached HEAD f9d351a] merge master -Dorg -Ssuccess-only
2024-05-03 12:54:41,127 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:54:41,128 [ scc.repo] DEBUG ## PRs found:
2024-05-03 12:54:41,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-05-03 12:54:42,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-05-03 12:54:42,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-05-03 12:54:42,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-05-03 12:54:43,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-03 12:54:43,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-03 12:54:44,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-03 12:54:44,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-05-03 12:54:44,877 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-03 12:54:44,877 [ scc.repo] DEBUG ## Branches found:
2024-05-03 12:54:44,877 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-03 12:54:44,877 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:44,877 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:44,883 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 12:54:44,887 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 12:54:44,888 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 12:54:44,892 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 12:54:44,897 [ scc.git] DEBUG Already up to date.
2024-05-03 12:54:44,897 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-05-03 12:54:45,294 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-05-03 12:54:45,294 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-05-03 12:54:45,299 [ scc.git] DEBUG ## Unique users: []
2024-05-03 12:54:45,299 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:45,299 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:45,304 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-05-03 12:54:45,309 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:45,313 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-05-03 12:54:45,322 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-05-03 12:54:45,323 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 12:54:45,325 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-05-03 12:54:45,325 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-05-03 12:54:45,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:54:45,518 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 12:54:45,553 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:45,553 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:45,557 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 12:54:45,591 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 12:54:45,597 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd8107c65b0> has no local changes
2024-05-03 12:54:45,597 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Generated by OMERO-plugins-push#53 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/)'
2024-05-03 12:54:45,604 [ scc.git] DEBUG [detached HEAD 7cefe5f] merge master -Dorg -Ssuccess-only
2024-05-03 12:54:45,604 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:54:45,604 [ scc.repo] DEBUG ## PRs found:
2024-05-03 12:54:46,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-05-03 12:54:46,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-05-03 12:54:47,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-05-03 12:54:47,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-03 12:54:48,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-03 12:54:48,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-03 12:54:48,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-05-03 12:54:48,981 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-03 12:54:48,981 [ scc.repo] DEBUG ## Branches found:
2024-05-03 12:54:48,982 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-03 12:54:48,982 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:48,982 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:48,988 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 12:54:48,992 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 12:54:48,993 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 12:54:48,997 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 12:54:49,003 [ scc.git] DEBUG Already up to date.
2024-05-03 12:54:49,003 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-03 12:54:49,429 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-05-03 12:54:49,429 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-03 12:54:49,434 [ scc.git] DEBUG ## Unique users: []
2024-05-03 12:54:49,434 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:49,434 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:49,440 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-03 12:54:49,445 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:49,449 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-03 12:54:49,480 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-05-03 12:54:49,480 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-05-03 12:54:49,480 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-05-03 12:54:49,480 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-05-03 12:54:49,480 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-05-03 12:54:49,480 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-05-03 12:54:49,480 [ scc.git] DEBUG Auto-merging setup.py
2024-05-03 12:54:49,480 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-05-03 12:54:49,481 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-03 12:54:49,481 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-03 12:54:49,485 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-03 12:54:49,491 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-05-03 12:54:49,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:54:49,653 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-03 12:54:49,659 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-03 12:54:49,663 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#53](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/signup_settings.py
- omero_signup/views.py
- omero_signup/urls.py
--conflicts
2024-05-03 12:54:49,667 [ scc.config] DEBUG Found github.token
2024-05-03 12:54:49,668 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-05-03 12:54:49,668 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 12:54:49,703 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:49,703 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:49,707 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 12:54:49,741 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 12:54:49,746 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd820850e80> has no local changes
2024-05-03 12:54:49,746 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Generated by OMERO-plugins-push#53 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/)'
2024-05-03 12:54:49,753 [ scc.git] DEBUG [detached HEAD ecab688] merge master -Dorg -Ssuccess-only
2024-05-03 12:54:49,753 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:54:49,753 [ scc.repo] DEBUG ## PRs found:
2024-05-03 12:54:50,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-05-03 12:54:50,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-05-03 12:54:51,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-05-03 12:54:51,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-03 12:54:52,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-03 12:54:52,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-03 12:54:52,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-05-03 12:54:52,960 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-03 12:54:52,960 [ scc.repo] DEBUG ## Branches found:
2024-05-03 12:54:52,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-03 12:54:52,960 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:52,960 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:52,966 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 12:54:52,971 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 12:54:52,971 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 12:54:52,977 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 12:54:52,983 [ scc.git] DEBUG Already up to date.
2024-05-03 12:54:52,983 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-05-03 12:54:53,364 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-05-03 12:54:53,364 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-05-03 12:54:53,369 [ scc.git] DEBUG ## Unique users: []
2024-05-03 12:54:53,369 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:53,370 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:53,374 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-05-03 12:54:53,380 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:53,384 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-05-03 12:54:53,400 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 12:54:53,402 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-05-03 12:54:53,402 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-05-03 12:54:53,403 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-05-03 12:54:53,403 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-05-03 12:54:53,403 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-05-03 12:54:53,403 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-05-03 12:54:53,404 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-05-03 12:54:53,404 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-05-03 12:54:53,404 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-05-03 12:54:53,405 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-05-03 12:54:53,405 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-05-03 12:54:53,405 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-05-03 12:54:53,405 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-05-03 12:54:53,405 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-05-03 12:54:53,405 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-05-03 12:54:53,405 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-05-03 12:54:53,405 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-05-03 12:54:53,405 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-05-03 12:54:53,405 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-05-03 12:54:53,405 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-05-03 12:54:53,405 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-05-03 12:54:53,405 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-05-03 12:54:53,405 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-05-03 12:54:53,405 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-05-03 12:54:53,405 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-05-03 12:54:53,405 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-05-03 12:54:53,405 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-05-03 12:54:53,405 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-05-03 12:54:53,406 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-05-03 12:54:53,406 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-05-03 12:54:53,406 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-05-03 12:54:53,406 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-05-03 12:54:53,406 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-05-03 12:54:53,406 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-05-03 12:54:53,406 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-05-03 12:54:53,406 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-05-03 12:54:53,406 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-05-03 12:54:53,406 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-05-03 12:54:53,406 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-05-03 12:54:53,406 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-05-03 12:54:53,406 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-05-03 12:54:53,406 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-05-03 12:54:53,406 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-05-03 12:54:53,406 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-05-03 12:54:53,406 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-05-03 12:54:53,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:54:53,558 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 12:54:53,595 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:53,595 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:53,600 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 12:54:53,640 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 12:54:53,647 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd82084adf0> has no local changes
2024-05-03 12:54:53,647 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Generated by OMERO-plugins-push#53 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/)'
2024-05-03 12:54:53,656 [ scc.git] DEBUG [detached HEAD 7271d11] merge master -Dorg -Ssuccess-only
2024-05-03 12:54:53,657 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:54:53,657 [ scc.repo] DEBUG ## PRs found:
2024-05-03 12:54:53,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-05-03 12:54:53,983 [ scc.repo] DEBUG ## Branches found:
2024-05-03 12:54:53,983 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-03 12:54:53,984 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:53,984 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:53,989 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 12:54:53,993 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 12:54:53,993 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 12:54:53,998 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 12:54:54,002 [ scc.git] DEBUG Already up to date.
2024-05-03 12:54:54,003 [ scc.git] DEBUG ## Unique users: []
2024-05-03 12:54:54,003 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:54,003 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:54,007 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 12:54:54,045 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:54,045 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:54,050 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 12:54:54,084 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 12:54:54,089 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd8107ebfa0> has no local changes
2024-05-03 12:54:54,089 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-upload
Already up to date.
Generated by OMERO-plugins-push#53 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/)'
2024-05-03 12:54:54,096 [ scc.git] DEBUG [detached HEAD cd2638d] merge master -Dorg -Ssuccess-only
2024-05-03 12:54:54,096 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:54:54,096 [ scc.repo] DEBUG ## PRs found:
2024-05-03 12:54:54,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-05-03 12:54:54,418 [ scc.repo] DEBUG ## Branches found:
2024-05-03 12:54:54,418 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-03 12:54:54,418 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:54,418 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:54,423 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 12:54:54,427 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 12:54:54,427 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 12:54:54,432 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 12:54:54,436 [ scc.git] DEBUG Already up to date.
2024-05-03 12:54:54,436 [ scc.git] DEBUG ## Unique users: []
2024-05-03 12:54:54,436 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:54,436 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:54,440 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 12:54:54,476 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:54,476 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:54,480 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 12:54:54,514 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 12:54:54,519 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd810780f70> has no local changes
2024-05-03 12:54:54,519 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-virtual-microscope
Already up to date.
Generated by OMERO-plugins-push#53 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/)'
2024-05-03 12:54:54,526 [ scc.git] DEBUG [detached HEAD d7426f0] merge master -Dorg -Ssuccess-only
2024-05-03 12:54:54,526 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:54:54,527 [ scc.git] INFO Overriding base-branch from master to main
2024-05-03 12:54:54,527 [ scc.repo] DEBUG ## PRs found:
2024-05-03 12:54:54,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-05-03 12:54:55,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-05-03 12:54:55,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-05-03 12:54:56,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-05-03 12:54:56,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-03 12:54:57,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-03 12:54:57,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-03 12:54:58,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-03 12:54:58,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-05-03 12:54:58,740 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-03 12:54:58,740 [ scc.repo] DEBUG ## Branches found:
2024-05-03 12:54:58,740 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-03 12:54:58,740 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:58,740 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:58,746 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-05-03 12:54:58,750 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 12:54:58,750 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-05-03 12:54:58,754 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-05-03 12:54:58,759 [ scc.git] DEBUG Already up to date.
2024-05-03 12:54:58,760 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-05-03 12:54:59,140 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-05-03 12:54:59,140 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-05-03 12:54:59,144 [ scc.git] DEBUG ## Unique users: []
2024-05-03 12:54:59,144 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:59,144 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:59,150 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-03 12:54:59,155 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:59,160 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-03 12:54:59,318 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-05-03 12:54:59,319 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-05-03 12:54:59,319 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-03 12:54:59,319 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-03 12:54:59,325 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-03 12:54:59,331 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-05-03 12:54:59,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:54:59,494 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-03 12:54:59,501 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-03 12:54:59,506 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#53](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-05-03 12:54:59,510 [ scc.config] DEBUG Found github.token
2024-05-03 12:54:59,510 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-05-03 12:54:59,510 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 12:54:59,547 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:59,547 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:59,552 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 12:54:59,586 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 12:54:59,592 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd810773430> has no local changes
2024-05-03 12:54:59,592 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Generated by OMERO-plugins-push#53 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/)'
2024-05-03 12:54:59,599 [ scc.git] DEBUG [detached HEAD 111cc8a] merge master -Dorg -Ssuccess-only
2024-05-03 12:54:59,599 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:54:59,599 [ scc.repo] DEBUG ## PRs found:
2024-05-03 12:54:59,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-05-03 12:54:59,940 [ scc.repo] DEBUG ## Branches found:
2024-05-03 12:54:59,940 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-03 12:54:59,940 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:59,940 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:59,945 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 12:54:59,950 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 12:54:59,950 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 12:54:59,954 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 12:54:59,959 [ scc.git] DEBUG Already up to date.
2024-05-03 12:54:59,959 [ scc.git] DEBUG ## Unique users: []
2024-05-03 12:54:59,959 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:59,959 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:54:59,963 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 12:54:59,998 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:54:59,998 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:55:00,003 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 12:55:00,036 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 12:55:00,041 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd81077ae50> has no local changes
2024-05-03 12:55:00,041 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-weberror
Already up to date.
Generated by OMERO-plugins-push#53 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/)'
2024-05-03 12:55:00,048 [ scc.git] DEBUG [detached HEAD b77990d] merge master -Dorg -Ssuccess-only
2024-05-03 12:55:00,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:55:00,049 [ scc.repo] DEBUG ## PRs found:
2024-05-03 12:55:00,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-05-03 12:55:00,370 [ scc.repo] DEBUG ## Branches found:
2024-05-03 12:55:00,370 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-03 12:55:00,371 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:55:00,371 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:55:00,375 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 12:55:00,379 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 12:55:00,379 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 12:55:00,383 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 12:55:00,388 [ scc.git] DEBUG Already up to date.
2024-05-03 12:55:00,388 [ scc.git] DEBUG ## Unique users: []
2024-05-03 12:55:00,388 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:55:00,388 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:55:00,392 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 12:55:00,489 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:55:00,489 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:55:00,493 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 12:55:00,527 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 12:55:00,532 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd8106bc940> has no local changes
2024-05-03 12:55:00,532 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-webtest
Already up to date.
Generated by OMERO-plugins-push#53 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/)'
2024-05-03 12:55:00,540 [ scc.git] DEBUG [detached HEAD 7cab999] merge master -Dorg -Ssuccess-only
2024-05-03 12:55:00,540 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:55:00,540 [ scc.repo] DEBUG ## PRs found:
2024-05-03 12:55:00,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-05-03 12:55:01,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-05-03 12:55:01,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-05-03 12:55:02,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-03 12:55:02,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-03 12:55:03,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-03 12:55:03,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-05-03 12:55:03,686 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-05-03 12:55:03,686 [ scc.repo] DEBUG ## Branches found:
2024-05-03 12:55:03,686 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-03 12:55:03,686 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:55:03,686 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:55:03,691 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 12:55:03,695 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 12:55:03,695 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 12:55:03,700 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 12:55:03,705 [ scc.git] DEBUG Already up to date.
2024-05-03 12:55:03,705 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-05-03 12:55:04,262 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-05-03 12:55:04,262 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-05-03 12:55:04,266 [ scc.git] DEBUG ## Unique users: []
2024-05-03 12:55:04,267 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:55:04,267 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:55:04,272 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-03 12:55:04,277 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:55:04,281 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-03 12:55:04,382 [ scc.git] DEBUG Auto-merging Dockerfile
2024-05-03 12:55:04,382 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-05-03 12:55:04,382 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-03 12:55:04,382 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-03 12:55:04,387 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-03 12:55:04,393 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-05-03 12:55:04,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:55:04,552 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-03 12:55:04,557 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-03 12:55:04,561 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#53](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-05-03 12:55:04,565 [ scc.config] DEBUG Found github.token
2024-05-03 12:55:04,565 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-05-03 12:55:04,566 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 12:55:04,600 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:55:04,601 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:55:04,605 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 12:55:04,639 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 12:55:04,644 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd8107269d0> has no local changes
2024-05-03 12:55:04,644 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Generated by OMERO-plugins-push#53 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/)'
2024-05-03 12:55:04,652 [ scc.git] DEBUG [detached HEAD 8c734d7] merge master -Dorg -Ssuccess-only
2024-05-03 12:55:04,652 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:55:04,652 [ scc.git] INFO Overriding base-branch from master to develop
2024-05-03 12:55:04,652 [ scc.repo] DEBUG ## PRs found:
2024-05-03 12:55:05,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-05-03 12:55:05,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-05-03 12:55:06,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-05-03 12:55:06,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-05-03 12:55:07,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-05-03 12:55:07,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-05-03 12:55:08,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-05-03 12:55:08,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-03 12:55:09,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-03 12:55:09,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-03 12:55:10,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-05-03 12:55:10,067 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-03 12:55:10,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-05-03 12:55:11,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-05-03 12:55:11,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-05-03 12:55:12,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-05-03 12:55:12,048 [ scc.repo] DEBUG ## Branches found:
2024-05-03 12:55:12,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-03 12:55:12,048 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:55:12,048 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:55:12,053 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-05-03 12:55:12,059 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 12:55:12,059 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-05-03 12:55:12,064 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-05-03 12:55:12,071 [ scc.git] DEBUG Already up to date.
2024-05-03 12:55:12,071 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-05-03 12:55:12,626 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-05-03 12:55:12,626 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-05-03 12:55:12,630 [ scc.git] DEBUG ## Unique users: []
2024-05-03 12:55:12,631 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:55:12,631 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:55:12,636 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-03 12:55:12,642 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:55:12,646 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-03 12:55:12,660 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-05-03 12:55:12,660 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-05-03 12:55:12,661 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-03 12:55:12,661 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-03 12:55:12,665 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-03 12:55:12,671 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-03 12:55:12,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:55:12,841 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-03 12:55:12,848 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-03 12:55:12,853 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#53](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-05-03 12:55:12,857 [ scc.config] DEBUG Found github.token
2024-05-03 12:55:12,857 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-05-03 12:55:12,857 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 12:55:12,892 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 12:55:12,892 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 12:55:12,896 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 12:55:12,930 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 12:55:12,935 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd8106bcbb0> has no local changes
2024-05-03 12:55:12,935 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#53 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/)'
2024-05-03 12:55:12,942 [ scc.git] DEBUG [detached HEAD d9342f2] merge master -Dorg -Ssuccess-only
2024-05-03 12:55:12,942 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:55:12,943 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 12:55:13,010 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-05-03 12:55:13,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:55:13,266 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-05-03 12:55:13,270 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-05-03 12:55:13,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:55:13,683 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-05-03 12:55:13,687 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-05-03 12:55:14,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:55:14,109 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-05-03 12:55:14,113 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-05-03 12:55:14,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:55:14,536 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-05-03 12:55:14,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:55:14,938 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-05-03 12:55:14,942 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-05-03 12:55:15,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:55:15,344 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-05-03 12:55:15,348 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-05-03 12:55:15,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:55:15,752 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-05-03 12:55:15,757 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-05-03 12:55:16,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:55:16,164 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-05-03 12:55:16,168 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-05-03 12:55:16,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:55:16,586 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-05-03 12:55:16,591 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-05-03 12:55:16,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:55:17,005 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-05-03 12:55:17,010 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-05-03 12:55:17,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:55:17,414 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-05-03 12:55:17,418 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-05-03 12:55:17,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:55:17,838 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-05-03 12:55:17,842 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-05-03 12:55:18,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:55:18,262 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-05-03 12:55:18,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:55:18,663 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-05-03 12:55:19,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:55:19,076 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-05-03 12:55:19,081 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-05-03 12:55:19,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:55:19,493 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-05-03 12:55:19,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:55:19,893 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-05-03 12:55:20,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:55:20,302 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-05-03 12:55:20,307 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-05-03 12:55:20,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:55:20,721 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-05-03 12:55:20,725 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-05-03 12:55:21,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:55:21,130 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-05-03 12:55:21,135 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-05-03 12:55:21,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:55:21,537 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-05-03 12:55:21,541 [ scc.config] DEBUG Found submodule.scripts.url
2024-05-03 12:55:21,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 12:55:21,952 [ scc.config] DEBUG Found submodule.scripts.branch
2024-05-03 12:55:21,952 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 12:55:22,030 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd823cf0460> has local changes
2024-05-03 12:55:22,030 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 362 dependabot[bot] 'Bump scripts from `2078ac7` to `5a90893`'
- PR 365 dependabot[bot] 'Bump omero-figure from `ded0caa` to `6bdf72c`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 554 jburel 'Update publish'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 561 will-moore 'Bugfixes may2024'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 469 will-moore 'changelog 0.14.0'
- PR 470 will-moore 'Movie playing waits for planes'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 474 will-moore 'Img data error handling'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#53 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/53/)'
2024-05-03 12:55:22,044 [ scc.git] DEBUG [detached HEAD ab9ab1f] merge master -Dorg -Ssuccess-only
2024-05-03 12:55:22,044 [ scc.merge] INFO Repository: ome/omero-plugins
2024-05-03 12:55:22,044 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-05-03 12:55:22,044 [ scc.merge] INFO Already up to date.
2024-05-03 12:55:22,044 [ scc.merge] INFO
2024-05-03 12:55:22,045 [ scc.merge] INFO Merged PRs:
2024-05-03 12:55:22,045 [ scc.merge] INFO - PR 362 dependabot[bot] 'Bump scripts from `2078ac7` to `5a90893`'
2024-05-03 12:55:22,045 [ scc.merge] INFO - PR 365 dependabot[bot] 'Bump omero-figure from `ded0caa` to `6bdf72c`'
2024-05-03 12:55:22,045 [ scc.merge] INFO
2024-05-03 12:55:22,045 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-05-03 12:55:22,045 [ scc.merge] INFO Already up to date.
2024-05-03 12:55:22,045 [ scc.merge] INFO
2024-05-03 12:55:22,045 [ scc.merge] INFO
2024-05-03 12:55:22,045 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-05-03 12:55:22,045 [ scc.merge] INFO Excluded PRs:
2024-05-03 12:55:22,045 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-05-03 12:55:22,045 [ scc.merge] INFO Already up to date.
2024-05-03 12:55:22,045 [ scc.merge] INFO
2024-05-03 12:55:22,045 [ scc.merge] INFO Merged PRs:
2024-05-03 12:55:22,045 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-05-03 12:55:22,045 [ scc.merge] INFO
2024-05-03 12:55:22,045 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-05-03 12:55:22,045 [ scc.merge] INFO Excluded PRs:
2024-05-03 12:55:22,045 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-05-03 12:55:22,045 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-05-03 12:55:22,045 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-05-03 12:55:22,045 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-05-03 12:55:22,045 [ scc.merge] INFO Already up to date.
2024-05-03 12:55:22,045 [ scc.merge] INFO
2024-05-03 12:55:22,045 [ scc.merge] INFO Merged PRs:
2024-05-03 12:55:22,045 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-05-03 12:55:22,045 [ scc.merge] INFO
2024-05-03 12:55:22,045 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-05-03 12:55:22,045 [ scc.merge] INFO Excluded PRs:
2024-05-03 12:55:22,045 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-03 12:55:22,045 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-05-03 12:55:22,045 [ scc.merge] INFO Already up to date.
2024-05-03 12:55:22,045 [ scc.merge] INFO
2024-05-03 12:55:22,045 [ scc.merge] INFO Merged PRs:
2024-05-03 12:55:22,046 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-05-03 12:55:22,046 [ scc.merge] INFO
2024-05-03 12:55:22,046 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-03 12:55:22,046 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-05-03 12:55:22,046 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-05-03 12:55:22,046 [ scc.merge] INFO
2024-05-03 12:55:22,046 [ scc.merge] INFO Repository: ome/omero-figure
2024-05-03 12:55:22,046 [ scc.merge] INFO Excluded PRs:
2024-05-03 12:55:22,046 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-05-03 12:55:22,046 [ scc.merge] INFO Already up to date.
2024-05-03 12:55:22,046 [ scc.merge] INFO
2024-05-03 12:55:22,046 [ scc.merge] INFO Merged PRs:
2024-05-03 12:55:22,046 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-05-03 12:55:22,046 [ scc.merge] INFO - PR 554 jburel 'Update publish'
2024-05-03 12:55:22,046 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-05-03 12:55:22,046 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-05-03 12:55:22,046 [ scc.merge] INFO - PR 561 will-moore 'Bugfixes may2024'
2024-05-03 12:55:22,046 [ scc.merge] INFO
2024-05-03 12:55:22,046 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-05-03 12:55:22,046 [ scc.merge] INFO Already up to date.
2024-05-03 12:55:22,046 [ scc.merge] INFO
2024-05-03 12:55:22,046 [ scc.merge] INFO Merged PRs:
2024-05-03 12:55:22,046 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-05-03 12:55:22,046 [ scc.merge] INFO
2024-05-03 12:55:22,046 [ scc.merge] INFO Repository: ome/omero-gallery
2024-05-03 12:55:22,046 [ scc.merge] INFO Already up to date.
2024-05-03 12:55:22,046 [ scc.merge] INFO
2024-05-03 12:55:22,046 [ scc.merge] INFO Merged PRs:
2024-05-03 12:55:22,046 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-03 12:55:22,046 [ scc.merge] INFO
2024-05-03 12:55:22,046 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-05-03 12:55:22,046 [ scc.merge] INFO Excluded PRs:
2024-05-03 12:55:22,046 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-05-03 12:55:22,046 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-05-03 12:55:22,046 [ scc.merge] INFO Already up to date.
2024-05-03 12:55:22,047 [ scc.merge] INFO
2024-05-03 12:55:22,047 [ scc.merge] INFO Merged PRs:
2024-05-03 12:55:22,047 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-05-03 12:55:22,047 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-05-03 12:55:22,047 [ scc.merge] INFO - PR 469 will-moore 'changelog 0.14.0'
2024-05-03 12:55:22,047 [ scc.merge] INFO - PR 470 will-moore 'Movie playing waits for planes'
2024-05-03 12:55:22,047 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-03 12:55:22,047 [ scc.merge] INFO - PR 474 will-moore 'Img data error handling'
2024-05-03 12:55:22,047 [ scc.merge] INFO
2024-05-03 12:55:22,047 [ scc.merge] INFO Repository: ome/omero-mapr
2024-05-03 12:55:22,047 [ scc.merge] INFO Excluded PRs:
2024-05-03 12:55:22,047 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-05-03 12:55:22,047 [ scc.merge] INFO Already up to date.
2024-05-03 12:55:22,047 [ scc.merge] INFO
2024-05-03 12:55:22,047 [ scc.merge] INFO Merged PRs:
2024-05-03 12:55:22,047 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-05-03 12:55:22,047 [ scc.merge] INFO
2024-05-03 12:55:22,047 [ scc.merge] INFO Repository: ome/omero-metadata
2024-05-03 12:55:22,047 [ scc.merge] INFO Already up to date.
2024-05-03 12:55:22,047 [ scc.merge] INFO
2024-05-03 12:55:22,047 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-03 12:55:22,047 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-03 12:55:22,047 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-03 12:55:22,047 [ scc.merge] INFO
2024-05-03 12:55:22,047 [ scc.merge] INFO Repository: ome/omero-parade
2024-05-03 12:55:22,047 [ scc.merge] INFO Excluded PRs:
2024-05-03 12:55:22,047 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-05-03 12:55:22,047 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-05-03 12:55:22,047 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-05-03 12:55:22,047 [ scc.merge] INFO Already up to date.
2024-05-03 12:55:22,047 [ scc.merge] INFO
2024-05-03 12:55:22,047 [ scc.merge] INFO Merged PRs:
2024-05-03 12:55:22,047 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-03 12:55:22,047 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-03 12:55:22,047 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-03 12:55:22,047 [ scc.merge] INFO
2024-05-03 12:55:22,047 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-05-03 12:55:22,048 [ scc.merge] INFO Already up to date.
2024-05-03 12:55:22,048 [ scc.merge] INFO
2024-05-03 12:55:22,048 [ scc.merge] INFO Merged PRs:
2024-05-03 12:55:22,048 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-05-03 12:55:22,048 [ scc.merge] INFO
2024-05-03 12:55:22,048 [ scc.merge] INFO Repository: ome/omero-rois
2024-05-03 12:55:22,048 [ scc.merge] INFO Excluded PRs:
2024-05-03 12:55:22,048 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-03 12:55:22,048 [ scc.merge] INFO Already up to date.
2024-05-03 12:55:22,048 [ scc.merge] INFO
2024-05-03 12:55:22,048 [ scc.merge] INFO Merged PRs:
2024-05-03 12:55:22,048 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-03 12:55:22,048 [ scc.merge] INFO
2024-05-03 12:55:22,048 [ scc.merge] INFO Repository: ome/omero-signup
2024-05-03 12:55:22,048 [ scc.merge] INFO Already up to date.
2024-05-03 12:55:22,048 [ scc.merge] INFO
2024-05-03 12:55:22,048 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-03 12:55:22,048 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-03 12:55:22,048 [ scc.merge] INFO
2024-05-03 12:55:22,048 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-05-03 12:55:22,048 [ scc.merge] INFO Already up to date.
2024-05-03 12:55:22,048 [ scc.merge] INFO
2024-05-03 12:55:22,048 [ scc.merge] INFO Merged PRs:
2024-05-03 12:55:22,048 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-03 12:55:22,048 [ scc.merge] INFO
2024-05-03 12:55:22,048 [ scc.merge] INFO Repository: ome/omero-upload
2024-05-03 12:55:22,048 [ scc.merge] INFO Already up to date.
2024-05-03 12:55:22,048 [ scc.merge] INFO
2024-05-03 12:55:22,048 [ scc.merge] INFO
2024-05-03 12:55:22,048 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-05-03 12:55:22,048 [ scc.merge] INFO Already up to date.
2024-05-03 12:55:22,048 [ scc.merge] INFO
2024-05-03 12:55:22,048 [ scc.merge] INFO
2024-05-03 12:55:22,048 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-05-03 12:55:22,048 [ scc.merge] INFO Excluded PRs:
2024-05-03 12:55:22,049 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-05-03 12:55:22,049 [ scc.merge] INFO Already up to date.
2024-05-03 12:55:22,049 [ scc.merge] INFO
2024-05-03 12:55:22,049 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-03 12:55:22,049 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-03 12:55:22,049 [ scc.merge] INFO
2024-05-03 12:55:22,049 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-05-03 12:55:22,049 [ scc.merge] INFO Already up to date.
2024-05-03 12:55:22,049 [ scc.merge] INFO
2024-05-03 12:55:22,049 [ scc.merge] INFO
2024-05-03 12:55:22,049 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-05-03 12:55:22,049 [ scc.merge] INFO Already up to date.
2024-05-03 12:55:22,049 [ scc.merge] INFO
2024-05-03 12:55:22,049 [ scc.merge] INFO
2024-05-03 12:55:22,049 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-05-03 12:55:22,049 [ scc.merge] INFO Already up to date.
2024-05-03 12:55:22,049 [ scc.merge] INFO
2024-05-03 12:55:22,049 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-03 12:55:22,049 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-05-03 12:55:22,049 [ scc.merge] INFO
2024-05-03 12:55:22,049 [ scc.merge] INFO Repository: ome/scripts
2024-05-03 12:55:22,049 [ scc.merge] INFO Excluded PRs:
2024-05-03 12:55:22,049 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-05-03 12:55:22,049 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-05-03 12:55:22,049 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-05-03 12:55:22,049 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-05-03 12:55:22,049 [ scc.merge] INFO Already up to date.
2024-05-03 12:55:22,049 [ scc.merge] INFO
2024-05-03 12:55:22,049 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-03 12:55:22,049 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-03 12:55:22,049 [ scc.merge] INFO
2024-05-03 12:55:22,049 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-03 12:55:22,050 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 12:55:22,055 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-05-03 12:55:22,055 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 12:55:22,059 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:55:22,060 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-05-03 12:55:22,060 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 12:55:22,064 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:55:22,064 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-05-03 12:55:22,064 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 12:55:22,068 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:55:22,068 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-05-03 12:55:22,068 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 12:55:22,073 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:55:22,073 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-03 12:55:22,073 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 12:55:22,077 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:55:22,077 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-03 12:55:22,077 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 12:55:22,081 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:55:22,081 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-03 12:55:22,081 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 12:55:22,085 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:55:22,086 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-03 12:55:22,086 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 12:55:22,090 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:55:22,090 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-03 12:55:22,090 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 12:55:22,094 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:55:22,094 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-03 12:55:22,094 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 12:55:22,099 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:55:22,099 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-03 12:55:22,099 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 12:55:22,103 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:55:22,103 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-03 12:55:22,103 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 12:55:22,107 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:55:22,108 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-03 12:55:22,108 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 12:55:22,112 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:55:22,112 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-03 12:55:22,112 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 12:55:22,116 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:55:22,116 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-03 12:55:22,117 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 12:55:22,121 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:55:22,121 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-03 12:55:22,121 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 12:55:22,125 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:55:22,125 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-03 12:55:22,125 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 12:55:22,129 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:55:22,130 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-03 12:55:22,130 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 12:55:22,134 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:55:22,134 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-03 12:55:22,134 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 12:55:22,138 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:55:22,138 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-03 12:55:22,139 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 12:55:22,143 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:55:22,143 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-03 12:55:22,143 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 12:55:22,147 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 12:55:22,147 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-03 12:55:22,147 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 12:55:22,151 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.8.2 to 5.9.1-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD c196743] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 2ca566b
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from 6bdf72cb
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from 9d8d147
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from a0148a6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 5a90893
nothing to commit, working tree clean
[detached HEAD 286ffd0] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-05-03 12:56:09,100 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-05-03 12:56:18,064 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-05-03 12:56:20,451 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-05-03 12:56:25,082 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-05-03 12:57:13,461 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/f6f303f9/images/svgs/logo.svg){kind=logo}
