Console Output
Skipping 91 KB..
Full LogT /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-23 10:35:51,818 [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-07-23 10:35:52,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-07-23 10:35:52,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/f7d26b972bfe9a7105c4f94776748446f2395c77?per_page=1 HTTP/1.1" 200 2
2024-07-23 10:35:52,658 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-07-23 10:35:52,660 [ scc.repo] DEBUG ## Branches found:
2024-07-23 10:35:52,660 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-07-23 10:35:52,660 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:35:52,660 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:35:52,667 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-23 10:35:52,672 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-23 10:35:52,673 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-23 10:35:52,679 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-23 10:35:52,687 [ scc.git] DEBUG Already up to date.
2024-07-23 10:35:52,687 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-07-23 10:35:53,091 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-23 10:35:53,092 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-07-23 10:35:53,097 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-07-23 10:35:54,009 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-23 10:35:54,009 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-07-23 10:35:54,014 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-07-23 10:35:55,239 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-23 10:35:55,240 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-07-23 10:35:55,251 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-07-23 10:35:55,879 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-23 10:35:55,880 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-07-23 10:35:55,888 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-07-23 10:35:56,550 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-23 10:35:56,550 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-07-23 10:35:56,555 [ scc.git] DEBUG ## Unique users: []
2024-07-23 10:35:56,555 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:35:56,556 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:35:56,562 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-07-23 10:35:56,570 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:35:56,580 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-07-23 10:35:56,686 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-07-23 10:35:56,687 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:35:56,694 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-07-23 10:35:56,694 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-07-23 10:35:56,694 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-07-23 10:35:56,694 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-07-23 10:35:56,694 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-07-23 10:35:56,694 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-07-23 10:35:56,694 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-07-23 10:35:56,694 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-07-23 10:35:56,694 [ scc.git] DEBUG src/templates/rois_form.template.html | 8 ++++
2024-07-23 10:35:56,694 [ scc.git] DEBUG 9 files changed, 271 insertions(+), 5 deletions(-)
2024-07-23 10:35:56,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:35:56,875 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-07-23 10:35:56,887 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:35:56,895 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-07-23 10:35:57,090 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-23 10:35:57,091 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-07-23 10:35:57,091 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-07-23 10:35:57,091 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-07-23 10:35:57,091 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:35:57,098 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-07-23 10:35:57,098 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-07-23 10:35:57,098 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-07-23 10:35:57,098 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-07-23 10:35:57,098 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-07-23 10:35:57,098 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-07-23 10:35:57,098 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-07-23 10:35:57,098 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-07-23 10:35:57,098 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-07-23 10:35:57,098 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-07-23 10:35:57,098 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-07-23 10:35:57,098 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-07-23 10:35:57,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:35:57,289 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-07-23 10:35:57,300 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:35:57,320 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) 3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-07-23 10:35:57,684 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-07-23 10:35:57,684 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-23 10:35:57,684 [ scc.git] DEBUG Auto-merging src/index.html
2024-07-23 10:35:57,684 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-07-23 10:35:57,684 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-07-23 10:35:57,684 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-07-23 10:35:57,684 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:35:57,693 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-07-23 10:35:57,693 [ scc.git] DEBUG omero_figure/urls.py | 10 +++-
2024-07-23 10:35:57,693 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-07-23 10:35:57,693 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-07-23 10:35:57,693 [ scc.git] DEBUG src/index.html | 1 +
2024-07-23 10:35:57,693 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-07-23 10:35:57,693 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-07-23 10:35:57,693 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-07-23 10:35:57,693 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-07-23 10:35:57,693 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-07-23 10:35:57,695 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-07-23 10:35:57,696 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-07-23 10:35:57,696 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-07-23 10:35:57,696 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-07-23 10:35:57,696 [ scc.git] DEBUG 14 files changed, 162 insertions(+), 15 deletions(-)
2024-07-23 10:35:57,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:35:57,856 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-07-23 10:35:57,869 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:35:57,878 [ 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-07-23 10:35:57,917 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:35:57,922 [ scc.git] DEBUG setup.py | 2 +-
2024-07-23 10:35:57,923 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-07-23 10:35:58,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:35:58,272 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...88901984c22249d20925e53c455cd822700be6d4'
2024-07-23 10:35:58,283 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:35:58,288 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 576 (Color picker - popup update) 88901984c22249d20925e53c455cd822700be6d4'
2024-07-23 10:35:58,348 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-23 10:35:58,348 [ scc.git] DEBUG Auto-merging src/index.html
2024-07-23 10:35:58,348 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:35:58,353 [ scc.git] DEBUG .gitignore | 2 +-
2024-07-23 10:35:58,354 [ scc.git] DEBUG src/css/figure.css | 3 +++
2024-07-23 10:35:58,354 [ scc.git] DEBUG src/index.html | 3 +++
2024-07-23 10:35:58,354 [ scc.git] DEBUG src/js/views/colorpicker.js | 10 ++++++++--
2024-07-23 10:35:58,354 [ scc.git] DEBUG 4 files changed, 15 insertions(+), 3 deletions(-)
2024-07-23 10:35:58,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:35:58,686 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-23 10:35:58,729 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:35:58,730 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:35:58,737 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:35:58,779 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-23 10:35:58,791 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7aa41a84c0> has no local changes
2024-07-23 10:35:58,792 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
- PR 580 Rdornier 'Weird translation' (user: Rdornier)
- 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)
Already up to date.
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'
- PR 576 Rdornier 'Color picker - popup update'
Generated by OMERO-plugins-push#131 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/)'
2024-07-23 10:35:58,805 [ scc.git] DEBUG [detached HEAD 31caf090] merge master -Dorg -Ssuccess-only
2024-07-23 10:35:58,806 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:35:58,806 [ scc.repo] DEBUG ## PRs found:
2024-07-23 10:35:59,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-07-23 10:35:59,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-07-23 10:36:00,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-07-23 10:36:00,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-07-23 10:36:01,422 [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-07-23 10:36:02,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-07-23 10:36:02,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-07-23 10:36:02,437 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-07-23 10:36:02,438 [ scc.repo] DEBUG ## Branches found:
2024-07-23 10:36:02,438 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-07-23 10:36:02,439 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:36:02,439 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:02,448 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-23 10:36:02,453 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-23 10:36:02,454 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-23 10:36:02,460 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-23 10:36:02,466 [ scc.git] DEBUG Already up to date.
2024-07-23 10:36:02,467 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-07-23 10:36:02,881 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-07-23 10:36:02,882 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-07-23 10:36:02,889 [ scc.git] DEBUG ## Unique users: []
2024-07-23 10:36:02,890 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:36:02,890 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:02,898 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-07-23 10:36:02,911 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:02,919 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-07-23 10:36:02,936 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-07-23 10:36:02,937 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:36:02,940 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-07-23 10:36:02,940 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-07-23 10:36:03,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:36:03,143 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-23 10:36:03,205 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:36:03,206 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:03,214 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:36:03,275 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-23 10:36:03,286 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7aa41e6a60> has no local changes
2024-07-23 10:36:03,286 [ 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#131 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/)'
2024-07-23 10:36:03,302 [ scc.git] DEBUG [detached HEAD 83d4ed7] merge master -Dorg -Ssuccess-only
2024-07-23 10:36:03,302 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:36:03,303 [ scc.repo] DEBUG ## PRs found:
2024-07-23 10:36:03,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-07-23 10:36:04,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-07-23 10:36:04,151 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-23 10:36:04,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-07-23 10:36:05,229 [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-07-23 10:36:05,741 [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-07-23 10:36:06,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-07-23 10:36:06,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-07-23 10:36:06,732 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-07-23 10:36:06,732 [ scc.repo] DEBUG ## Branches found:
2024-07-23 10:36:06,732 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-07-23 10:36:06,732 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:36:06,732 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:06,738 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-23 10:36:06,742 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-23 10:36:06,743 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-23 10:36:06,748 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-23 10:36:06,753 [ scc.git] DEBUG Already up to date.
2024-07-23 10:36:06,753 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-07-23 10:36:07,107 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-07-23 10:36:07,108 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-07-23 10:36:07,115 [ scc.git] DEBUG ## Unique users: []
2024-07-23 10:36:07,116 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:36:07,116 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:07,122 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-07-23 10:36:07,128 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:07,132 [ 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-07-23 10:36:07,162 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:36:07,172 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-07-23 10:36:07,172 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-07-23 10:36:07,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:36:07,343 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-23 10:36:07,384 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:36:07,384 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:07,391 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:36:07,430 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-23 10:36:07,439 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7aa41c9b50> has no local changes
2024-07-23 10:36:07,439 [ 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#131 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/)'
2024-07-23 10:36:07,449 [ scc.git] DEBUG [detached HEAD 8866c5e] merge master -Dorg -Ssuccess-only
2024-07-23 10:36:07,450 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:36:07,450 [ scc.repo] DEBUG ## PRs found:
2024-07-23 10:36:07,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-07-23 10:36:08,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-07-23 10:36:08,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-07-23 10:36:08,916 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-23 10:36:09,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-07-23 10:36:10,021 [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-07-23 10:36:10,508 [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-07-23 10:36:11,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-07-23 10:36:11,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-07-23 10:36:11,434 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-07-23 10:36:11,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-07-23 10:36:11,945 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-23 10:36:12,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-07-23 10:36:13,046 [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-07-23 10:36:13,623 [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-07-23 10:36:14,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-07-23 10:36:14,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-07-23 10:36:14,502 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-07-23 10:36:14,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-07-23 10:36:15,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-07-23 10:36:15,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-07-23 10:36:16,482 [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-07-23 10:36:16,972 [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-07-23 10:36:17,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-07-23 10:36:17,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-07-23 10:36:17,845 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-07-23 10:36:18,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-07-23 10:36:18,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-07-23 10:36:19,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-07-23 10:36:19,927 [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-07-23 10:36:20,405 [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-07-23 10:36:20,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-07-23 10:36:21,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-07-23 10:36:21,327 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-07-23 10:36:21,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-07-23 10:36:22,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-07-23 10:36:22,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-07-23 10:36:23,289 [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-07-23 10:36:23,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-07-23 10:36:24,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-07-23 10:36:24,157 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-07-23 10:36:24,157 [ scc.repo] DEBUG ## Branches found:
2024-07-23 10:36:24,157 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-07-23 10:36:24,157 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:36:24,158 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:24,163 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-23 10:36:24,168 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-23 10:36:24,168 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-23 10:36:24,216 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-23 10:36:24,224 [ scc.git] DEBUG Already up to date.
2024-07-23 10:36:24,224 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-07-23 10:36:24,854 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-23 10:36:24,855 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-07-23 10:36:24,860 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-07-23 10:36:25,943 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-23 10:36:25,943 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-07-23 10:36:25,949 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-07-23 10:36:26,382 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-23 10:36:26,382 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-07-23 10:36:26,387 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-07-23 10:36:26,752 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-23 10:36:26,752 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-07-23 10:36:26,757 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-07-23 10:36:27,091 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-23 10:36:27,092 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-07-23 10:36:27,096 [ scc.git] DEBUG ## Unique users: []
2024-07-23 10:36:27,097 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:36:27,097 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:27,102 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-07-23 10:36:27,108 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:27,123 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-07-23 10:36:27,181 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-07-23 10:36:27,182 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:36:27,186 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-07-23 10:36:27,186 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-07-23 10:36:27,186 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-07-23 10:36:27,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:36:27,362 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-07-23 10:36:27,369 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:27,375 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-07-23 10:36:27,475 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-07-23 10:36:27,475 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-07-23 10:36:27,475 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-07-23 10:36:27,476 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-07-23 10:36:27,476 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:36:27,480 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-07-23 10:36:27,480 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-07-23 10:36:27,480 [ scc.git] DEBUG src/app/header.html | 5 +
2024-07-23 10:36:27,480 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-07-23 10:36:27,480 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-07-23 10:36:27,480 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-07-23 10:36:27,480 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-07-23 10:36:27,480 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-07-23 10:36:27,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:36:27,784 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-07-23 10:36:27,791 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:27,797 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-07-23 10:36:27,838 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-07-23 10:36:27,839 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:36:27,842 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-07-23 10:36:27,842 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-07-23 10:36:27,842 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-07-23 10:36:28,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:36:28,208 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-07-23 10:36:28,231 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:28,236 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-07-23 10:36:28,258 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:36:28,268 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-07-23 10:36:28,268 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-07-23 10:36:28,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:36:28,628 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-07-23 10:36:28,645 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:28,650 [ 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-07-23 10:36:28,701 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-23 10:36:28,701 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:36:29,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:36:29,047 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-23 10:36:29,094 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:36:29,094 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:29,100 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:36:29,145 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-23 10:36:29,155 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7aa418cbe0> has no local changes
2024-07-23 10:36:29,155 [ 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#131 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/)'
2024-07-23 10:36:29,165 [ scc.git] DEBUG [detached HEAD 956988e] merge master -Dorg -Ssuccess-only
2024-07-23 10:36:29,166 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:36:29,166 [ scc.repo] DEBUG ## PRs found:
2024-07-23 10:36:29,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-07-23 10:36:30,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-07-23 10:36:30,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-07-23 10:36:31,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-07-23 10:36:31,857 [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-07-23 10:36:32,378 [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-07-23 10:36:32,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-07-23 10:36:33,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-07-23 10:36:33,294 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-07-23 10:36:33,294 [ scc.repo] DEBUG ## Branches found:
2024-07-23 10:36:33,294 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-07-23 10:36:33,294 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:36:33,294 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:33,299 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-23 10:36:33,304 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-23 10:36:33,304 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-23 10:36:33,311 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-23 10:36:33,317 [ scc.git] DEBUG Already up to date.
2024-07-23 10:36:33,318 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-07-23 10:36:33,678 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-07-23 10:36:33,679 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-07-23 10:36:33,685 [ scc.git] DEBUG ## Unique users: []
2024-07-23 10:36:33,685 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:36:33,685 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:33,692 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-07-23 10:36:33,700 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:33,706 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-07-23 10:36:33,718 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:36:33,722 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-07-23 10:36:33,722 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-07-23 10:36:33,722 [ scc.git] DEBUG requirements.txt | 2 +-
2024-07-23 10:36:33,722 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-07-23 10:36:33,722 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-07-23 10:36:33,722 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-07-23 10:36:33,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:36:33,898 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-23 10:36:33,945 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:36:33,945 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:33,953 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:36:34,004 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-23 10:36:34,011 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7aa4188e20> has no local changes
2024-07-23 10:36:34,011 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Generated by OMERO-plugins-push#131 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/)'
2024-07-23 10:36:34,021 [ scc.git] DEBUG [detached HEAD 576ed20] merge master -Dorg -Ssuccess-only
2024-07-23 10:36:34,021 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:36:34,021 [ scc.repo] DEBUG ## PRs found:
2024-07-23 10:36:34,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-07-23 10:36:35,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-07-23 10:36:35,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-07-23 10:36:36,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-07-23 10:36:36,714 [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-07-23 10:36:37,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-07-23 10:36:37,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-07-23 10:36:37,675 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-07-23 10:36:38,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-07-23 10:36:38,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-07-23 10:36:39,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-07-23 10:36:39,562 [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-07-23 10:36:39,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-07-23 10:36:40,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-07-23 10:36:40,424 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-07-23 10:36:40,425 [ scc.repo] DEBUG ## Branches found:
2024-07-23 10:36:40,425 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-07-23 10:36:40,425 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:36:40,425 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:40,432 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-23 10:36:40,438 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-23 10:36:40,438 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-23 10:36:40,444 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-23 10:36:40,451 [ scc.git] DEBUG Already up to date.
2024-07-23 10:36:40,452 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-07-23 10:36:40,981 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-07-23 10:36:40,981 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-07-23 10:36:40,986 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-07-23 10:36:41,445 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-07-23 10:36:41,445 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-07-23 10:36:41,450 [ scc.git] DEBUG ## Unique users: []
2024-07-23 10:36:41,450 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:36:41,450 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:41,455 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-23 10:36:41,461 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:41,466 [ 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-07-23 10:36:41,525 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-07-23 10:36:41,525 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-07-23 10:36:41,525 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-07-23 10:36:41,525 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-07-23 10:36:41,526 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-23 10:36:41,526 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-23 10:36:41,532 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-23 10:36:41,538 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-07-23 10:36:41,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:36:41,695 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-23 10:36:41,701 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-23 10:36:41,707 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#131](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-07-23 10:36:41,712 [ scc.config] DEBUG Found github.token
2024-07-23 10:36:41,712 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-07-23 10:36:41,712 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-23 10:36:41,718 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:41,723 [ 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-07-23 10:36:41,740 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-07-23 10:36:41,740 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-07-23 10:36:41,740 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-07-23 10:36:41,741 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-23 10:36:41,741 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-23 10:36:41,747 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-23 10:36:41,755 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-07-23 10:36:42,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:36:42,115 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-23 10:36:42,123 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-23 10:36:42,129 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#131](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/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-07-23 10:36:42,134 [ scc.config] DEBUG Found github.token
2024-07-23 10:36:42,134 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-07-23 10:36:42,135 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-23 10:36:42,175 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:36:42,175 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:42,180 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:36:42,226 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-23 10:36:42,232 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7aa415bf40> has no local changes
2024-07-23 10:36:42,232 [ 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#131 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/)'
2024-07-23 10:36:42,240 [ scc.git] DEBUG [detached HEAD c262c6e] merge master -Dorg -Ssuccess-only
2024-07-23 10:36:42,240 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:36:42,240 [ scc.repo] DEBUG ## PRs found:
2024-07-23 10:36:42,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-07-23 10:36:43,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-07-23 10:36:43,148 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-23 10:36:43,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-07-23 10:36:44,234 [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-07-23 10:36:44,753 [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-07-23 10:36:45,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-07-23 10:36:45,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-07-23 10:36:45,763 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-07-23 10:36:46,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-07-23 10:36:46,268 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-23 10:36:46,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-07-23 10:36:47,377 [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-07-23 10:36:47,845 [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-07-23 10:36:48,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-07-23 10:36:48,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-07-23 10:36:48,823 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-07-23 10:36:49,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-07-23 10:36:49,293 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-23 10:36:49,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-07-23 10:36:50,424 [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-07-23 10:36:50,941 [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-07-23 10:36:51,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-07-23 10:36:51,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-07-23 10:36:51,903 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-07-23 10:36:52,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-07-23 10:36:52,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-07-23 10:36:53,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-07-23 10:36:53,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-07-23 10:36:54,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-07-23 10:36:54,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-07-23 10:36:54,987 [ scc.repo] DEBUG ## Branches found:
2024-07-23 10:36:54,987 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-07-23 10:36:54,987 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:36:54,987 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:54,995 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-23 10:36:55,002 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-23 10:36:55,002 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-23 10:36:55,009 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-23 10:36:55,016 [ scc.git] DEBUG Already up to date.
2024-07-23 10:36:55,017 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-07-23 10:36:55,381 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-23 10:36:55,381 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-07-23 10:36:55,388 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-07-23 10:36:55,739 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-23 10:36:55,740 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-07-23 10:36:55,746 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-07-23 10:36:56,148 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-23 10:36:56,149 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-07-23 10:36:56,155 [ scc.git] DEBUG ## Unique users: []
2024-07-23 10:36:56,155 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:36:56,155 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:56,164 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-07-23 10:36:56,173 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:56,181 [ 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-07-23 10:36:56,193 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:36:56,198 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-07-23 10:36:56,198 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-07-23 10:36:56,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:36:56,375 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-07-23 10:36:56,384 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:56,393 [ 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-07-23 10:36:56,441 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-23 10:36:56,442 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:36:56,446 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-07-23 10:36:56,446 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-07-23 10:36:56,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:36:56,804 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-07-23 10:36:56,820 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:56,832 [ 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-07-23 10:36:56,849 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-23 10:36:56,850 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:36:56,855 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-07-23 10:36:56,856 [ scc.git] DEBUG package.json | 2 +-
2024-07-23 10:36:56,857 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-07-23 10:36:57,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:36:57,234 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-23 10:36:57,276 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:36:57,276 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:36:57,283 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:36:57,347 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-23 10:36:57,357 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7aa411b580> has no local changes
2024-07-23 10:36:57,357 [ 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#131 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/)'
2024-07-23 10:36:57,371 [ scc.git] DEBUG [detached HEAD 04376b3] merge master -Dorg -Ssuccess-only
2024-07-23 10:36:57,372 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:36:57,372 [ scc.repo] DEBUG ## PRs found:
2024-07-23 10:36:57,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-07-23 10:36:58,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-07-23 10:36:58,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-07-23 10:36:59,361 [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-07-23 10:36:59,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-07-23 10:37:00,202 [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-07-23 10:37:00,203 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-07-23 10:37:00,203 [ scc.repo] DEBUG ## Branches found:
2024-07-23 10:37:00,203 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-07-23 10:37:00,204 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:00,204 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:00,212 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-23 10:37:00,219 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-23 10:37:00,220 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-23 10:37:00,239 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-23 10:37:00,248 [ scc.git] DEBUG Already up to date.
2024-07-23 10:37:00,249 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-07-23 10:37:00,652 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-07-23 10:37:00,653 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-07-23 10:37:00,660 [ scc.git] DEBUG ## Unique users: []
2024-07-23 10:37:00,660 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:00,661 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:00,670 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-07-23 10:37:00,681 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:00,691 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-07-23 10:37:00,704 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:37:00,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:37:00,893 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-23 10:37:00,949 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:00,949 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:00,956 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:37:01,000 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-23 10:37:01,007 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7aa4134e80> has no local changes
2024-07-23 10:37:01,008 [ 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#131 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/)'
2024-07-23 10:37:01,017 [ scc.git] DEBUG [detached HEAD bfe5421] merge master -Dorg -Ssuccess-only
2024-07-23 10:37:01,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:01,018 [ scc.repo] DEBUG ## PRs found:
2024-07-23 10:37:01,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-07-23 10:37:01,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-07-23 10:37:02,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-07-23 10:37:02,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-07-23 10:37:03,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-07-23 10:37:03,949 [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-07-23 10:37:04,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-07-23 10:37:04,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-07-23 10:37:04,937 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-07-23 10:37:04,938 [ scc.repo] DEBUG ## Branches found:
2024-07-23 10:37:04,938 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-07-23 10:37:04,938 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:04,938 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:04,945 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-23 10:37:04,954 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-23 10:37:04,954 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-23 10:37:04,961 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-23 10:37:04,969 [ scc.git] DEBUG Already up to date.
2024-07-23 10:37:04,969 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-07-23 10:37:05,506 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-07-23 10:37:05,507 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-07-23 10:37:05,515 [ scc.git] DEBUG ## Unique users: []
2024-07-23 10:37:05,515 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:05,516 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:05,523 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-07-23 10:37:05,532 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:05,542 [ 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-07-23 10:37:05,561 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-07-23 10:37:05,562 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:37:05,567 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-07-23 10:37:05,567 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-07-23 10:37:05,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:37:05,737 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-23 10:37:05,812 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:05,812 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:05,822 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:37:05,892 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-23 10:37:05,906 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7aa412bb50> has no local changes
2024-07-23 10:37:05,906 [ 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#131 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/)'
2024-07-23 10:37:05,923 [ scc.git] DEBUG [detached HEAD 7fab260] merge master -Dorg -Ssuccess-only
2024-07-23 10:37:05,923 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:05,924 [ scc.repo] DEBUG ## PRs found:
2024-07-23 10:37:06,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-07-23 10:37:06,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-07-23 10:37:07,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-07-23 10:37:07,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-07-23 10:37:08,310 [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-07-23 10:37:08,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-07-23 10:37:09,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-07-23 10:37:09,284 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-07-23 10:37:09,284 [ scc.repo] DEBUG ## Branches found:
2024-07-23 10:37:09,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-07-23 10:37:09,285 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:09,285 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:09,294 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-23 10:37:09,301 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-23 10:37:09,302 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-23 10:37:09,311 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-23 10:37:09,320 [ scc.git] DEBUG Already up to date.
2024-07-23 10:37:09,321 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-07-23 10:37:09,828 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-07-23 10:37:09,828 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-07-23 10:37:09,836 [ scc.git] DEBUG ## Unique users: []
2024-07-23 10:37:09,836 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:09,836 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:09,845 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-23 10:37:09,852 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:09,859 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-23 10:37:09,963 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-07-23 10:37:09,964 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-07-23 10:37:09,964 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-07-23 10:37:09,964 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-07-23 10:37:09,964 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-07-23 10:37:09,964 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-07-23 10:37:09,964 [ scc.git] DEBUG Auto-merging setup.py
2024-07-23 10:37:09,964 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-07-23 10:37:09,964 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-23 10:37:09,965 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-23 10:37:09,976 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-07-23 10:37:09,987 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-07-23 10:37:10,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:37:10,163 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-23 10:37:10,175 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-07-23 10:37:10,188 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#131](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/views.py
- setup.py
- omero_signup/signup_settings.py
--conflicts
2024-07-23 10:37:10,197 [ scc.config] DEBUG Found github.token
2024-07-23 10:37:10,197 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-07-23 10:37:10,197 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-23 10:37:10,266 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:10,266 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:10,278 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:37:10,358 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-23 10:37:10,373 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7aa411b730> has no local changes
2024-07-23 10:37:10,374 [ 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#131 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/)'
2024-07-23 10:37:10,386 [ scc.git] DEBUG [detached HEAD b59b199] merge master -Dorg -Ssuccess-only
2024-07-23 10:37:10,386 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:10,387 [ scc.repo] DEBUG ## PRs found:
2024-07-23 10:37:10,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-07-23 10:37:11,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-07-23 10:37:11,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-07-23 10:37:12,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-07-23 10:37:12,688 [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-07-23 10:37:13,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-07-23 10:37:13,798 [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-07-23 10:37:13,799 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-07-23 10:37:13,800 [ scc.repo] DEBUG ## Branches found:
2024-07-23 10:37:13,800 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-07-23 10:37:13,800 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:13,800 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:13,816 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-23 10:37:13,830 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-23 10:37:13,830 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-23 10:37:13,841 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-23 10:37:13,850 [ scc.git] DEBUG Already up to date.
2024-07-23 10:37:13,850 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-07-23 10:37:14,398 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-07-23 10:37:14,398 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-07-23 10:37:14,405 [ scc.git] DEBUG ## Unique users: []
2024-07-23 10:37:14,405 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:14,406 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:14,415 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-07-23 10:37:14,425 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:14,433 [ 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-07-23 10:37:14,456 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:37:14,464 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-07-23 10:37:14,470 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-07-23 10:37:14,470 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-07-23 10:37:14,470 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-07-23 10:37:14,470 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-07-23 10:37:14,471 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-07-23 10:37:14,471 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-07-23 10:37:14,471 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-07-23 10:37:14,471 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-07-23 10:37:14,471 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-07-23 10:37:14,471 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-07-23 10:37:14,471 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-07-23 10:37:14,471 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-07-23 10:37:14,471 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-07-23 10:37:14,471 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-07-23 10:37:14,471 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-07-23 10:37:14,471 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-07-23 10:37:14,471 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-07-23 10:37:14,471 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-07-23 10:37:14,471 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-07-23 10:37:14,471 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-07-23 10:37:14,471 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-07-23 10:37:14,471 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-07-23 10:37:14,472 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-07-23 10:37:14,472 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-07-23 10:37:14,472 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-07-23 10:37:14,472 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-07-23 10:37:14,472 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-07-23 10:37:14,472 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-07-23 10:37:14,472 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-07-23 10:37:14,472 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-07-23 10:37:14,472 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-07-23 10:37:14,472 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-07-23 10:37:14,472 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-07-23 10:37:14,472 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-07-23 10:37:14,472 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-07-23 10:37:14,472 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-07-23 10:37:14,472 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-07-23 10:37:14,472 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-07-23 10:37:14,472 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-07-23 10:37:14,472 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-07-23 10:37:14,472 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-07-23 10:37:14,472 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-07-23 10:37:14,472 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-07-23 10:37:14,472 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-07-23 10:37:14,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:37:14,634 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-23 10:37:14,696 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:14,696 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:14,704 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:37:14,785 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-23 10:37:14,797 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7aa40e6640> has no local changes
2024-07-23 10:37:14,798 [ 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#131 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/)'
2024-07-23 10:37:14,812 [ scc.git] DEBUG [detached HEAD 65ba882] merge master -Dorg -Ssuccess-only
2024-07-23 10:37:14,813 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:14,815 [ scc.repo] DEBUG ## PRs found:
2024-07-23 10:37:15,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-07-23 10:37:15,069 [ scc.repo] DEBUG ## Branches found:
2024-07-23 10:37:15,069 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-07-23 10:37:15,069 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:15,069 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:15,078 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-23 10:37:15,086 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-23 10:37:15,086 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-23 10:37:15,094 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-23 10:37:15,104 [ scc.git] DEBUG Already up to date.
2024-07-23 10:37:15,104 [ scc.git] DEBUG ## Unique users: []
2024-07-23 10:37:15,105 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:15,105 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:15,112 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-23 10:37:15,170 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:15,170 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:15,176 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:37:15,243 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-23 10:37:15,269 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7aa4083e80> has no local changes
2024-07-23 10:37:15,270 [ 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#131 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/)'
2024-07-23 10:37:15,306 [ scc.git] DEBUG [detached HEAD 982a5b7] merge master -Dorg -Ssuccess-only
2024-07-23 10:37:15,307 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:15,307 [ scc.repo] DEBUG ## PRs found:
2024-07-23 10:37:15,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-07-23 10:37:15,523 [ scc.repo] DEBUG ## Branches found:
2024-07-23 10:37:15,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-07-23 10:37:15,524 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:15,524 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:15,532 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-23 10:37:15,540 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-23 10:37:15,541 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-23 10:37:15,550 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-23 10:37:15,560 [ scc.git] DEBUG Already up to date.
2024-07-23 10:37:15,560 [ scc.git] DEBUG ## Unique users: []
2024-07-23 10:37:15,561 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:15,561 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:15,570 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-23 10:37:15,627 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:15,628 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:15,636 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:37:15,681 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-23 10:37:15,687 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7aa40d7d30> has no local changes
2024-07-23 10:37:15,688 [ 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#131 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/)'
2024-07-23 10:37:15,697 [ scc.git] DEBUG [detached HEAD 691c371] merge master -Dorg -Ssuccess-only
2024-07-23 10:37:15,697 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:15,697 [ scc.git] INFO Overriding base-branch from master to main
2024-07-23 10:37:15,698 [ scc.repo] DEBUG ## PRs found:
2024-07-23 10:37:16,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-07-23 10:37:16,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-07-23 10:37:16,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-07-23 10:37:17,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-07-23 10:37:18,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-07-23 10:37:18,511 [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-07-23 10:37:18,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-23 10:37:19,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-07-23 10:37:19,950 [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-07-23 10:37:19,950 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-07-23 10:37:19,951 [ scc.repo] DEBUG ## Branches found:
2024-07-23 10:37:19,951 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-07-23 10:37:19,951 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:19,951 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:19,959 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-07-23 10:37:19,966 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-23 10:37:19,967 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-07-23 10:37:19,976 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-07-23 10:37:19,987 [ scc.git] DEBUG Already up to date.
2024-07-23 10:37:19,987 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-07-23 10:37:20,431 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-07-23 10:37:20,432 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-07-23 10:37:20,438 [ scc.git] DEBUG ## Unique users: []
2024-07-23 10:37:20,438 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:20,439 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:20,445 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-23 10:37:20,454 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:20,461 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-23 10:37:20,498 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-07-23 10:37:20,498 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-07-23 10:37:20,498 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-23 10:37:20,499 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-23 10:37:20,512 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-07-23 10:37:20,528 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-07-23 10:37:20,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:37:20,700 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-23 10:37:20,713 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-07-23 10:37:20,724 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#131](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-07-23 10:37:20,736 [ scc.config] DEBUG Found github.token
2024-07-23 10:37:20,736 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-07-23 10:37:20,736 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-23 10:37:20,790 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:20,791 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:20,798 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:37:20,836 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-23 10:37:20,843 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7aa40edf40> has no local changes
2024-07-23 10:37:20,843 [ 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#131 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/)'
2024-07-23 10:37:20,851 [ scc.git] DEBUG [detached HEAD 2476f91] merge master -Dorg -Ssuccess-only
2024-07-23 10:37:20,852 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:20,852 [ scc.repo] DEBUG ## PRs found:
2024-07-23 10:37:21,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-07-23 10:37:21,139 [ scc.repo] DEBUG ## Branches found:
2024-07-23 10:37:21,140 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-07-23 10:37:21,140 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:21,140 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:21,146 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-23 10:37:21,151 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-23 10:37:21,152 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-23 10:37:21,157 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-23 10:37:21,167 [ scc.git] DEBUG Already up to date.
2024-07-23 10:37:21,167 [ scc.git] DEBUG ## Unique users: []
2024-07-23 10:37:21,167 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:21,167 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:21,179 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-23 10:37:21,246 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:21,247 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:21,256 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:37:21,308 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-23 10:37:21,321 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7aa40e17c0> has no local changes
2024-07-23 10:37:21,322 [ 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#131 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/)'
2024-07-23 10:37:21,335 [ scc.git] DEBUG [detached HEAD 8779b2a] merge master -Dorg -Ssuccess-only
2024-07-23 10:37:21,336 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:21,336 [ scc.repo] DEBUG ## PRs found:
2024-07-23 10:37:21,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-07-23 10:37:21,604 [ scc.repo] DEBUG ## Branches found:
2024-07-23 10:37:21,604 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-07-23 10:37:21,605 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:21,605 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:21,617 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-23 10:37:21,628 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-23 10:37:21,628 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-23 10:37:21,639 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-23 10:37:21,649 [ scc.git] DEBUG Already up to date.
2024-07-23 10:37:21,649 [ scc.git] DEBUG ## Unique users: []
2024-07-23 10:37:21,649 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:21,649 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:21,658 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-23 10:37:21,721 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:21,721 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:21,730 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:37:21,776 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-23 10:37:21,783 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7aa40a9490> has no local changes
2024-07-23 10:37:21,784 [ 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#131 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/)'
2024-07-23 10:37:21,803 [ scc.git] DEBUG [detached HEAD 47075c7] merge master -Dorg -Ssuccess-only
2024-07-23 10:37:21,806 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:21,807 [ scc.repo] DEBUG ## PRs found:
2024-07-23 10:37:22,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-07-23 10:37:22,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-07-23 10:37:23,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-07-23 10:37:23,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-07-23 10:37:24,030 [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-07-23 10:37:24,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-07-23 10:37:24,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-07-23 10:37:24,981 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-07-23 10:37:24,982 [ scc.repo] DEBUG ## Branches found:
2024-07-23 10:37:24,982 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-07-23 10:37:24,982 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:24,982 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:24,988 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-23 10:37:24,994 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-23 10:37:24,994 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-23 10:37:25,000 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-23 10:37:25,007 [ scc.git] DEBUG Already up to date.
2024-07-23 10:37:25,007 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-07-23 10:37:25,461 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-07-23 10:37:25,462 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-07-23 10:37:25,467 [ scc.git] DEBUG ## Unique users: []
2024-07-23 10:37:25,467 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:25,468 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:25,476 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-23 10:37:25,486 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:25,494 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-23 10:37:25,618 [ scc.git] DEBUG Auto-merging Dockerfile
2024-07-23 10:37:25,618 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-07-23 10:37:25,618 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-23 10:37:25,618 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-23 10:37:25,628 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-07-23 10:37:25,638 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-07-23 10:37:25,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:37:25,805 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-23 10:37:25,812 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-07-23 10:37:25,819 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#131](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-07-23 10:37:25,826 [ scc.config] DEBUG Found github.token
2024-07-23 10:37:25,827 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-07-23 10:37:25,827 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-23 10:37:25,878 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:25,878 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:25,886 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:37:25,943 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-23 10:37:25,955 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7aa404b8b0> has no local changes
2024-07-23 10:37:25,956 [ 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#131 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/)'
2024-07-23 10:37:25,969 [ scc.git] DEBUG [detached HEAD 3ce1437] merge master -Dorg -Ssuccess-only
2024-07-23 10:37:25,970 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:25,970 [ scc.git] INFO Overriding base-branch from master to develop
2024-07-23 10:37:25,970 [ scc.repo] DEBUG ## PRs found:
2024-07-23 10:37:26,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-07-23 10:37:26,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-07-23 10:37:27,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-07-23 10:37:27,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-07-23 10:37:28,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-07-23 10:37:28,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-07-23 10:37:29,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-07-23 10:37:29,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-23 10:37:30,368 [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-07-23 10:37:30,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-23 10:37:31,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-07-23 10:37:31,300 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-23 10:37:31,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-07-23 10:37:32,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-07-23 10:37:32,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-07-23 10:37:33,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-07-23 10:37:33,533 [ scc.repo] DEBUG ## Branches found:
2024-07-23 10:37:33,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-07-23 10:37:33,533 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:33,533 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:33,545 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-07-23 10:37:33,560 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-23 10:37:33,561 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-07-23 10:37:33,571 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-07-23 10:37:33,581 [ scc.git] DEBUG Already up to date.
2024-07-23 10:37:33,582 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-07-23 10:37:34,016 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-07-23 10:37:34,016 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-07-23 10:37:34,023 [ scc.git] DEBUG ## Unique users: []
2024-07-23 10:37:34,023 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:34,023 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:34,030 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-23 10:37:34,040 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:34,050 [ 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-07-23 10:37:34,113 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-07-23 10:37:34,113 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-07-23 10:37:34,113 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-23 10:37:34,113 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-23 10:37:34,120 [ scc.git] DEBUG Calling 'git reset --hard c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-23 10:37:34,128 [ scc.git] DEBUG HEAD is now at c20d273 Merge pull request #221 from imcf/fix-typechecking
2024-07-23 10:37:34,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:37:34,301 [ scc.git] DEBUG Calling 'git merge-base c20d2734b711c659cecea83db6e2ebd7b7013636 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-23 10:37:34,311 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-23 10:37:34,324 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#131](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-07-23 10:37:34,333 [ scc.config] DEBUG Found github.token
2024-07-23 10:37:34,334 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-07-23 10:37:34,334 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-23 10:37:34,390 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:37:34,391 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:37:34,399 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:37:34,465 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-23 10:37:34,478 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7aa404b5b0> has no local changes
2024-07-23 10:37:34,478 [ 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#131 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/)'
2024-07-23 10:37:34,495 [ scc.git] DEBUG [detached HEAD bd7ea8d] merge master -Dorg -Ssuccess-only
2024-07-23 10:37:34,496 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:34,496 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:37:34,591 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-07-23 10:37:34,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:37:34,778 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-07-23 10:37:34,784 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-07-23 10:37:35,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:37:35,203 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-07-23 10:37:35,211 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-07-23 10:37:35,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:37:35,638 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-07-23 10:37:35,647 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-07-23 10:37:36,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:37:36,075 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-07-23 10:37:36,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:37:36,494 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-07-23 10:37:36,501 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-07-23 10:37:36,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:37:36,905 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-07-23 10:37:36,912 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-07-23 10:37:37,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:37:37,322 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-07-23 10:37:37,330 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-07-23 10:37:37,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:37:37,731 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-07-23 10:37:37,738 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-07-23 10:37:38,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:37:38,144 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-07-23 10:37:38,151 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-07-23 10:37:38,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:37:38,573 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-07-23 10:37:38,581 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-07-23 10:37:38,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:37:38,989 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-07-23 10:37:38,995 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-07-23 10:37:39,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:37:39,412 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-07-23 10:37:39,422 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-07-23 10:37:39,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:37:39,842 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-07-23 10:37:40,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:37:40,260 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-07-23 10:37:40,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:37:40,701 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-07-23 10:37:40,711 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-07-23 10:37:41,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:37:41,130 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-07-23 10:37:41,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:37:41,541 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-07-23 10:37:41,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:37:41,940 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-07-23 10:37:41,947 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-07-23 10:37:42,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:37:42,351 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-07-23 10:37:42,357 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-07-23 10:37:42,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:37:42,789 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-07-23 10:37:42,797 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-07-23 10:37:43,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:37:43,202 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-07-23 10:37:43,209 [ scc.config] DEBUG Found submodule.scripts.url
2024-07-23 10:37:43,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:37:43,617 [ scc.config] DEBUG Found submodule.scripts.branch
2024-07-23 10:37:43,617 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-23 10:37:43,728 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7aa769e460> has local changes
2024-07-23 10:37:43,729 [ 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.
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'
- PR 63 sbesson 'Remove python-future dependency'
- PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
- PR 580 Rdornier 'Weird translation' (user: Rdornier)
- 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)
Already up to date.
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'
- PR 576 Rdornier 'Color picker - popup update'
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 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#131 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/131/)'
2024-07-23 10:37:43,745 [ scc.git] DEBUG [detached HEAD def3d92] merge master -Dorg -Ssuccess-only
2024-07-23 10:37:43,746 [ scc.merge] INFO Repository: ome/omero-plugins
2024-07-23 10:37:43,746 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-07-23 10:37:43,746 [ scc.merge] INFO Already up to date.
2024-07-23 10:37:43,746 [ scc.merge] INFO
2024-07-23 10:37:43,746 [ scc.merge] INFO
2024-07-23 10:37:43,746 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-07-23 10:37:43,746 [ scc.merge] INFO Already up to date.
2024-07-23 10:37:43,746 [ scc.merge] INFO
2024-07-23 10:37:43,746 [ scc.merge] INFO
2024-07-23 10:37:43,746 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-07-23 10:37:43,746 [ scc.merge] INFO Excluded PRs:
2024-07-23 10:37:43,746 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-07-23 10:37:43,747 [ scc.merge] INFO Already up to date.
2024-07-23 10:37:43,747 [ scc.merge] INFO
2024-07-23 10:37:43,747 [ scc.merge] INFO Merged PRs:
2024-07-23 10:37:43,747 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-07-23 10:37:43,747 [ scc.merge] INFO
2024-07-23 10:37:43,747 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-07-23 10:37:43,747 [ scc.merge] INFO Excluded PRs:
2024-07-23 10:37:43,747 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-07-23 10:37:43,747 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-07-23 10:37:43,747 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-07-23 10:37:43,747 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-07-23 10:37:43,747 [ scc.merge] INFO Already up to date.
2024-07-23 10:37:43,747 [ scc.merge] INFO
2024-07-23 10:37:43,747 [ scc.merge] INFO Merged PRs:
2024-07-23 10:37:43,747 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-07-23 10:37:43,747 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-07-23 10:37:43,747 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-07-23 10:37:43,747 [ scc.merge] INFO
2024-07-23 10:37:43,747 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-07-23 10:37:43,747 [ scc.merge] INFO Excluded PRs:
2024-07-23 10:37:43,747 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-07-23 10:37:43,747 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-07-23 10:37:43,747 [ scc.merge] INFO Already up to date.
2024-07-23 10:37:43,747 [ scc.merge] INFO
2024-07-23 10:37:43,747 [ scc.merge] INFO Merged PRs:
2024-07-23 10:37:43,747 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-07-23 10:37:43,747 [ scc.merge] INFO
2024-07-23 10:37:43,747 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-23 10:37:43,747 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-07-23 10:37:43,747 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-07-23 10:37:43,747 [ scc.merge] INFO
2024-07-23 10:37:43,747 [ scc.merge] INFO Repository: ome/omero-figure
2024-07-23 10:37:43,747 [ scc.merge] INFO Excluded PRs:
2024-07-23 10:37:43,747 [ scc.merge] INFO - PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
2024-07-23 10:37:43,747 [ scc.merge] INFO - PR 580 Rdornier 'Weird translation' (user: Rdornier)
2024-07-23 10:37:43,747 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-07-23 10:37:43,747 [ scc.merge] INFO - PR 578 Rdornier 'Image outline' (user: Rdornier)
2024-07-23 10:37:43,747 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' (user: Rdornier)
2024-07-23 10:37:43,748 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-07-23 10:37:43,748 [ scc.merge] INFO Already up to date.
2024-07-23 10:37:43,748 [ scc.merge] INFO
2024-07-23 10:37:43,748 [ scc.merge] INFO Merged PRs:
2024-07-23 10:37:43,748 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-07-23 10:37:43,748 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-07-23 10:37:43,748 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-07-23 10:37:43,748 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-07-23 10:37:43,748 [ scc.merge] INFO - PR 576 Rdornier 'Color picker - popup update'
2024-07-23 10:37:43,748 [ scc.merge] INFO
2024-07-23 10:37:43,748 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-07-23 10:37:43,748 [ scc.merge] INFO Already up to date.
2024-07-23 10:37:43,748 [ scc.merge] INFO
2024-07-23 10:37:43,748 [ scc.merge] INFO Merged PRs:
2024-07-23 10:37:43,748 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-07-23 10:37:43,748 [ scc.merge] INFO
2024-07-23 10:37:43,748 [ scc.merge] INFO Repository: ome/omero-gallery
2024-07-23 10:37:43,748 [ scc.merge] INFO Already up to date.
2024-07-23 10:37:43,748 [ scc.merge] INFO
2024-07-23 10:37:43,748 [ scc.merge] INFO Merged PRs:
2024-07-23 10:37:43,748 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-07-23 10:37:43,748 [ scc.merge] INFO
2024-07-23 10:37:43,748 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-07-23 10:37:43,748 [ scc.merge] INFO Excluded PRs:
2024-07-23 10:37:43,748 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-07-23 10:37:43,748 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-07-23 10:37:43,748 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-07-23 10:37:43,748 [ scc.merge] INFO Already up to date.
2024-07-23 10:37:43,748 [ scc.merge] INFO
2024-07-23 10:37:43,748 [ scc.merge] INFO Merged PRs:
2024-07-23 10:37:43,748 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-07-23 10:37:43,748 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-07-23 10:37:43,748 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-07-23 10:37:43,748 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-07-23 10:37:43,748 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-07-23 10:37:43,748 [ scc.merge] INFO
2024-07-23 10:37:43,748 [ scc.merge] INFO Repository: ome/omero-mapr
2024-07-23 10:37:43,748 [ scc.merge] INFO Excluded PRs:
2024-07-23 10:37:43,748 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-07-23 10:37:43,749 [ scc.merge] INFO Already up to date.
2024-07-23 10:37:43,749 [ scc.merge] INFO
2024-07-23 10:37:43,749 [ scc.merge] INFO Merged PRs:
2024-07-23 10:37:43,749 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-07-23 10:37:43,749 [ scc.merge] INFO
2024-07-23 10:37:43,749 [ scc.merge] INFO Repository: ome/omero-metadata
2024-07-23 10:37:43,749 [ scc.merge] INFO Already up to date.
2024-07-23 10:37:43,749 [ scc.merge] INFO
2024-07-23 10:37:43,749 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-23 10:37:43,749 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-07-23 10:37:43,749 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-07-23 10:37:43,749 [ scc.merge] INFO
2024-07-23 10:37:43,749 [ scc.merge] INFO Repository: ome/omero-parade
2024-07-23 10:37:43,749 [ scc.merge] INFO Excluded PRs:
2024-07-23 10:37:43,749 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-07-23 10:37:43,749 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-07-23 10:37:43,749 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-07-23 10:37:43,749 [ scc.merge] INFO Already up to date.
2024-07-23 10:37:43,749 [ scc.merge] INFO
2024-07-23 10:37:43,749 [ scc.merge] INFO Merged PRs:
2024-07-23 10:37:43,749 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-07-23 10:37:43,749 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-07-23 10:37:43,749 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-07-23 10:37:43,749 [ scc.merge] INFO
2024-07-23 10:37:43,749 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-07-23 10:37:43,749 [ scc.merge] INFO Already up to date.
2024-07-23 10:37:43,749 [ scc.merge] INFO
2024-07-23 10:37:43,749 [ scc.merge] INFO Merged PRs:
2024-07-23 10:37:43,749 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-07-23 10:37:43,749 [ scc.merge] INFO
2024-07-23 10:37:43,749 [ scc.merge] INFO Repository: ome/omero-rois
2024-07-23 10:37:43,749 [ scc.merge] INFO Excluded PRs:
2024-07-23 10:37:43,749 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-07-23 10:37:43,749 [ scc.merge] INFO Already up to date.
2024-07-23 10:37:43,749 [ scc.merge] INFO
2024-07-23 10:37:43,749 [ scc.merge] INFO Merged PRs:
2024-07-23 10:37:43,749 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-07-23 10:37:43,749 [ scc.merge] INFO
2024-07-23 10:37:43,750 [ scc.merge] INFO Repository: ome/omero-signup
2024-07-23 10:37:43,750 [ scc.merge] INFO Already up to date.
2024-07-23 10:37:43,750 [ scc.merge] INFO
2024-07-23 10:37:43,750 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-23 10:37:43,750 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-07-23 10:37:43,750 [ scc.merge] INFO
2024-07-23 10:37:43,750 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-07-23 10:37:43,750 [ scc.merge] INFO Already up to date.
2024-07-23 10:37:43,750 [ scc.merge] INFO
2024-07-23 10:37:43,750 [ scc.merge] INFO Merged PRs:
2024-07-23 10:37:43,750 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-07-23 10:37:43,750 [ scc.merge] INFO
2024-07-23 10:37:43,750 [ scc.merge] INFO Repository: ome/omero-upload
2024-07-23 10:37:43,750 [ scc.merge] INFO Already up to date.
2024-07-23 10:37:43,750 [ scc.merge] INFO
2024-07-23 10:37:43,750 [ scc.merge] INFO
2024-07-23 10:37:43,750 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-07-23 10:37:43,750 [ scc.merge] INFO Already up to date.
2024-07-23 10:37:43,750 [ scc.merge] INFO
2024-07-23 10:37:43,750 [ scc.merge] INFO
2024-07-23 10:37:43,750 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-07-23 10:37:43,750 [ scc.merge] INFO Excluded PRs:
2024-07-23 10:37:43,750 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-07-23 10:37:43,750 [ scc.merge] INFO Already up to date.
2024-07-23 10:37:43,750 [ scc.merge] INFO
2024-07-23 10:37:43,750 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-23 10:37:43,750 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-07-23 10:37:43,750 [ scc.merge] INFO
2024-07-23 10:37:43,750 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-07-23 10:37:43,750 [ scc.merge] INFO Already up to date.
2024-07-23 10:37:43,750 [ scc.merge] INFO
2024-07-23 10:37:43,750 [ scc.merge] INFO
2024-07-23 10:37:43,750 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-07-23 10:37:43,750 [ scc.merge] INFO Already up to date.
2024-07-23 10:37:43,750 [ scc.merge] INFO
2024-07-23 10:37:43,750 [ scc.merge] INFO
2024-07-23 10:37:43,750 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-07-23 10:37:43,750 [ scc.merge] INFO Already up to date.
2024-07-23 10:37:43,750 [ scc.merge] INFO
2024-07-23 10:37:43,751 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-23 10:37:43,751 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-07-23 10:37:43,751 [ scc.merge] INFO
2024-07-23 10:37:43,751 [ scc.merge] INFO Repository: ome/scripts
2024-07-23 10:37:43,751 [ scc.merge] INFO Excluded PRs:
2024-07-23 10:37:43,751 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-07-23 10:37:43,751 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-07-23 10:37:43,751 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-07-23 10:37:43,751 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-07-23 10:37:43,751 [ scc.merge] INFO Already up to date.
2024-07-23 10:37:43,751 [ scc.merge] INFO
2024-07-23 10:37:43,751 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-23 10:37:43,751 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-23 10:37:43,751 [ scc.merge] INFO
2024-07-23 10:37:43,751 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-23 10:37:43,751 [ scc.git] DEBUG Calling 'git remote'
2024-07-23 10:37:43,758 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-07-23 10:37:43,758 [ scc.git] DEBUG Calling 'git remote'
2024-07-23 10:37:43,765 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:43,765 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-07-23 10:37:43,765 [ scc.git] DEBUG Calling 'git remote'
2024-07-23 10:37:43,772 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:43,772 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-07-23 10:37:43,772 [ scc.git] DEBUG Calling 'git remote'
2024-07-23 10:37:43,780 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:43,780 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-07-23 10:37:43,780 [ scc.git] DEBUG Calling 'git remote'
2024-07-23 10:37:43,787 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:43,788 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-07-23 10:37:43,788 [ scc.git] DEBUG Calling 'git remote'
2024-07-23 10:37:43,793 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:43,794 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-07-23 10:37:43,794 [ scc.git] DEBUG Calling 'git remote'
2024-07-23 10:37:43,799 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:43,800 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-07-23 10:37:43,800 [ scc.git] DEBUG Calling 'git remote'
2024-07-23 10:37:43,805 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:43,805 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-07-23 10:37:43,805 [ scc.git] DEBUG Calling 'git remote'
2024-07-23 10:37:43,811 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:43,811 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-07-23 10:37:43,812 [ scc.git] DEBUG Calling 'git remote'
2024-07-23 10:37:43,817 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:43,817 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-07-23 10:37:43,817 [ scc.git] DEBUG Calling 'git remote'
2024-07-23 10:37:43,823 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:43,823 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-07-23 10:37:43,823 [ scc.git] DEBUG Calling 'git remote'
2024-07-23 10:37:43,830 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:43,830 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-07-23 10:37:43,831 [ scc.git] DEBUG Calling 'git remote'
2024-07-23 10:37:43,838 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:43,838 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-07-23 10:37:43,838 [ scc.git] DEBUG Calling 'git remote'
2024-07-23 10:37:43,845 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:43,846 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-07-23 10:37:43,846 [ scc.git] DEBUG Calling 'git remote'
2024-07-23 10:37:43,852 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:43,852 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-07-23 10:37:43,853 [ scc.git] DEBUG Calling 'git remote'
2024-07-23 10:37:43,859 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:43,859 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-07-23 10:37:43,859 [ scc.git] DEBUG Calling 'git remote'
2024-07-23 10:37:43,865 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:43,865 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-07-23 10:37:43,865 [ scc.git] DEBUG Calling 'git remote'
2024-07-23 10:37:43,871 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:43,871 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-07-23 10:37:43,871 [ scc.git] DEBUG Calling 'git remote'
2024-07-23 10:37:43,877 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:43,878 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-07-23 10:37:43,878 [ scc.git] DEBUG Calling 'git remote'
2024-07-23 10:37:43,884 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:43,884 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-07-23 10:37:43,884 [ scc.git] DEBUG Calling 'git remote'
2024-07-23 10:37:43,891 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:43,891 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-07-23 10:37:43,891 [ scc.git] DEBUG Calling 'git remote'
2024-07-23 10:37:43,897 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-23 10:37:43,898 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-07-23 10:37:43,898 [ scc.git] DEBUG Calling 'git remote'
2024-07-23 10:37:43,904 [ 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.1 to 5.9.2-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 a5a85a7] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 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 fefe87cf
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 c20d273
nothing to commit, working tree clean
[detached HEAD 9e1c271] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-07-23 10:38:32,926 [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-07-23 10:38:42,131 [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-07-23 10:38:44,590 [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-07-23 10:38:49,366 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-07-23 10:39:39,339 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci