Console Output
Skipping 93 KB..
Full Log2024-08-05 08:40:54,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-08-05 08:40:55,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-05 08:40:55,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-05 08:40:56,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-08-05 08:40:56,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/f7d26b972bfe9a7105c4f94776748446f2395c77?per_page=1 HTTP/1.1" 200 2
2024-08-05 08:40:56,668 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-08-05 08:40:56,669 [ scc.repo] DEBUG ## Branches found:
2024-08-05 08:40:56,669 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-08-05 08:40:56,669 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:40:56,669 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:40:56,676 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-05 08:40:56,682 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-05 08:40:56,682 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-05 08:40:56,689 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-05 08:40:56,696 [ scc.git] DEBUG Already up to date.
2024-08-05 08:40:56,696 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-08-05 08:40:57,080 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-05 08:40:57,080 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-08-05 08:40:57,086 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-08-05 08:40:57,880 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-05 08:40:57,880 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-08-05 08:40:57,886 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-08-05 08:40:59,325 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-05 08:40:59,326 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-08-05 08:40:59,330 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-08-05 08:40:59,656 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-05 08:40:59,656 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-08-05 08:40:59,661 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-08-05 08:41:00,295 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-05 08:41:00,295 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-08-05 08:41:00,300 [ scc.git] DEBUG ## Unique users: []
2024-08-05 08:41:00,300 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:41:00,300 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:00,307 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-08-05 08:41:00,315 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:00,321 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-08-05 08:41:00,449 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-05 08:41:00,450 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-05 08:41:00,456 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-08-05 08:41:00,456 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-08-05 08:41:00,456 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-08-05 08:41:00,456 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-08-05 08:41:00,456 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-08-05 08:41:00,456 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-08-05 08:41:00,456 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-08-05 08:41:00,456 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-08-05 08:41:00,457 [ scc.git] DEBUG src/templates/rois_form.template.html | 8 ++++
2024-08-05 08:41:00,457 [ scc.git] DEBUG 9 files changed, 271 insertions(+), 5 deletions(-)
2024-08-05 08:41:00,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:41:00,604 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-08-05 08:41:00,615 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:00,622 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-08-05 08:41:00,932 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-05 08:41:00,933 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-05 08:41:00,933 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-08-05 08:41:00,933 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-08-05 08:41:00,933 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-05 08:41:00,940 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-08-05 08:41:00,940 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-08-05 08:41:00,940 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-08-05 08:41:00,940 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-08-05 08:41:00,940 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-08-05 08:41:00,940 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-08-05 08:41:00,940 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-08-05 08:41:00,940 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-08-05 08:41:00,943 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-08-05 08:41:00,943 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-08-05 08:41:00,944 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-08-05 08:41:00,944 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-08-05 08:41:01,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:41:01,073 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-08-05 08:41:01,087 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:01,092 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) 3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-08-05 08:41:01,607 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-08-05 08:41:01,607 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-05 08:41:01,607 [ scc.git] DEBUG Auto-merging src/index.html
2024-08-05 08:41:01,607 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-08-05 08:41:01,607 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-05 08:41:01,607 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-05 08:41:01,608 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-05 08:41:01,616 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-08-05 08:41:01,616 [ scc.git] DEBUG omero_figure/urls.py | 10 +++-
2024-08-05 08:41:01,616 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-08-05 08:41:01,616 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-08-05 08:41:01,616 [ scc.git] DEBUG src/index.html | 1 +
2024-08-05 08:41:01,616 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-08-05 08:41:01,616 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-08-05 08:41:01,616 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-08-05 08:41:01,616 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-08-05 08:41:01,616 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-08-05 08:41:01,616 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-08-05 08:41:01,616 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-08-05 08:41:01,616 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-08-05 08:41:01,616 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-08-05 08:41:01,616 [ scc.git] DEBUG 14 files changed, 162 insertions(+), 15 deletions(-)
2024-08-05 08:41:01,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:41:01,766 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-08-05 08:41:01,778 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:01,785 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 568 (Remove numpy from tests_require in setup.py) 15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-08-05 08:41:01,846 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-05 08:41:01,850 [ scc.git] DEBUG setup.py | 2 +-
2024-08-05 08:41:01,850 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-05 08:41:02,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:41:02,147 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...88901984c22249d20925e53c455cd822700be6d4'
2024-08-05 08:41:02,157 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:02,162 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 576 (Color picker - popup update) 88901984c22249d20925e53c455cd822700be6d4'
2024-08-05 08:41:02,308 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-05 08:41:02,308 [ scc.git] DEBUG Auto-merging src/index.html
2024-08-05 08:41:02,309 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-05 08:41:02,313 [ scc.git] DEBUG .gitignore | 2 +-
2024-08-05 08:41:02,313 [ scc.git] DEBUG src/css/figure.css | 3 +++
2024-08-05 08:41:02,313 [ scc.git] DEBUG src/index.html | 3 +++
2024-08-05 08:41:02,313 [ scc.git] DEBUG src/js/views/colorpicker.js | 10 ++++++++--
2024-08-05 08:41:02,313 [ scc.git] DEBUG 4 files changed, 15 insertions(+), 3 deletions(-)
2024-08-05 08:41:02,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:41:02,548 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-05 08:41:02,587 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:41:02,587 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:02,592 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-05 08:41:02,629 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-05 08:41:02,637 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f22bddf4490> has no local changes
2024-08-05 08:41:02,638 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
- PR 580 Rdornier 'Weird translation' (user: Rdornier)
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 578 Rdornier 'Image outline' (user: Rdornier)
- PR 577 Rdornier 'Fill rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 576 Rdornier 'Color picker - popup update'
Generated by OMERO-plugins-push#143 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/)'
2024-08-05 08:41:02,661 [ scc.git] DEBUG [detached HEAD 798ac1c3] merge master -Dorg -Ssuccess-only
2024-08-05 08:41:02,661 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:41:02,661 [ scc.repo] DEBUG ## PRs found:
2024-08-05 08:41:03,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-08-05 08:41:03,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-08-05 08:41:03,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-08-05 08:41:04,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-05 08:41:05,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-05 08:41:05,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-05 08:41:06,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-08-05 08:41:06,001 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-08-05 08:41:06,002 [ scc.repo] DEBUG ## Branches found:
2024-08-05 08:41:06,002 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-05 08:41:06,002 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:41:06,002 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:06,007 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-05 08:41:06,011 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-05 08:41:06,011 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-05 08:41:06,016 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-05 08:41:06,023 [ scc.git] DEBUG Already up to date.
2024-08-05 08:41:06,024 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-08-05 08:41:06,388 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-08-05 08:41:06,388 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-08-05 08:41:06,393 [ scc.git] DEBUG ## Unique users: []
2024-08-05 08:41:06,393 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:41:06,393 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:06,399 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-05 08:41:06,406 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:06,411 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-05 08:41:06,448 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-08-05 08:41:06,449 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-05 08:41:06,452 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-08-05 08:41:06,452 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-08-05 08:41:06,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:41:06,590 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-05 08:41:06,633 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:41:06,633 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:06,639 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-05 08:41:06,682 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-05 08:41:06,690 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f22bde317c0> has no local changes
2024-08-05 08:41:06,691 [ 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#143 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/)'
2024-08-05 08:41:06,701 [ scc.git] DEBUG [detached HEAD e3c4c14] merge master -Dorg -Ssuccess-only
2024-08-05 08:41:06,701 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:41:06,701 [ scc.repo] DEBUG ## PRs found:
2024-08-05 08:41:07,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-08-05 08:41:07,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-08-05 08:41:07,530 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-05 08:41:08,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-05 08:41:08,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-05 08:41:09,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-05 08:41:09,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-05 08:41:10,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-08-05 08:41:10,004 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-05 08:41:10,004 [ scc.repo] DEBUG ## Branches found:
2024-08-05 08:41:10,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-05 08:41:10,005 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:41:10,005 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:10,010 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-05 08:41:10,016 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-05 08:41:10,016 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-05 08:41:10,021 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-05 08:41:10,026 [ scc.git] DEBUG Already up to date.
2024-08-05 08:41:10,026 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-08-05 08:41:10,319 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-08-05 08:41:10,319 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-08-05 08:41:10,324 [ scc.git] DEBUG ## Unique users: []
2024-08-05 08:41:10,324 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:41:10,324 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:10,331 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-08-05 08:41:10,338 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:10,343 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-08-05 08:41:10,354 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-05 08:41:10,358 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-08-05 08:41:10,358 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-08-05 08:41:10,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:41:10,505 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-05 08:41:10,552 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:41:10,552 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:10,558 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-05 08:41:10,601 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-05 08:41:10,609 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f22bde10af0> has no local changes
2024-08-05 08:41:10,610 [ 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#143 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/)'
2024-08-05 08:41:10,620 [ scc.git] DEBUG [detached HEAD b2935b5] merge master -Dorg -Ssuccess-only
2024-08-05 08:41:10,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:41:10,621 [ scc.repo] DEBUG ## PRs found:
2024-08-05 08:41:11,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-08-05 08:41:11,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-08-05 08:41:12,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-08-05 08:41:12,045 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-05 08:41:12,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-05 08:41:13,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-05 08:41:13,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-05 08:41:14,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-05 08:41:14,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-08-05 08:41:14,668 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-05 08:41:15,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-08-05 08:41:15,147 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-05 08:41:15,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-05 08:41:16,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-05 08:41:16,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-05 08:41:17,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-05 08:41:17,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-08-05 08:41:17,666 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-05 08:41:18,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-08-05 08:41:18,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-08-05 08:41:19,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-05 08:41:19,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-05 08:41:20,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-05 08:41:20,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-05 08:41:20,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-08-05 08:41:20,933 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-05 08:41:21,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-08-05 08:41:21,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-08-05 08:41:22,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-05 08:41:23,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-05 08:41:23,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-05 08:41:23,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-05 08:41:24,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-08-05 08:41:24,356 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-08-05 08:41:24,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-08-05 08:41:25,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-08-05 08:41:25,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-05 08:41:26,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-05 08:41:26,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-05 08:41:27,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-08-05 08:41:27,150 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-08-05 08:41:27,151 [ scc.repo] DEBUG ## Branches found:
2024-08-05 08:41:27,151 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-05 08:41:27,151 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:41:27,151 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:27,157 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-05 08:41:27,163 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-05 08:41:27,164 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-05 08:41:27,222 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-05 08:41:27,229 [ scc.git] DEBUG Already up to date.
2024-08-05 08:41:27,229 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-08-05 08:41:27,864 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-05 08:41:27,864 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-08-05 08:41:27,870 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-08-05 08:41:29,118 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-05 08:41:29,119 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-08-05 08:41:29,125 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-08-05 08:41:29,619 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-05 08:41:29,619 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-08-05 08:41:29,625 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-08-05 08:41:29,931 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-05 08:41:29,931 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-08-05 08:41:29,936 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-08-05 08:41:30,376 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-05 08:41:30,376 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-08-05 08:41:30,381 [ scc.git] DEBUG ## Unique users: []
2024-08-05 08:41:30,381 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:41:30,381 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:30,386 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-05 08:41:30,392 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:30,396 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-05 08:41:30,476 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-08-05 08:41:30,495 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-05 08:41:30,500 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-08-05 08:41:30,500 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-08-05 08:41:30,500 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-08-05 08:41:30,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:41:30,643 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-05 08:41:30,651 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:30,657 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-05 08:41:30,880 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-08-05 08:41:30,880 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-08-05 08:41:30,880 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-08-05 08:41:30,880 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-08-05 08:41:30,881 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-05 08:41:30,886 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-08-05 08:41:30,886 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-08-05 08:41:30,886 [ scc.git] DEBUG src/app/header.html | 5 +
2024-08-05 08:41:30,886 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-08-05 08:41:30,886 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-08-05 08:41:30,886 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-08-05 08:41:30,886 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-08-05 08:41:30,886 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-08-05 08:41:31,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:41:31,033 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-05 08:41:31,042 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:31,047 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-05 08:41:31,168 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-08-05 08:41:31,169 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-05 08:41:31,173 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-08-05 08:41:31,173 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-08-05 08:41:31,173 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-08-05 08:41:31,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:41:31,418 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-05 08:41:31,480 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:31,486 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-05 08:41:31,518 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-05 08:41:31,528 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-08-05 08:41:31,528 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-08-05 08:41:31,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:41:31,797 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-08-05 08:41:32,103 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:32,109 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 478 (Bump socket.io from 4.6.1 to 4.7.5) 91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-08-05 08:41:32,318 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-05 08:41:32,380 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-05 08:41:32,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:41:32,528 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-05 08:41:32,567 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:41:32,567 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:32,574 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-05 08:41:32,612 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-05 08:41:32,619 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f22bde10d90> has no local changes
2024-08-05 08:41:32,619 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
Generated by OMERO-plugins-push#143 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/)'
2024-08-05 08:41:32,658 [ scc.git] DEBUG [detached HEAD 95887b9] merge master -Dorg -Ssuccess-only
2024-08-05 08:41:32,658 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:41:32,658 [ scc.repo] DEBUG ## PRs found:
2024-08-05 08:41:33,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-08-05 08:41:33,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-08-05 08:41:34,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-08-05 08:41:34,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-05 08:41:35,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-05 08:41:35,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-05 08:41:35,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-05 08:41:36,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-08-05 08:41:36,377 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-08-05 08:41:36,378 [ scc.repo] DEBUG ## Branches found:
2024-08-05 08:41:36,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-05 08:41:36,378 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:41:36,378 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:36,384 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-05 08:41:36,390 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-05 08:41:36,390 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-05 08:41:36,398 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-05 08:41:36,405 [ scc.git] DEBUG Already up to date.
2024-08-05 08:41:36,405 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-08-05 08:41:36,732 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-08-05 08:41:36,733 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-08-05 08:41:36,738 [ scc.git] DEBUG ## Unique users: []
2024-08-05 08:41:36,738 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:41:36,738 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:36,745 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-05 08:41:36,751 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:36,758 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-05 08:41:36,770 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-05 08:41:36,773 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-08-05 08:41:36,773 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-08-05 08:41:36,773 [ scc.git] DEBUG requirements.txt | 2 +-
2024-08-05 08:41:36,773 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-08-05 08:41:36,773 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-08-05 08:41:36,773 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-08-05 08:41:36,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:41:36,910 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-05 08:41:36,952 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:41:36,952 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:36,959 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-05 08:41:36,998 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-05 08:41:37,004 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f22bc59ff70> has no local changes
2024-08-05 08:41:37,005 [ 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#143 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/)'
2024-08-05 08:41:37,013 [ scc.git] DEBUG [detached HEAD 2c6e14c] merge master -Dorg -Ssuccess-only
2024-08-05 08:41:37,014 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:41:37,014 [ scc.repo] DEBUG ## PRs found:
2024-08-05 08:41:37,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-08-05 08:41:37,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-08-05 08:41:38,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-08-05 08:41:38,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-05 08:41:39,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-05 08:41:39,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-05 08:41:40,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-08-05 08:41:40,210 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-05 08:41:40,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-08-05 08:41:41,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-08-05 08:41:41,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-05 08:41:42,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-05 08:41:42,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-05 08:41:42,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-08-05 08:41:42,949 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-05 08:41:42,949 [ scc.repo] DEBUG ## Branches found:
2024-08-05 08:41:42,949 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-05 08:41:42,950 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:41:42,950 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:42,955 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-05 08:41:42,959 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-05 08:41:42,959 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-05 08:41:42,964 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-05 08:41:42,968 [ scc.git] DEBUG Already up to date.
2024-08-05 08:41:42,969 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-08-05 08:41:43,423 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-05 08:41:43,423 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-08-05 08:41:43,428 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-08-05 08:41:43,867 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-05 08:41:43,867 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-08-05 08:41:43,872 [ scc.git] DEBUG ## Unique users: []
2024-08-05 08:41:43,872 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:41:43,872 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:43,877 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-05 08:41:43,884 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:43,889 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-05 08:41:43,962 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-08-05 08:41:43,963 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-08-05 08:41:43,963 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-05 08:41:43,963 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-05 08:41:43,963 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-05 08:41:43,963 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-05 08:41:43,970 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-05 08:41:43,977 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-05 08:41:44,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:41:44,114 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-05 08:41:44,121 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-05 08:41:44,126 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#143](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-08-05 08:41:44,130 [ scc.config] DEBUG Found github.token
2024-08-05 08:41:44,131 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-08-05 08:41:44,131 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-05 08:41:44,137 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:44,142 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-05 08:41:44,160 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-05 08:41:44,161 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-05 08:41:44,161 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-08-05 08:41:44,161 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-05 08:41:44,161 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-05 08:41:44,168 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-05 08:41:44,174 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-05 08:41:44,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:41:44,503 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-05 08:41:44,510 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-05 08:41:44,515 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#143](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-08-05 08:41:44,519 [ scc.config] DEBUG Found github.token
2024-08-05 08:41:44,520 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-08-05 08:41:44,520 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-05 08:41:44,561 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:41:44,561 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:44,566 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-05 08:41:44,605 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-05 08:41:44,616 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f22bddbcd90> has no local changes
2024-08-05 08:41:44,616 [ 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#143 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/)'
2024-08-05 08:41:44,625 [ scc.git] DEBUG [detached HEAD 8a02038] merge master -Dorg -Ssuccess-only
2024-08-05 08:41:44,625 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:41:44,626 [ scc.repo] DEBUG ## PRs found:
2024-08-05 08:41:45,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-08-05 08:41:45,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-08-05 08:41:45,493 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-05 08:41:46,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-05 08:41:46,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-05 08:41:46,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-05 08:41:47,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-05 08:41:47,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-08-05 08:41:47,817 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-05 08:41:48,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-08-05 08:41:48,277 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-05 08:41:48,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-05 08:41:49,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-05 08:41:49,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-05 08:41:50,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-05 08:41:50,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-08-05 08:41:50,835 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-05 08:41:51,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-08-05 08:41:51,295 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-05 08:41:51,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-05 08:41:52,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-05 08:41:52,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-05 08:41:53,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-05 08:41:53,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-08-05 08:41:53,767 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-05 08:41:54,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-08-05 08:41:54,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-08-05 08:41:55,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-08-05 08:41:55,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-08-05 08:41:56,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-08-05 08:41:56,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-08-05 08:41:56,669 [ scc.repo] DEBUG ## Branches found:
2024-08-05 08:41:56,669 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-05 08:41:56,669 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:41:56,669 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:56,675 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-05 08:41:56,679 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-05 08:41:56,679 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-05 08:41:56,684 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-05 08:41:56,689 [ scc.git] DEBUG Already up to date.
2024-08-05 08:41:56,690 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-08-05 08:41:57,060 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-05 08:41:57,061 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-08-05 08:41:57,065 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-08-05 08:41:57,338 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-05 08:41:57,338 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-08-05 08:41:57,343 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-08-05 08:41:57,634 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-05 08:41:57,635 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-08-05 08:41:57,639 [ scc.git] DEBUG ## Unique users: []
2024-08-05 08:41:57,639 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:41:57,639 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:57,645 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-08-05 08:41:57,651 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:57,656 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-08-05 08:41:57,668 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-05 08:41:57,671 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-08-05 08:41:57,671 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-08-05 08:41:57,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:41:57,812 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-08-05 08:41:57,818 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:57,823 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 129 (Bump @babel/traverse from 7.21.4 to 7.23.2) 733f52703019d4b6d7e375c121a25c107b64dbec'
2024-08-05 08:41:57,879 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-05 08:41:57,879 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-05 08:41:57,882 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-08-05 08:41:57,883 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-08-05 08:41:58,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:41:58,206 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-08-05 08:41:58,214 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:58,220 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (Bump axios from 1.3.5 to 1.6.0) a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-08-05 08:41:58,243 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-05 08:41:58,244 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-05 08:41:58,248 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-08-05 08:41:58,248 [ scc.git] DEBUG package.json | 2 +-
2024-08-05 08:41:58,248 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-08-05 08:41:58,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:41:58,599 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-05 08:41:58,637 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:41:58,637 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:41:58,643 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-05 08:41:58,680 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-05 08:41:58,688 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f22bc5665e0> has no local changes
2024-08-05 08:41:58,688 [ 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#143 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/)'
2024-08-05 08:41:58,696 [ scc.git] DEBUG [detached HEAD 26b0ccc] merge master -Dorg -Ssuccess-only
2024-08-05 08:41:58,697 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:41:58,697 [ scc.repo] DEBUG ## PRs found:
2024-08-05 08:41:59,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-08-05 08:41:59,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-08-05 08:42:00,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-05 08:42:00,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-05 08:42:01,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-05 08:42:01,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-08-05 08:42:01,680 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-08-05 08:42:01,680 [ scc.repo] DEBUG ## Branches found:
2024-08-05 08:42:01,680 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-05 08:42:01,680 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:01,680 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:01,687 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-05 08:42:01,691 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-05 08:42:01,691 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-05 08:42:01,696 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-05 08:42:01,701 [ scc.git] DEBUG Already up to date.
2024-08-05 08:42:01,701 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-05 08:42:02,044 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-08-05 08:42:02,044 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-05 08:42:02,052 [ scc.git] DEBUG ## Unique users: []
2024-08-05 08:42:02,053 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:02,053 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:02,063 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-05 08:42:02,073 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:02,083 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-05 08:42:02,101 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-05 08:42:02,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:42:02,262 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-05 08:42:02,304 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:02,304 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:02,311 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-05 08:42:02,355 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-05 08:42:02,362 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f22bc57cee0> has no local changes
2024-08-05 08:42:02,362 [ 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#143 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/)'
2024-08-05 08:42:02,370 [ scc.git] DEBUG [detached HEAD 901f5a5] merge master -Dorg -Ssuccess-only
2024-08-05 08:42:02,371 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:02,371 [ scc.repo] DEBUG ## PRs found:
2024-08-05 08:42:02,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-08-05 08:42:03,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-08-05 08:42:03,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-08-05 08:42:04,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-08-05 08:42:04,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-05 08:42:05,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-05 08:42:05,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-05 08:42:05,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-08-05 08:42:05,960 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-05 08:42:05,960 [ scc.repo] DEBUG ## Branches found:
2024-08-05 08:42:05,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-05 08:42:05,960 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:05,960 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:05,966 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-05 08:42:05,970 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-05 08:42:05,971 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-05 08:42:05,975 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-05 08:42:05,981 [ scc.git] DEBUG Already up to date.
2024-08-05 08:42:05,981 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-08-05 08:42:06,419 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-08-05 08:42:06,419 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-08-05 08:42:06,425 [ scc.git] DEBUG ## Unique users: []
2024-08-05 08:42:06,425 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:06,425 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:06,431 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-08-05 08:42:06,436 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:06,441 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-08-05 08:42:06,450 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-08-05 08:42:06,450 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-05 08:42:06,453 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-08-05 08:42:06,453 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-08-05 08:42:06,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:42:06,603 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-05 08:42:06,652 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:06,652 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:06,657 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-05 08:42:06,705 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-05 08:42:06,713 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f22bc4f8b50> has no local changes
2024-08-05 08:42:06,714 [ 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#143 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/)'
2024-08-05 08:42:06,725 [ scc.git] DEBUG [detached HEAD 1f1d6e6] merge master -Dorg -Ssuccess-only
2024-08-05 08:42:06,725 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:06,726 [ scc.repo] DEBUG ## PRs found:
2024-08-05 08:42:07,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-08-05 08:42:07,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-08-05 08:42:07,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-08-05 08:42:08,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-05 08:42:09,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-05 08:42:09,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-05 08:42:10,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-08-05 08:42:10,016 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-05 08:42:10,017 [ scc.repo] DEBUG ## Branches found:
2024-08-05 08:42:10,017 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-05 08:42:10,017 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:10,017 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:10,024 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-05 08:42:10,031 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-05 08:42:10,032 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-05 08:42:10,039 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-05 08:42:10,045 [ scc.git] DEBUG Already up to date.
2024-08-05 08:42:10,045 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-05 08:42:10,417 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-08-05 08:42:10,418 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-05 08:42:10,423 [ scc.git] DEBUG ## Unique users: []
2024-08-05 08:42:10,423 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:10,424 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:10,431 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-05 08:42:10,437 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:10,444 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-05 08:42:10,502 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-08-05 08:42:10,502 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-08-05 08:42:10,502 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-08-05 08:42:10,502 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-08-05 08:42:10,502 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-08-05 08:42:10,503 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-08-05 08:42:10,503 [ scc.git] DEBUG Auto-merging setup.py
2024-08-05 08:42:10,503 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-08-05 08:42:10,503 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-05 08:42:10,503 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-05 08:42:10,510 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-05 08:42:10,518 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-08-05 08:42:10,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:42:10,651 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-05 08:42:10,659 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-05 08:42:10,665 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#143](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
- setup.py
--conflicts
2024-08-05 08:42:10,670 [ scc.config] DEBUG Found github.token
2024-08-05 08:42:10,671 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-08-05 08:42:10,671 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-05 08:42:10,710 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:10,711 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:10,718 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-05 08:42:10,755 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-05 08:42:10,762 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f22bc5667f0> has no local changes
2024-08-05 08:42:10,763 [ 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#143 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/)'
2024-08-05 08:42:10,771 [ scc.git] DEBUG [detached HEAD 8543f7b] merge master -Dorg -Ssuccess-only
2024-08-05 08:42:10,771 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:10,771 [ scc.repo] DEBUG ## PRs found:
2024-08-05 08:42:11,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-08-05 08:42:11,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-08-05 08:42:12,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-08-05 08:42:12,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-05 08:42:13,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-05 08:42:13,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-05 08:42:13,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-08-05 08:42:13,966 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-05 08:42:13,966 [ scc.repo] DEBUG ## Branches found:
2024-08-05 08:42:13,966 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-05 08:42:13,966 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:13,966 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:13,973 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-05 08:42:13,979 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-05 08:42:13,979 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-05 08:42:13,986 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-05 08:42:13,993 [ scc.git] DEBUG Already up to date.
2024-08-05 08:42:13,993 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-08-05 08:42:14,432 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-08-05 08:42:14,432 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-08-05 08:42:14,437 [ scc.git] DEBUG ## Unique users: []
2024-08-05 08:42:14,438 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:14,438 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:14,445 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-08-05 08:42:14,454 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:14,461 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-08-05 08:42:14,506 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-05 08:42:14,509 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-08-05 08:42:14,509 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-08-05 08:42:14,509 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-08-05 08:42:14,509 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-08-05 08:42:14,509 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-08-05 08:42:14,509 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-08-05 08:42:14,512 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-08-05 08:42:14,512 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-08-05 08:42:14,512 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-08-05 08:42:14,512 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-08-05 08:42:14,512 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-08-05 08:42:14,512 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-08-05 08:42:14,512 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-08-05 08:42:14,512 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-08-05 08:42:14,512 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-08-05 08:42:14,512 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-08-05 08:42:14,512 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-08-05 08:42:14,512 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-08-05 08:42:14,512 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-08-05 08:42:14,513 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-08-05 08:42:14,513 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-08-05 08:42:14,513 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-08-05 08:42:14,513 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-08-05 08:42:14,513 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-08-05 08:42:14,513 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-08-05 08:42:14,513 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-08-05 08:42:14,513 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-08-05 08:42:14,513 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-08-05 08:42:14,513 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-08-05 08:42:14,513 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-08-05 08:42:14,513 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-08-05 08:42:14,513 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-08-05 08:42:14,513 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-08-05 08:42:14,513 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-08-05 08:42:14,513 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-08-05 08:42:14,513 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-08-05 08:42:14,513 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-08-05 08:42:14,513 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-08-05 08:42:14,513 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-08-05 08:42:14,513 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-08-05 08:42:14,513 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-08-05 08:42:14,513 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-08-05 08:42:14,513 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-08-05 08:42:14,513 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-08-05 08:42:14,513 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-08-05 08:42:14,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:42:14,694 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-05 08:42:14,739 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:14,739 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:14,746 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-05 08:42:14,791 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-05 08:42:14,802 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f22bc547cd0> has no local changes
2024-08-05 08:42:14,802 [ 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#143 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/)'
2024-08-05 08:42:14,815 [ scc.git] DEBUG [detached HEAD 74d4309] merge master -Dorg -Ssuccess-only
2024-08-05 08:42:14,816 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:14,816 [ scc.repo] DEBUG ## PRs found:
2024-08-05 08:42:15,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-08-05 08:42:15,103 [ scc.repo] DEBUG ## Branches found:
2024-08-05 08:42:15,103 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-05 08:42:15,103 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:15,104 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:15,110 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-05 08:42:15,116 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-05 08:42:15,116 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-05 08:42:15,122 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-05 08:42:15,128 [ scc.git] DEBUG Already up to date.
2024-08-05 08:42:15,128 [ scc.git] DEBUG ## Unique users: []
2024-08-05 08:42:15,129 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:15,129 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:15,134 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-05 08:42:15,175 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:15,176 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:15,182 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-05 08:42:15,226 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-05 08:42:15,233 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f22bc4d12e0> has no local changes
2024-08-05 08:42:15,234 [ 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#143 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/)'
2024-08-05 08:42:15,245 [ scc.git] DEBUG [detached HEAD f3e88ce] merge master -Dorg -Ssuccess-only
2024-08-05 08:42:15,245 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:15,246 [ scc.repo] DEBUG ## PRs found:
2024-08-05 08:42:15,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-08-05 08:42:15,519 [ scc.repo] DEBUG ## Branches found:
2024-08-05 08:42:15,520 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-05 08:42:15,520 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:15,520 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:15,527 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-05 08:42:15,532 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-05 08:42:15,532 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-05 08:42:15,538 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-05 08:42:15,544 [ scc.git] DEBUG Already up to date.
2024-08-05 08:42:15,545 [ scc.git] DEBUG ## Unique users: []
2024-08-05 08:42:15,545 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:15,545 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:15,551 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-05 08:42:15,589 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:15,589 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:15,594 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-05 08:42:15,631 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-05 08:42:15,637 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f22bc59fa60> has no local changes
2024-08-05 08:42:15,637 [ 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#143 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/)'
2024-08-05 08:42:15,645 [ scc.git] DEBUG [detached HEAD 4869cf3] merge master -Dorg -Ssuccess-only
2024-08-05 08:42:15,645 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:15,645 [ scc.git] INFO Overriding base-branch from master to main
2024-08-05 08:42:15,645 [ scc.repo] DEBUG ## PRs found:
2024-08-05 08:42:16,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-08-05 08:42:16,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-08-05 08:42:16,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-08-05 08:42:17,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-08-05 08:42:17,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-05 08:42:18,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-05 08:42:18,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-05 08:42:19,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-08-05 08:42:19,271 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-05 08:42:19,271 [ scc.repo] DEBUG ## Branches found:
2024-08-05 08:42:19,271 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-05 08:42:19,271 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:19,271 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:19,278 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-08-05 08:42:19,283 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-05 08:42:19,284 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-08-05 08:42:19,290 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-08-05 08:42:19,297 [ scc.git] DEBUG Already up to date.
2024-08-05 08:42:19,297 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-08-05 08:42:19,688 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-08-05 08:42:19,688 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-08-05 08:42:19,694 [ scc.git] DEBUG ## Unique users: []
2024-08-05 08:42:19,694 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:19,694 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:19,700 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-05 08:42:19,706 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:19,712 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-05 08:42:19,744 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-08-05 08:42:19,744 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-08-05 08:42:19,744 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-05 08:42:19,744 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-05 08:42:19,751 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-05 08:42:19,757 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-08-05 08:42:19,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:42:19,898 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-05 08:42:19,907 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-05 08:42:19,913 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#143](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-08-05 08:42:19,919 [ scc.config] DEBUG Found github.token
2024-08-05 08:42:19,920 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-08-05 08:42:19,920 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-05 08:42:19,963 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:19,964 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:19,969 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-05 08:42:20,008 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-05 08:42:20,016 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f22bc4cf850> has no local changes
2024-08-05 08:42:20,016 [ 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#143 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/)'
2024-08-05 08:42:20,024 [ scc.git] DEBUG [detached HEAD 4f4d74b] merge master -Dorg -Ssuccess-only
2024-08-05 08:42:20,025 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:20,025 [ scc.repo] DEBUG ## PRs found:
2024-08-05 08:42:20,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-08-05 08:42:20,329 [ scc.repo] DEBUG ## Branches found:
2024-08-05 08:42:20,329 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-05 08:42:20,330 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:20,330 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:20,336 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-05 08:42:20,340 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-05 08:42:20,341 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-05 08:42:20,345 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-05 08:42:20,351 [ scc.git] DEBUG Already up to date.
2024-08-05 08:42:20,351 [ scc.git] DEBUG ## Unique users: []
2024-08-05 08:42:20,351 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:20,352 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:20,358 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-05 08:42:20,397 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:20,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:20,404 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-05 08:42:20,446 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-05 08:42:20,453 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f22bc52ad90> has no local changes
2024-08-05 08:42:20,453 [ 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#143 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/)'
2024-08-05 08:42:20,462 [ scc.git] DEBUG [detached HEAD b368238] merge master -Dorg -Ssuccess-only
2024-08-05 08:42:20,462 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:20,462 [ scc.repo] DEBUG ## PRs found:
2024-08-05 08:42:20,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-08-05 08:42:20,732 [ scc.repo] DEBUG ## Branches found:
2024-08-05 08:42:20,733 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-05 08:42:20,733 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:20,733 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:20,740 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-05 08:42:20,745 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-05 08:42:20,745 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-05 08:42:20,752 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-05 08:42:20,760 [ scc.git] DEBUG Already up to date.
2024-08-05 08:42:20,760 [ scc.git] DEBUG ## Unique users: []
2024-08-05 08:42:20,760 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:20,760 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:20,766 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-05 08:42:20,812 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:20,813 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:20,820 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-05 08:42:20,862 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-05 08:42:20,868 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f22bc4f3490> has no local changes
2024-08-05 08:42:20,869 [ 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#143 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/)'
2024-08-05 08:42:20,877 [ scc.git] DEBUG [detached HEAD eb8b3d8] merge master -Dorg -Ssuccess-only
2024-08-05 08:42:20,877 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:20,877 [ scc.repo] DEBUG ## PRs found:
2024-08-05 08:42:21,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-08-05 08:42:21,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-08-05 08:42:22,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-08-05 08:42:22,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-05 08:42:23,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-05 08:42:23,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-05 08:42:24,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-08-05 08:42:24,018 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-08-05 08:42:24,018 [ scc.repo] DEBUG ## Branches found:
2024-08-05 08:42:24,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-05 08:42:24,018 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:24,018 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:24,024 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-05 08:42:24,030 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-05 08:42:24,030 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-05 08:42:24,036 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-05 08:42:24,042 [ scc.git] DEBUG Already up to date.
2024-08-05 08:42:24,043 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-08-05 08:42:24,439 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-08-05 08:42:24,439 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-08-05 08:42:24,444 [ scc.git] DEBUG ## Unique users: []
2024-08-05 08:42:24,444 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:24,444 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:24,451 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-05 08:42:24,459 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:24,466 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-05 08:42:24,543 [ scc.git] DEBUG Auto-merging Dockerfile
2024-08-05 08:42:24,543 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-08-05 08:42:24,543 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-05 08:42:24,544 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-05 08:42:24,551 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-05 08:42:24,559 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-08-05 08:42:24,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:42:24,691 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-05 08:42:24,697 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-05 08:42:24,702 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#143](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-08-05 08:42:24,706 [ scc.config] DEBUG Found github.token
2024-08-05 08:42:24,706 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-08-05 08:42:24,707 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-05 08:42:24,748 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:24,749 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:24,754 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-05 08:42:24,791 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-05 08:42:24,798 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f22bc4ee640> has no local changes
2024-08-05 08:42:24,798 [ 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#143 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/)'
2024-08-05 08:42:24,806 [ scc.git] DEBUG [detached HEAD ca7f737] merge master -Dorg -Ssuccess-only
2024-08-05 08:42:24,807 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:24,807 [ scc.git] INFO Overriding base-branch from master to develop
2024-08-05 08:42:24,807 [ scc.repo] DEBUG ## PRs found:
2024-08-05 08:42:25,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-08-05 08:42:25,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-08-05 08:42:26,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-08-05 08:42:26,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-08-05 08:42:27,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-08-05 08:42:27,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-08-05 08:42:27,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-08-05 08:42:28,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-05 08:42:28,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-05 08:42:29,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-05 08:42:29,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-08-05 08:42:29,763 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-05 08:42:30,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-08-05 08:42:30,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-08-05 08:42:31,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-08-05 08:42:31,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-08-05 08:42:31,687 [ scc.repo] DEBUG ## Branches found:
2024-08-05 08:42:31,687 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-05 08:42:31,688 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:31,688 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:31,693 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-08-05 08:42:31,698 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-05 08:42:31,698 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-08-05 08:42:31,703 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-08-05 08:42:31,708 [ scc.git] DEBUG Already up to date.
2024-08-05 08:42:31,708 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-08-05 08:42:32,136 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-08-05 08:42:32,136 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-08-05 08:42:32,142 [ scc.git] DEBUG ## Unique users: []
2024-08-05 08:42:32,142 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:32,142 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:32,147 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-05 08:42:32,154 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:32,159 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-05 08:42:32,220 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-08-05 08:42:32,220 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-08-05 08:42:32,220 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-05 08:42:32,221 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-05 08:42:32,227 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-05 08:42:32,233 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-08-05 08:42:32,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:42:32,371 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-05 08:42:32,379 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-05 08:42:32,384 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#143](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-08-05 08:42:32,388 [ scc.config] DEBUG Found github.token
2024-08-05 08:42:32,388 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-08-05 08:42:32,388 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-05 08:42:32,427 [ scc.git] DEBUG Get sha1 of %s
2024-08-05 08:42:32,428 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-05 08:42:32,435 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-05 08:42:32,473 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-05 08:42:32,479 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f22bc497970> has no local changes
2024-08-05 08:42:32,479 [ 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#143 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/)'
2024-08-05 08:42:32,487 [ scc.git] DEBUG [detached HEAD b9f2043] merge master -Dorg -Ssuccess-only
2024-08-05 08:42:32,487 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:32,488 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-05 08:42:32,562 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-08-05 08:42:32,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:42:32,772 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-08-05 08:42:32,777 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-08-05 08:42:33,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:42:33,179 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-08-05 08:42:33,183 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-08-05 08:42:33,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:42:33,560 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-08-05 08:42:33,564 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-08-05 08:42:33,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:42:33,950 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-08-05 08:42:34,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:42:34,336 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-08-05 08:42:34,340 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-08-05 08:42:34,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:42:34,721 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-08-05 08:42:34,725 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-08-05 08:42:35,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:42:35,108 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-08-05 08:42:35,112 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-08-05 08:42:35,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:42:35,532 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-08-05 08:42:35,538 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-08-05 08:42:35,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:42:35,934 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-08-05 08:42:35,942 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-08-05 08:42:36,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:42:36,315 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-08-05 08:42:36,319 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-08-05 08:42:36,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:42:36,708 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-08-05 08:42:36,713 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-08-05 08:42:37,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:42:37,112 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-08-05 08:42:37,116 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-08-05 08:42:37,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:42:37,512 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-08-05 08:42:37,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:42:37,903 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-08-05 08:42:38,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:42:38,275 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-08-05 08:42:38,279 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-08-05 08:42:38,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:42:38,673 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-08-05 08:42:39,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:42:39,055 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-08-05 08:42:39,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:42:39,431 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-08-05 08:42:39,435 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-08-05 08:42:39,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:42:39,831 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-08-05 08:42:39,836 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-08-05 08:42:40,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:42:40,258 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-08-05 08:42:40,262 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-08-05 08:42:40,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:42:40,643 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-08-05 08:42:40,648 [ scc.config] DEBUG Found submodule.scripts.url
2024-08-05 08:42:41,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-05 08:42:41,036 [ scc.config] DEBUG Found submodule.scripts.branch
2024-08-05 08:42:41,036 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-05 08:42:41,112 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f22beece790> has local changes
2024-08-05 08:42:41,112 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
Merged PRs:
- PR 66 jburel 'Gateway 5 9 2'
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 63 sbesson 'Remove python-future dependency'
- PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
- PR 580 Rdornier 'Weird translation' (user: Rdornier)
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 578 Rdornier 'Image outline' (user: Rdornier)
- PR 577 Rdornier 'Fill rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 576 Rdornier 'Color picker - popup update'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#143 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/143/)'
2024-08-05 08:42:41,142 [ scc.git] DEBUG [detached HEAD 68b4a80] merge master -Dorg -Ssuccess-only
2024-08-05 08:42:41,142 [ scc.merge] INFO Repository: ome/omero-plugins
2024-08-05 08:42:41,142 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-08-05 08:42:41,142 [ scc.merge] INFO Already up to date.
2024-08-05 08:42:41,143 [ scc.merge] INFO
2024-08-05 08:42:41,143 [ scc.merge] INFO
2024-08-05 08:42:41,143 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-08-05 08:42:41,143 [ scc.merge] INFO Already up to date.
2024-08-05 08:42:41,143 [ scc.merge] INFO
2024-08-05 08:42:41,143 [ scc.merge] INFO Merged PRs:
2024-08-05 08:42:41,143 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-08-05 08:42:41,143 [ scc.merge] INFO
2024-08-05 08:42:41,143 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-08-05 08:42:41,143 [ scc.merge] INFO Excluded PRs:
2024-08-05 08:42:41,143 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-08-05 08:42:41,143 [ scc.merge] INFO Already up to date.
2024-08-05 08:42:41,143 [ scc.merge] INFO
2024-08-05 08:42:41,143 [ scc.merge] INFO Merged PRs:
2024-08-05 08:42:41,143 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-08-05 08:42:41,143 [ scc.merge] INFO
2024-08-05 08:42:41,143 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-08-05 08:42:41,143 [ scc.merge] INFO Excluded PRs:
2024-08-05 08:42:41,143 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-08-05 08:42:41,143 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-08-05 08:42:41,143 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-08-05 08:42:41,143 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-08-05 08:42:41,143 [ scc.merge] INFO Already up to date.
2024-08-05 08:42:41,143 [ scc.merge] INFO
2024-08-05 08:42:41,143 [ scc.merge] INFO Merged PRs:
2024-08-05 08:42:41,143 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-08-05 08:42:41,143 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-08-05 08:42:41,143 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-08-05 08:42:41,143 [ scc.merge] INFO
2024-08-05 08:42:41,143 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-08-05 08:42:41,143 [ scc.merge] INFO Excluded PRs:
2024-08-05 08:42:41,143 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-05 08:42:41,143 [ scc.merge] INFO Already up to date.
2024-08-05 08:42:41,143 [ scc.merge] INFO
2024-08-05 08:42:41,143 [ scc.merge] INFO Merged PRs:
2024-08-05 08:42:41,144 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-08-05 08:42:41,144 [ scc.merge] INFO
2024-08-05 08:42:41,144 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-05 08:42:41,144 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-08-05 08:42:41,144 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-08-05 08:42:41,144 [ scc.merge] INFO
2024-08-05 08:42:41,144 [ scc.merge] INFO Repository: ome/omero-figure
2024-08-05 08:42:41,144 [ scc.merge] INFO Excluded PRs:
2024-08-05 08:42:41,144 [ scc.merge] INFO - PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
2024-08-05 08:42:41,144 [ scc.merge] INFO - PR 580 Rdornier 'Weird translation' (user: Rdornier)
2024-08-05 08:42:41,144 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-08-05 08:42:41,144 [ scc.merge] INFO - PR 578 Rdornier 'Image outline' (user: Rdornier)
2024-08-05 08:42:41,144 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' (user: Rdornier)
2024-08-05 08:42:41,144 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-08-05 08:42:41,144 [ scc.merge] INFO Already up to date.
2024-08-05 08:42:41,144 [ scc.merge] INFO
2024-08-05 08:42:41,144 [ scc.merge] INFO Merged PRs:
2024-08-05 08:42:41,144 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-08-05 08:42:41,144 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-08-05 08:42:41,144 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-08-05 08:42:41,144 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-08-05 08:42:41,144 [ scc.merge] INFO - PR 576 Rdornier 'Color picker - popup update'
2024-08-05 08:42:41,144 [ scc.merge] INFO
2024-08-05 08:42:41,144 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-08-05 08:42:41,144 [ scc.merge] INFO Already up to date.
2024-08-05 08:42:41,144 [ scc.merge] INFO
2024-08-05 08:42:41,144 [ scc.merge] INFO Merged PRs:
2024-08-05 08:42:41,144 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-08-05 08:42:41,144 [ scc.merge] INFO
2024-08-05 08:42:41,144 [ scc.merge] INFO Repository: ome/omero-gallery
2024-08-05 08:42:41,144 [ scc.merge] INFO Already up to date.
2024-08-05 08:42:41,144 [ scc.merge] INFO
2024-08-05 08:42:41,144 [ scc.merge] INFO Merged PRs:
2024-08-05 08:42:41,144 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-05 08:42:41,144 [ scc.merge] INFO
2024-08-05 08:42:41,144 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-08-05 08:42:41,144 [ scc.merge] INFO Excluded PRs:
2024-08-05 08:42:41,144 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-08-05 08:42:41,145 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-08-05 08:42:41,145 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-08-05 08:42:41,145 [ scc.merge] INFO Already up to date.
2024-08-05 08:42:41,145 [ scc.merge] INFO
2024-08-05 08:42:41,145 [ scc.merge] INFO Merged PRs:
2024-08-05 08:42:41,145 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-08-05 08:42:41,145 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-08-05 08:42:41,145 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-05 08:42:41,145 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-05 08:42:41,145 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-05 08:42:41,145 [ scc.merge] INFO
2024-08-05 08:42:41,145 [ scc.merge] INFO Repository: ome/omero-mapr
2024-08-05 08:42:41,145 [ scc.merge] INFO Excluded PRs:
2024-08-05 08:42:41,145 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-08-05 08:42:41,145 [ scc.merge] INFO Already up to date.
2024-08-05 08:42:41,145 [ scc.merge] INFO
2024-08-05 08:42:41,145 [ scc.merge] INFO Merged PRs:
2024-08-05 08:42:41,145 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-08-05 08:42:41,145 [ scc.merge] INFO
2024-08-05 08:42:41,145 [ scc.merge] INFO Repository: ome/omero-metadata
2024-08-05 08:42:41,145 [ scc.merge] INFO Already up to date.
2024-08-05 08:42:41,145 [ scc.merge] INFO
2024-08-05 08:42:41,145 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-05 08:42:41,145 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-05 08:42:41,145 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-05 08:42:41,145 [ scc.merge] INFO
2024-08-05 08:42:41,145 [ scc.merge] INFO Repository: ome/omero-parade
2024-08-05 08:42:41,145 [ scc.merge] INFO Excluded PRs:
2024-08-05 08:42:41,145 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-08-05 08:42:41,145 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-08-05 08:42:41,145 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-08-05 08:42:41,145 [ scc.merge] INFO Already up to date.
2024-08-05 08:42:41,145 [ scc.merge] INFO
2024-08-05 08:42:41,145 [ scc.merge] INFO Merged PRs:
2024-08-05 08:42:41,145 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-05 08:42:41,145 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-05 08:42:41,145 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-05 08:42:41,145 [ scc.merge] INFO
2024-08-05 08:42:41,145 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-08-05 08:42:41,146 [ scc.merge] INFO Already up to date.
2024-08-05 08:42:41,146 [ scc.merge] INFO
2024-08-05 08:42:41,146 [ scc.merge] INFO Merged PRs:
2024-08-05 08:42:41,146 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-08-05 08:42:41,146 [ scc.merge] INFO
2024-08-05 08:42:41,146 [ scc.merge] INFO Repository: ome/omero-rois
2024-08-05 08:42:41,146 [ scc.merge] INFO Excluded PRs:
2024-08-05 08:42:41,146 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-05 08:42:41,146 [ scc.merge] INFO Already up to date.
2024-08-05 08:42:41,146 [ scc.merge] INFO
2024-08-05 08:42:41,146 [ scc.merge] INFO Merged PRs:
2024-08-05 08:42:41,146 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-05 08:42:41,146 [ scc.merge] INFO
2024-08-05 08:42:41,146 [ scc.merge] INFO Repository: ome/omero-signup
2024-08-05 08:42:41,146 [ scc.merge] INFO Already up to date.
2024-08-05 08:42:41,146 [ scc.merge] INFO
2024-08-05 08:42:41,146 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-05 08:42:41,146 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-05 08:42:41,146 [ scc.merge] INFO
2024-08-05 08:42:41,146 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-08-05 08:42:41,146 [ scc.merge] INFO Already up to date.
2024-08-05 08:42:41,146 [ scc.merge] INFO
2024-08-05 08:42:41,146 [ scc.merge] INFO Merged PRs:
2024-08-05 08:42:41,146 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-05 08:42:41,146 [ scc.merge] INFO
2024-08-05 08:42:41,146 [ scc.merge] INFO Repository: ome/omero-upload
2024-08-05 08:42:41,146 [ scc.merge] INFO Already up to date.
2024-08-05 08:42:41,146 [ scc.merge] INFO
2024-08-05 08:42:41,146 [ scc.merge] INFO
2024-08-05 08:42:41,146 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-08-05 08:42:41,146 [ scc.merge] INFO Already up to date.
2024-08-05 08:42:41,146 [ scc.merge] INFO
2024-08-05 08:42:41,146 [ scc.merge] INFO
2024-08-05 08:42:41,146 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-08-05 08:42:41,146 [ scc.merge] INFO Excluded PRs:
2024-08-05 08:42:41,146 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-08-05 08:42:41,146 [ scc.merge] INFO Already up to date.
2024-08-05 08:42:41,146 [ scc.merge] INFO
2024-08-05 08:42:41,146 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-05 08:42:41,146 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-05 08:42:41,147 [ scc.merge] INFO
2024-08-05 08:42:41,147 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-08-05 08:42:41,147 [ scc.merge] INFO Already up to date.
2024-08-05 08:42:41,147 [ scc.merge] INFO
2024-08-05 08:42:41,147 [ scc.merge] INFO
2024-08-05 08:42:41,147 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-08-05 08:42:41,147 [ scc.merge] INFO Already up to date.
2024-08-05 08:42:41,147 [ scc.merge] INFO
2024-08-05 08:42:41,147 [ scc.merge] INFO
2024-08-05 08:42:41,147 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-08-05 08:42:41,147 [ scc.merge] INFO Already up to date.
2024-08-05 08:42:41,147 [ scc.merge] INFO
2024-08-05 08:42:41,147 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-05 08:42:41,147 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-08-05 08:42:41,147 [ scc.merge] INFO
2024-08-05 08:42:41,147 [ scc.merge] INFO Repository: ome/scripts
2024-08-05 08:42:41,147 [ scc.merge] INFO Excluded PRs:
2024-08-05 08:42:41,147 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-08-05 08:42:41,147 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-08-05 08:42:41,147 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-08-05 08:42:41,147 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-08-05 08:42:41,147 [ scc.merge] INFO Already up to date.
2024-08-05 08:42:41,147 [ scc.merge] INFO
2024-08-05 08:42:41,147 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-05 08:42:41,147 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-05 08:42:41,147 [ scc.merge] INFO
2024-08-05 08:42:41,147 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-08-05 08:42:41,147 [ scc.git] DEBUG Calling 'git remote'
2024-08-05 08:42:41,153 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-08-05 08:42:41,154 [ scc.git] DEBUG Calling 'git remote'
2024-08-05 08:42:41,158 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:41,159 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-08-05 08:42:41,159 [ scc.git] DEBUG Calling 'git remote'
2024-08-05 08:42:41,163 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:41,163 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-08-05 08:42:41,163 [ scc.git] DEBUG Calling 'git remote'
2024-08-05 08:42:41,168 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:41,168 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-08-05 08:42:41,168 [ scc.git] DEBUG Calling 'git remote'
2024-08-05 08:42:41,172 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:41,172 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-08-05 08:42:41,172 [ scc.git] DEBUG Calling 'git remote'
2024-08-05 08:42:41,177 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:41,177 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-05 08:42:41,177 [ scc.git] DEBUG Calling 'git remote'
2024-08-05 08:42:41,181 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:41,182 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-05 08:42:41,182 [ scc.git] DEBUG Calling 'git remote'
2024-08-05 08:42:41,188 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:41,188 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-05 08:42:41,188 [ scc.git] DEBUG Calling 'git remote'
2024-08-05 08:42:41,192 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:41,192 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-05 08:42:41,192 [ scc.git] DEBUG Calling 'git remote'
2024-08-05 08:42:41,196 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:41,197 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-05 08:42:41,197 [ scc.git] DEBUG Calling 'git remote'
2024-08-05 08:42:41,201 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:41,201 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-05 08:42:41,201 [ scc.git] DEBUG Calling 'git remote'
2024-08-05 08:42:41,210 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:41,210 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-05 08:42:41,210 [ scc.git] DEBUG Calling 'git remote'
2024-08-05 08:42:41,216 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:41,217 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-05 08:42:41,217 [ scc.git] DEBUG Calling 'git remote'
2024-08-05 08:42:41,221 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:41,222 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-05 08:42:41,222 [ scc.git] DEBUG Calling 'git remote'
2024-08-05 08:42:41,226 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:41,226 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-05 08:42:41,226 [ scc.git] DEBUG Calling 'git remote'
2024-08-05 08:42:41,231 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:41,231 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-05 08:42:41,231 [ scc.git] DEBUG Calling 'git remote'
2024-08-05 08:42:41,235 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:41,235 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-05 08:42:41,236 [ scc.git] DEBUG Calling 'git remote'
2024-08-05 08:42:41,240 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:41,240 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-05 08:42:41,240 [ scc.git] DEBUG Calling 'git remote'
2024-08-05 08:42:41,245 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:41,245 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-05 08:42:41,245 [ scc.git] DEBUG Calling 'git remote'
2024-08-05 08:42:41,249 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:41,249 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-05 08:42:41,249 [ scc.git] DEBUG Calling 'git remote'
2024-08-05 08:42:41,254 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:41,254 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-05 08:42:41,254 [ scc.git] DEBUG Calling 'git remote'
2024-08-05 08:42:41,258 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-05 08:42:41,258 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-05 08:42:41,258 [ scc.git] DEBUG Calling 'git remote'
2024-08-05 08:42:41,262 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.9.2 to 5.9.3-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD 6d730ad] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 9b73dd9
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from fefe87cf
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from a8f380f
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 312afbe
nothing to commit, working tree clean
[detached HEAD 0f44a3f] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-08-05 08:43:26,702 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-08-05 08:43:35,336 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-08-05 08:43:37,595 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-08-05 08:43:42,038 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-08-05 08:44:22,958 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/b04263cd/images/svgs/logo.svg){kind=logo}
