Skipping 110 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-07-11 08:03:18,725 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:03:18,725 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:03:18,731 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-11 08:03:18,736 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-11 08:03:18,736 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-11 08:03:18,741 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-11 08:03:18,746 [ scc.git] DEBUG Already up to date.
2024-07-11 08:03:18,747 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-07-11 08:03:19,460 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-11 08:03:19,460 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-07-11 08:03:19,464 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-07-11 08:03:20,365 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-11 08:03:20,365 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-07-11 08:03:20,370 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-07-11 08:03:21,929 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-11 08:03:21,930 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-07-11 08:03:21,934 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-07-11 08:03:22,366 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-11 08:03:22,366 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-07-11 08:03:22,370 [ scc.git] DEBUG Calling 'git fetch origin pull/575/head'
2024-07-11 08:03:22,912 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-11 08:03:22,912 [ scc.git] DEBUG * branch refs/pull/575/head -> FETCH_HEAD
2024-07-11 08:03:22,914 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-07-11 08:03:23,319 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-11 08:03:23,319 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-07-11 08:03:23,323 [ scc.git] DEBUG ## Unique users: []
2024-07-11 08:03:23,323 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:03:23,324 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:03:23,328 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-07-11 08:03:23,335 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:03:23,339 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-07-11 08:03:23,438 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-11 08:03:23,443 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-07-11 08:03:23,443 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-07-11 08:03:23,443 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-07-11 08:03:23,443 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-07-11 08:03:23,443 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-07-11 08:03:23,443 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-07-11 08:03:23,443 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-07-11 08:03:23,443 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-07-11 08:03:23,443 [ scc.git] DEBUG src/templates/rois_form.template.html | 8 ++++
2024-07-11 08:03:23,445 [ scc.git] DEBUG 9 files changed, 271 insertions(+), 5 deletions(-)
2024-07-11 08:03:23,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:03:23,592 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-07-11 08:03:23,599 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:03:23,603 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-07-11 08:03:24,011 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-07-11 08:03:24,011 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-07-11 08:03:24,011 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-07-11 08:03:24,012 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-11 08:03:24,017 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-07-11 08:03:24,017 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-07-11 08:03:24,017 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-07-11 08:03:24,017 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-07-11 08:03:24,017 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-07-11 08:03:24,018 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-07-11 08:03:24,018 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-07-11 08:03:24,018 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-07-11 08:03:24,018 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-07-11 08:03:24,018 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-07-11 08:03:24,020 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-07-11 08:03:24,020 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-07-11 08:03:24,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:03:24,180 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b000e028f28537162bf329e0cb3e4fbf7e7bede4'
2024-07-11 08:03:24,188 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:03:24,192 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) b000e028f28537162bf329e0cb3e4fbf7e7bede4'
2024-07-11 08:03:25,278 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-07-11 08:03:25,279 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-11 08:03:25,279 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-07-11 08:03:25,279 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-07-11 08:03:25,279 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-07-11 08:03:25,279 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-11 08:03:25,286 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-07-11 08:03:25,286 [ scc.git] DEBUG omero_figure/urls.py | 8 +++
2024-07-11 08:03:25,286 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-07-11 08:03:25,286 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-07-11 08:03:25,286 [ scc.git] DEBUG src/index.html | 1 +
2024-07-11 08:03:25,287 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-07-11 08:03:25,287 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-07-11 08:03:25,287 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-07-11 08:03:25,287 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-07-11 08:03:25,287 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-07-11 08:03:25,287 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-07-11 08:03:25,287 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-07-11 08:03:25,287 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-07-11 08:03:25,287 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-07-11 08:03:25,287 [ scc.git] DEBUG 14 files changed, 161 insertions(+), 14 deletions(-)
2024-07-11 08:03:25,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:03:25,450 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-07-11 08:03:25,458 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:03:25,462 [ 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-11 08:03:25,585 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-11 08:03:25,588 [ scc.git] DEBUG setup.py | 2 +-
2024-07-11 08:03:25,588 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-07-11 08:03:25,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:03:25,865 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...049617504722215fa2dff44e8d534a9b7ecd97c9'
2024-07-11 08:03:25,873 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:03:25,877 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 575 (Label sorting with drag and drop) 049617504722215fa2dff44e8d534a9b7ecd97c9'
2024-07-11 08:03:25,898 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-11 08:03:25,898 [ scc.git] DEBUG Auto-merging src/index.html
2024-07-11 08:03:25,898 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-07-11 08:03:25,899 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-11 08:03:25,903 [ scc.git] DEBUG package.json | 1 +
2024-07-11 08:03:25,903 [ scc.git] DEBUG src/css/figure.css | 10 ++--
2024-07-11 08:03:25,903 [ scc.git] DEBUG src/index.html | 9 ++--
2024-07-11 08:03:25,903 [ scc.git] DEBUG src/js/views/right_panel_view.js | 92 +++++++++++++++++++++++++++++++--
2024-07-11 08:03:25,904 [ scc.git] DEBUG src/templates/labels_form.template.html | 2 +-
2024-07-11 08:03:25,904 [ scc.git] DEBUG 5 files changed, 101 insertions(+), 13 deletions(-)
2024-07-11 08:03:26,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:03:26,276 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f4b9c3912e5f22ce4ca023e06a5863f5c577598e'
2024-07-11 08:03:26,284 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:03:26,289 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 576 (Color picker - popup update) f4b9c3912e5f22ce4ca023e06a5863f5c577598e'
2024-07-11 08:03:26,352 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-11 08:03:26,355 [ scc.git] DEBUG src/js/views/colorpicker.js | 5 +++--
2024-07-11 08:03:26,355 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-)
2024-07-11 08:03:26,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:03:26,687 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-11 08:03:26,725 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:03:26,725 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:03:26,730 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-11 08:03:26,765 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-11 08:03:26,772 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f26f82f6610> has no local changes
2024-07-11 08:03:26,772 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- 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 575 Tom-TBT 'Label sorting with drag and drop'
- PR 576 Rdornier 'Color picker - popup update'
Generated by OMERO-plugins-push#119 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/)'
2024-07-11 08:03:26,781 [ scc.git] DEBUG [detached HEAD 5f04b87a] merge master -Dorg -Ssuccess-only
2024-07-11 08:03:26,781 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:03:26,782 [ scc.repo] DEBUG ## PRs found:
2024-07-11 08:03:27,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-07-11 08:03:27,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-07-11 08:03:28,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-07-11 08:03:28,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-07-11 08:03:29,074 [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-11 08:03:29,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-07-11 08:03:30,024 [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-11 08:03:30,024 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-07-11 08:03:30,024 [ scc.repo] DEBUG ## Branches found:
2024-07-11 08:03:30,025 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-07-11 08:03:30,025 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:03:30,025 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:03:30,030 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-11 08:03:30,035 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-11 08:03:30,035 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-11 08:03:30,040 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-11 08:03:30,045 [ scc.git] DEBUG Already up to date.
2024-07-11 08:03:30,045 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-07-11 08:03:30,529 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-07-11 08:03:30,530 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-07-11 08:03:30,534 [ scc.git] DEBUG ## Unique users: []
2024-07-11 08:03:30,534 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:03:30,534 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:03:30,539 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-07-11 08:03:30,544 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:03:30,548 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-07-11 08:03:30,695 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-07-11 08:03:30,695 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-11 08:03:30,698 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-07-11 08:03:30,698 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-07-11 08:03:30,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:03:30,851 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-11 08:03:30,888 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:03:30,888 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:03:30,893 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-11 08:03:30,928 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-11 08:03:30,934 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f26fb36b8b0> has no local changes
2024-07-11 08:03:30,934 [ 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#119 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/)'
2024-07-11 08:03:30,942 [ scc.git] DEBUG [detached HEAD 68c5752] merge master -Dorg -Ssuccess-only
2024-07-11 08:03:30,942 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:03:30,942 [ scc.repo] DEBUG ## PRs found:
2024-07-11 08:03:31,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-07-11 08:03:31,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-07-11 08:03:31,835 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-11 08:03:32,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-07-11 08:03:32,875 [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-11 08:03:33,403 [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-11 08:03:33,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-07-11 08:03:34,387 [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-11 08:03:34,387 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-07-11 08:03:34,387 [ scc.repo] DEBUG ## Branches found:
2024-07-11 08:03:34,387 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-07-11 08:03:34,388 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:03:34,388 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:03:34,393 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-11 08:03:34,398 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-11 08:03:34,398 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-11 08:03:34,403 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-11 08:03:34,408 [ scc.git] DEBUG Already up to date.
2024-07-11 08:03:34,408 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-07-11 08:03:34,799 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-07-11 08:03:34,799 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-07-11 08:03:34,803 [ scc.git] DEBUG ## Unique users: []
2024-07-11 08:03:34,804 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:03:34,804 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:03:34,809 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-07-11 08:03:34,814 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:03:34,819 [ 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-11 08:03:34,829 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-11 08:03:34,832 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-07-11 08:03:34,832 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-07-11 08:03:35,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:03:35,006 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-11 08:03:35,042 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:03:35,043 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:03:35,047 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-11 08:03:35,084 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-11 08:03:35,091 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f26f8302610> has no local changes
2024-07-11 08:03:35,091 [ 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#119 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/)'
2024-07-11 08:03:35,098 [ scc.git] DEBUG [detached HEAD 3305485] merge master -Dorg -Ssuccess-only
2024-07-11 08:03:35,099 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:03:35,099 [ scc.repo] DEBUG ## PRs found:
2024-07-11 08:03:35,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-07-11 08:03:36,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-07-11 08:03:36,033 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-11 08:03:36,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-07-11 08:03:37,206 [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-11 08:03:37,702 [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-11 08:03:38,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-07-11 08:03:38,734 [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-11 08:03:38,735 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-07-11 08:03:39,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-07-11 08:03:39,198 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-11 08:03:39,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-07-11 08:03:40,266 [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-11 08:03:40,805 [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-11 08:03:41,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-07-11 08:03:41,860 [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-11 08:03:41,861 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-07-11 08:03:42,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-07-11 08:03:42,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-07-11 08:03:43,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-07-11 08:03:43,813 [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-11 08:03:44,280 [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-11 08:03:44,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-07-11 08:03:45,221 [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-11 08:03:45,222 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-07-11 08:03:45,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-07-11 08:03:46,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-07-11 08:03:46,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-07-11 08:03:47,168 [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-11 08:03:47,631 [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-11 08:03:48,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-07-11 08:03:48,496 [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-11 08:03:48,497 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-07-11 08:03:48,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-07-11 08:03:49,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-07-11 08:03:49,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-07-11 08:03:50,369 [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-11 08:03:50,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-07-11 08:03:51,331 [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-11 08:03:51,332 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-07-11 08:03:51,332 [ scc.repo] DEBUG ## Branches found:
2024-07-11 08:03:51,332 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-07-11 08:03:51,332 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:03:51,332 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:03:51,338 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-11 08:03:51,343 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-11 08:03:51,343 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-11 08:03:51,419 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-11 08:03:51,424 [ scc.git] DEBUG Already up to date.
2024-07-11 08:03:51,424 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-07-11 08:03:52,309 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-11 08:03:52,309 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-07-11 08:03:52,313 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-07-11 08:03:54,648 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-11 08:03:54,648 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-07-11 08:03:54,653 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-07-11 08:03:55,363 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-11 08:03:55,364 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-07-11 08:03:55,368 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-07-11 08:03:55,688 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-11 08:03:55,688 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-07-11 08:03:55,692 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-07-11 08:03:56,019 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-11 08:03:56,019 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-07-11 08:03:56,023 [ scc.git] DEBUG ## Unique users: []
2024-07-11 08:03:56,023 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:03:56,024 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:03:56,028 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-07-11 08:03:56,034 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:03:56,039 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-07-11 08:03:56,262 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-07-11 08:03:56,263 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-11 08:03:56,266 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-07-11 08:03:56,266 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-07-11 08:03:56,266 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-07-11 08:03:56,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:03:56,433 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-07-11 08:03:56,440 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:03:56,444 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-07-11 08:03:56,763 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-07-11 08:03:56,763 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-07-11 08:03:56,763 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-07-11 08:03:56,763 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-07-11 08:03:56,764 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-11 08:03:56,768 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-07-11 08:03:56,768 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-07-11 08:03:56,768 [ scc.git] DEBUG src/app/header.html | 5 +
2024-07-11 08:03:56,768 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-07-11 08:03:56,768 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-07-11 08:03:56,768 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-07-11 08:03:56,768 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-07-11 08:03:56,768 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-07-11 08:03:56,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:03:56,937 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-07-11 08:03:56,944 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:03:56,948 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-07-11 08:03:56,998 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-07-11 08:03:56,999 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-11 08:03:57,002 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-07-11 08:03:57,002 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-07-11 08:03:57,002 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-07-11 08:03:57,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:03:57,347 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-07-11 08:03:57,354 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:03:57,358 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-07-11 08:03:57,383 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-11 08:03:57,392 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-07-11 08:03:57,392 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-07-11 08:03:57,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:03:57,756 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-07-11 08:03:57,816 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:03:57,820 [ 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-11 08:03:57,909 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-11 08:03:57,910 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-11 08:03:58,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:03:58,161 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-11 08:03:58,198 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:03:58,198 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:03:58,202 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-11 08:03:58,240 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-11 08:03:58,248 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f26fb391df0> has no local changes
2024-07-11 08:03:58,249 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 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#119 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/)'
2024-07-11 08:03:58,256 [ scc.git] DEBUG [detached HEAD f177494] merge master -Dorg -Ssuccess-only
2024-07-11 08:03:58,257 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:03:58,257 [ scc.repo] DEBUG ## PRs found:
2024-07-11 08:03:58,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-07-11 08:03:59,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-07-11 08:03:59,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-07-11 08:04:00,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-07-11 08:04:00,673 [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-11 08:04:01,114 [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-11 08:04:01,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-07-11 08:04:01,955 [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-11 08:04:01,955 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-07-11 08:04:01,956 [ scc.repo] DEBUG ## Branches found:
2024-07-11 08:04:01,956 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-07-11 08:04:01,956 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:01,956 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:01,962 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-11 08:04:01,968 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-11 08:04:01,968 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-11 08:04:01,973 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-11 08:04:01,978 [ scc.git] DEBUG Already up to date.
2024-07-11 08:04:01,979 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-07-11 08:04:02,335 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-07-11 08:04:02,335 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-07-11 08:04:02,339 [ scc.git] DEBUG ## Unique users: []
2024-07-11 08:04:02,339 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:02,339 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:02,345 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-07-11 08:04:02,350 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:02,355 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-07-11 08:04:02,364 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-11 08:04:02,367 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-07-11 08:04:02,367 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-07-11 08:04:02,367 [ scc.git] DEBUG requirements.txt | 2 +-
2024-07-11 08:04:02,367 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-07-11 08:04:02,367 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-07-11 08:04:02,367 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-07-11 08:04:02,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:04:02,536 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-11 08:04:02,574 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:02,574 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:02,579 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-11 08:04:02,616 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-11 08:04:02,622 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f26f83144c0> has no local changes
2024-07-11 08:04:02,623 [ 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#119 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/)'
2024-07-11 08:04:02,631 [ scc.git] DEBUG [detached HEAD 6283f84] merge master -Dorg -Ssuccess-only
2024-07-11 08:04:02,632 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:04:02,632 [ scc.repo] DEBUG ## PRs found:
2024-07-11 08:04:03,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-07-11 08:04:03,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-07-11 08:04:04,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-07-11 08:04:04,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-07-11 08:04:05,133 [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-11 08:04:05,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-07-11 08:04:06,046 [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-11 08:04:06,047 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-07-11 08:04:06,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-07-11 08:04:07,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-07-11 08:04:07,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-07-11 08:04:08,001 [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-11 08:04:08,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-07-11 08:04:08,860 [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-11 08:04:08,860 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-07-11 08:04:08,860 [ scc.repo] DEBUG ## Branches found:
2024-07-11 08:04:08,860 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-07-11 08:04:08,861 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:08,861 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:08,866 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-11 08:04:08,871 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-11 08:04:08,871 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-11 08:04:08,876 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-11 08:04:08,881 [ scc.git] DEBUG Already up to date.
2024-07-11 08:04:08,881 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-07-11 08:04:09,638 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-07-11 08:04:09,638 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-07-11 08:04:09,643 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-07-11 08:04:10,245 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-07-11 08:04:10,245 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-07-11 08:04:10,249 [ scc.git] DEBUG ## Unique users: []
2024-07-11 08:04:10,249 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:10,249 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:10,255 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-11 08:04:10,261 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:10,266 [ 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-11 08:04:10,334 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-07-11 08:04:10,335 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-07-11 08:04:10,335 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-07-11 08:04:10,335 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-07-11 08:04:10,335 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-11 08:04:10,335 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-11 08:04:10,340 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-11 08:04:10,346 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-07-11 08:04:10,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:04:10,527 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-11 08:04:10,533 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-11 08:04:10,538 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#119](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-07-11 08:04:10,542 [ scc.config] DEBUG Found github.token
2024-07-11 08:04:10,542 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-07-11 08:04:10,542 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-11 08:04:10,548 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:10,553 [ 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-11 08:04:10,583 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-07-11 08:04:10,583 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-07-11 08:04:10,583 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-07-11 08:04:10,583 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-11 08:04:10,583 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-11 08:04:10,588 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-11 08:04:10,595 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-07-11 08:04:10,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:04:10,935 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-11 08:04:10,941 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-11 08:04:10,946 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#119](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/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-11 08:04:10,950 [ scc.config] DEBUG Found github.token
2024-07-11 08:04:10,950 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-07-11 08:04:10,950 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-11 08:04:10,987 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:10,987 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:10,992 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-11 08:04:11,028 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-11 08:04:11,035 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f26fb379ee0> has no local changes
2024-07-11 08:04:11,035 [ 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#119 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/)'
2024-07-11 08:04:11,042 [ scc.git] DEBUG [detached HEAD 2f23b36] merge master -Dorg -Ssuccess-only
2024-07-11 08:04:11,042 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:04:11,043 [ scc.repo] DEBUG ## PRs found:
2024-07-11 08:04:11,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-07-11 08:04:12,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-07-11 08:04:12,013 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-11 08:04:12,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-07-11 08:04:13,163 [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-11 08:04:13,610 [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-11 08:04:14,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-07-11 08:04:14,616 [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-11 08:04:14,617 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-07-11 08:04:15,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-07-11 08:04:15,078 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-11 08:04:15,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-07-11 08:04:16,140 [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-11 08:04:16,778 [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-11 08:04:17,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-07-11 08:04:17,753 [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-11 08:04:17,753 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-07-11 08:04:18,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-07-11 08:04:18,213 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-11 08:04:18,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-07-11 08:04:19,336 [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-11 08:04:19,856 [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-11 08:04:20,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-07-11 08:04:20,777 [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-11 08:04:20,777 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-07-11 08:04:21,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-07-11 08:04:21,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-07-11 08:04:22,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-07-11 08:04:22,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-07-11 08:04:23,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-07-11 08:04:23,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-07-11 08:04:23,653 [ scc.repo] DEBUG ## Branches found:
2024-07-11 08:04:23,653 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-07-11 08:04:23,653 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:23,654 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:23,659 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-11 08:04:23,663 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-11 08:04:23,664 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-11 08:04:23,668 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-11 08:04:23,674 [ scc.git] DEBUG Already up to date.
2024-07-11 08:04:23,674 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-07-11 08:04:24,051 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-11 08:04:24,051 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-07-11 08:04:24,056 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-07-11 08:04:24,389 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-11 08:04:24,389 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-07-11 08:04:24,394 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-07-11 08:04:24,780 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-11 08:04:24,780 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-07-11 08:04:24,784 [ scc.git] DEBUG ## Unique users: []
2024-07-11 08:04:24,785 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:24,785 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:24,790 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-07-11 08:04:24,796 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:24,801 [ 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-11 08:04:24,809 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-11 08:04:24,812 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-07-11 08:04:24,812 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-07-11 08:04:24,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:04:24,970 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-07-11 08:04:24,975 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:24,979 [ 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-11 08:04:25,041 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-11 08:04:25,042 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-11 08:04:25,045 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-07-11 08:04:25,045 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-07-11 08:04:25,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:04:25,381 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-07-11 08:04:25,386 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:25,390 [ 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-11 08:04:25,452 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-11 08:04:25,453 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-11 08:04:25,456 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-07-11 08:04:25,456 [ scc.git] DEBUG package.json | 2 +-
2024-07-11 08:04:25,456 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-07-11 08:04:25,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:04:25,802 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-11 08:04:25,838 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:25,838 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:25,842 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-11 08:04:25,877 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-11 08:04:25,883 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f26f82bb880> has no local changes
2024-07-11 08:04:25,884 [ 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#119 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/)'
2024-07-11 08:04:25,891 [ scc.git] DEBUG [detached HEAD c34fe9f] merge master -Dorg -Ssuccess-only
2024-07-11 08:04:25,892 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:04:25,892 [ scc.repo] DEBUG ## PRs found:
2024-07-11 08:04:26,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-07-11 08:04:26,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-07-11 08:04:27,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-07-11 08:04:27,766 [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-11 08:04:28,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-07-11 08:04:28,697 [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-11 08:04:28,698 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-07-11 08:04:28,698 [ scc.repo] DEBUG ## Branches found:
2024-07-11 08:04:28,698 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-07-11 08:04:28,698 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:28,698 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:28,703 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-11 08:04:28,707 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-11 08:04:28,707 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-11 08:04:28,712 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-11 08:04:28,717 [ scc.git] DEBUG Already up to date.
2024-07-11 08:04:28,717 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-07-11 08:04:29,128 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-07-11 08:04:29,129 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-07-11 08:04:29,132 [ scc.git] DEBUG ## Unique users: []
2024-07-11 08:04:29,132 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:29,132 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:29,136 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-07-11 08:04:29,141 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:29,145 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-07-11 08:04:29,153 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-11 08:04:29,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:04:29,329 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-11 08:04:29,365 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:29,365 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:29,369 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-11 08:04:29,406 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-11 08:04:29,411 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f26f8302490> has no local changes
2024-07-11 08:04:29,411 [ 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#119 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/)'
2024-07-11 08:04:29,418 [ scc.git] DEBUG [detached HEAD 464bfdb] merge master -Dorg -Ssuccess-only
2024-07-11 08:04:29,419 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:04:29,419 [ scc.repo] DEBUG ## PRs found:
2024-07-11 08:04:29,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-07-11 08:04:30,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-07-11 08:04:30,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-07-11 08:04:31,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-07-11 08:04:31,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-07-11 08:04:32,286 [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-11 08:04:32,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-07-11 08:04:33,225 [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-11 08:04:33,225 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-07-11 08:04:33,225 [ scc.repo] DEBUG ## Branches found:
2024-07-11 08:04:33,225 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-07-11 08:04:33,225 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:33,225 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:33,231 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-11 08:04:33,235 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-11 08:04:33,236 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-11 08:04:33,240 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-11 08:04:33,245 [ scc.git] DEBUG Already up to date.
2024-07-11 08:04:33,246 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-07-11 08:04:33,727 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-07-11 08:04:33,727 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-07-11 08:04:33,730 [ scc.git] DEBUG ## Unique users: []
2024-07-11 08:04:33,730 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:33,730 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:33,735 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-07-11 08:04:33,740 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:33,744 [ 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-11 08:04:33,753 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-07-11 08:04:33,754 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-11 08:04:33,756 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-07-11 08:04:33,756 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-07-11 08:04:33,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:04:33,909 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-11 08:04:33,945 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:33,945 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:33,950 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-11 08:04:33,986 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-11 08:04:33,991 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f26f8331c70> has no local changes
2024-07-11 08:04:33,991 [ 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#119 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/)'
2024-07-11 08:04:33,999 [ scc.git] DEBUG [detached HEAD 41501e1] merge master -Dorg -Ssuccess-only
2024-07-11 08:04:33,999 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:04:33,999 [ scc.repo] DEBUG ## PRs found:
2024-07-11 08:04:34,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-07-11 08:04:34,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-07-11 08:04:35,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-07-11 08:04:35,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-07-11 08:04:36,428 [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-11 08:04:36,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-07-11 08:04:37,382 [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-11 08:04:37,382 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-07-11 08:04:37,382 [ scc.repo] DEBUG ## Branches found:
2024-07-11 08:04:37,383 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-07-11 08:04:37,383 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:37,383 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:37,388 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-11 08:04:37,392 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-11 08:04:37,392 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-11 08:04:37,397 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-11 08:04:37,402 [ scc.git] DEBUG Already up to date.
2024-07-11 08:04:37,402 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-07-11 08:04:37,933 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-07-11 08:04:37,934 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-07-11 08:04:37,937 [ scc.git] DEBUG ## Unique users: []
2024-07-11 08:04:37,937 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:37,937 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:37,942 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-11 08:04:37,947 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:37,951 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-11 08:04:37,985 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-07-11 08:04:37,985 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-07-11 08:04:37,985 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-07-11 08:04:37,985 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-07-11 08:04:37,985 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-07-11 08:04:37,986 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-07-11 08:04:37,986 [ scc.git] DEBUG Auto-merging setup.py
2024-07-11 08:04:37,986 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-07-11 08:04:37,986 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-11 08:04:37,986 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-11 08:04:37,990 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-07-11 08:04:37,996 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-07-11 08:04:38,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:04:38,153 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-11 08:04:38,158 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-07-11 08:04:38,163 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#119](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- setup.py
- omero_signup/urls.py
- omero_signup/views.py
--conflicts
2024-07-11 08:04:38,167 [ scc.config] DEBUG Found github.token
2024-07-11 08:04:38,167 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-07-11 08:04:38,167 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-11 08:04:38,203 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:38,203 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:38,207 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-11 08:04:38,243 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-11 08:04:38,248 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f26f82ffd30> has no local changes
2024-07-11 08:04:38,248 [ 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#119 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/)'
2024-07-11 08:04:38,256 [ scc.git] DEBUG [detached HEAD 9bfaa3d] merge master -Dorg -Ssuccess-only
2024-07-11 08:04:38,256 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:04:38,256 [ scc.repo] DEBUG ## PRs found:
2024-07-11 08:04:38,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-07-11 08:04:39,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-07-11 08:04:39,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-07-11 08:04:40,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-07-11 08:04:40,590 [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-11 08:04:41,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-07-11 08:04:41,474 [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-11 08:04:41,475 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-07-11 08:04:41,475 [ scc.repo] DEBUG ## Branches found:
2024-07-11 08:04:41,475 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-07-11 08:04:41,475 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:41,475 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:41,480 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-11 08:04:41,484 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-11 08:04:41,485 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-11 08:04:41,489 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-11 08:04:41,495 [ scc.git] DEBUG Already up to date.
2024-07-11 08:04:41,495 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-07-11 08:04:42,073 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-07-11 08:04:42,073 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-07-11 08:04:42,077 [ scc.git] DEBUG ## Unique users: []
2024-07-11 08:04:42,077 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:42,077 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:42,082 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-07-11 08:04:42,088 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:42,092 [ 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-11 08:04:42,155 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-11 08:04:42,158 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-07-11 08:04:42,158 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-07-11 08:04:42,158 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-07-11 08:04:42,158 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-07-11 08:04:42,158 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-07-11 08:04:42,158 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-07-11 08:04:42,158 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-07-11 08:04:42,160 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-07-11 08:04:42,160 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-07-11 08:04:42,160 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-07-11 08:04:42,160 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-07-11 08:04:42,160 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-07-11 08:04:42,160 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-07-11 08:04:42,160 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-07-11 08:04:42,160 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-07-11 08:04:42,160 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-07-11 08:04:42,160 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-07-11 08:04:42,160 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-07-11 08:04:42,160 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-07-11 08:04:42,160 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-07-11 08:04:42,160 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-07-11 08:04:42,160 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-07-11 08:04:42,160 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-07-11 08:04:42,160 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-07-11 08:04:42,160 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-07-11 08:04:42,160 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-07-11 08:04:42,160 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-07-11 08:04:42,160 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-07-11 08:04:42,161 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-07-11 08:04:42,161 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-07-11 08:04:42,161 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-07-11 08:04:42,161 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-07-11 08:04:42,161 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-07-11 08:04:42,161 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-07-11 08:04:42,161 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-07-11 08:04:42,161 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-07-11 08:04:42,161 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-07-11 08:04:42,161 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-07-11 08:04:42,161 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-07-11 08:04:42,161 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-07-11 08:04:42,161 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-07-11 08:04:42,161 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-07-11 08:04:42,161 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-07-11 08:04:42,161 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-07-11 08:04:42,161 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-07-11 08:04:42,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:04:42,324 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-11 08:04:42,360 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:42,360 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:42,364 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-11 08:04:42,399 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-11 08:04:42,405 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f26f82ccbe0> has no local changes
2024-07-11 08:04:42,405 [ 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#119 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/)'
2024-07-11 08:04:42,414 [ scc.git] DEBUG [detached HEAD c49359f] merge master -Dorg -Ssuccess-only
2024-07-11 08:04:42,414 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:04:42,414 [ scc.repo] DEBUG ## PRs found:
2024-07-11 08:04:42,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-07-11 08:04:42,742 [ scc.repo] DEBUG ## Branches found:
2024-07-11 08:04:42,742 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-07-11 08:04:42,742 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:42,742 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:42,747 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-11 08:04:42,751 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-11 08:04:42,751 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-11 08:04:42,756 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-11 08:04:42,761 [ scc.git] DEBUG Already up to date.
2024-07-11 08:04:42,761 [ scc.git] DEBUG ## Unique users: []
2024-07-11 08:04:42,761 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:42,761 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:42,767 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-11 08:04:42,804 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:42,804 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:42,808 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-11 08:04:42,845 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-11 08:04:42,851 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f26f82be490> has no local changes
2024-07-11 08:04:42,851 [ 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#119 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/)'
2024-07-11 08:04:42,858 [ scc.git] DEBUG [detached HEAD 99b0b9f] merge master -Dorg -Ssuccess-only
2024-07-11 08:04:42,859 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:04:42,859 [ scc.repo] DEBUG ## PRs found:
2024-07-11 08:04:43,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-07-11 08:04:43,174 [ scc.repo] DEBUG ## Branches found:
2024-07-11 08:04:43,174 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-07-11 08:04:43,174 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:43,175 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:43,179 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-11 08:04:43,184 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-11 08:04:43,184 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-11 08:04:43,189 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-11 08:04:43,194 [ scc.git] DEBUG Already up to date.
2024-07-11 08:04:43,194 [ scc.git] DEBUG ## Unique users: []
2024-07-11 08:04:43,194 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:43,194 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:43,198 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-11 08:04:43,234 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:43,234 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:43,239 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-11 08:04:43,275 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-11 08:04:43,282 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f26f8294490> has no local changes
2024-07-11 08:04:43,282 [ 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#119 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/)'
2024-07-11 08:04:43,290 [ scc.git] DEBUG [detached HEAD db18c4c] merge master -Dorg -Ssuccess-only
2024-07-11 08:04:43,290 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:04:43,290 [ scc.git] INFO Overriding base-branch from master to main
2024-07-11 08:04:43,290 [ scc.repo] DEBUG ## PRs found:
2024-07-11 08:04:43,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-07-11 08:04:44,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-07-11 08:04:44,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-07-11 08:04:45,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-07-11 08:04:45,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-07-11 08:04:46,170 [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-11 08:04:46,671 [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-11 08:04:47,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-07-11 08:04:47,536 [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-11 08:04:47,536 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-07-11 08:04:47,536 [ scc.repo] DEBUG ## Branches found:
2024-07-11 08:04:47,536 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-07-11 08:04:47,536 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:47,537 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:47,542 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-07-11 08:04:47,547 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-11 08:04:47,547 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-07-11 08:04:47,552 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-07-11 08:04:47,557 [ scc.git] DEBUG Already up to date.
2024-07-11 08:04:47,557 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-07-11 08:04:48,068 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-07-11 08:04:48,068 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-07-11 08:04:48,072 [ scc.git] DEBUG ## Unique users: []
2024-07-11 08:04:48,072 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:48,073 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:48,078 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-11 08:04:48,083 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:48,088 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-11 08:04:48,184 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-07-11 08:04:48,184 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-07-11 08:04:48,184 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-11 08:04:48,184 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-11 08:04:48,189 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-07-11 08:04:48,195 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-07-11 08:04:48,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:04:48,354 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-11 08:04:48,359 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-07-11 08:04:48,364 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#119](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-07-11 08:04:48,368 [ scc.config] DEBUG Found github.token
2024-07-11 08:04:48,368 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-07-11 08:04:48,368 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-11 08:04:48,406 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:48,406 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:48,410 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-11 08:04:48,447 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-11 08:04:48,452 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f26f82454f0> has no local changes
2024-07-11 08:04:48,453 [ 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#119 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/)'
2024-07-11 08:04:48,460 [ scc.git] DEBUG [detached HEAD 4ff5ae7] merge master -Dorg -Ssuccess-only
2024-07-11 08:04:48,460 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:04:48,460 [ scc.repo] DEBUG ## PRs found:
2024-07-11 08:04:48,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-07-11 08:04:48,801 [ scc.repo] DEBUG ## Branches found:
2024-07-11 08:04:48,801 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-07-11 08:04:48,801 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:48,801 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:48,806 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-11 08:04:48,810 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-11 08:04:48,810 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-11 08:04:48,815 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-11 08:04:48,820 [ scc.git] DEBUG Already up to date.
2024-07-11 08:04:48,820 [ scc.git] DEBUG ## Unique users: []
2024-07-11 08:04:48,820 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:48,820 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:48,825 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-11 08:04:48,861 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:48,861 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:48,865 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-11 08:04:48,900 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-11 08:04:48,906 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f26f829bf40> has no local changes
2024-07-11 08:04:48,906 [ 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#119 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/)'
2024-07-11 08:04:48,913 [ scc.git] DEBUG [detached HEAD a91371e] merge master -Dorg -Ssuccess-only
2024-07-11 08:04:48,913 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:04:48,913 [ scc.repo] DEBUG ## PRs found:
2024-07-11 08:04:49,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-07-11 08:04:49,233 [ scc.repo] DEBUG ## Branches found:
2024-07-11 08:04:49,233 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-07-11 08:04:49,234 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:49,234 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:49,238 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-11 08:04:49,243 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-11 08:04:49,243 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-11 08:04:49,248 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-11 08:04:49,253 [ scc.git] DEBUG Already up to date.
2024-07-11 08:04:49,253 [ scc.git] DEBUG ## Unique users: []
2024-07-11 08:04:49,253 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:49,253 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:49,258 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-11 08:04:49,294 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:49,294 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:49,299 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-11 08:04:49,334 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-11 08:04:49,339 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f26f826e700> has no local changes
2024-07-11 08:04:49,340 [ 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#119 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/)'
2024-07-11 08:04:49,347 [ scc.git] DEBUG [detached HEAD d9e376c] merge master -Dorg -Ssuccess-only
2024-07-11 08:04:49,347 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:04:49,348 [ scc.repo] DEBUG ## PRs found:
2024-07-11 08:04:49,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-07-11 08:04:50,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-07-11 08:04:50,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-07-11 08:04:51,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-07-11 08:04:51,750 [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-11 08:04:52,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-07-11 08:04:52,708 [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-11 08:04:52,709 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-07-11 08:04:52,709 [ scc.repo] DEBUG ## Branches found:
2024-07-11 08:04:52,709 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-07-11 08:04:52,709 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:52,709 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:52,715 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-11 08:04:52,719 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-11 08:04:52,719 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-11 08:04:52,724 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-11 08:04:52,729 [ scc.git] DEBUG Already up to date.
2024-07-11 08:04:52,730 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-07-11 08:04:53,190 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-07-11 08:04:53,190 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-07-11 08:04:53,194 [ scc.git] DEBUG ## Unique users: []
2024-07-11 08:04:53,194 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:53,194 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:53,199 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-11 08:04:53,204 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:53,209 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-11 08:04:53,310 [ scc.git] DEBUG Auto-merging Dockerfile
2024-07-11 08:04:53,310 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-07-11 08:04:53,310 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-11 08:04:53,310 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-11 08:04:53,315 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-07-11 08:04:53,322 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-07-11 08:04:53,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:04:53,485 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-11 08:04:53,490 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-07-11 08:04:53,495 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#119](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-07-11 08:04:53,500 [ scc.config] DEBUG Found github.token
2024-07-11 08:04:53,500 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-07-11 08:04:53,500 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-11 08:04:53,536 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:04:53,536 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:04:53,541 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-11 08:04:53,576 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-11 08:04:53,582 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f26f8201df0> has no local changes
2024-07-11 08:04:53,582 [ 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#119 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/)'
2024-07-11 08:04:53,590 [ scc.git] DEBUG [detached HEAD de6ea8d] merge master -Dorg -Ssuccess-only
2024-07-11 08:04:53,590 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:04:53,591 [ scc.git] INFO Overriding base-branch from master to develop
2024-07-11 08:04:53,591 [ scc.repo] DEBUG ## PRs found:
2024-07-11 08:04:54,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-07-11 08:04:54,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-07-11 08:04:55,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-07-11 08:04:55,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-07-11 08:04:56,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-07-11 08:04:56,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-07-11 08:04:57,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-07-11 08:04:57,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-11 08:04:58,070 [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-11 08:04:58,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-11 08:04:59,008 [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-11 08:04:59,008 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-11 08:04:59,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-07-11 08:05:00,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-07-11 08:05:00,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-07-11 08:05:01,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-07-11 08:05:01,022 [ scc.repo] DEBUG ## Branches found:
2024-07-11 08:05:01,022 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-07-11 08:05:01,022 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:05:01,023 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:05:01,028 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-07-11 08:05:01,033 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-11 08:05:01,033 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-07-11 08:05:01,038 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-07-11 08:05:01,043 [ scc.git] DEBUG Already up to date.
2024-07-11 08:05:01,043 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-07-11 08:05:02,944 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-07-11 08:05:02,944 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-07-11 08:05:02,948 [ scc.git] DEBUG ## Unique users: []
2024-07-11 08:05:02,948 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:05:02,948 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:05:02,954 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-11 08:05:02,961 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:05:02,965 [ 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-11 08:05:03,121 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-07-11 08:05:03,121 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-07-11 08:05:03,121 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-11 08:05:03,121 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-11 08:05:03,126 [ scc.git] DEBUG Calling 'git reset --hard c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-11 08:05:03,132 [ scc.git] DEBUG HEAD is now at c20d273 Merge pull request #221 from imcf/fix-typechecking
2024-07-11 08:05:03,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:05:03,286 [ scc.git] DEBUG Calling 'git merge-base c20d2734b711c659cecea83db6e2ebd7b7013636 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-11 08:05:03,292 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-11 08:05:03,297 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#119](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-07-11 08:05:03,302 [ scc.config] DEBUG Found github.token
2024-07-11 08:05:03,302 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-07-11 08:05:03,302 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-11 08:05:03,338 [ scc.git] DEBUG Get sha1 of %s
2024-07-11 08:05:03,339 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-11 08:05:03,343 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-11 08:05:03,378 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-11 08:05:03,384 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f26f826bee0> has no local changes
2024-07-11 08:05:03,384 [ 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#119 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/)'
2024-07-11 08:05:03,391 [ scc.git] DEBUG [detached HEAD cb28a9e] merge master -Dorg -Ssuccess-only
2024-07-11 08:05:03,392 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:05:03,392 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-11 08:05:03,462 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-07-11 08:05:03,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:05:03,730 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-07-11 08:05:03,734 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-07-11 08:05:04,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:05:04,161 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-07-11 08:05:04,166 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-07-11 08:05:04,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:05:04,581 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-07-11 08:05:04,586 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-07-11 08:05:04,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:05:05,001 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-07-11 08:05:05,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:05:05,420 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-07-11 08:05:05,424 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-07-11 08:05:05,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:05:05,832 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-07-11 08:05:05,836 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-07-11 08:05:06,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:05:06,241 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-07-11 08:05:06,245 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-07-11 08:05:06,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:05:06,648 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-07-11 08:05:06,652 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-07-11 08:05:07,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:05:07,056 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-07-11 08:05:07,060 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-07-11 08:05:07,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:05:07,481 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-07-11 08:05:07,485 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-07-11 08:05:07,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:05:07,902 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-07-11 08:05:07,907 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-07-11 08:05:08,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:05:08,317 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-07-11 08:05:08,321 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-07-11 08:05:08,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:05:08,729 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-07-11 08:05:09,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:05:09,142 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-07-11 08:05:09,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:05:09,553 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-07-11 08:05:09,557 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-07-11 08:05:09,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:05:09,967 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-07-11 08:05:10,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:05:10,384 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-07-11 08:05:10,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:05:10,798 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-07-11 08:05:10,802 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-07-11 08:05:11,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:05:11,204 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-07-11 08:05:11,208 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-07-11 08:05:11,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:05:11,620 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-07-11 08:05:11,624 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-07-11 08:05:12,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:05:12,045 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-07-11 08:05:12,049 [ scc.config] DEBUG Found submodule.scripts.url
2024-07-11 08:05:12,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-11 08:05:12,469 [ scc.config] DEBUG Found submodule.scripts.branch
2024-07-11 08:05:12,469 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-11 08:05:12,544 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f26fc468d60> has local changes
2024-07-11 08:05:12,544 [ 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 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 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 575 Tom-TBT 'Label sorting with drag and drop'
- 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 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#119 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/119/)'
2024-07-11 08:05:12,558 [ scc.git] DEBUG [detached HEAD f2588e0] merge master -Dorg -Ssuccess-only
2024-07-11 08:05:12,558 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-07-11 08:05:12,558 [ scc.merge] INFO Repository: ome/omero-plugins
2024-07-11 08:05:12,558 [ scc.merge] INFO Already up to date.
2024-07-11 08:05:12,558 [ scc.merge] INFO
2024-07-11 08:05:12,558 [ scc.merge] INFO
2024-07-11 08:05:12,558 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-07-11 08:05:12,558 [ scc.merge] INFO Already up to date.
2024-07-11 08:05:12,558 [ scc.merge] INFO
2024-07-11 08:05:12,558 [ scc.merge] INFO
2024-07-11 08:05:12,558 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-07-11 08:05:12,558 [ scc.merge] INFO Excluded PRs:
2024-07-11 08:05:12,558 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-07-11 08:05:12,558 [ scc.merge] INFO Already up to date.
2024-07-11 08:05:12,559 [ scc.merge] INFO
2024-07-11 08:05:12,559 [ scc.merge] INFO Merged PRs:
2024-07-11 08:05:12,559 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-07-11 08:05:12,559 [ scc.merge] INFO
2024-07-11 08:05:12,559 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-07-11 08:05:12,559 [ scc.merge] INFO Excluded PRs:
2024-07-11 08:05:12,559 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-07-11 08:05:12,559 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-07-11 08:05:12,559 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-07-11 08:05:12,559 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-07-11 08:05:12,559 [ scc.merge] INFO Already up to date.
2024-07-11 08:05:12,559 [ scc.merge] INFO
2024-07-11 08:05:12,559 [ scc.merge] INFO Merged PRs:
2024-07-11 08:05:12,559 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-07-11 08:05:12,559 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-07-11 08:05:12,559 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-07-11 08:05:12,559 [ scc.merge] INFO
2024-07-11 08:05:12,559 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-07-11 08:05:12,559 [ scc.merge] INFO Excluded PRs:
2024-07-11 08:05:12,559 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-07-11 08:05:12,559 [ scc.merge] INFO Already up to date.
2024-07-11 08:05:12,559 [ scc.merge] INFO
2024-07-11 08:05:12,559 [ scc.merge] INFO Merged PRs:
2024-07-11 08:05:12,559 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-07-11 08:05:12,559 [ scc.merge] INFO
2024-07-11 08:05:12,559 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-11 08:05:12,559 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-07-11 08:05:12,559 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-07-11 08:05:12,559 [ scc.merge] INFO
2024-07-11 08:05:12,559 [ scc.merge] INFO Repository: ome/omero-figure
2024-07-11 08:05:12,559 [ scc.merge] INFO Excluded PRs:
2024-07-11 08:05:12,559 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' (user: Rdornier)
2024-07-11 08:05:12,559 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-07-11 08:05:12,559 [ scc.merge] INFO Already up to date.
2024-07-11 08:05:12,559 [ scc.merge] INFO
2024-07-11 08:05:12,559 [ scc.merge] INFO Merged PRs:
2024-07-11 08:05:12,559 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-07-11 08:05:12,559 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-07-11 08:05:12,560 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-07-11 08:05:12,560 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-07-11 08:05:12,560 [ scc.merge] INFO - PR 575 Tom-TBT 'Label sorting with drag and drop'
2024-07-11 08:05:12,560 [ scc.merge] INFO - PR 576 Rdornier 'Color picker - popup update'
2024-07-11 08:05:12,560 [ scc.merge] INFO
2024-07-11 08:05:12,560 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-07-11 08:05:12,560 [ scc.merge] INFO Already up to date.
2024-07-11 08:05:12,560 [ scc.merge] INFO
2024-07-11 08:05:12,560 [ scc.merge] INFO Merged PRs:
2024-07-11 08:05:12,560 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-07-11 08:05:12,560 [ scc.merge] INFO
2024-07-11 08:05:12,560 [ scc.merge] INFO Repository: ome/omero-gallery
2024-07-11 08:05:12,560 [ scc.merge] INFO Already up to date.
2024-07-11 08:05:12,560 [ scc.merge] INFO
2024-07-11 08:05:12,560 [ scc.merge] INFO Merged PRs:
2024-07-11 08:05:12,560 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-07-11 08:05:12,560 [ scc.merge] INFO
2024-07-11 08:05:12,560 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-07-11 08:05:12,560 [ scc.merge] INFO Excluded PRs:
2024-07-11 08:05:12,560 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-07-11 08:05:12,560 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-07-11 08:05:12,560 [ scc.merge] INFO Already up to date.
2024-07-11 08:05:12,560 [ scc.merge] INFO
2024-07-11 08:05:12,560 [ scc.merge] INFO Merged PRs:
2024-07-11 08:05:12,560 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-07-11 08:05:12,560 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-07-11 08:05:12,560 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-07-11 08:05:12,560 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-07-11 08:05:12,560 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-07-11 08:05:12,560 [ scc.merge] INFO
2024-07-11 08:05:12,560 [ scc.merge] INFO Repository: ome/omero-mapr
2024-07-11 08:05:12,560 [ scc.merge] INFO Excluded PRs:
2024-07-11 08:05:12,560 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-07-11 08:05:12,560 [ scc.merge] INFO Already up to date.
2024-07-11 08:05:12,560 [ scc.merge] INFO
2024-07-11 08:05:12,560 [ scc.merge] INFO Merged PRs:
2024-07-11 08:05:12,560 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-07-11 08:05:12,560 [ scc.merge] INFO
2024-07-11 08:05:12,560 [ scc.merge] INFO Repository: ome/omero-metadata
2024-07-11 08:05:12,561 [ scc.merge] INFO Already up to date.
2024-07-11 08:05:12,561 [ scc.merge] INFO
2024-07-11 08:05:12,561 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-11 08:05:12,561 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-07-11 08:05:12,561 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-07-11 08:05:12,561 [ scc.merge] INFO
2024-07-11 08:05:12,561 [ scc.merge] INFO Repository: ome/omero-parade
2024-07-11 08:05:12,561 [ scc.merge] INFO Excluded PRs:
2024-07-11 08:05:12,561 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-07-11 08:05:12,561 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-07-11 08:05:12,561 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-07-11 08:05:12,561 [ scc.merge] INFO Already up to date.
2024-07-11 08:05:12,561 [ scc.merge] INFO
2024-07-11 08:05:12,561 [ scc.merge] INFO Merged PRs:
2024-07-11 08:05:12,561 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-07-11 08:05:12,561 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-07-11 08:05:12,561 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-07-11 08:05:12,561 [ scc.merge] INFO
2024-07-11 08:05:12,561 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-07-11 08:05:12,561 [ scc.merge] INFO Already up to date.
2024-07-11 08:05:12,561 [ scc.merge] INFO
2024-07-11 08:05:12,561 [ scc.merge] INFO Merged PRs:
2024-07-11 08:05:12,561 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-07-11 08:05:12,561 [ scc.merge] INFO
2024-07-11 08:05:12,561 [ scc.merge] INFO Repository: ome/omero-rois
2024-07-11 08:05:12,561 [ scc.merge] INFO Excluded PRs:
2024-07-11 08:05:12,561 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-07-11 08:05:12,561 [ scc.merge] INFO Already up to date.
2024-07-11 08:05:12,561 [ scc.merge] INFO
2024-07-11 08:05:12,561 [ scc.merge] INFO Merged PRs:
2024-07-11 08:05:12,561 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-07-11 08:05:12,561 [ scc.merge] INFO
2024-07-11 08:05:12,561 [ scc.merge] INFO Repository: ome/omero-signup
2024-07-11 08:05:12,561 [ scc.merge] INFO Already up to date.
2024-07-11 08:05:12,561 [ scc.merge] INFO
2024-07-11 08:05:12,561 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-11 08:05:12,561 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-07-11 08:05:12,561 [ scc.merge] INFO
2024-07-11 08:05:12,561 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-07-11 08:05:12,561 [ scc.merge] INFO Already up to date.
2024-07-11 08:05:12,562 [ scc.merge] INFO
2024-07-11 08:05:12,562 [ scc.merge] INFO Merged PRs:
2024-07-11 08:05:12,562 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-07-11 08:05:12,562 [ scc.merge] INFO
2024-07-11 08:05:12,562 [ scc.merge] INFO Repository: ome/omero-upload
2024-07-11 08:05:12,562 [ scc.merge] INFO Already up to date.
2024-07-11 08:05:12,562 [ scc.merge] INFO
2024-07-11 08:05:12,562 [ scc.merge] INFO
2024-07-11 08:05:12,562 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-07-11 08:05:12,562 [ scc.merge] INFO Already up to date.
2024-07-11 08:05:12,562 [ scc.merge] INFO
2024-07-11 08:05:12,562 [ scc.merge] INFO
2024-07-11 08:05:12,562 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-07-11 08:05:12,562 [ scc.merge] INFO Excluded PRs:
2024-07-11 08:05:12,562 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-07-11 08:05:12,562 [ scc.merge] INFO Already up to date.
2024-07-11 08:05:12,562 [ scc.merge] INFO
2024-07-11 08:05:12,562 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-11 08:05:12,562 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-07-11 08:05:12,562 [ scc.merge] INFO
2024-07-11 08:05:12,562 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-07-11 08:05:12,562 [ scc.merge] INFO Already up to date.
2024-07-11 08:05:12,562 [ scc.merge] INFO
2024-07-11 08:05:12,562 [ scc.merge] INFO
2024-07-11 08:05:12,562 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-07-11 08:05:12,562 [ scc.merge] INFO Already up to date.
2024-07-11 08:05:12,562 [ scc.merge] INFO
2024-07-11 08:05:12,562 [ scc.merge] INFO
2024-07-11 08:05:12,562 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-07-11 08:05:12,562 [ scc.merge] INFO Already up to date.
2024-07-11 08:05:12,562 [ scc.merge] INFO
2024-07-11 08:05:12,562 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-11 08:05:12,562 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-07-11 08:05:12,562 [ scc.merge] INFO
2024-07-11 08:05:12,562 [ scc.merge] INFO Repository: ome/scripts
2024-07-11 08:05:12,562 [ scc.merge] INFO Excluded PRs:
2024-07-11 08:05:12,562 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-07-11 08:05:12,562 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-07-11 08:05:12,562 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-07-11 08:05:12,563 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-07-11 08:05:12,563 [ scc.merge] INFO Already up to date.
2024-07-11 08:05:12,563 [ scc.merge] INFO
2024-07-11 08:05:12,563 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-11 08:05:12,563 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-11 08:05:12,563 [ scc.merge] INFO
2024-07-11 08:05:12,563 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-11 08:05:12,563 [ scc.git] DEBUG Calling 'git remote'
2024-07-11 08:05:12,567 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-07-11 08:05:12,567 [ scc.git] DEBUG Calling 'git remote'
2024-07-11 08:05:12,572 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:05:12,572 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-07-11 08:05:12,572 [ scc.git] DEBUG Calling 'git remote'
2024-07-11 08:05:12,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:05:12,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-07-11 08:05:12,576 [ scc.git] DEBUG Calling 'git remote'
2024-07-11 08:05:12,581 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:05:12,581 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-07-11 08:05:12,581 [ scc.git] DEBUG Calling 'git remote'
2024-07-11 08:05:12,585 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:05:12,585 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-07-11 08:05:12,585 [ scc.git] DEBUG Calling 'git remote'
2024-07-11 08:05:12,590 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:05:12,590 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-07-11 08:05:12,590 [ scc.git] DEBUG Calling 'git remote'
2024-07-11 08:05:12,594 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:05:12,595 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-07-11 08:05:12,595 [ scc.git] DEBUG Calling 'git remote'
2024-07-11 08:05:12,599 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:05:12,599 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-07-11 08:05:12,599 [ scc.git] DEBUG Calling 'git remote'
2024-07-11 08:05:12,603 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:05:12,604 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-07-11 08:05:12,604 [ scc.git] DEBUG Calling 'git remote'
2024-07-11 08:05:12,608 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:05:12,608 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-07-11 08:05:12,608 [ scc.git] DEBUG Calling 'git remote'
2024-07-11 08:05:12,613 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:05:12,613 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-07-11 08:05:12,613 [ scc.git] DEBUG Calling 'git remote'
2024-07-11 08:05:12,617 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:05:12,617 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-07-11 08:05:12,617 [ scc.git] DEBUG Calling 'git remote'
2024-07-11 08:05:12,622 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:05:12,622 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-07-11 08:05:12,622 [ scc.git] DEBUG Calling 'git remote'
2024-07-11 08:05:12,626 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:05:12,626 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-07-11 08:05:12,626 [ scc.git] DEBUG Calling 'git remote'
2024-07-11 08:05:12,631 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:05:12,631 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-07-11 08:05:12,631 [ scc.git] DEBUG Calling 'git remote'
2024-07-11 08:05:12,635 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:05:12,635 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-07-11 08:05:12,635 [ scc.git] DEBUG Calling 'git remote'
2024-07-11 08:05:12,640 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:05:12,640 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-07-11 08:05:12,640 [ scc.git] DEBUG Calling 'git remote'
2024-07-11 08:05:12,644 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:05:12,644 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-07-11 08:05:12,644 [ scc.git] DEBUG Calling 'git remote'
2024-07-11 08:05:12,648 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:05:12,649 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-07-11 08:05:12,649 [ scc.git] DEBUG Calling 'git remote'
2024-07-11 08:05:12,653 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:05:12,653 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-07-11 08:05:12,653 [ scc.git] DEBUG Calling 'git remote'
2024-07-11 08:05:12,657 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:05:12,657 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-07-11 08:05:12,658 [ scc.git] DEBUG Calling 'git remote'
2024-07-11 08:05:12,662 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-11 08:05:12,662 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-07-11 08:05:12,662 [ scc.git] DEBUG Calling 'git remote'
2024-07-11 08:05:12,666 [ 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 04411b9] 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 64566080
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 d791e9a] 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-11 08:05:59,904 [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-11 08:06:09,166 [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-11 08:06:11,637 [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-11 08:06:16,249 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-07-11 08:07:05,250 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/f6f303f9/images/svgs/logo.svg){kind=logo}
