Console Output
Skipping 93 KB..
Full Log-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 13:40:54,526 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 13:40:54,527 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 13:40:54,531 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 13:40:54,536 [ scc.git] DEBUG Already up to date.
2024-05-03 13:40:54,536 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-05-03 13:40:54,990 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-03 13:40:54,991 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-05-03 13:40:54,994 [ scc.git] DEBUG Calling 'git fetch origin pull/554/head'
2024-05-03 13:40:55,390 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-03 13:40:55,390 [ scc.git] DEBUG * branch refs/pull/554/head -> FETCH_HEAD
2024-05-03 13:40:55,394 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-05-03 13:40:55,832 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-03 13:40:55,833 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-05-03 13:40:55,837 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-05-03 13:40:56,223 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-03 13:40:56,223 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-05-03 13:40:56,228 [ scc.git] DEBUG Calling 'git fetch origin pull/561/head'
2024-05-03 13:40:56,628 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-03 13:40:56,629 [ scc.git] DEBUG * branch refs/pull/561/head -> FETCH_HEAD
2024-05-03 13:40:56,633 [ scc.git] DEBUG ## Unique users: []
2024-05-03 13:40:56,633 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:40:56,633 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:40:56,637 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7d54cb3a86d5f1c1c1f8deda3741a50ed25630'
2024-05-03 13:40:56,643 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:40:56,647 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) fb7d54cb3a86d5f1c1c1f8deda3741a50ed25630'
2024-05-03 13:40:56,663 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 13:40:56,668 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-05-03 13:40:56,668 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-05-03 13:40:56,668 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-05-03 13:40:56,668 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-05-03 13:40:56,668 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-05-03 13:40:56,668 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-05-03 13:40:56,669 [ scc.git] DEBUG src/js/views/right_panel_view.js | 69 +++++++++++++++++++++++++++-
2024-05-03 13:40:56,669 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-05-03 13:40:56,670 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-05-03 13:40:56,670 [ scc.git] DEBUG 9 files changed, 265 insertions(+), 5 deletions(-)
2024-05-03 13:40:56,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:40:56,826 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...902c4461b9479c4681e6bf71114616299e2adde5'
2024-05-03 13:40:56,834 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:40:56,838 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 554 (Update publish) 902c4461b9479c4681e6bf71114616299e2adde5'
2024-05-03 13:40:56,853 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 13:40:56,855 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++---
2024-05-03 13:40:56,855 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-05-03 13:40:57,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:40:57,239 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-03 13:40:57,246 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:40:57,250 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-03 13:40:57,266 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-03 13:40:57,266 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-05-03 13:40:57,266 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-05-03 13:40:57,266 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 13:40:57,272 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-05-03 13:40:57,272 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-05-03 13:40:57,272 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-05-03 13:40:57,272 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-05-03 13:40:57,272 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-05-03 13:40:57,272 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-05-03 13:40:57,272 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-05-03 13:40:57,272 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-05-03 13:40:57,272 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-05-03 13:40:57,272 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-05-03 13:40:57,272 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-05-03 13:40:57,272 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-05-03 13:40:57,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:40:57,651 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...385502576c168df58f51bc14bff6bd62a76fc15b'
2024-05-03 13:40:57,657 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:40:57,661 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) 385502576c168df58f51bc14bff6bd62a76fc15b'
2024-05-03 13:40:57,681 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-05-03 13:40:57,682 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-05-03 13:40:57,682 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-03 13:40:57,682 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-05-03 13:40:57,682 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 13:40:57,688 [ scc.git] DEBUG omero_figure/urls.py | 8 +++
2024-05-03 13:40:57,688 [ scc.git] DEBUG omero_figure/views.py | 69 +++++++++++++++++++++++
2024-05-03 13:40:57,688 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-05-03 13:40:57,688 [ scc.git] DEBUG src/index.html | 1 +
2024-05-03 13:40:57,688 [ scc.git] DEBUG src/js/models/figure_model.js | 29 +++++++++-
2024-05-03 13:40:57,688 [ scc.git] DEBUG src/js/models/panel_model.js | 37 +++++++++++-
2024-05-03 13:40:57,688 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-05-03 13:40:57,688 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-05-03 13:40:57,688 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-05-03 13:40:57,688 [ scc.git] DEBUG src/js/views/right_panel_view.js | 8 +++
2024-05-03 13:40:57,688 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-05-03 13:40:57,688 [ scc.git] DEBUG src/templates/image_display_options.template.html | 9 +++
2024-05-03 13:40:57,688 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-05-03 13:40:57,688 [ scc.git] DEBUG 13 files changed, 168 insertions(+), 10 deletions(-)
2024-05-03 13:40:58,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:40:58,075 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...629e2770fe996522b1be7f35fc9dc7ab18716ba8'
2024-05-03 13:40:58,080 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:40:58,085 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 561 (Bugfixes may2024) 629e2770fe996522b1be7f35fc9dc7ab18716ba8'
2024-05-03 13:40:58,098 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 13:40:58,101 [ scc.git] DEBUG src/js/views/channel_slider_view.js | 9 +++++----
2024-05-03 13:40:58,101 [ scc.git] DEBUG 1 file changed, 5 insertions(+), 4 deletions(-)
2024-05-03 13:40:58,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:40:58,483 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 13:40:58,519 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:40:58,519 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:40:58,523 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 13:40:58,559 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 13:40:58,565 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2d79c5ebe0> has no local changes
2024-05-03 13:40:58,565 [ 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#54 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/)'
2024-05-03 13:40:58,574 [ scc.git] DEBUG [detached HEAD e7ff02bc] merge master -Dorg -Ssuccess-only
2024-05-03 13:40:58,574 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:40:58,574 [ scc.repo] DEBUG ## PRs found:
2024-05-03 13:40:58,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-05-03 13:40:59,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-05-03 13:40:59,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-05-03 13:41:00,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-03 13:41:00,799 [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 13:41:01,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-03 13:41:01,653 [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 13:41:01,654 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-05-03 13:41:01,654 [ scc.repo] DEBUG ## Branches found:
2024-05-03 13:41:01,654 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-03 13:41:01,654 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:41:01,654 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:01,659 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 13:41:01,663 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 13:41:01,664 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 13:41:01,668 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 13:41:01,673 [ scc.git] DEBUG Already up to date.
2024-05-03 13:41:01,673 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-05-03 13:41:02,055 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-05-03 13:41:02,055 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-05-03 13:41:02,059 [ scc.git] DEBUG ## Unique users: []
2024-05-03 13:41:02,059 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:41:02,059 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:02,064 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-03 13:41:02,069 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:02,073 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-03 13:41:02,081 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-05-03 13:41:02,082 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 13:41:02,084 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-05-03 13:41:02,084 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-05-03 13:41:02,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:41:02,240 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 13:41:02,276 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:41:02,276 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:02,280 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 13:41:02,314 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 13:41:02,319 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2d79c2b550> has no local changes
2024-05-03 13:41:02,320 [ 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#54 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/)'
2024-05-03 13:41:02,326 [ scc.git] DEBUG [detached HEAD 9bdd4df] merge master -Dorg -Ssuccess-only
2024-05-03 13:41:02,327 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:41:02,327 [ scc.repo] DEBUG ## PRs found:
2024-05-03 13:41:02,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-05-03 13:41:03,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-05-03 13:41:03,209 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-03 13:41:03,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-03 13:41:04,155 [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 13:41:04,701 [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 13:41:05,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-03 13:41:05,568 [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 13:41:05,569 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-03 13:41:05,569 [ scc.repo] DEBUG ## Branches found:
2024-05-03 13:41:05,569 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-03 13:41:05,569 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:41:05,569 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:05,574 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 13:41:05,578 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 13:41:05,578 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 13:41:05,583 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 13:41:05,587 [ scc.git] DEBUG Already up to date.
2024-05-03 13:41:05,588 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-05-03 13:41:05,963 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-05-03 13:41:05,963 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-05-03 13:41:05,967 [ scc.git] DEBUG ## Unique users: []
2024-05-03 13:41:05,967 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:41:05,967 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:05,971 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-05-03 13:41:05,976 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:05,980 [ 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 13:41:05,990 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 13:41:05,993 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-05-03 13:41:05,993 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-05-03 13:41:06,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:41:06,153 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 13:41:06,189 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:41:06,189 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:06,193 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 13:41:06,227 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 13:41:06,233 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2d79c2f9d0> has no local changes
2024-05-03 13:41:06,233 [ 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#54 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/)'
2024-05-03 13:41:06,240 [ scc.git] DEBUG [detached HEAD b2df990] merge master -Dorg -Ssuccess-only
2024-05-03 13:41:06,241 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:41:06,241 [ scc.repo] DEBUG ## PRs found:
2024-05-03 13:41:06,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-05-03 13:41:07,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/474 HTTP/1.1" 200 None
2024-05-03 13:41:07,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/474/comments HTTP/1.1" 200 None
2024-05-03 13:41:08,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/8a03e780c490251af547bc7f26a31af056816ad5 HTTP/1.1" 200 None
2024-05-03 13:41:08,502 [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 13:41:08,940 [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 13:41:09,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/8a03e780c490251af547bc7f26a31af056816ad5 HTTP/1.1" 200 None
2024-05-03 13:41:09,798 [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 13:41:09,799 [ scc.repo] DEBUG - PR 474 will-moore 'Img data error handling'
2024-05-03 13:41:10,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-05-03 13:41:10,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-05-03 13:41:11,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-03 13:41:11,645 [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 13:41:12,111 [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 13:41:12,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-03 13:41:12,960 [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 13:41:12,960 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-03 13:41:13,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470 HTTP/1.1" 200 None
2024-05-03 13:41:13,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470/comments HTTP/1.1" 200 None
2024-05-03 13:41:14,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99 HTTP/1.1" 200 None
2024-05-03 13:41:14,866 [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 13:41:15,383 [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 13:41:15,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99 HTTP/1.1" 200 None
2024-05-03 13:41:16,288 [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 13:41:16,289 [ scc.repo] DEBUG - PR 470 will-moore 'Movie playing waits for planes'
2024-05-03 13:41:16,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469 HTTP/1.1" 200 None
2024-05-03 13:41:17,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-05-03 13:41:17,693 [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 13:41:18,160 [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 13:41:18,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-05-03 13:41:19,041 [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 13:41:19,042 [ scc.repo] DEBUG - PR 469 will-moore 'changelog 0.14.0'
2024-05-03 13:41:19,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-05-03 13:41:20,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-05-03 13:41:20,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-05-03 13:41:21,008 [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 13:41:21,492 [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 13:41:21,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-05-03 13:41:22,329 [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 13:41:22,329 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-05-03 13:41:22,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-05-03 13:41:23,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-05-03 13:41:23,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-03 13:41:24,235 [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 13:41:24,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-03 13:41:25,134 [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 13:41:25,135 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-05-03 13:41:25,135 [ scc.repo] DEBUG ## Branches found:
2024-05-03 13:41:25,135 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-03 13:41:25,135 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:41:25,135 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:25,141 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 13:41:25,145 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 13:41:25,145 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 13:41:25,150 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 13:41:25,154 [ scc.git] DEBUG Already up to date.
2024-05-03 13:41:25,154 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-05-03 13:41:25,557 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-03 13:41:25,557 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-05-03 13:41:25,561 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-05-03 13:41:26,034 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-03 13:41:26,034 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-05-03 13:41:26,038 [ scc.git] DEBUG Calling 'git fetch origin pull/469/head'
2024-05-03 13:41:26,421 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-03 13:41:26,421 [ scc.git] DEBUG * branch refs/pull/469/head -> FETCH_HEAD
2024-05-03 13:41:26,425 [ scc.git] DEBUG Calling 'git fetch origin pull/470/head'
2024-05-03 13:41:27,118 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-03 13:41:27,119 [ scc.git] DEBUG * branch refs/pull/470/head -> FETCH_HEAD
2024-05-03 13:41:27,122 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-05-03 13:41:27,550 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-03 13:41:27,550 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-05-03 13:41:27,554 [ scc.git] DEBUG Calling 'git fetch origin pull/474/head'
2024-05-03 13:41:27,990 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-03 13:41:27,990 [ scc.git] DEBUG * branch refs/pull/474/head -> FETCH_HEAD
2024-05-03 13:41:27,994 [ scc.git] DEBUG ## Unique users: []
2024-05-03 13:41:27,994 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:41:27,995 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:27,999 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-03 13:41:28,005 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:28,009 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-03 13:41:28,019 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 13:41:28,022 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-05-03 13:41:28,022 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-05-03 13:41:28,022 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-05-03 13:41:28,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:41:28,177 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-05-03 13:41:28,182 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:28,186 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-05-03 13:41:28,199 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 13:41:28,203 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-05-03 13:41:28,203 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-05-03 13:41:28,203 [ scc.git] DEBUG src/app/header.html | 5 +
2024-05-03 13:41:28,203 [ scc.git] DEBUG src/app/header.js | 46 ++++++++-
2024-05-03 13:41:28,203 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-05-03 13:41:28,203 [ scc.git] DEBUG src/utils/figure.js | 220 ++++++++++++++++++++++++++++++++++++++++++
2024-05-03 13:41:28,203 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 1 -
2024-05-03 13:41:28,203 [ scc.git] DEBUG 7 files changed, 294 insertions(+), 7 deletions(-)
2024-05-03 13:41:28,203 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-05-03 13:41:28,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:41:28,587 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-05-03 13:41:28,592 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:28,596 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 469 (changelog 0.14.0) ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-05-03 13:41:28,608 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 13:41:28,610 [ scc.git] DEBUG CHANGELOG.md | 9 ++++++++-
2024-05-03 13:41:28,610 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-05-03 13:41:29,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:41:29,002 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99'
2024-05-03 13:41:29,008 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:29,012 [ 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 13:41:29,028 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-05-03 13:41:29,029 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 13:41:29,034 [ scc.git] DEBUG css/app.css | 30 +++++++
2024-05-03 13:41:29,034 [ scc.git] DEBUG src/controls/dimension-slider.js | 6 +-
2024-05-03 13:41:29,034 [ scc.git] DEBUG src/events/events.js | 4 +
2024-05-03 13:41:29,034 [ scc.git] DEBUG src/index-dev.html | 6 +-
2024-05-03 13:41:29,034 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 4 +-
2024-05-03 13:41:29,034 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 165 +++++++++++++++++++++++++------------
2024-05-03 13:41:29,034 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 61 +++++++++++++-
2024-05-03 13:41:29,034 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 15 +++-
2024-05-03 13:41:29,034 [ scc.git] DEBUG 8 files changed, 228 insertions(+), 63 deletions(-)
2024-05-03 13:41:29,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:41:29,410 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-03 13:41:29,416 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:29,420 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-03 13:41:29,432 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-05-03 13:41:29,433 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 13:41:29,435 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-05-03 13:41:29,435 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-05-03 13:41:29,435 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-05-03 13:41:29,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:41:29,844 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8a03e780c490251af547bc7f26a31af056816ad5'
2024-05-03 13:41:29,850 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:29,854 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 474 (Img data error handling) 8a03e780c490251af547bc7f26a31af056816ad5'
2024-05-03 13:41:29,872 [ scc.git] DEBUG Auto-merging css/app.css
2024-05-03 13:41:29,872 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-05-03 13:41:29,872 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-05-03 13:41:29,872 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-05-03 13:41:29,872 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-05-03 13:41:29,873 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 13:41:29,877 [ scc.git] DEBUG css/app.css | 4 ++++
2024-05-03 13:41:29,877 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 18 +++++++++++-----
2024-05-03 13:41:29,877 [ scc.git] DEBUG src/app/context.js | 3 +++
2024-05-03 13:41:29,877 [ scc.git] DEBUG src/model/image_info.js | 50 +++++++++++++++++++++++++++++++++++++++++++
2024-05-03 13:41:29,877 [ scc.git] DEBUG src/utils/constants.js | 1 +
2024-05-03 13:41:29,877 [ scc.git] DEBUG 5 files changed, 71 insertions(+), 5 deletions(-)
2024-05-03 13:41:30,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:41:30,243 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 13:41:30,278 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:41:30,278 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:30,283 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 13:41:30,316 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 13:41:30,324 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2d79c1e5b0> has no local changes
2024-05-03 13:41:30,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#54 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/)'
2024-05-03 13:41:30,332 [ scc.git] DEBUG [detached HEAD aa8ffff] merge master -Dorg -Ssuccess-only
2024-05-03 13:41:30,332 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:41:30,332 [ scc.repo] DEBUG ## PRs found:
2024-05-03 13:41:30,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-05-03 13:41:31,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-05-03 13:41:31,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-05-03 13:41:32,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-03 13:41:32,739 [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 13:41:33,226 [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 13:41:33,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-03 13:41:34,065 [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 13:41:34,065 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-05-03 13:41:34,065 [ scc.repo] DEBUG ## Branches found:
2024-05-03 13:41:34,065 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-03 13:41:34,065 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:41:34,065 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:34,070 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 13:41:34,075 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 13:41:34,075 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 13:41:34,080 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 13:41:34,085 [ scc.git] DEBUG Already up to date.
2024-05-03 13:41:34,085 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-05-03 13:41:34,530 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-05-03 13:41:34,530 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-05-03 13:41:34,533 [ scc.git] DEBUG ## Unique users: []
2024-05-03 13:41:34,533 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:41:34,533 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:34,537 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-03 13:41:34,543 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:34,547 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-03 13:41:34,555 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 13:41:34,558 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-05-03 13:41:34,558 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-05-03 13:41:34,558 [ scc.git] DEBUG requirements.txt | 2 +-
2024-05-03 13:41:34,558 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-05-03 13:41:34,558 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-05-03 13:41:34,558 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-05-03 13:41:34,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:41:34,709 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 13:41:34,742 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:41:34,743 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:34,747 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 13:41:34,780 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 13:41:34,786 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2d79bfe160> has no local changes
2024-05-03 13:41:34,786 [ 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#54 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/)'
2024-05-03 13:41:34,795 [ scc.git] DEBUG [detached HEAD e2eaab0] merge master -Dorg -Ssuccess-only
2024-05-03 13:41:34,795 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:41:34,795 [ scc.repo] DEBUG ## PRs found:
2024-05-03 13:41:35,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-05-03 13:41:35,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-05-03 13:41:36,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-05-03 13:41:36,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-03 13:41:37,075 [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 13:41:37,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-03 13:41:37,953 [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 13:41:37,953 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-03 13:41:38,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-05-03 13:41:38,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-05-03 13:41:39,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-03 13:41:39,818 [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 13:41:40,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-03 13:41:40,666 [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 13:41:40,666 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-03 13:41:40,666 [ scc.repo] DEBUG ## Branches found:
2024-05-03 13:41:40,667 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-03 13:41:40,667 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:41:40,667 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:40,672 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 13:41:40,676 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 13:41:40,676 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 13:41:40,681 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 13:41:40,686 [ scc.git] DEBUG Already up to date.
2024-05-03 13:41:40,686 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-05-03 13:41:41,454 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-03 13:41:41,454 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-05-03 13:41:41,458 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-05-03 13:41:41,925 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-03 13:41:41,925 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-05-03 13:41:41,928 [ scc.git] DEBUG ## Unique users: []
2024-05-03 13:41:41,928 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:41:41,929 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:41,933 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-03 13:41:41,939 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:41,943 [ 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 13:41:41,956 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-05-03 13:41:41,957 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-05-03 13:41:41,957 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-03 13:41:41,957 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-03 13:41:41,957 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-03 13:41:41,957 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-03 13:41:41,962 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-03 13:41:41,968 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-03 13:41:42,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:41:42,156 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-03 13:41:42,162 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-03 13:41:42,167 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#54](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-05-03 13:41:42,171 [ scc.config] DEBUG Found github.token
2024-05-03 13:41:42,171 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-05-03 13:41:42,171 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-03 13:41:42,177 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:42,181 [ 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 13:41:42,197 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-03 13:41:42,197 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-03 13:41:42,197 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-05-03 13:41:42,197 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-03 13:41:42,198 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-03 13:41:42,202 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-03 13:41:42,208 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-03 13:41:42,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:41:42,588 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-03 13:41:42,593 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-03 13:41:42,598 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#54](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/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 13:41:42,602 [ scc.config] DEBUG Found github.token
2024-05-03 13:41:42,602 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-05-03 13:41:42,603 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 13:41:42,637 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:41:42,637 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:42,641 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 13:41:42,675 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 13:41:42,681 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2d79c1e550> has no local changes
2024-05-03 13:41:42,681 [ 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#54 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/)'
2024-05-03 13:41:42,689 [ scc.git] DEBUG [detached HEAD 070e4ea] merge master -Dorg -Ssuccess-only
2024-05-03 13:41:42,689 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:41:42,689 [ scc.repo] DEBUG ## PRs found:
2024-05-03 13:41:43,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-05-03 13:41:43,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-05-03 13:41:43,633 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-03 13:41:44,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-03 13:41:44,581 [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 13:41:45,086 [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 13:41:45,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-03 13:41:45,967 [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 13:41:45,968 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-03 13:41:46,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-05-03 13:41:46,433 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-03 13:41:47,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-03 13:41:47,503 [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 13:41:47,992 [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 13:41:48,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-03 13:41:48,853 [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 13:41:48,853 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-03 13:41:49,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-05-03 13:41:49,316 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-03 13:41:49,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-03 13:41:50,338 [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 13:41:50,829 [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 13:41:51,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-03 13:41:51,687 [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 13:41:51,688 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-03 13:41:52,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-05-03 13:41:52,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-05-03 13:41:53,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-05-03 13:41:53,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-05-03 13:41:54,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-05-03 13:41:54,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-05-03 13:41:54,643 [ scc.repo] DEBUG ## Branches found:
2024-05-03 13:41:54,643 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-03 13:41:54,643 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:41:54,643 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:54,648 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 13:41:54,653 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 13:41:54,653 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 13:41:54,658 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 13:41:54,662 [ scc.git] DEBUG Already up to date.
2024-05-03 13:41:54,662 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-05-03 13:41:55,018 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-03 13:41:55,018 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-05-03 13:41:55,021 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-05-03 13:41:55,412 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-03 13:41:55,412 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-05-03 13:41:55,416 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-05-03 13:41:55,800 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-03 13:41:55,800 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-05-03 13:41:55,804 [ scc.git] DEBUG ## Unique users: []
2024-05-03 13:41:55,804 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:41:55,804 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:55,808 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-05-03 13:41:55,813 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:55,817 [ 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 13:41:55,825 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 13:41:55,828 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-05-03 13:41:55,828 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-05-03 13:41:55,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:41:55,986 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-05-03 13:41:55,991 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:55,995 [ 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 13:41:56,005 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-03 13:41:56,005 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 13:41:56,008 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-05-03 13:41:56,008 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-05-03 13:41:56,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:41:56,399 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-05-03 13:41:56,404 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:56,408 [ 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 13:41:56,418 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-03 13:41:56,419 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 13:41:56,422 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-05-03 13:41:56,422 [ scc.git] DEBUG package.json | 2 +-
2024-05-03 13:41:56,422 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-05-03 13:41:56,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:41:56,816 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 13:41:56,850 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:41:56,850 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:56,854 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 13:41:56,889 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 13:41:56,895 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2d79c15fd0> has no local changes
2024-05-03 13:41:56,895 [ 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#54 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/)'
2024-05-03 13:41:56,903 [ scc.git] DEBUG [detached HEAD 1a5bb55] merge master -Dorg -Ssuccess-only
2024-05-03 13:41:56,903 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:41:56,903 [ scc.repo] DEBUG ## PRs found:
2024-05-03 13:41:57,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-05-03 13:41:57,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-05-03 13:41:58,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-03 13:41:58,736 [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 13:41:59,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-03 13:41:59,677 [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 13:41:59,678 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-05-03 13:41:59,678 [ scc.repo] DEBUG ## Branches found:
2024-05-03 13:41:59,678 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-03 13:41:59,678 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:41:59,678 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:41:59,683 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 13:41:59,687 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 13:41:59,687 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 13:41:59,692 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 13:41:59,697 [ scc.git] DEBUG Already up to date.
2024-05-03 13:41:59,697 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-03 13:42:00,075 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-05-03 13:42:00,075 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-03 13:42:00,078 [ scc.git] DEBUG ## Unique users: []
2024-05-03 13:42:00,078 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:00,078 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:00,083 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-03 13:42:00,087 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:00,091 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-03 13:42:00,099 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 13:42:00,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:42:00,260 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 13:42:00,294 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:00,294 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:00,299 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 13:42:00,332 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 13:42:00,337 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2d7839b340> has no local changes
2024-05-03 13:42:00,338 [ 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#54 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/)'
2024-05-03 13:42:00,345 [ scc.git] DEBUG [detached HEAD cceeb01] merge master -Dorg -Ssuccess-only
2024-05-03 13:42:00,345 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:00,345 [ scc.repo] DEBUG ## PRs found:
2024-05-03 13:42:00,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-05-03 13:42:01,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-05-03 13:42:01,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-05-03 13:42:02,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-05-03 13:42:02,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-03 13:42:03,101 [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 13:42:03,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-03 13:42:03,997 [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 13:42:03,998 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-03 13:42:03,998 [ scc.repo] DEBUG ## Branches found:
2024-05-03 13:42:03,998 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-03 13:42:03,998 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:03,998 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:04,003 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 13:42:04,007 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 13:42:04,008 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 13:42:04,012 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 13:42:04,017 [ scc.git] DEBUG Already up to date.
2024-05-03 13:42:04,017 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-05-03 13:42:04,557 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-05-03 13:42:04,557 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-05-03 13:42:04,561 [ scc.git] DEBUG ## Unique users: []
2024-05-03 13:42:04,561 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:04,561 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:04,565 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-05-03 13:42:04,571 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:04,575 [ 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 13:42:04,583 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-05-03 13:42:04,584 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 13:42:04,586 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-05-03 13:42:04,586 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-05-03 13:42:04,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:42:04,760 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 13:42:04,794 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:04,794 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:04,798 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 13:42:04,834 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 13:42:04,839 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2d783dc5b0> has no local changes
2024-05-03 13:42:04,840 [ 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#54 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/)'
2024-05-03 13:42:04,847 [ scc.git] DEBUG [detached HEAD 94be9d7] merge master -Dorg -Ssuccess-only
2024-05-03 13:42:04,847 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:04,847 [ scc.repo] DEBUG ## PRs found:
2024-05-03 13:42:05,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-05-03 13:42:05,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-05-03 13:42:06,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-05-03 13:42:06,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-03 13:42:07,091 [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 13:42:07,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-03 13:42:08,018 [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 13:42:08,019 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-03 13:42:08,019 [ scc.repo] DEBUG ## Branches found:
2024-05-03 13:42:08,019 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-03 13:42:08,019 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:08,019 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:08,024 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 13:42:08,028 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 13:42:08,028 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 13:42:08,033 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 13:42:08,038 [ scc.git] DEBUG Already up to date.
2024-05-03 13:42:08,038 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-03 13:42:08,415 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-05-03 13:42:08,415 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-03 13:42:08,418 [ scc.git] DEBUG ## Unique users: []
2024-05-03 13:42:08,418 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:08,418 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:08,422 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-03 13:42:08,428 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:08,432 [ 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 13:42:08,447 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-05-03 13:42:08,448 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-05-03 13:42:08,448 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-05-03 13:42:08,448 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-05-03 13:42:08,448 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-05-03 13:42:08,448 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-05-03 13:42:08,448 [ scc.git] DEBUG Auto-merging setup.py
2024-05-03 13:42:08,448 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-05-03 13:42:08,448 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-03 13:42:08,448 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-03 13:42:08,453 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-03 13:42:08,458 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-05-03 13:42:08,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:42:08,610 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-03 13:42:08,614 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-03 13:42:08,619 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#54](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/views.py
- setup.py
- omero_signup/urls.py
--conflicts
2024-05-03 13:42:08,623 [ scc.config] DEBUG Found github.token
2024-05-03 13:42:08,623 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-05-03 13:42:08,623 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 13:42:08,657 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:08,657 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:08,661 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 13:42:08,697 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 13:42:08,702 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2d79c2fe80> has no local changes
2024-05-03 13:42:08,702 [ 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#54 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/)'
2024-05-03 13:42:08,709 [ scc.git] DEBUG [detached HEAD 130a0e7] merge master -Dorg -Ssuccess-only
2024-05-03 13:42:08,709 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:08,710 [ scc.repo] DEBUG ## PRs found:
2024-05-03 13:42:09,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-05-03 13:42:09,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-05-03 13:42:10,018 [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 13:42:10,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-03 13:42:10,938 [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 13:42:11,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-03 13:42:11,824 [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 13:42:11,825 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-03 13:42:11,825 [ scc.repo] DEBUG ## Branches found:
2024-05-03 13:42:11,825 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-03 13:42:11,825 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:11,825 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:11,830 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 13:42:11,834 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 13:42:11,834 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 13:42:11,839 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 13:42:11,844 [ scc.git] DEBUG Already up to date.
2024-05-03 13:42:11,844 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-05-03 13:42:12,239 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-05-03 13:42:12,239 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-05-03 13:42:12,242 [ scc.git] DEBUG ## Unique users: []
2024-05-03 13:42:12,242 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:12,242 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:12,247 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-05-03 13:42:12,252 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:12,257 [ 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 13:42:12,268 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 13:42:12,270 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-05-03 13:42:12,270 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-05-03 13:42:12,271 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-05-03 13:42:12,271 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-05-03 13:42:12,271 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-05-03 13:42:12,271 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-05-03 13:42:12,272 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-05-03 13:42:12,272 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-05-03 13:42:12,272 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-05-03 13:42:12,273 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-05-03 13:42:12,273 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-05-03 13:42:12,273 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-05-03 13:42:12,273 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-05-03 13:42:12,273 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-05-03 13:42:12,273 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-05-03 13:42:12,273 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-05-03 13:42:12,273 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-05-03 13:42:12,273 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-05-03 13:42:12,273 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-05-03 13:42:12,273 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-05-03 13:42:12,273 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-05-03 13:42:12,273 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-05-03 13:42:12,273 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-05-03 13:42:12,273 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-05-03 13:42:12,273 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-05-03 13:42:12,273 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-05-03 13:42:12,273 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-05-03 13:42:12,273 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-05-03 13:42:12,273 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-05-03 13:42:12,273 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-05-03 13:42:12,273 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-05-03 13:42:12,273 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-05-03 13:42:12,273 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-05-03 13:42:12,273 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-05-03 13:42:12,273 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-05-03 13:42:12,274 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-05-03 13:42:12,274 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-05-03 13:42:12,274 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-05-03 13:42:12,274 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-05-03 13:42:12,274 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-05-03 13:42:12,274 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-05-03 13:42:12,274 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-05-03 13:42:12,274 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-05-03 13:42:12,274 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-05-03 13:42:12,274 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-05-03 13:42:12,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:42:12,432 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 13:42:12,466 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:12,466 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:12,471 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 13:42:12,505 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 13:42:12,510 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2d79c15df0> has no local changes
2024-05-03 13:42:12,510 [ 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#54 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/)'
2024-05-03 13:42:12,518 [ scc.git] DEBUG [detached HEAD 1b114d6] merge master -Dorg -Ssuccess-only
2024-05-03 13:42:12,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:12,519 [ scc.repo] DEBUG ## PRs found:
2024-05-03 13:42:12,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-05-03 13:42:12,887 [ scc.repo] DEBUG ## Branches found:
2024-05-03 13:42:12,887 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-03 13:42:12,887 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:12,888 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:12,892 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 13:42:12,896 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 13:42:12,896 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 13:42:12,901 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 13:42:12,906 [ scc.git] DEBUG Already up to date.
2024-05-03 13:42:12,906 [ scc.git] DEBUG ## Unique users: []
2024-05-03 13:42:12,906 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:12,906 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:12,910 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 13:42:12,947 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:12,947 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:12,951 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 13:42:12,985 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 13:42:12,990 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2d783effa0> has no local changes
2024-05-03 13:42:12,991 [ 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#54 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/)'
2024-05-03 13:42:12,998 [ scc.git] DEBUG [detached HEAD 0b26594] merge master -Dorg -Ssuccess-only
2024-05-03 13:42:12,998 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:12,998 [ scc.repo] DEBUG ## PRs found:
2024-05-03 13:42:13,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-05-03 13:42:13,323 [ scc.repo] DEBUG ## Branches found:
2024-05-03 13:42:13,323 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-03 13:42:13,323 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:13,323 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:13,327 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 13:42:13,331 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 13:42:13,332 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 13:42:13,336 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 13:42:13,341 [ scc.git] DEBUG Already up to date.
2024-05-03 13:42:13,341 [ scc.git] DEBUG ## Unique users: []
2024-05-03 13:42:13,341 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:13,341 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:13,345 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 13:42:13,379 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:13,379 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:13,384 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 13:42:13,418 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 13:42:13,423 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2d7839ff70> has no local changes
2024-05-03 13:42:13,423 [ 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#54 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/)'
2024-05-03 13:42:13,430 [ scc.git] DEBUG [detached HEAD 122d9ec] merge master -Dorg -Ssuccess-only
2024-05-03 13:42:13,430 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:13,430 [ scc.git] INFO Overriding base-branch from master to main
2024-05-03 13:42:13,430 [ scc.repo] DEBUG ## PRs found:
2024-05-03 13:42:13,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-05-03 13:42:14,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-05-03 13:42:14,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-05-03 13:42:15,291 [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 13:42:15,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-03 13:42:16,256 [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 13:42:16,738 [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 13:42:17,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-03 13:42:17,641 [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 13:42:17,641 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-03 13:42:17,641 [ scc.repo] DEBUG ## Branches found:
2024-05-03 13:42:17,642 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-03 13:42:17,642 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:17,642 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:17,647 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-05-03 13:42:17,651 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 13:42:17,651 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-05-03 13:42:17,656 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-05-03 13:42:17,660 [ scc.git] DEBUG Already up to date.
2024-05-03 13:42:17,661 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-05-03 13:42:18,082 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-05-03 13:42:18,082 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-05-03 13:42:18,086 [ scc.git] DEBUG ## Unique users: []
2024-05-03 13:42:18,086 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:18,086 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:18,090 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-03 13:42:18,095 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:18,100 [ 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 13:42:18,109 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-05-03 13:42:18,109 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-05-03 13:42:18,109 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-03 13:42:18,109 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-03 13:42:18,114 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-03 13:42:18,119 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-05-03 13:42:18,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:42:18,285 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-03 13:42:18,289 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-03 13:42:18,294 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#54](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-05-03 13:42:18,298 [ scc.config] DEBUG Found github.token
2024-05-03 13:42:18,298 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-05-03 13:42:18,298 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 13:42:18,334 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:18,334 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:18,339 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 13:42:18,372 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 13:42:18,377 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2d78338430> has no local changes
2024-05-03 13:42:18,378 [ 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#54 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/)'
2024-05-03 13:42:18,385 [ scc.git] DEBUG [detached HEAD 8e3adad] merge master -Dorg -Ssuccess-only
2024-05-03 13:42:18,385 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:18,385 [ scc.repo] DEBUG ## PRs found:
2024-05-03 13:42:18,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-05-03 13:42:18,711 [ scc.repo] DEBUG ## Branches found:
2024-05-03 13:42:18,711 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-03 13:42:18,712 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:18,712 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:18,716 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 13:42:18,720 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 13:42:18,720 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 13:42:18,724 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 13:42:18,729 [ scc.git] DEBUG Already up to date.
2024-05-03 13:42:18,729 [ scc.git] DEBUG ## Unique users: []
2024-05-03 13:42:18,729 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:18,729 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:18,734 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 13:42:18,767 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:18,768 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:18,772 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 13:42:18,806 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 13:42:18,811 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2d78391e50> has no local changes
2024-05-03 13:42:18,811 [ 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#54 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/)'
2024-05-03 13:42:18,817 [ scc.git] DEBUG [detached HEAD e1db72d] merge master -Dorg -Ssuccess-only
2024-05-03 13:42:18,818 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:18,818 [ scc.repo] DEBUG ## PRs found:
2024-05-03 13:42:19,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-05-03 13:42:19,147 [ scc.repo] DEBUG ## Branches found:
2024-05-03 13:42:19,147 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-03 13:42:19,147 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:19,147 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:19,151 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 13:42:19,155 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 13:42:19,155 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 13:42:19,160 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 13:42:19,165 [ scc.git] DEBUG Already up to date.
2024-05-03 13:42:19,165 [ scc.git] DEBUG ## Unique users: []
2024-05-03 13:42:19,165 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:19,165 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:19,169 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 13:42:19,204 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:19,204 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:19,208 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 13:42:19,241 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 13:42:19,246 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2d782ba940> has no local changes
2024-05-03 13:42:19,246 [ 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#54 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/)'
2024-05-03 13:42:19,254 [ scc.git] DEBUG [detached HEAD fc8d0c9] merge master -Dorg -Ssuccess-only
2024-05-03 13:42:19,254 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:19,254 [ scc.repo] DEBUG ## PRs found:
2024-05-03 13:42:19,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-05-03 13:42:20,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-05-03 13:42:20,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-05-03 13:42:21,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-03 13:42:21,511 [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 13:42:21,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-03 13:42:22,343 [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 13:42:22,344 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-05-03 13:42:22,344 [ scc.repo] DEBUG ## Branches found:
2024-05-03 13:42:22,344 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-03 13:42:22,344 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:22,344 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:22,349 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 13:42:22,353 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 13:42:22,354 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 13:42:22,358 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 13:42:22,363 [ scc.git] DEBUG Already up to date.
2024-05-03 13:42:22,363 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-05-03 13:42:22,736 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-05-03 13:42:22,736 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-05-03 13:42:22,739 [ scc.git] DEBUG ## Unique users: []
2024-05-03 13:42:22,740 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:22,740 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:22,744 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-03 13:42:22,749 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:22,753 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-03 13:42:22,762 [ scc.git] DEBUG Auto-merging Dockerfile
2024-05-03 13:42:22,762 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-05-03 13:42:22,762 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-03 13:42:22,763 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-03 13:42:22,767 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-03 13:42:22,774 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-05-03 13:42:22,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:42:22,944 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-03 13:42:22,949 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-03 13:42:22,954 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#54](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-05-03 13:42:22,958 [ scc.config] DEBUG Found github.token
2024-05-03 13:42:22,958 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-05-03 13:42:22,958 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 13:42:22,993 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:22,993 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:22,997 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 13:42:23,032 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 13:42:23,038 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2d782f9310> has no local changes
2024-05-03 13:42:23,038 [ 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#54 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/)'
2024-05-03 13:42:23,046 [ scc.git] DEBUG [detached HEAD 080214a] merge master -Dorg -Ssuccess-only
2024-05-03 13:42:23,046 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:23,046 [ scc.git] INFO Overriding base-branch from master to develop
2024-05-03 13:42:23,046 [ scc.repo] DEBUG ## PRs found:
2024-05-03 13:42:23,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-05-03 13:42:24,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-05-03 13:42:24,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-05-03 13:42:24,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-05-03 13:42:25,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-05-03 13:42:25,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-05-03 13:42:26,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-05-03 13:42:26,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-03 13:42:27,345 [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 13:42:27,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-03 13:42:28,245 [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 13:42:28,245 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-03 13:42:28,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-05-03 13:42:29,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-05-03 13:42:29,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-05-03 13:42:30,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-05-03 13:42:30,183 [ scc.repo] DEBUG ## Branches found:
2024-05-03 13:42:30,183 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-03 13:42:30,183 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:30,183 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:30,188 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-05-03 13:42:30,192 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 13:42:30,193 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-05-03 13:42:30,197 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-05-03 13:42:30,202 [ scc.git] DEBUG Already up to date.
2024-05-03 13:42:30,203 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-05-03 13:42:30,617 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-05-03 13:42:30,617 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-05-03 13:42:30,620 [ scc.git] DEBUG ## Unique users: []
2024-05-03 13:42:30,620 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:30,620 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:30,625 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-03 13:42:30,631 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:30,635 [ 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 13:42:30,645 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-05-03 13:42:30,645 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-05-03 13:42:30,645 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-03 13:42:30,645 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-03 13:42:30,650 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-03 13:42:30,655 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-03 13:42:30,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:42:30,810 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-03 13:42:30,815 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-03 13:42:30,820 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#54](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-05-03 13:42:30,824 [ scc.config] DEBUG Found github.token
2024-05-03 13:42:30,824 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-05-03 13:42:30,824 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 13:42:30,859 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 13:42:30,859 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 13:42:30,863 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 13:42:30,897 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 13:42:30,902 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2d782babb0> has no local changes
2024-05-03 13:42:30,903 [ 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#54 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/)'
2024-05-03 13:42:30,910 [ scc.git] DEBUG [detached HEAD 596c2c8] merge master -Dorg -Ssuccess-only
2024-05-03 13:42:30,910 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:30,910 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 13:42:30,979 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-05-03 13:42:31,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:42:31,225 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-05-03 13:42:31,229 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-05-03 13:42:31,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:42:31,635 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-05-03 13:42:31,639 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-05-03 13:42:32,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:42:32,032 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-05-03 13:42:32,036 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-05-03 13:42:32,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:42:32,453 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-05-03 13:42:32,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:42:32,855 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-05-03 13:42:32,859 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-05-03 13:42:33,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:42:33,335 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-05-03 13:42:33,339 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-05-03 13:42:33,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:42:33,749 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-05-03 13:42:33,753 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-05-03 13:42:34,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:42:34,159 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-05-03 13:42:34,163 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-05-03 13:42:34,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:42:34,589 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-05-03 13:42:34,593 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-05-03 13:42:35,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:42:35,031 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-05-03 13:42:35,035 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-05-03 13:42:35,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:42:35,437 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-05-03 13:42:35,441 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-05-03 13:42:35,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:42:35,849 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-05-03 13:42:35,852 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-05-03 13:42:36,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:42:36,265 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-05-03 13:42:36,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:42:36,690 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-05-03 13:42:37,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:42:37,080 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-05-03 13:42:37,084 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-05-03 13:42:37,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:42:37,481 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-05-03 13:42:37,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:42:37,887 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-05-03 13:42:38,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:42:38,285 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-05-03 13:42:38,289 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-05-03 13:42:38,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:42:38,705 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-05-03 13:42:38,709 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-05-03 13:42:39,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:42:39,115 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-05-03 13:42:39,119 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-05-03 13:42:39,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:42:39,521 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-05-03 13:42:39,525 [ scc.config] DEBUG Found submodule.scripts.url
2024-05-03 13:42:39,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 13:42:39,933 [ scc.config] DEBUG Found submodule.scripts.branch
2024-05-03 13:42:39,933 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 13:42:40,005 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2d7adb9ac0> has local changes
2024-05-03 13:42:40,005 [ 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#54 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/54/)'
2024-05-03 13:42:40,017 [ scc.git] DEBUG [detached HEAD 302e56f] merge master -Dorg -Ssuccess-only
2024-05-03 13:42:40,018 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-05-03 13:42:40,018 [ scc.merge] INFO Repository: ome/omero-plugins
2024-05-03 13:42:40,018 [ scc.merge] INFO Already up to date.
2024-05-03 13:42:40,018 [ scc.merge] INFO
2024-05-03 13:42:40,018 [ scc.merge] INFO Merged PRs:
2024-05-03 13:42:40,018 [ scc.merge] INFO - PR 362 dependabot[bot] 'Bump scripts from `2078ac7` to `5a90893`'
2024-05-03 13:42:40,018 [ scc.merge] INFO - PR 365 dependabot[bot] 'Bump omero-figure from `ded0caa` to `6bdf72c`'
2024-05-03 13:42:40,018 [ scc.merge] INFO
2024-05-03 13:42:40,018 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-05-03 13:42:40,018 [ scc.merge] INFO Already up to date.
2024-05-03 13:42:40,018 [ scc.merge] INFO
2024-05-03 13:42:40,018 [ scc.merge] INFO
2024-05-03 13:42:40,018 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-05-03 13:42:40,018 [ scc.merge] INFO Excluded PRs:
2024-05-03 13:42:40,018 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-05-03 13:42:40,018 [ scc.merge] INFO Already up to date.
2024-05-03 13:42:40,018 [ scc.merge] INFO
2024-05-03 13:42:40,018 [ scc.merge] INFO Merged PRs:
2024-05-03 13:42:40,018 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-05-03 13:42:40,018 [ scc.merge] INFO
2024-05-03 13:42:40,018 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-05-03 13:42:40,018 [ scc.merge] INFO Excluded PRs:
2024-05-03 13:42:40,018 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-05-03 13:42:40,018 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-05-03 13:42:40,018 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-05-03 13:42:40,018 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-05-03 13:42:40,018 [ scc.merge] INFO Already up to date.
2024-05-03 13:42:40,019 [ scc.merge] INFO
2024-05-03 13:42:40,019 [ scc.merge] INFO Merged PRs:
2024-05-03 13:42:40,019 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-05-03 13:42:40,019 [ scc.merge] INFO
2024-05-03 13:42:40,019 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-05-03 13:42:40,019 [ scc.merge] INFO Excluded PRs:
2024-05-03 13:42:40,019 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-03 13:42:40,019 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-05-03 13:42:40,019 [ scc.merge] INFO Already up to date.
2024-05-03 13:42:40,019 [ scc.merge] INFO
2024-05-03 13:42:40,019 [ scc.merge] INFO Merged PRs:
2024-05-03 13:42:40,019 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-05-03 13:42:40,019 [ scc.merge] INFO
2024-05-03 13:42:40,019 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-03 13:42:40,019 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-05-03 13:42:40,019 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-05-03 13:42:40,019 [ scc.merge] INFO
2024-05-03 13:42:40,019 [ scc.merge] INFO Repository: ome/omero-figure
2024-05-03 13:42:40,019 [ scc.merge] INFO Excluded PRs:
2024-05-03 13:42:40,019 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-05-03 13:42:40,019 [ scc.merge] INFO Already up to date.
2024-05-03 13:42:40,019 [ scc.merge] INFO
2024-05-03 13:42:40,019 [ scc.merge] INFO Merged PRs:
2024-05-03 13:42:40,019 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-05-03 13:42:40,019 [ scc.merge] INFO - PR 554 jburel 'Update publish'
2024-05-03 13:42:40,019 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-05-03 13:42:40,019 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-05-03 13:42:40,019 [ scc.merge] INFO - PR 561 will-moore 'Bugfixes may2024'
2024-05-03 13:42:40,019 [ scc.merge] INFO
2024-05-03 13:42:40,019 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-05-03 13:42:40,019 [ scc.merge] INFO Already up to date.
2024-05-03 13:42:40,019 [ scc.merge] INFO
2024-05-03 13:42:40,019 [ scc.merge] INFO Merged PRs:
2024-05-03 13:42:40,019 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-05-03 13:42:40,019 [ scc.merge] INFO
2024-05-03 13:42:40,019 [ scc.merge] INFO Repository: ome/omero-gallery
2024-05-03 13:42:40,019 [ scc.merge] INFO Already up to date.
2024-05-03 13:42:40,020 [ scc.merge] INFO
2024-05-03 13:42:40,020 [ scc.merge] INFO Merged PRs:
2024-05-03 13:42:40,020 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-03 13:42:40,020 [ scc.merge] INFO
2024-05-03 13:42:40,020 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-05-03 13:42:40,020 [ scc.merge] INFO Excluded PRs:
2024-05-03 13:42:40,020 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-05-03 13:42:40,020 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-05-03 13:42:40,020 [ scc.merge] INFO Already up to date.
2024-05-03 13:42:40,020 [ scc.merge] INFO
2024-05-03 13:42:40,020 [ scc.merge] INFO Merged PRs:
2024-05-03 13:42:40,020 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-05-03 13:42:40,020 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-05-03 13:42:40,020 [ scc.merge] INFO - PR 469 will-moore 'changelog 0.14.0'
2024-05-03 13:42:40,020 [ scc.merge] INFO - PR 470 will-moore 'Movie playing waits for planes'
2024-05-03 13:42:40,020 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-03 13:42:40,020 [ scc.merge] INFO - PR 474 will-moore 'Img data error handling'
2024-05-03 13:42:40,020 [ scc.merge] INFO
2024-05-03 13:42:40,020 [ scc.merge] INFO Repository: ome/omero-mapr
2024-05-03 13:42:40,020 [ scc.merge] INFO Excluded PRs:
2024-05-03 13:42:40,020 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-05-03 13:42:40,020 [ scc.merge] INFO Already up to date.
2024-05-03 13:42:40,020 [ scc.merge] INFO
2024-05-03 13:42:40,020 [ scc.merge] INFO Merged PRs:
2024-05-03 13:42:40,020 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-05-03 13:42:40,020 [ scc.merge] INFO
2024-05-03 13:42:40,020 [ scc.merge] INFO Repository: ome/omero-metadata
2024-05-03 13:42:40,020 [ scc.merge] INFO Already up to date.
2024-05-03 13:42:40,020 [ scc.merge] INFO
2024-05-03 13:42:40,020 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-03 13:42:40,020 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-03 13:42:40,020 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-03 13:42:40,020 [ scc.merge] INFO
2024-05-03 13:42:40,020 [ scc.merge] INFO Repository: ome/omero-parade
2024-05-03 13:42:40,020 [ scc.merge] INFO Excluded PRs:
2024-05-03 13:42:40,020 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-05-03 13:42:40,020 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-05-03 13:42:40,020 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-05-03 13:42:40,021 [ scc.merge] INFO Already up to date.
2024-05-03 13:42:40,021 [ scc.merge] INFO
2024-05-03 13:42:40,021 [ scc.merge] INFO Merged PRs:
2024-05-03 13:42:40,021 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-03 13:42:40,021 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-03 13:42:40,021 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-03 13:42:40,021 [ scc.merge] INFO
2024-05-03 13:42:40,021 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-05-03 13:42:40,021 [ scc.merge] INFO Already up to date.
2024-05-03 13:42:40,021 [ scc.merge] INFO
2024-05-03 13:42:40,021 [ scc.merge] INFO Merged PRs:
2024-05-03 13:42:40,021 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-05-03 13:42:40,021 [ scc.merge] INFO
2024-05-03 13:42:40,021 [ scc.merge] INFO Repository: ome/omero-rois
2024-05-03 13:42:40,021 [ scc.merge] INFO Excluded PRs:
2024-05-03 13:42:40,021 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-03 13:42:40,021 [ scc.merge] INFO Already up to date.
2024-05-03 13:42:40,021 [ scc.merge] INFO
2024-05-03 13:42:40,021 [ scc.merge] INFO Merged PRs:
2024-05-03 13:42:40,021 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-03 13:42:40,021 [ scc.merge] INFO
2024-05-03 13:42:40,021 [ scc.merge] INFO Repository: ome/omero-signup
2024-05-03 13:42:40,021 [ scc.merge] INFO Already up to date.
2024-05-03 13:42:40,021 [ scc.merge] INFO
2024-05-03 13:42:40,021 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-03 13:42:40,021 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-03 13:42:40,021 [ scc.merge] INFO
2024-05-03 13:42:40,021 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-05-03 13:42:40,021 [ scc.merge] INFO Already up to date.
2024-05-03 13:42:40,021 [ scc.merge] INFO
2024-05-03 13:42:40,021 [ scc.merge] INFO Merged PRs:
2024-05-03 13:42:40,021 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-03 13:42:40,021 [ scc.merge] INFO
2024-05-03 13:42:40,021 [ scc.merge] INFO Repository: ome/omero-upload
2024-05-03 13:42:40,021 [ scc.merge] INFO Already up to date.
2024-05-03 13:42:40,021 [ scc.merge] INFO
2024-05-03 13:42:40,021 [ scc.merge] INFO
2024-05-03 13:42:40,021 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-05-03 13:42:40,022 [ scc.merge] INFO Already up to date.
2024-05-03 13:42:40,022 [ scc.merge] INFO
2024-05-03 13:42:40,022 [ scc.merge] INFO
2024-05-03 13:42:40,022 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-05-03 13:42:40,022 [ scc.merge] INFO Excluded PRs:
2024-05-03 13:42:40,022 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-05-03 13:42:40,022 [ scc.merge] INFO Already up to date.
2024-05-03 13:42:40,022 [ scc.merge] INFO
2024-05-03 13:42:40,022 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-03 13:42:40,022 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-03 13:42:40,022 [ scc.merge] INFO
2024-05-03 13:42:40,022 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-05-03 13:42:40,022 [ scc.merge] INFO Already up to date.
2024-05-03 13:42:40,022 [ scc.merge] INFO
2024-05-03 13:42:40,022 [ scc.merge] INFO
2024-05-03 13:42:40,022 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-05-03 13:42:40,022 [ scc.merge] INFO Already up to date.
2024-05-03 13:42:40,022 [ scc.merge] INFO
2024-05-03 13:42:40,022 [ scc.merge] INFO
2024-05-03 13:42:40,022 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-05-03 13:42:40,022 [ scc.merge] INFO Already up to date.
2024-05-03 13:42:40,022 [ scc.merge] INFO
2024-05-03 13:42:40,022 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-03 13:42:40,022 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-05-03 13:42:40,022 [ scc.merge] INFO
2024-05-03 13:42:40,022 [ scc.merge] INFO Repository: ome/scripts
2024-05-03 13:42:40,022 [ scc.merge] INFO Excluded PRs:
2024-05-03 13:42:40,022 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-05-03 13:42:40,022 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-05-03 13:42:40,022 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-05-03 13:42:40,022 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-05-03 13:42:40,022 [ scc.merge] INFO Already up to date.
2024-05-03 13:42:40,022 [ scc.merge] INFO
2024-05-03 13:42:40,022 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-03 13:42:40,022 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-03 13:42:40,022 [ scc.merge] INFO
2024-05-03 13:42:40,022 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-03 13:42:40,023 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 13:42:40,027 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-05-03 13:42:40,027 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 13:42:40,031 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:40,031 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-05-03 13:42:40,031 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 13:42:40,035 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:40,036 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-05-03 13:42:40,036 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 13:42:40,040 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:40,040 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-05-03 13:42:40,040 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 13:42:40,044 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:40,044 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-03 13:42:40,044 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 13:42:40,049 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:40,049 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-03 13:42:40,049 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 13:42:40,053 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:40,053 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-03 13:42:40,053 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 13:42:40,057 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:40,057 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-03 13:42:40,057 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 13:42:40,061 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:40,061 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-03 13:42:40,061 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 13:42:40,065 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:40,065 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-03 13:42:40,065 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 13:42:40,069 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:40,070 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-03 13:42:40,070 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 13:42:40,074 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:40,074 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-03 13:42:40,074 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 13:42:40,078 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:40,078 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-03 13:42:40,078 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 13:42:40,082 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:40,082 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-03 13:42:40,082 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 13:42:40,086 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:40,086 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-03 13:42:40,086 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 13:42:40,090 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:40,091 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-03 13:42:40,091 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 13:42:40,095 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:40,095 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-03 13:42:40,095 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 13:42:40,099 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:40,099 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-03 13:42:40,099 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 13:42:40,103 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:40,103 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-03 13:42:40,103 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 13:42:40,107 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:40,108 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-03 13:42:40,108 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 13:42:40,112 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:40,112 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-03 13:42:40,112 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 13:42:40,116 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-03 13:42:40,116 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-03 13:42:40,116 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 13:42:40,120 [ 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 17ef3bd] 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 ae0467b] 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 13:43:24,507 [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 13:43:33,466 [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 13:43:35,830 [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 13:43:40,366 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-05-03 13:44:26,565 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci