Console Output
Skipping 86 KB..
Full Logommits/3179811fd0a1d65e2dc5f56013cf92e086da24ab/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-23 00:43:20,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-08-23 00:43:20,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/3179811fd0a1d65e2dc5f56013cf92e086da24ab?per_page=1 HTTP/1.1" 200 2
2024-08-23 00:43:20,678 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-08-23 00:43:21,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-08-23 00:43:21,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549/comments HTTP/1.1" 200 None
2024-08-23 00:43:22,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-08-23 00:43:22,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-23 00:43:23,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-23 00:43:23,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-08-23 00:43:23,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/f7d26b972bfe9a7105c4f94776748446f2395c77?per_page=1 HTTP/1.1" 200 2
2024-08-23 00:43:23,846 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-08-23 00:43:23,846 [ scc.repo] DEBUG ## Branches found:
2024-08-23 00:43:23,846 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-08-23 00:43:23,847 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:43:23,847 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:43:23,853 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-23 00:43:23,858 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-23 00:43:23,859 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-23 00:43:23,864 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-23 00:43:23,894 [ scc.git] DEBUG Updating 47f49486..cbdd3657
2024-08-23 00:43:24,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls/576 HTTP/1.1" 200 None
2024-08-23 00:43:24,444 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-08-23 00:43:24,814 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-23 00:43:24,815 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-08-23 00:43:24,821 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-08-23 00:43:25,381 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-23 00:43:25,381 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-08-23 00:43:25,388 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-08-23 00:43:25,703 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-23 00:43:25,704 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-08-23 00:43:25,711 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-08-23 00:43:26,084 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-23 00:43:26,084 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-08-23 00:43:26,091 [ scc.git] DEBUG ## Unique users: []
2024-08-23 00:43:26,092 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:43:26,092 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:43:26,100 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-08-23 00:43:26,111 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:43:26,118 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-08-23 00:43:26,190 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-23 00:43:26,190 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-23 00:43:26,191 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-23 00:43:26,197 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-08-23 00:43:26,197 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-08-23 00:43:26,197 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-08-23 00:43:26,197 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-08-23 00:43:26,197 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-08-23 00:43:26,197 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-08-23 00:43:26,197 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-08-23 00:43:26,197 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-08-23 00:43:26,197 [ scc.git] DEBUG src/templates/rois_form.template.html | 8 ++++
2024-08-23 00:43:26,197 [ scc.git] DEBUG 9 files changed, 271 insertions(+), 5 deletions(-)
2024-08-23 00:43:26,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:43:26,371 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-08-23 00:43:26,380 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:43:26,385 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-08-23 00:43:26,518 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-23 00:43:26,518 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-23 00:43:26,518 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-08-23 00:43:26,519 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-08-23 00:43:26,519 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-23 00:43:26,527 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-08-23 00:43:26,527 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-08-23 00:43:26,527 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-08-23 00:43:26,527 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-08-23 00:43:26,527 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-08-23 00:43:26,527 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-08-23 00:43:26,527 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-08-23 00:43:26,527 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-08-23 00:43:26,527 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-08-23 00:43:26,527 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-08-23 00:43:26,527 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-08-23 00:43:26,527 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-08-23 00:43:26,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:43:26,760 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...996699f155d2df664d08ff1b8b01c8f6305074be'
2024-08-23 00:43:26,772 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:43:26,778 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) 996699f155d2df664d08ff1b8b01c8f6305074be'
2024-08-23 00:43:26,881 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-08-23 00:43:26,881 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-23 00:43:26,881 [ scc.git] DEBUG Auto-merging src/index.html
2024-08-23 00:43:26,881 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-08-23 00:43:26,881 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-23 00:43:26,881 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-23 00:43:26,882 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-23 00:43:26,889 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-08-23 00:43:26,889 [ scc.git] DEBUG omero_figure/urls.py | 10 +++-
2024-08-23 00:43:26,889 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-08-23 00:43:26,889 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-08-23 00:43:26,889 [ scc.git] DEBUG src/index.html | 1 +
2024-08-23 00:43:26,889 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-08-23 00:43:26,889 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-08-23 00:43:26,889 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-08-23 00:43:26,889 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-08-23 00:43:26,889 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-08-23 00:43:26,889 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-08-23 00:43:26,889 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-08-23 00:43:26,890 [ scc.git] DEBUG src/templates/image_display_options.template.html | 6 ++-
2024-08-23 00:43:26,890 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-08-23 00:43:26,890 [ scc.git] DEBUG 14 files changed, 163 insertions(+), 16 deletions(-)
2024-08-23 00:43:27,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:43:27,143 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-08-23 00:43:27,152 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:43:27,158 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 568 (Remove numpy from tests_require in setup.py) 15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-08-23 00:43:27,189 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-23 00:43:27,192 [ scc.git] DEBUG setup.py | 2 +-
2024-08-23 00:43:27,192 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-23 00:43:27,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:43:27,526 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-23 00:43:27,566 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:43:27,567 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:43:27,573 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-23 00:43:27,611 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-23 00:43:27,620 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1e200d94f0> has no local changes
2024-08-23 00:43:27,620 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 578 Rdornier 'Image outline' (user: Rdornier)
- PR 577 Rdornier 'Fill rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 47f49486..cbdd3657
Previously merged:
- PR 576 Rdornier 'Color picker - popup update'
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
Generated by OMERO-plugins-push#161 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/)'
2024-08-23 00:43:27,631 [ scc.git] DEBUG [detached HEAD d8adbbc9] merge master -Dorg -Ssuccess-only
2024-08-23 00:43:27,632 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:43:27,632 [ scc.repo] DEBUG ## PRs found:
2024-08-23 00:43:27,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-08-23 00:43:28,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-08-23 00:43:28,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-08-23 00:43:29,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-23 00:43:29,859 [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-08-23 00:43:30,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-23 00:43:30,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-08-23 00:43:30,803 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-08-23 00:43:30,803 [ scc.repo] DEBUG ## Branches found:
2024-08-23 00:43:30,803 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-23 00:43:30,803 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:43:30,804 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:43:30,810 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-23 00:43:30,815 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-23 00:43:30,815 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-23 00:43:30,821 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-23 00:43:30,827 [ scc.git] DEBUG Already up to date.
2024-08-23 00:43:30,827 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-08-23 00:43:31,136 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-08-23 00:43:31,136 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-08-23 00:43:31,141 [ scc.git] DEBUG ## Unique users: []
2024-08-23 00:43:31,142 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:43:31,142 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:43:31,148 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-23 00:43:31,155 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:43:31,161 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-23 00:43:31,192 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-08-23 00:43:31,193 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-23 00:43:31,196 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-08-23 00:43:31,196 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-08-23 00:43:31,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:43:31,344 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-23 00:43:31,386 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:43:31,386 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:43:31,392 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-23 00:43:31,430 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-23 00:43:31,438 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1e20132700> has no local changes
2024-08-23 00:43:31,439 [ 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#161 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/)'
2024-08-23 00:43:31,449 [ scc.git] DEBUG [detached HEAD a9e0651] merge master -Dorg -Ssuccess-only
2024-08-23 00:43:31,449 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:43:31,449 [ scc.repo] DEBUG ## PRs found:
2024-08-23 00:43:31,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-08-23 00:43:32,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-08-23 00:43:32,256 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-23 00:43:32,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-23 00:43:33,232 [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-08-23 00:43:33,694 [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-08-23 00:43:34,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-23 00:43:34,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-08-23 00:43:34,675 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-23 00:43:34,676 [ scc.repo] DEBUG ## Branches found:
2024-08-23 00:43:34,676 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-23 00:43:34,676 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:43:34,676 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:43:34,682 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-23 00:43:34,687 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-23 00:43:34,688 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-23 00:43:34,693 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-23 00:43:34,699 [ scc.git] DEBUG Already up to date.
2024-08-23 00:43:34,699 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-08-23 00:43:35,015 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-08-23 00:43:35,016 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-08-23 00:43:35,022 [ scc.git] DEBUG ## Unique users: []
2024-08-23 00:43:35,023 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:43:35,023 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:43:35,029 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-08-23 00:43:35,035 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:43:35,040 [ 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-08-23 00:43:35,052 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-23 00:43:35,057 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-08-23 00:43:35,057 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-08-23 00:43:35,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:43:35,208 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-23 00:43:35,251 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:43:35,252 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:43:35,257 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-23 00:43:35,298 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-23 00:43:35,306 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1e2017bb50> has no local changes
2024-08-23 00:43:35,306 [ 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#161 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/)'
2024-08-23 00:43:35,316 [ scc.git] DEBUG [detached HEAD 5a6eaca] merge master -Dorg -Ssuccess-only
2024-08-23 00:43:35,317 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:43:35,317 [ scc.repo] DEBUG ## PRs found:
2024-08-23 00:43:35,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-08-23 00:43:36,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-08-23 00:43:36,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-08-23 00:43:36,646 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-23 00:43:37,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-23 00:43:37,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-23 00:43:38,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-23 00:43:38,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-23 00:43:39,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-08-23 00:43:39,139 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-23 00:43:39,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-08-23 00:43:39,606 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-23 00:43:40,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-23 00:43:40,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-23 00:43:41,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-23 00:43:41,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-23 00:43:42,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-08-23 00:43:42,069 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-23 00:43:42,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-08-23 00:43:42,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-08-23 00:43:43,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-23 00:43:43,910 [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-08-23 00:43:44,344 [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-08-23 00:43:44,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-23 00:43:45,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-08-23 00:43:45,162 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-23 00:43:45,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-08-23 00:43:46,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-08-23 00:43:46,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-23 00:43:47,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-23 00:43:47,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-23 00:43:47,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-23 00:43:48,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-08-23 00:43:48,359 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-08-23 00:43:48,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-08-23 00:43:49,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-08-23 00:43:49,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-23 00:43:50,247 [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-08-23 00:43:50,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-23 00:43:51,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-08-23 00:43:51,083 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-08-23 00:43:51,083 [ scc.repo] DEBUG ## Branches found:
2024-08-23 00:43:51,083 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-23 00:43:51,084 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:43:51,084 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:43:51,090 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-23 00:43:51,097 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-23 00:43:51,098 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-23 00:43:51,150 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-23 00:43:51,158 [ scc.git] DEBUG Already up to date.
2024-08-23 00:43:51,159 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-08-23 00:43:51,645 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-23 00:43:51,645 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-08-23 00:43:51,651 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-08-23 00:43:52,691 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-23 00:43:52,691 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-08-23 00:43:52,700 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-08-23 00:43:53,201 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-23 00:43:53,201 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-08-23 00:43:53,209 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-08-23 00:43:53,498 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-23 00:43:53,499 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-08-23 00:43:53,505 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-08-23 00:43:53,805 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-23 00:43:53,805 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-08-23 00:43:53,812 [ scc.git] DEBUG ## Unique users: []
2024-08-23 00:43:53,813 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:43:53,813 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:43:53,820 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-23 00:43:53,830 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:43:53,838 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-23 00:43:53,914 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-08-23 00:43:53,915 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-23 00:43:53,921 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-08-23 00:43:53,921 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-08-23 00:43:53,921 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-08-23 00:43:54,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:43:54,063 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-23 00:43:54,076 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:43:54,086 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-23 00:43:54,255 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-08-23 00:43:54,256 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-08-23 00:43:54,256 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-08-23 00:43:54,256 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-08-23 00:43:54,257 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-23 00:43:54,264 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-08-23 00:43:54,264 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-08-23 00:43:54,264 [ scc.git] DEBUG src/app/header.html | 5 +
2024-08-23 00:43:54,264 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-08-23 00:43:54,264 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-08-23 00:43:54,264 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-08-23 00:43:54,264 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-08-23 00:43:54,264 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-08-23 00:43:54,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:43:54,445 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-23 00:43:54,456 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:43:54,466 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-23 00:43:54,523 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-08-23 00:43:54,525 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-23 00:43:54,531 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-08-23 00:43:54,531 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-08-23 00:43:54,531 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-08-23 00:43:54,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:43:54,836 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-23 00:43:54,862 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:43:54,891 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-23 00:43:54,963 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-23 00:43:54,988 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-08-23 00:43:54,989 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-08-23 00:43:55,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:43:55,214 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-08-23 00:43:55,237 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:43:55,242 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 478 (Bump socket.io from 4.6.1 to 4.7.5) 91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-08-23 00:43:55,364 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-23 00:43:55,365 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-23 00:43:55,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:43:55,596 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-23 00:43:55,638 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:43:55,638 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:43:55,645 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-23 00:43:55,690 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-23 00:43:55,698 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1e20126be0> has no local changes
2024-08-23 00:43:55,699 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- 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 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
Generated by OMERO-plugins-push#161 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/)'
2024-08-23 00:43:55,708 [ scc.git] DEBUG [detached HEAD f5a8258] merge master -Dorg -Ssuccess-only
2024-08-23 00:43:55,709 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:43:55,709 [ scc.repo] DEBUG ## PRs found:
2024-08-23 00:43:56,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-08-23 00:43:56,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/85 HTTP/1.1" 200 None
2024-08-23 00:43:56,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/85/comments HTTP/1.1" 200 None
2024-08-23 00:43:57,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/5166040a15b493631009b9e446f25b6a724289e3 HTTP/1.1" 200 None
2024-08-23 00:43:57,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/5166040a15b493631009b9e446f25b6a724289e3/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-23 00:43:58,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/5166040a15b493631009b9e446f25b6a724289e3/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-23 00:43:58,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-08-23 00:43:59,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-08-23 00:43:59,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-23 00:44:00,364 [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-08-23 00:44:00,871 [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-08-23 00:44:01,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-23 00:44:01,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-08-23 00:44:01,746 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-08-23 00:44:01,747 [ scc.repo] DEBUG ## Branches found:
2024-08-23 00:44:01,747 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-23 00:44:01,747 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:01,747 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:01,753 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-23 00:44:01,758 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-23 00:44:01,758 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-23 00:44:01,765 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-23 00:44:01,771 [ scc.git] DEBUG Already up to date.
2024-08-23 00:44:01,772 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-08-23 00:44:02,100 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-08-23 00:44:02,100 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-08-23 00:44:02,106 [ scc.git] DEBUG ## Unique users: []
2024-08-23 00:44:02,106 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:02,106 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:02,114 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-23 00:44:02,121 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:02,129 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-23 00:44:02,141 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-23 00:44:02,145 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-08-23 00:44:02,145 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-08-23 00:44:02,145 [ scc.git] DEBUG requirements.txt | 2 +-
2024-08-23 00:44:02,145 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-08-23 00:44:02,145 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-08-23 00:44:02,145 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-08-23 00:44:02,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:44:02,278 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-23 00:44:02,331 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:02,331 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:02,338 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-23 00:44:02,390 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-23 00:44:02,399 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1e20125d30> has no local changes
2024-08-23 00:44:02,399 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- PR 85 sbesson 'Add support for OMERO.web 5.27.0' (status: failure)
- 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#161 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/)'
2024-08-23 00:44:02,412 [ scc.git] DEBUG [detached HEAD 8b10e1d] merge master -Dorg -Ssuccess-only
2024-08-23 00:44:02,412 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:44:02,412 [ scc.repo] DEBUG ## PRs found:
2024-08-23 00:44:02,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-08-23 00:44:03,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-08-23 00:44:03,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-08-23 00:44:04,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-23 00:44:04,654 [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-08-23 00:44:05,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-23 00:44:05,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-08-23 00:44:05,473 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-23 00:44:05,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-08-23 00:44:06,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-08-23 00:44:06,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-23 00:44:07,312 [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-08-23 00:44:07,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-23 00:44:08,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-08-23 00:44:08,159 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-23 00:44:08,159 [ scc.repo] DEBUG ## Branches found:
2024-08-23 00:44:08,159 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-23 00:44:08,160 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:08,160 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:08,165 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-23 00:44:08,170 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-23 00:44:08,171 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-23 00:44:08,176 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-23 00:44:08,182 [ scc.git] DEBUG Already up to date.
2024-08-23 00:44:08,183 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-08-23 00:44:08,648 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-23 00:44:08,648 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-08-23 00:44:08,654 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-08-23 00:44:09,832 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-23 00:44:09,833 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-08-23 00:44:09,839 [ scc.git] DEBUG ## Unique users: []
2024-08-23 00:44:09,839 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:09,839 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:09,845 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-23 00:44:09,852 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:09,857 [ 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-08-23 00:44:09,902 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-08-23 00:44:09,902 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-08-23 00:44:09,902 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-23 00:44:09,902 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-23 00:44:09,903 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-23 00:44:09,903 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-23 00:44:09,909 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-23 00:44:09,916 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-23 00:44:10,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:44:10,079 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-23 00:44:10,086 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-23 00:44:10,092 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#161](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-08-23 00:44:10,098 [ scc.config] DEBUG Found github.token
2024-08-23 00:44:10,098 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-08-23 00:44:10,098 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-23 00:44:10,105 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:10,111 [ 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-08-23 00:44:10,129 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-23 00:44:10,129 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-23 00:44:10,129 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-08-23 00:44:10,129 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-23 00:44:10,129 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-23 00:44:10,136 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-23 00:44:10,143 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-23 00:44:10,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:44:10,475 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-23 00:44:10,482 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-23 00:44:10,488 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#161](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/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-08-23 00:44:10,494 [ scc.config] DEBUG Found github.token
2024-08-23 00:44:10,494 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-08-23 00:44:10,494 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-23 00:44:10,533 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:10,533 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:10,539 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-23 00:44:10,579 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-23 00:44:10,585 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1e20103f40> has no local changes
2024-08-23 00:44:10,586 [ 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#161 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/)'
2024-08-23 00:44:10,595 [ scc.git] DEBUG [detached HEAD e57b9bd] merge master -Dorg -Ssuccess-only
2024-08-23 00:44:10,595 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:44:10,596 [ scc.repo] DEBUG ## PRs found:
2024-08-23 00:44:11,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-08-23 00:44:11,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-08-23 00:44:11,464 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-23 00:44:12,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-23 00:44:12,613 [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-08-23 00:44:13,098 [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-08-23 00:44:13,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-23 00:44:14,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-08-23 00:44:14,034 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-23 00:44:14,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-08-23 00:44:14,485 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-23 00:44:14,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-23 00:44:15,498 [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-08-23 00:44:15,948 [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-08-23 00:44:16,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-23 00:44:16,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-08-23 00:44:16,923 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-23 00:44:17,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-08-23 00:44:17,377 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-23 00:44:17,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-23 00:44:18,450 [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-08-23 00:44:18,931 [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-08-23 00:44:19,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-23 00:44:19,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-08-23 00:44:19,855 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-23 00:44:20,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-08-23 00:44:20,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-08-23 00:44:21,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-08-23 00:44:21,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-08-23 00:44:22,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-08-23 00:44:22,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-08-23 00:44:22,698 [ scc.repo] DEBUG ## Branches found:
2024-08-23 00:44:22,698 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-23 00:44:22,698 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:22,698 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:22,705 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-23 00:44:22,711 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-23 00:44:22,711 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-23 00:44:22,717 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-23 00:44:22,723 [ scc.git] DEBUG Already up to date.
2024-08-23 00:44:22,723 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-08-23 00:44:23,043 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-23 00:44:23,043 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-08-23 00:44:23,048 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-08-23 00:44:23,392 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-23 00:44:23,392 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-08-23 00:44:23,398 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-08-23 00:44:23,671 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-23 00:44:23,672 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-08-23 00:44:23,677 [ scc.git] DEBUG ## Unique users: []
2024-08-23 00:44:23,677 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:23,677 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:23,683 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-08-23 00:44:23,690 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:23,696 [ 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-08-23 00:44:23,710 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-23 00:44:23,713 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-08-23 00:44:23,714 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-08-23 00:44:23,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:44:23,845 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-08-23 00:44:23,852 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:23,858 [ 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-08-23 00:44:23,904 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-23 00:44:23,904 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-23 00:44:23,907 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-08-23 00:44:23,907 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-08-23 00:44:24,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:44:24,231 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-08-23 00:44:24,237 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:24,244 [ 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-08-23 00:44:24,284 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-23 00:44:24,285 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-23 00:44:24,289 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-08-23 00:44:24,289 [ scc.git] DEBUG package.json | 2 +-
2024-08-23 00:44:24,289 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-08-23 00:44:24,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:44:24,623 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-23 00:44:24,669 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:24,669 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:24,675 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-23 00:44:24,714 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-23 00:44:24,722 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1e200a9580> has no local changes
2024-08-23 00:44:24,722 [ 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#161 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/)'
2024-08-23 00:44:24,732 [ scc.git] DEBUG [detached HEAD 5248fdd] merge master -Dorg -Ssuccess-only
2024-08-23 00:44:24,733 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:44:24,733 [ scc.repo] DEBUG ## PRs found:
2024-08-23 00:44:25,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-08-23 00:44:25,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-08-23 00:44:26,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-23 00:44:26,509 [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-08-23 00:44:27,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-23 00:44:27,392 [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-08-23 00:44:27,393 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-08-23 00:44:27,393 [ scc.repo] DEBUG ## Branches found:
2024-08-23 00:44:27,393 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-23 00:44:27,393 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:27,393 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:27,400 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-23 00:44:27,406 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-23 00:44:27,406 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-23 00:44:27,413 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-23 00:44:27,420 [ scc.git] DEBUG Already up to date.
2024-08-23 00:44:27,421 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-23 00:44:27,734 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-08-23 00:44:27,735 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-23 00:44:27,739 [ scc.git] DEBUG ## Unique users: []
2024-08-23 00:44:27,740 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:27,740 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:27,746 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-23 00:44:27,753 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:27,760 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-23 00:44:27,770 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-23 00:44:27,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:44:27,914 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-23 00:44:27,958 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:27,958 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:27,965 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-23 00:44:28,004 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-23 00:44:28,010 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1e200e9e80> has no local changes
2024-08-23 00:44:28,010 [ 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#161 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/)'
2024-08-23 00:44:28,019 [ scc.git] DEBUG [detached HEAD 697185a] merge master -Dorg -Ssuccess-only
2024-08-23 00:44:28,019 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:44:28,019 [ scc.repo] DEBUG ## PRs found:
2024-08-23 00:44:28,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-08-23 00:44:28,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-08-23 00:44:29,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-08-23 00:44:29,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-08-23 00:44:30,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-23 00:44:30,685 [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-08-23 00:44:31,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-23 00:44:31,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-08-23 00:44:31,572 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-23 00:44:31,572 [ scc.repo] DEBUG ## Branches found:
2024-08-23 00:44:31,572 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-23 00:44:31,573 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:31,573 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:31,578 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-23 00:44:31,584 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-23 00:44:31,584 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-23 00:44:31,589 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-23 00:44:31,596 [ scc.git] DEBUG Already up to date.
2024-08-23 00:44:31,597 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-08-23 00:44:32,061 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-08-23 00:44:32,061 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-08-23 00:44:32,067 [ scc.git] DEBUG ## Unique users: []
2024-08-23 00:44:32,067 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:32,067 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:32,074 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-08-23 00:44:32,081 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:32,086 [ 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-08-23 00:44:32,096 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-08-23 00:44:32,097 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-23 00:44:32,099 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-08-23 00:44:32,099 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-08-23 00:44:32,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:44:32,242 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-23 00:44:32,281 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:32,281 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:32,286 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-23 00:44:32,325 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-23 00:44:32,331 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1e2005cb50> has no local changes
2024-08-23 00:44:32,332 [ 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#161 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/)'
2024-08-23 00:44:32,340 [ scc.git] DEBUG [detached HEAD 5e1a8c3] merge master -Dorg -Ssuccess-only
2024-08-23 00:44:32,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:44:32,340 [ scc.repo] DEBUG ## PRs found:
2024-08-23 00:44:32,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-08-23 00:44:33,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-08-23 00:44:33,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-08-23 00:44:34,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-23 00:44:34,683 [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-08-23 00:44:35,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-23 00:44:35,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-08-23 00:44:35,647 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-23 00:44:35,647 [ scc.repo] DEBUG ## Branches found:
2024-08-23 00:44:35,647 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-23 00:44:35,647 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:35,647 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:35,654 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-23 00:44:35,659 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-23 00:44:35,659 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-23 00:44:35,665 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-23 00:44:35,670 [ scc.git] DEBUG Already up to date.
2024-08-23 00:44:35,671 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-23 00:44:36,045 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-08-23 00:44:36,045 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-23 00:44:36,052 [ scc.git] DEBUG ## Unique users: []
2024-08-23 00:44:36,052 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:36,052 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:36,058 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-23 00:44:36,064 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:36,070 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-23 00:44:36,142 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-08-23 00:44:36,143 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-08-23 00:44:36,143 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-08-23 00:44:36,143 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-08-23 00:44:36,143 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-08-23 00:44:36,143 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-08-23 00:44:36,143 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-23 00:44:36,143 [ scc.git] DEBUG Auto-merging setup.py
2024-08-23 00:44:36,144 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-08-23 00:44:36,144 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-23 00:44:36,150 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-23 00:44:36,157 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-08-23 00:44:36,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:44:36,291 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-23 00:44:36,299 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-23 00:44:36,305 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#161](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- setup.py
- omero_signup/views.py
- omero_signup/urls.py
--conflicts
2024-08-23 00:44:36,310 [ scc.config] DEBUG Found github.token
2024-08-23 00:44:36,310 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-08-23 00:44:36,310 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-23 00:44:36,349 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:36,350 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:36,358 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-23 00:44:36,404 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-23 00:44:36,412 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1e200a9730> has no local changes
2024-08-23 00:44:36,413 [ 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#161 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/)'
2024-08-23 00:44:36,422 [ scc.git] DEBUG [detached HEAD 57638d8] merge master -Dorg -Ssuccess-only
2024-08-23 00:44:36,423 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:44:36,423 [ scc.repo] DEBUG ## PRs found:
2024-08-23 00:44:36,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-08-23 00:44:37,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-08-23 00:44:37,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-08-23 00:44:38,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-23 00:44:38,641 [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-08-23 00:44:39,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-23 00:44:39,451 [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-08-23 00:44:39,452 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-23 00:44:39,452 [ scc.repo] DEBUG ## Branches found:
2024-08-23 00:44:39,452 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-23 00:44:39,452 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:39,452 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:39,458 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-23 00:44:39,463 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-23 00:44:39,463 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-23 00:44:39,468 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-23 00:44:39,475 [ scc.git] DEBUG Already up to date.
2024-08-23 00:44:39,475 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-08-23 00:44:39,870 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-08-23 00:44:39,870 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-08-23 00:44:39,876 [ scc.git] DEBUG ## Unique users: []
2024-08-23 00:44:39,876 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:39,877 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:39,883 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-08-23 00:44:39,892 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:39,898 [ 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-08-23 00:44:39,925 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-23 00:44:39,929 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-08-23 00:44:39,930 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-08-23 00:44:39,930 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-08-23 00:44:39,930 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-08-23 00:44:39,930 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-08-23 00:44:39,930 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-08-23 00:44:39,930 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-08-23 00:44:39,930 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-08-23 00:44:39,930 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-08-23 00:44:39,930 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-08-23 00:44:39,932 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-08-23 00:44:39,932 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-08-23 00:44:39,932 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-08-23 00:44:39,932 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-08-23 00:44:39,932 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-08-23 00:44:39,932 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-08-23 00:44:39,932 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-08-23 00:44:39,932 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-08-23 00:44:39,932 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-08-23 00:44:39,932 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-08-23 00:44:39,932 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-08-23 00:44:39,933 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-08-23 00:44:39,933 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-08-23 00:44:39,933 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-08-23 00:44:39,933 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-08-23 00:44:39,933 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-08-23 00:44:39,933 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-08-23 00:44:39,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-08-23 00:44:39,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-08-23 00:44:39,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-08-23 00:44:39,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-08-23 00:44:39,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-08-23 00:44:39,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-08-23 00:44:39,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-08-23 00:44:39,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-08-23 00:44:39,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-08-23 00:44:39,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-08-23 00:44:39,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-08-23 00:44:39,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-08-23 00:44:39,933 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-08-23 00:44:39,933 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-08-23 00:44:39,933 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-08-23 00:44:39,933 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-08-23 00:44:39,933 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-08-23 00:44:39,933 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-08-23 00:44:40,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:44:40,079 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-23 00:44:40,152 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:40,153 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:40,162 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-23 00:44:40,203 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-23 00:44:40,209 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1e20095640> has no local changes
2024-08-23 00:44:40,210 [ 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#161 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/)'
2024-08-23 00:44:40,220 [ scc.git] DEBUG [detached HEAD b856761] merge master -Dorg -Ssuccess-only
2024-08-23 00:44:40,220 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:44:40,220 [ scc.repo] DEBUG ## PRs found:
2024-08-23 00:44:40,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-08-23 00:44:40,549 [ scc.repo] DEBUG ## Branches found:
2024-08-23 00:44:40,549 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-23 00:44:40,550 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:40,550 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:40,557 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-23 00:44:40,563 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-23 00:44:40,563 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-23 00:44:40,568 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-23 00:44:40,574 [ scc.git] DEBUG Already up to date.
2024-08-23 00:44:40,574 [ scc.git] DEBUG ## Unique users: []
2024-08-23 00:44:40,574 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:40,574 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:40,579 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-23 00:44:40,619 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:40,619 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:40,625 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-23 00:44:40,666 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-23 00:44:40,673 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1e2002fe80> has no local changes
2024-08-23 00:44:40,673 [ 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#161 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/)'
2024-08-23 00:44:40,681 [ scc.git] DEBUG [detached HEAD c882996] merge master -Dorg -Ssuccess-only
2024-08-23 00:44:40,682 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:44:40,682 [ scc.repo] DEBUG ## PRs found:
2024-08-23 00:44:40,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-08-23 00:44:40,960 [ scc.repo] DEBUG ## Branches found:
2024-08-23 00:44:40,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-23 00:44:40,960 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:40,960 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:40,966 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-23 00:44:40,972 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-23 00:44:40,972 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-23 00:44:40,977 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-23 00:44:40,983 [ scc.git] DEBUG Already up to date.
2024-08-23 00:44:40,983 [ scc.git] DEBUG ## Unique users: []
2024-08-23 00:44:40,983 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:40,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:40,989 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-23 00:44:41,035 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:41,035 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:41,040 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-23 00:44:41,087 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-23 00:44:41,094 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1e2005a790> has no local changes
2024-08-23 00:44:41,094 [ 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#161 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/)'
2024-08-23 00:44:41,103 [ scc.git] DEBUG [detached HEAD f508988] merge master -Dorg -Ssuccess-only
2024-08-23 00:44:41,104 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:44:41,104 [ scc.git] INFO Overriding base-branch from master to main
2024-08-23 00:44:41,104 [ scc.repo] DEBUG ## PRs found:
2024-08-23 00:44:41,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-08-23 00:44:41,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-08-23 00:44:42,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-08-23 00:44:42,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-08-23 00:44:43,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-23 00:44:43,745 [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-08-23 00:44:44,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-23 00:44:44,635 [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-08-23 00:44:44,636 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-23 00:44:44,636 [ scc.repo] DEBUG ## Branches found:
2024-08-23 00:44:44,636 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-23 00:44:44,637 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:44,637 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:44,646 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-08-23 00:44:44,652 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-23 00:44:44,652 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-08-23 00:44:44,659 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-08-23 00:44:44,666 [ scc.git] DEBUG Already up to date.
2024-08-23 00:44:44,666 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-08-23 00:44:45,015 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-08-23 00:44:45,015 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-08-23 00:44:45,022 [ scc.git] DEBUG ## Unique users: []
2024-08-23 00:44:45,022 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:45,022 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:45,028 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-23 00:44:45,035 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:45,044 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-23 00:44:45,075 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-08-23 00:44:45,076 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-08-23 00:44:45,076 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-23 00:44:45,076 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-23 00:44:45,082 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-23 00:44:45,090 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-08-23 00:44:45,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:44:45,239 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-23 00:44:45,247 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-23 00:44:45,255 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#161](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-08-23 00:44:45,262 [ scc.config] DEBUG Found github.token
2024-08-23 00:44:45,263 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-08-23 00:44:45,263 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-23 00:44:45,308 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:45,309 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:45,315 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-23 00:44:45,357 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-23 00:44:45,365 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1e2007af40> has no local changes
2024-08-23 00:44:45,365 [ 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#161 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/)'
2024-08-23 00:44:45,376 [ scc.git] DEBUG [detached HEAD 8d26f7b] merge master -Dorg -Ssuccess-only
2024-08-23 00:44:45,377 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:44:45,377 [ scc.repo] DEBUG ## PRs found:
2024-08-23 00:44:45,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-08-23 00:44:45,664 [ scc.repo] DEBUG ## Branches found:
2024-08-23 00:44:45,664 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-23 00:44:45,664 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:45,664 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:45,671 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-23 00:44:45,678 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-23 00:44:45,678 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-23 00:44:45,685 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-23 00:44:45,691 [ scc.git] DEBUG Already up to date.
2024-08-23 00:44:45,691 [ scc.git] DEBUG ## Unique users: []
2024-08-23 00:44:45,692 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:45,692 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:45,699 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-23 00:44:45,744 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:45,744 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:45,752 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-23 00:44:45,798 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-23 00:44:45,806 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1e2001e7c0> has no local changes
2024-08-23 00:44:45,807 [ 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#161 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/)'
2024-08-23 00:44:45,820 [ scc.git] DEBUG [detached HEAD 5afe9f9] merge master -Dorg -Ssuccess-only
2024-08-23 00:44:45,821 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:44:45,821 [ scc.repo] DEBUG ## PRs found:
2024-08-23 00:44:46,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-08-23 00:44:46,062 [ scc.repo] DEBUG ## Branches found:
2024-08-23 00:44:46,062 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-23 00:44:46,062 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:46,063 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:46,069 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-23 00:44:46,075 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-23 00:44:46,075 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-23 00:44:46,081 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-23 00:44:46,088 [ scc.git] DEBUG Already up to date.
2024-08-23 00:44:46,089 [ scc.git] DEBUG ## Unique users: []
2024-08-23 00:44:46,089 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:46,089 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:46,095 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-23 00:44:46,139 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:46,139 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:46,146 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-23 00:44:46,188 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-23 00:44:46,195 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1e187ba490> has no local changes
2024-08-23 00:44:46,196 [ 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#161 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/)'
2024-08-23 00:44:46,205 [ scc.git] DEBUG [detached HEAD 983bb9d] merge master -Dorg -Ssuccess-only
2024-08-23 00:44:46,206 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:44:46,206 [ scc.repo] DEBUG ## PRs found:
2024-08-23 00:44:46,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-08-23 00:44:47,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-08-23 00:44:47,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-08-23 00:44:47,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-23 00:44:48,364 [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-08-23 00:44:48,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-23 00:44:49,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-08-23 00:44:49,232 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-08-23 00:44:49,232 [ scc.repo] DEBUG ## Branches found:
2024-08-23 00:44:49,232 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-23 00:44:49,232 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:49,232 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:49,238 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-23 00:44:49,245 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-23 00:44:49,245 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-23 00:44:49,252 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-23 00:44:49,259 [ scc.git] DEBUG Already up to date.
2024-08-23 00:44:49,259 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-08-23 00:44:49,620 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-08-23 00:44:49,620 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-08-23 00:44:49,626 [ scc.git] DEBUG ## Unique users: []
2024-08-23 00:44:49,627 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:49,627 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:49,635 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-23 00:44:49,643 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:49,650 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-23 00:44:49,697 [ scc.git] DEBUG Auto-merging Dockerfile
2024-08-23 00:44:49,698 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-08-23 00:44:49,698 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-23 00:44:49,700 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-23 00:44:49,712 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-23 00:44:49,728 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-08-23 00:44:49,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:44:49,863 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-23 00:44:49,873 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-23 00:44:49,883 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#161](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-08-23 00:44:49,891 [ scc.config] DEBUG Found github.token
2024-08-23 00:44:49,892 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-08-23 00:44:49,892 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-23 00:44:49,938 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:49,938 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:49,944 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-23 00:44:49,991 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-23 00:44:49,999 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1e187dc8b0> has no local changes
2024-08-23 00:44:49,999 [ 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#161 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/)'
2024-08-23 00:44:50,009 [ scc.git] DEBUG [detached HEAD bf0f74d] merge master -Dorg -Ssuccess-only
2024-08-23 00:44:50,009 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:44:50,010 [ scc.git] INFO Overriding base-branch from master to develop
2024-08-23 00:44:50,010 [ scc.repo] DEBUG ## PRs found:
2024-08-23 00:44:50,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-08-23 00:44:50,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-08-23 00:44:51,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-08-23 00:44:51,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-08-23 00:44:52,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-08-23 00:44:52,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-08-23 00:44:53,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-08-23 00:44:53,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-23 00:44:54,093 [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-08-23 00:44:54,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-23 00:44:54,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-08-23 00:44:54,998 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-23 00:44:55,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-08-23 00:44:55,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-08-23 00:44:56,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-08-23 00:44:56,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-08-23 00:44:56,832 [ scc.repo] DEBUG ## Branches found:
2024-08-23 00:44:56,832 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-23 00:44:56,833 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:56,833 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:56,845 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-08-23 00:44:56,857 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-23 00:44:56,857 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-08-23 00:44:56,871 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-08-23 00:44:56,885 [ scc.git] DEBUG Already up to date.
2024-08-23 00:44:56,885 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-08-23 00:44:57,327 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-08-23 00:44:57,328 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-08-23 00:44:57,338 [ scc.git] DEBUG ## Unique users: []
2024-08-23 00:44:57,339 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:57,339 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:57,347 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-23 00:44:57,357 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:57,364 [ 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-08-23 00:44:57,413 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-08-23 00:44:57,413 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-08-23 00:44:57,413 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-23 00:44:57,414 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-23 00:44:57,422 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-23 00:44:57,430 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-08-23 00:44:57,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:44:57,647 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-23 00:44:57,658 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-23 00:44:57,666 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#161](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-08-23 00:44:57,674 [ scc.config] DEBUG Found github.token
2024-08-23 00:44:57,675 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-08-23 00:44:57,675 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-23 00:44:57,730 [ scc.git] DEBUG Get sha1 of %s
2024-08-23 00:44:57,731 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-23 00:44:57,739 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-23 00:44:57,790 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-23 00:44:57,803 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1e187dc5b0> has no local changes
2024-08-23 00:44:57,804 [ 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#161 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/)'
2024-08-23 00:44:57,820 [ scc.git] DEBUG [detached HEAD b31be4c] merge master -Dorg -Ssuccess-only
2024-08-23 00:44:57,821 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:44:57,821 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-23 00:44:57,906 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-08-23 00:44:58,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:44:58,072 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-08-23 00:44:58,077 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-08-23 00:44:58,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:44:58,457 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-08-23 00:44:58,462 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-08-23 00:44:58,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:44:58,844 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-08-23 00:44:58,849 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-08-23 00:44:59,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:44:59,263 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-08-23 00:44:59,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:44:59,615 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-08-23 00:44:59,624 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-08-23 00:44:59,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:44:59,988 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-08-23 00:44:59,994 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-08-23 00:45:00,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:45:00,372 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-08-23 00:45:00,377 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-08-23 00:45:00,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:45:00,763 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-08-23 00:45:00,773 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-08-23 00:45:01,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:45:01,154 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-08-23 00:45:01,161 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-08-23 00:45:01,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:45:01,541 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-08-23 00:45:01,550 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-08-23 00:45:01,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:45:01,948 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-08-23 00:45:01,954 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-08-23 00:45:02,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:45:02,324 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-08-23 00:45:02,328 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-08-23 00:45:02,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:45:02,714 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-08-23 00:45:03,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:45:03,110 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-08-23 00:45:03,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:45:03,523 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-08-23 00:45:03,529 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-08-23 00:45:03,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:45:03,914 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-08-23 00:45:04,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:45:04,305 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-08-23 00:45:04,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:45:04,678 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-08-23 00:45:04,683 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-08-23 00:45:05,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:45:05,066 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-08-23 00:45:05,071 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-08-23 00:45:05,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:45:05,448 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-08-23 00:45:05,453 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-08-23 00:45:05,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:45:05,826 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-08-23 00:45:05,831 [ scc.config] DEBUG Found submodule.scripts.url
2024-08-23 00:45:06,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-23 00:45:06,210 [ scc.config] DEBUG Found submodule.scripts.branch
2024-08-23 00:45:06,211 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-23 00:45:06,288 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1e20a2b790> has local changes
2024-08-23 00:45:06,288 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
Merged PRs:
- PR 66 jburel 'Gateway 5 9 2'
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 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
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 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 578 Rdornier 'Image outline' (user: Rdornier)
- PR 577 Rdornier 'Fill rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 47f49486..cbdd3657
Previously merged:
- PR 576 Rdornier 'Color picker - popup update'
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
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 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- 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 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
Repository: ome/omero-mapr
Excluded PRs:
- PR 85 sbesson 'Add support for OMERO.web 5.27.0' (status: failure)
- 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#161 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/161/)'
2024-08-23 00:45:06,304 [ scc.git] DEBUG [detached HEAD d35230e] merge master -Dorg -Ssuccess-only
2024-08-23 00:45:06,304 [ scc.merge] INFO Repository: ome/omero-plugins
2024-08-23 00:45:06,304 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-08-23 00:45:06,304 [ scc.merge] INFO Already up to date.
2024-08-23 00:45:06,304 [ scc.merge] INFO
2024-08-23 00:45:06,304 [ scc.merge] INFO
2024-08-23 00:45:06,304 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-08-23 00:45:06,304 [ scc.merge] INFO Already up to date.
2024-08-23 00:45:06,304 [ scc.merge] INFO
2024-08-23 00:45:06,305 [ scc.merge] INFO Merged PRs:
2024-08-23 00:45:06,305 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-08-23 00:45:06,305 [ scc.merge] INFO
2024-08-23 00:45:06,305 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-08-23 00:45:06,305 [ scc.merge] INFO Excluded PRs:
2024-08-23 00:45:06,305 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-08-23 00:45:06,305 [ scc.merge] INFO Already up to date.
2024-08-23 00:45:06,305 [ scc.merge] INFO
2024-08-23 00:45:06,305 [ scc.merge] INFO Merged PRs:
2024-08-23 00:45:06,305 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-08-23 00:45:06,305 [ scc.merge] INFO
2024-08-23 00:45:06,305 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-08-23 00:45:06,305 [ scc.merge] INFO Excluded PRs:
2024-08-23 00:45:06,305 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-08-23 00:45:06,305 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-08-23 00:45:06,305 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-08-23 00:45:06,305 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-08-23 00:45:06,305 [ scc.merge] INFO Already up to date.
2024-08-23 00:45:06,305 [ scc.merge] INFO
2024-08-23 00:45:06,305 [ scc.merge] INFO Merged PRs:
2024-08-23 00:45:06,305 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-08-23 00:45:06,305 [ scc.merge] INFO
2024-08-23 00:45:06,305 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-08-23 00:45:06,305 [ scc.merge] INFO Excluded PRs:
2024-08-23 00:45:06,305 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-23 00:45:06,305 [ scc.merge] INFO Already up to date.
2024-08-23 00:45:06,305 [ scc.merge] INFO
2024-08-23 00:45:06,305 [ scc.merge] INFO Merged PRs:
2024-08-23 00:45:06,305 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-08-23 00:45:06,305 [ scc.merge] INFO
2024-08-23 00:45:06,305 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-23 00:45:06,305 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-08-23 00:45:06,305 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-08-23 00:45:06,305 [ scc.merge] INFO
2024-08-23 00:45:06,305 [ scc.merge] INFO Repository: ome/omero-figure
2024-08-23 00:45:06,305 [ scc.merge] INFO Excluded PRs:
2024-08-23 00:45:06,305 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-08-23 00:45:06,305 [ scc.merge] INFO - PR 578 Rdornier 'Image outline' (user: Rdornier)
2024-08-23 00:45:06,306 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' (user: Rdornier)
2024-08-23 00:45:06,306 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-08-23 00:45:06,306 [ scc.merge] INFO Updating 47f49486..cbdd3657
2024-08-23 00:45:06,306 [ scc.merge] INFO Previously merged:
2024-08-23 00:45:06,306 [ scc.merge] INFO - PR 576 Rdornier 'Color picker - popup update'
2024-08-23 00:45:06,306 [ scc.merge] INFO
2024-08-23 00:45:06,306 [ scc.merge] INFO Merged PRs:
2024-08-23 00:45:06,306 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-08-23 00:45:06,306 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-08-23 00:45:06,306 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-08-23 00:45:06,306 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-08-23 00:45:06,306 [ scc.merge] INFO
2024-08-23 00:45:06,306 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-08-23 00:45:06,306 [ scc.merge] INFO Already up to date.
2024-08-23 00:45:06,306 [ scc.merge] INFO
2024-08-23 00:45:06,306 [ scc.merge] INFO Merged PRs:
2024-08-23 00:45:06,306 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-08-23 00:45:06,306 [ scc.merge] INFO
2024-08-23 00:45:06,306 [ scc.merge] INFO Repository: ome/omero-gallery
2024-08-23 00:45:06,306 [ scc.merge] INFO Already up to date.
2024-08-23 00:45:06,306 [ scc.merge] INFO
2024-08-23 00:45:06,306 [ scc.merge] INFO Merged PRs:
2024-08-23 00:45:06,306 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-23 00:45:06,306 [ scc.merge] INFO
2024-08-23 00:45:06,306 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-08-23 00:45:06,306 [ scc.merge] INFO Excluded PRs:
2024-08-23 00:45:06,306 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-08-23 00:45:06,306 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-08-23 00:45:06,306 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-08-23 00:45:06,306 [ scc.merge] INFO Already up to date.
2024-08-23 00:45:06,306 [ scc.merge] INFO
2024-08-23 00:45:06,306 [ scc.merge] INFO Merged PRs:
2024-08-23 00:45:06,306 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-08-23 00:45:06,306 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-08-23 00:45:06,306 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-23 00:45:06,306 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-23 00:45:06,306 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-23 00:45:06,306 [ scc.merge] INFO
2024-08-23 00:45:06,307 [ scc.merge] INFO Repository: ome/omero-mapr
2024-08-23 00:45:06,307 [ scc.merge] INFO Excluded PRs:
2024-08-23 00:45:06,307 [ scc.merge] INFO - PR 85 sbesson 'Add support for OMERO.web 5.27.0' (status: failure)
2024-08-23 00:45:06,307 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-08-23 00:45:06,307 [ scc.merge] INFO Already up to date.
2024-08-23 00:45:06,307 [ scc.merge] INFO
2024-08-23 00:45:06,307 [ scc.merge] INFO Merged PRs:
2024-08-23 00:45:06,307 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-08-23 00:45:06,307 [ scc.merge] INFO
2024-08-23 00:45:06,307 [ scc.merge] INFO Repository: ome/omero-metadata
2024-08-23 00:45:06,307 [ scc.merge] INFO Already up to date.
2024-08-23 00:45:06,307 [ scc.merge] INFO
2024-08-23 00:45:06,307 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-23 00:45:06,307 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-23 00:45:06,307 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-23 00:45:06,307 [ scc.merge] INFO
2024-08-23 00:45:06,307 [ scc.merge] INFO Repository: ome/omero-parade
2024-08-23 00:45:06,307 [ scc.merge] INFO Excluded PRs:
2024-08-23 00:45:06,307 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-08-23 00:45:06,307 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-08-23 00:45:06,307 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-08-23 00:45:06,307 [ scc.merge] INFO Already up to date.
2024-08-23 00:45:06,307 [ scc.merge] INFO
2024-08-23 00:45:06,307 [ scc.merge] INFO Merged PRs:
2024-08-23 00:45:06,307 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-23 00:45:06,307 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-23 00:45:06,307 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-23 00:45:06,307 [ scc.merge] INFO
2024-08-23 00:45:06,307 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-08-23 00:45:06,307 [ scc.merge] INFO Already up to date.
2024-08-23 00:45:06,307 [ scc.merge] INFO
2024-08-23 00:45:06,307 [ scc.merge] INFO Merged PRs:
2024-08-23 00:45:06,307 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-08-23 00:45:06,307 [ scc.merge] INFO
2024-08-23 00:45:06,307 [ scc.merge] INFO Repository: ome/omero-rois
2024-08-23 00:45:06,307 [ scc.merge] INFO Excluded PRs:
2024-08-23 00:45:06,307 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-23 00:45:06,307 [ scc.merge] INFO Already up to date.
2024-08-23 00:45:06,308 [ scc.merge] INFO
2024-08-23 00:45:06,308 [ scc.merge] INFO Merged PRs:
2024-08-23 00:45:06,308 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-23 00:45:06,308 [ scc.merge] INFO
2024-08-23 00:45:06,308 [ scc.merge] INFO Repository: ome/omero-signup
2024-08-23 00:45:06,308 [ scc.merge] INFO Already up to date.
2024-08-23 00:45:06,308 [ scc.merge] INFO
2024-08-23 00:45:06,308 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-23 00:45:06,308 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-23 00:45:06,308 [ scc.merge] INFO
2024-08-23 00:45:06,308 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-08-23 00:45:06,308 [ scc.merge] INFO Already up to date.
2024-08-23 00:45:06,308 [ scc.merge] INFO
2024-08-23 00:45:06,308 [ scc.merge] INFO Merged PRs:
2024-08-23 00:45:06,308 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-23 00:45:06,308 [ scc.merge] INFO
2024-08-23 00:45:06,308 [ scc.merge] INFO Repository: ome/omero-upload
2024-08-23 00:45:06,308 [ scc.merge] INFO Already up to date.
2024-08-23 00:45:06,308 [ scc.merge] INFO
2024-08-23 00:45:06,308 [ scc.merge] INFO
2024-08-23 00:45:06,308 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-08-23 00:45:06,308 [ scc.merge] INFO Already up to date.
2024-08-23 00:45:06,308 [ scc.merge] INFO
2024-08-23 00:45:06,308 [ scc.merge] INFO
2024-08-23 00:45:06,308 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-08-23 00:45:06,308 [ scc.merge] INFO Excluded PRs:
2024-08-23 00:45:06,308 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-08-23 00:45:06,308 [ scc.merge] INFO Already up to date.
2024-08-23 00:45:06,308 [ scc.merge] INFO
2024-08-23 00:45:06,308 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-23 00:45:06,308 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-23 00:45:06,309 [ scc.merge] INFO
2024-08-23 00:45:06,309 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-08-23 00:45:06,309 [ scc.merge] INFO Already up to date.
2024-08-23 00:45:06,309 [ scc.merge] INFO
2024-08-23 00:45:06,309 [ scc.merge] INFO
2024-08-23 00:45:06,309 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-08-23 00:45:06,309 [ scc.merge] INFO Already up to date.
2024-08-23 00:45:06,309 [ scc.merge] INFO
2024-08-23 00:45:06,309 [ scc.merge] INFO
2024-08-23 00:45:06,309 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-08-23 00:45:06,309 [ scc.merge] INFO Already up to date.
2024-08-23 00:45:06,309 [ scc.merge] INFO
2024-08-23 00:45:06,309 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-23 00:45:06,309 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-08-23 00:45:06,309 [ scc.merge] INFO
2024-08-23 00:45:06,309 [ scc.merge] INFO Repository: ome/scripts
2024-08-23 00:45:06,309 [ scc.merge] INFO Excluded PRs:
2024-08-23 00:45:06,309 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-08-23 00:45:06,309 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-08-23 00:45:06,309 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-08-23 00:45:06,309 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-08-23 00:45:06,309 [ scc.merge] INFO Already up to date.
2024-08-23 00:45:06,309 [ scc.merge] INFO
2024-08-23 00:45:06,309 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-23 00:45:06,309 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-23 00:45:06,309 [ scc.merge] INFO
2024-08-23 00:45:06,309 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-08-23 00:45:06,309 [ scc.git] DEBUG Calling 'git remote'
2024-08-23 00:45:06,315 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-08-23 00:45:06,315 [ scc.git] DEBUG Calling 'git remote'
2024-08-23 00:45:06,319 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:45:06,319 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-08-23 00:45:06,319 [ scc.git] DEBUG Calling 'git remote'
2024-08-23 00:45:06,324 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:45:06,324 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-08-23 00:45:06,324 [ scc.git] DEBUG Calling 'git remote'
2024-08-23 00:45:06,329 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:45:06,329 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-08-23 00:45:06,329 [ scc.git] DEBUG Calling 'git remote'
2024-08-23 00:45:06,334 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:45:06,334 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-08-23 00:45:06,334 [ scc.git] DEBUG Calling 'git remote'
2024-08-23 00:45:06,339 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:45:06,339 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-23 00:45:06,339 [ scc.git] DEBUG Calling 'git remote'
2024-08-23 00:45:06,344 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:45:06,344 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-23 00:45:06,344 [ scc.git] DEBUG Calling 'git remote'
2024-08-23 00:45:06,348 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:45:06,349 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-23 00:45:06,349 [ scc.git] DEBUG Calling 'git remote'
2024-08-23 00:45:06,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:45:06,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-23 00:45:06,354 [ scc.git] DEBUG Calling 'git remote'
2024-08-23 00:45:06,361 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:45:06,361 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-23 00:45:06,361 [ scc.git] DEBUG Calling 'git remote'
2024-08-23 00:45:06,367 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:45:06,367 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-23 00:45:06,367 [ scc.git] DEBUG Calling 'git remote'
2024-08-23 00:45:06,372 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:45:06,372 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-23 00:45:06,372 [ scc.git] DEBUG Calling 'git remote'
2024-08-23 00:45:06,377 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:45:06,377 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-23 00:45:06,377 [ scc.git] DEBUG Calling 'git remote'
2024-08-23 00:45:06,383 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:45:06,383 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-23 00:45:06,383 [ scc.git] DEBUG Calling 'git remote'
2024-08-23 00:45:06,389 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:45:06,389 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-23 00:45:06,389 [ scc.git] DEBUG Calling 'git remote'
2024-08-23 00:45:06,394 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:45:06,394 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-23 00:45:06,394 [ scc.git] DEBUG Calling 'git remote'
2024-08-23 00:45:06,398 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:45:06,399 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-23 00:45:06,399 [ scc.git] DEBUG Calling 'git remote'
2024-08-23 00:45:06,404 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:45:06,404 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-23 00:45:06,404 [ scc.git] DEBUG Calling 'git remote'
2024-08-23 00:45:06,410 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:45:06,410 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-23 00:45:06,411 [ scc.git] DEBUG Calling 'git remote'
2024-08-23 00:45:06,416 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:45:06,417 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-23 00:45:06,417 [ scc.git] DEBUG Calling 'git remote'
2024-08-23 00:45:06,421 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:45:06,422 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-23 00:45:06,422 [ scc.git] DEBUG Calling 'git remote'
2024-08-23 00:45:06,427 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-23 00:45:06,427 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-23 00:45:06,427 [ scc.git] DEBUG Calling 'git remote'
2024-08-23 00:45:06,432 [ 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.9.2 to 5.9.3-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 9e8a57b] 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 173cac0
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 9b73dd9
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 47f49486
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 a8f380f
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 cda3ec6
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 312afbe
nothing to commit, working tree clean
[detached HEAD 426f241] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-08-23 00:45:52,311 [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-08-23 00:46:00,956 [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-08-23 00:46:03,223 [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-08-23 00:46:07,587 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-08-23 00:46:47,962 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/f6f303f9/images/svgs/logo.svg){kind=logo}
