Console Output
Skipping 98 KB..
Full Log4 09:23:27,578 [ scc.repo] DEBUG ## Branches found:
2024-08-14 09:23:27,578 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-08-14 09:23:27,578 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:23:27,578 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:23:27,584 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-14 09:23:27,589 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-14 09:23:27,589 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-14 09:23:27,594 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-14 09:23:27,600 [ scc.git] DEBUG Already up to date.
2024-08-14 09:23:27,600 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-08-14 09:23:28,387 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-14 09:23:28,387 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-08-14 09:23:28,391 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-08-14 09:23:29,062 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-14 09:23:29,062 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-08-14 09:23:29,066 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-08-14 09:23:30,381 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-14 09:23:30,381 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-08-14 09:23:30,385 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-08-14 09:23:30,726 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-14 09:23:30,726 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-08-14 09:23:30,730 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-08-14 09:23:31,650 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-14 09:23:31,651 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-08-14 09:23:31,655 [ scc.git] DEBUG ## Unique users: []
2024-08-14 09:23:31,655 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:23:31,655 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:23:31,660 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-08-14 09:23:31,667 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:23:31,672 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-08-14 09:23:31,687 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-14 09:23:31,687 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-14 09:23:31,688 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-14 09:23:31,693 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-08-14 09:23:31,693 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-08-14 09:23:31,693 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-08-14 09:23:31,693 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-08-14 09:23:31,693 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-08-14 09:23:31,693 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-08-14 09:23:31,693 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-08-14 09:23:31,693 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-08-14 09:23:31,693 [ scc.git] DEBUG src/templates/rois_form.template.html | 8 ++++
2024-08-14 09:23:31,693 [ scc.git] DEBUG 9 files changed, 271 insertions(+), 5 deletions(-)
2024-08-14 09:23:31,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:23:31,836 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-08-14 09:23:31,843 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:23:31,847 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-08-14 09:23:31,872 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-14 09:23:31,872 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-14 09:23:31,872 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-08-14 09:23:31,872 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-08-14 09:23:31,873 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-14 09:23:31,879 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-08-14 09:23:31,879 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-08-14 09:23:31,879 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-08-14 09:23:31,879 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-08-14 09:23:31,879 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-08-14 09:23:31,879 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-08-14 09:23:31,879 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-08-14 09:23:31,879 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-08-14 09:23:31,879 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-08-14 09:23:31,879 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-08-14 09:23:31,879 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-08-14 09:23:31,879 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-08-14 09:23:32,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:23:32,237 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-08-14 09:23:32,245 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:23:32,249 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) 3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-08-14 09:23:32,576 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-08-14 09:23:32,576 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-14 09:23:32,576 [ scc.git] DEBUG Auto-merging src/index.html
2024-08-14 09:23:32,576 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-08-14 09:23:32,576 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-14 09:23:32,576 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-14 09:23:32,577 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-14 09:23:32,584 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-08-14 09:23:32,584 [ scc.git] DEBUG omero_figure/urls.py | 10 +++-
2024-08-14 09:23:32,584 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-08-14 09:23:32,584 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-08-14 09:23:32,584 [ scc.git] DEBUG src/index.html | 1 +
2024-08-14 09:23:32,584 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-08-14 09:23:32,584 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-08-14 09:23:32,584 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-08-14 09:23:32,584 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-08-14 09:23:32,584 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-08-14 09:23:32,584 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-08-14 09:23:32,586 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-08-14 09:23:32,586 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-08-14 09:23:32,586 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-08-14 09:23:32,586 [ scc.git] DEBUG 14 files changed, 162 insertions(+), 15 deletions(-)
2024-08-14 09:23:32,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:23:32,729 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-08-14 09:23:32,736 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:23:32,740 [ 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-14 09:23:32,764 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-14 09:23:32,767 [ scc.git] DEBUG setup.py | 2 +-
2024-08-14 09:23:32,767 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-14 09:23:33,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:23:33,113 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...84186c0c62398b8ddbbe47dabea7f16cb7913e99'
2024-08-14 09:23:33,120 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:23:33,125 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 576 (Color picker - popup update) 84186c0c62398b8ddbbe47dabea7f16cb7913e99'
2024-08-14 09:23:33,211 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-14 09:23:33,211 [ scc.git] DEBUG Auto-merging src/index.html
2024-08-14 09:23:33,211 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-14 09:23:33,215 [ scc.git] DEBUG src/css/figure.css | 3 +++
2024-08-14 09:23:33,215 [ scc.git] DEBUG src/index.html | 5 ++++-
2024-08-14 09:23:33,215 [ scc.git] DEBUG src/js/views/colorpicker.js | 14 ++++++++++++--
2024-08-14 09:23:33,215 [ scc.git] DEBUG 3 files changed, 19 insertions(+), 3 deletions(-)
2024-08-14 09:23:33,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:23:33,505 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-14 09:23:33,541 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:23:33,541 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:23:33,546 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-14 09:23:33,580 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-14 09:23:33,587 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc2c4d3490> has no local changes
2024-08-14 09:23:33,587 [ 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 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#153 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/)'
2024-08-14 09:23:33,596 [ scc.git] DEBUG [detached HEAD 90c36fa9] merge master -Dorg -Ssuccess-only
2024-08-14 09:23:33,597 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:23:33,597 [ scc.repo] DEBUG ## PRs found:
2024-08-14 09:23:34,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-08-14 09:23:34,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-08-14 09:23:34,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-08-14 09:23:35,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-14 09:23:35,872 [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-14 09:23:36,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-14 09:23:36,698 [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-14 09:23:36,698 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-08-14 09:23:36,698 [ scc.repo] DEBUG ## Branches found:
2024-08-14 09:23:36,698 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-14 09:23:36,698 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:23:36,698 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:23:36,704 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-14 09:23:36,708 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-14 09:23:36,709 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-14 09:23:36,713 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-14 09:23:36,718 [ scc.git] DEBUG Already up to date.
2024-08-14 09:23:36,718 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-08-14 09:23:37,061 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-08-14 09:23:37,061 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-08-14 09:23:37,065 [ scc.git] DEBUG ## Unique users: []
2024-08-14 09:23:37,065 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:23:37,065 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:23:37,070 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-14 09:23:37,075 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:23:37,079 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-14 09:23:37,097 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-08-14 09:23:37,098 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-14 09:23:37,100 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-08-14 09:23:37,100 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-08-14 09:23:37,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:23:37,238 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-14 09:23:37,273 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:23:37,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:23:37,278 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-14 09:23:37,312 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-14 09:23:37,318 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc2e583a60> has no local changes
2024-08-14 09:23:37,318 [ 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#153 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/)'
2024-08-14 09:23:37,326 [ scc.git] DEBUG [detached HEAD 87cd7db] merge master -Dorg -Ssuccess-only
2024-08-14 09:23:37,326 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:23:37,326 [ scc.repo] DEBUG ## PRs found:
2024-08-14 09:23:37,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-08-14 09:23:38,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-08-14 09:23:38,172 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-14 09:23:38,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-14 09:23:39,226 [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-14 09:23:39,734 [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-14 09:23:40,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-14 09:23:40,691 [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-14 09:23:40,691 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-14 09:23:40,691 [ scc.repo] DEBUG ## Branches found:
2024-08-14 09:23:40,691 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-14 09:23:40,691 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:23:40,691 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:23:40,697 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-14 09:23:40,701 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-14 09:23:40,701 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-14 09:23:40,706 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-14 09:23:40,711 [ scc.git] DEBUG Already up to date.
2024-08-14 09:23:40,711 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-08-14 09:23:41,023 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-08-14 09:23:41,023 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-08-14 09:23:41,027 [ scc.git] DEBUG ## Unique users: []
2024-08-14 09:23:41,027 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:23:41,027 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:23:41,031 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-08-14 09:23:41,036 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:23:41,040 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-08-14 09:23:41,050 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-14 09:23:41,054 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-08-14 09:23:41,054 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-08-14 09:23:41,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:23:41,186 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-14 09:23:41,222 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:23:41,222 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:23:41,227 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-14 09:23:41,261 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-14 09:23:41,268 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc2e592af0> has no local changes
2024-08-14 09:23:41,268 [ 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#153 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/)'
2024-08-14 09:23:41,276 [ scc.git] DEBUG [detached HEAD f4492d0] merge master -Dorg -Ssuccess-only
2024-08-14 09:23:41,276 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:23:41,276 [ scc.repo] DEBUG ## PRs found:
2024-08-14 09:23:41,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-08-14 09:23:42,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-08-14 09:23:42,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-08-14 09:23:42,608 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-14 09:23:43,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-14 09:23:43,704 [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-14 09:23:44,198 [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-14 09:23:44,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-14 09:23:45,152 [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-14 09:23:45,153 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-14 09:23:45,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-08-14 09:23:45,623 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-14 09:23:46,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-14 09:23:46,782 [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-14 09:23:47,267 [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-14 09:23:47,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-14 09:23:48,190 [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-14 09:23:48,191 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-14 09:23:48,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-08-14 09:23:49,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-08-14 09:23:49,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-14 09:23:50,050 [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-14 09:23:50,527 [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-14 09:23:50,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-14 09:23:51,333 [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-14 09:23:51,333 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-14 09:23:51,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-08-14 09:23:52,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-08-14 09:23:52,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-14 09:23:53,275 [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-14 09:23:53,751 [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-14 09:23:54,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-14 09:23:54,545 [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-14 09:23:54,546 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-08-14 09:23:54,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-08-14 09:23:55,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-08-14 09:23:55,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-14 09:23:56,406 [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-14 09:23:56,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-14 09:23:57,298 [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-14 09:23:57,299 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-08-14 09:23:57,299 [ scc.repo] DEBUG ## Branches found:
2024-08-14 09:23:57,299 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-14 09:23:57,299 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:23:57,299 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:23:57,305 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-14 09:23:57,309 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-14 09:23:57,309 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-14 09:23:57,440 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-14 09:23:57,445 [ scc.git] DEBUG Already up to date.
2024-08-14 09:23:57,445 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-08-14 09:23:58,226 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-14 09:23:58,226 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-08-14 09:23:58,230 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-08-14 09:24:00,264 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-14 09:24:00,264 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-08-14 09:24:00,269 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-08-14 09:24:00,861 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-14 09:24:00,861 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-08-14 09:24:00,865 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-08-14 09:24:01,151 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-14 09:24:01,152 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-08-14 09:24:01,156 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-08-14 09:24:01,428 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-14 09:24:01,428 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-08-14 09:24:01,431 [ scc.git] DEBUG ## Unique users: []
2024-08-14 09:24:01,431 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:01,431 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:01,436 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-14 09:24:01,442 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:01,446 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-14 09:24:01,548 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-08-14 09:24:01,548 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-14 09:24:01,551 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-08-14 09:24:01,551 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-08-14 09:24:01,551 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-08-14 09:24:01,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:24:01,686 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-14 09:24:01,693 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:01,697 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-14 09:24:01,715 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-08-14 09:24:01,715 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-08-14 09:24:01,715 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-08-14 09:24:01,715 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-08-14 09:24:01,715 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-14 09:24:01,719 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-08-14 09:24:01,719 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-08-14 09:24:01,719 [ scc.git] DEBUG src/app/header.html | 5 +
2024-08-14 09:24:01,719 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-08-14 09:24:01,719 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-08-14 09:24:01,719 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-08-14 09:24:01,719 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-08-14 09:24:01,719 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-08-14 09:24:02,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:24:02,065 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-14 09:24:02,070 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:02,075 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-14 09:24:02,086 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-08-14 09:24:02,086 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-14 09:24:02,089 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-08-14 09:24:02,089 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-08-14 09:24:02,089 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-08-14 09:24:02,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:24:02,459 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-14 09:24:02,465 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:02,469 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-14 09:24:02,482 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-14 09:24:02,491 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-08-14 09:24:02,491 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-08-14 09:24:02,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:24:02,845 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-08-14 09:24:02,851 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:02,856 [ 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-14 09:24:02,966 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-14 09:24:02,966 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-14 09:24:03,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:24:03,231 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-14 09:24:03,267 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:03,267 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:03,271 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-14 09:24:03,306 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-14 09:24:03,314 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc2e53bd30> has no local changes
2024-08-14 09:24:03,314 [ 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#153 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/)'
2024-08-14 09:24:03,322 [ scc.git] DEBUG [detached HEAD 5a882f0] merge master -Dorg -Ssuccess-only
2024-08-14 09:24:03,322 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:24:03,323 [ scc.repo] DEBUG ## PRs found:
2024-08-14 09:24:03,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-08-14 09:24:04,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/85 HTTP/1.1" 200 None
2024-08-14 09:24:04,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/5166040a15b493631009b9e446f25b6a724289e3 HTTP/1.1" 200 None
2024-08-14 09:24:05,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/5166040a15b493631009b9e446f25b6a724289e3/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-14 09:24:05,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/5166040a15b493631009b9e446f25b6a724289e3/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-14 09:24:06,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-08-14 09:24:06,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-08-14 09:24:07,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-14 09:24:07,598 [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-14 09:24:08,077 [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-14 09:24:08,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-14 09:24:08,938 [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-14 09:24:08,939 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-08-14 09:24:08,939 [ scc.repo] DEBUG ## Branches found:
2024-08-14 09:24:08,939 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-14 09:24:08,939 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:08,939 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:08,944 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-14 09:24:08,948 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-14 09:24:08,949 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-14 09:24:08,953 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-14 09:24:08,958 [ scc.git] DEBUG Already up to date.
2024-08-14 09:24:08,958 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-08-14 09:24:09,245 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-08-14 09:24:09,246 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-08-14 09:24:09,249 [ scc.git] DEBUG ## Unique users: []
2024-08-14 09:24:09,249 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:09,250 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:09,254 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-14 09:24:09,259 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:09,264 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-14 09:24:09,272 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-14 09:24:09,275 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-08-14 09:24:09,275 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-08-14 09:24:09,275 [ scc.git] DEBUG requirements.txt | 2 +-
2024-08-14 09:24:09,275 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-08-14 09:24:09,275 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-08-14 09:24:09,275 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-08-14 09:24:09,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:24:09,408 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-14 09:24:09,443 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:09,443 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:09,447 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-14 09:24:09,481 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-14 09:24:09,486 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc2e539eb0> has no local changes
2024-08-14 09:24:09,487 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- PR 85 sbesson 'Add support for OMERO.web 5.27.0' (status: failure)
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Generated by OMERO-plugins-push#153 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/)'
2024-08-14 09:24:09,494 [ scc.git] DEBUG [detached HEAD 2a21c58] merge master -Dorg -Ssuccess-only
2024-08-14 09:24:09,494 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:24:09,495 [ scc.repo] DEBUG ## PRs found:
2024-08-14 09:24:09,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-08-14 09:24:10,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-08-14 09:24:10,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-08-14 09:24:11,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-14 09:24:11,932 [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-14 09:24:12,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-14 09:24:12,753 [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-14 09:24:12,753 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-14 09:24:13,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-08-14 09:24:13,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-08-14 09:24:14,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-14 09:24:14,709 [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-14 09:24:15,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-14 09:24:15,580 [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-14 09:24:15,580 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-14 09:24:15,580 [ scc.repo] DEBUG ## Branches found:
2024-08-14 09:24:15,581 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-14 09:24:15,581 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:15,581 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:15,586 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-14 09:24:15,590 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-14 09:24:15,590 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-14 09:24:15,595 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-14 09:24:15,600 [ scc.git] DEBUG Already up to date.
2024-08-14 09:24:15,600 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-08-14 09:24:16,069 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-14 09:24:16,069 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-08-14 09:24:16,073 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-08-14 09:24:16,484 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-14 09:24:16,484 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-08-14 09:24:16,488 [ scc.git] DEBUG ## Unique users: []
2024-08-14 09:24:16,488 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:16,488 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:16,492 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-14 09:24:16,498 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:16,503 [ 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-14 09:24:16,554 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-08-14 09:24:16,555 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-08-14 09:24:16,555 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-14 09:24:16,555 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-14 09:24:16,555 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-14 09:24:16,556 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-14 09:24:16,560 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-14 09:24:16,566 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-14 09:24:16,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:24:16,698 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-14 09:24:16,704 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-14 09:24:16,709 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#153](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-08-14 09:24:16,713 [ scc.config] DEBUG Found github.token
2024-08-14 09:24:16,714 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-08-14 09:24:16,714 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-14 09:24:16,720 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:16,724 [ 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-14 09:24:16,814 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-14 09:24:16,814 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-14 09:24:16,814 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-08-14 09:24:16,814 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-14 09:24:16,814 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-14 09:24:16,819 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-14 09:24:16,826 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-14 09:24:17,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:24:17,095 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-14 09:24:17,100 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-14 09:24:17,105 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#153](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/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-14 09:24:17,109 [ scc.config] DEBUG Found github.token
2024-08-14 09:24:17,109 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-08-14 09:24:17,109 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-14 09:24:17,144 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:17,144 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:17,149 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-14 09:24:17,184 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-14 09:24:17,191 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc2c505f10> has no local changes
2024-08-14 09:24:17,191 [ 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#153 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/)'
2024-08-14 09:24:17,198 [ scc.git] DEBUG [detached HEAD 5344f1a] merge master -Dorg -Ssuccess-only
2024-08-14 09:24:17,198 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:24:17,199 [ scc.repo] DEBUG ## PRs found:
2024-08-14 09:24:17,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-08-14 09:24:18,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-08-14 09:24:18,334 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-14 09:24:18,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-14 09:24:19,431 [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-14 09:24:19,907 [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-14 09:24:20,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-14 09:24:20,926 [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-14 09:24:20,926 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-14 09:24:21,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-08-14 09:24:21,388 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-14 09:24:21,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-14 09:24:22,422 [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-14 09:24:22,933 [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-14 09:24:23,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-14 09:24:23,895 [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-14 09:24:23,896 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-14 09:24:24,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-08-14 09:24:24,370 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-14 09:24:24,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-14 09:24:25,443 [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-14 09:24:26,037 [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-14 09:24:26,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-14 09:24:27,027 [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-14 09:24:27,027 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-14 09:24:27,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-08-14 09:24:27,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-08-14 09:24:28,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-08-14 09:24:28,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-08-14 09:24:29,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-08-14 09:24:29,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-08-14 09:24:29,826 [ scc.repo] DEBUG ## Branches found:
2024-08-14 09:24:29,826 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-14 09:24:29,826 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:29,826 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:29,831 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-14 09:24:29,835 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-14 09:24:29,835 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-14 09:24:29,840 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-14 09:24:29,845 [ scc.git] DEBUG Already up to date.
2024-08-14 09:24:29,845 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-08-14 09:24:30,162 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-14 09:24:30,163 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-08-14 09:24:30,166 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-08-14 09:24:30,486 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-14 09:24:30,486 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-08-14 09:24:30,490 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-08-14 09:24:30,771 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-14 09:24:30,772 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-08-14 09:24:30,775 [ scc.git] DEBUG ## Unique users: []
2024-08-14 09:24:30,775 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:30,775 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:30,780 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-08-14 09:24:30,785 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:30,789 [ 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-14 09:24:30,797 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-14 09:24:30,800 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-08-14 09:24:30,800 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-08-14 09:24:30,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:24:30,939 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-08-14 09:24:30,944 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:30,948 [ 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-14 09:24:30,957 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-14 09:24:30,958 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-14 09:24:30,961 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-08-14 09:24:30,961 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-08-14 09:24:31,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:24:31,314 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-08-14 09:24:31,319 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:31,323 [ 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-14 09:24:31,333 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-14 09:24:31,333 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-14 09:24:31,336 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-08-14 09:24:31,336 [ scc.git] DEBUG package.json | 2 +-
2024-08-14 09:24:31,336 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-08-14 09:24:31,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:24:31,691 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-14 09:24:31,726 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:31,727 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:31,731 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-14 09:24:31,765 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-14 09:24:31,771 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc2c49f4f0> has no local changes
2024-08-14 09:24:31,771 [ 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#153 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/)'
2024-08-14 09:24:31,779 [ scc.git] DEBUG [detached HEAD a8b14e0] merge master -Dorg -Ssuccess-only
2024-08-14 09:24:31,779 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:24:31,779 [ scc.repo] DEBUG ## PRs found:
2024-08-14 09:24:32,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-08-14 09:24:32,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-08-14 09:24:33,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-14 09:24:33,597 [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-14 09:24:34,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-14 09:24:34,524 [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-14 09:24:34,524 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-08-14 09:24:34,524 [ scc.repo] DEBUG ## Branches found:
2024-08-14 09:24:34,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-14 09:24:34,524 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:34,524 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:34,529 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-14 09:24:34,533 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-14 09:24:34,533 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-14 09:24:34,538 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-14 09:24:34,543 [ scc.git] DEBUG Already up to date.
2024-08-14 09:24:34,543 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-14 09:24:34,859 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-08-14 09:24:34,859 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-14 09:24:34,862 [ scc.git] DEBUG ## Unique users: []
2024-08-14 09:24:34,862 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:34,862 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:34,867 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-14 09:24:34,872 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:34,877 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-14 09:24:34,885 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-14 09:24:35,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:24:35,020 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-14 09:24:35,057 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:35,057 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:35,061 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-14 09:24:35,096 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-14 09:24:35,101 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc2c500f40> has no local changes
2024-08-14 09:24:35,102 [ 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#153 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/)'
2024-08-14 09:24:35,109 [ scc.git] DEBUG [detached HEAD ef8d1c6] merge master -Dorg -Ssuccess-only
2024-08-14 09:24:35,109 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:24:35,109 [ scc.repo] DEBUG ## PRs found:
2024-08-14 09:24:35,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-08-14 09:24:35,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-08-14 09:24:36,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-08-14 09:24:36,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-08-14 09:24:37,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-14 09:24:37,823 [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-14 09:24:38,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-14 09:24:38,725 [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-14 09:24:38,726 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-14 09:24:38,726 [ scc.repo] DEBUG ## Branches found:
2024-08-14 09:24:38,726 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-14 09:24:38,726 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:38,726 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:38,730 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-14 09:24:38,735 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-14 09:24:38,735 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-14 09:24:38,740 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-14 09:24:38,744 [ scc.git] DEBUG Already up to date.
2024-08-14 09:24:38,745 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-08-14 09:24:39,319 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-08-14 09:24:39,319 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-08-14 09:24:39,323 [ scc.git] DEBUG ## Unique users: []
2024-08-14 09:24:39,323 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:39,323 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:39,328 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-08-14 09:24:39,333 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:39,337 [ 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-14 09:24:39,346 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-08-14 09:24:39,346 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-14 09:24:39,348 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-08-14 09:24:39,348 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-08-14 09:24:39,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:24:39,482 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-14 09:24:39,519 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:39,519 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:39,523 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-14 09:24:39,558 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-14 09:24:39,563 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc2c456bb0> has no local changes
2024-08-14 09:24:39,563 [ 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#153 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/)'
2024-08-14 09:24:39,570 [ scc.git] DEBUG [detached HEAD e5f8e3c] merge master -Dorg -Ssuccess-only
2024-08-14 09:24:39,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:24:39,571 [ scc.repo] DEBUG ## PRs found:
2024-08-14 09:24:39,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-08-14 09:24:40,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-08-14 09:24:40,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-08-14 09:24:41,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-14 09:24:41,910 [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-14 09:24:42,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-14 09:24:42,914 [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-14 09:24:42,914 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-14 09:24:42,914 [ scc.repo] DEBUG ## Branches found:
2024-08-14 09:24:42,914 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-14 09:24:42,914 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:42,914 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:42,919 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-14 09:24:42,923 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-14 09:24:42,923 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-14 09:24:42,928 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-14 09:24:42,933 [ scc.git] DEBUG Already up to date.
2024-08-14 09:24:42,933 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-14 09:24:43,320 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-08-14 09:24:43,321 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-14 09:24:43,324 [ scc.git] DEBUG ## Unique users: []
2024-08-14 09:24:43,324 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:43,324 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:43,329 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-14 09:24:43,334 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:43,338 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-14 09:24:43,456 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-08-14 09:24:43,456 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-08-14 09:24:43,456 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-08-14 09:24:43,456 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-08-14 09:24:43,456 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-08-14 09:24:43,456 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-08-14 09:24:43,456 [ scc.git] DEBUG Auto-merging setup.py
2024-08-14 09:24:43,456 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-08-14 09:24:43,456 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-14 09:24:43,456 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-14 09:24:43,461 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-14 09:24:43,466 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-08-14 09:24:43,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:24:43,592 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-14 09:24:43,597 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-14 09:24:43,601 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#153](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/signup_settings.py
- omero_signup/views.py
- omero_signup/urls.py
--conflicts
2024-08-14 09:24:43,605 [ scc.config] DEBUG Found github.token
2024-08-14 09:24:43,606 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-08-14 09:24:43,606 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-14 09:24:43,641 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:43,641 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:43,645 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-14 09:24:43,679 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-14 09:24:43,685 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc2c4c3700> has no local changes
2024-08-14 09:24:43,685 [ 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#153 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/)'
2024-08-14 09:24:43,692 [ scc.git] DEBUG [detached HEAD b4d9f86] merge master -Dorg -Ssuccess-only
2024-08-14 09:24:43,693 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:24:43,693 [ scc.repo] DEBUG ## PRs found:
2024-08-14 09:24:44,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-08-14 09:24:44,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-08-14 09:24:44,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-08-14 09:24:45,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-14 09:24:45,884 [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-14 09:24:46,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-14 09:24:46,761 [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-14 09:24:46,761 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-14 09:24:46,761 [ scc.repo] DEBUG ## Branches found:
2024-08-14 09:24:46,761 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-14 09:24:46,761 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:46,761 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:46,766 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-14 09:24:46,770 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-14 09:24:46,771 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-14 09:24:46,775 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-14 09:24:46,780 [ scc.git] DEBUG Already up to date.
2024-08-14 09:24:46,780 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-08-14 09:24:47,190 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-08-14 09:24:47,190 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-08-14 09:24:47,194 [ scc.git] DEBUG ## Unique users: []
2024-08-14 09:24:47,194 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:47,194 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:47,198 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-08-14 09:24:47,205 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:47,209 [ 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-14 09:24:47,221 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-14 09:24:47,223 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-08-14 09:24:47,223 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-08-14 09:24:47,223 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-08-14 09:24:47,223 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-08-14 09:24:47,223 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-08-14 09:24:47,223 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-08-14 09:24:47,225 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-08-14 09:24:47,225 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-08-14 09:24:47,225 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-08-14 09:24:47,225 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-08-14 09:24:47,225 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-08-14 09:24:47,225 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-08-14 09:24:47,225 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-08-14 09:24:47,225 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-08-14 09:24:47,225 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-08-14 09:24:47,225 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-08-14 09:24:47,225 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-08-14 09:24:47,225 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-08-14 09:24:47,225 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-08-14 09:24:47,226 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-08-14 09:24:47,226 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-08-14 09:24:47,226 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-08-14 09:24:47,226 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-08-14 09:24:47,226 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-08-14 09:24:47,226 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-08-14 09:24:47,226 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-08-14 09:24:47,226 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-08-14 09:24:47,226 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-08-14 09:24:47,226 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-08-14 09:24:47,226 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-08-14 09:24:47,226 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-08-14 09:24:47,226 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-08-14 09:24:47,226 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-08-14 09:24:47,226 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-08-14 09:24:47,226 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-08-14 09:24:47,226 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-08-14 09:24:47,226 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-08-14 09:24:47,226 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-08-14 09:24:47,226 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-08-14 09:24:47,226 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-08-14 09:24:47,226 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-08-14 09:24:47,226 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-08-14 09:24:47,226 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-08-14 09:24:47,226 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-08-14 09:24:47,226 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-08-14 09:24:47,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:24:47,388 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-14 09:24:47,423 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:47,423 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:47,428 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-14 09:24:47,462 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-14 09:24:47,467 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc2c48f610> has no local changes
2024-08-14 09:24:47,468 [ 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#153 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/)'
2024-08-14 09:24:47,476 [ scc.git] DEBUG [detached HEAD 251d9d9] merge master -Dorg -Ssuccess-only
2024-08-14 09:24:47,476 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:24:47,476 [ scc.repo] DEBUG ## PRs found:
2024-08-14 09:24:47,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-08-14 09:24:47,790 [ scc.repo] DEBUG ## Branches found:
2024-08-14 09:24:47,790 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-14 09:24:47,790 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:47,790 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:47,795 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-14 09:24:47,799 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-14 09:24:47,799 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-14 09:24:47,804 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-14 09:24:47,809 [ scc.git] DEBUG Already up to date.
2024-08-14 09:24:47,809 [ scc.git] DEBUG ## Unique users: []
2024-08-14 09:24:47,809 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:47,809 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:47,813 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-14 09:24:47,848 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:47,848 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:47,853 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-14 09:24:47,887 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-14 09:24:47,892 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc2c429e80> has no local changes
2024-08-14 09:24:47,892 [ 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#153 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/)'
2024-08-14 09:24:47,899 [ scc.git] DEBUG [detached HEAD fe7dc5e] merge master -Dorg -Ssuccess-only
2024-08-14 09:24:47,900 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:24:47,900 [ scc.repo] DEBUG ## PRs found:
2024-08-14 09:24:48,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-08-14 09:24:48,198 [ scc.repo] DEBUG ## Branches found:
2024-08-14 09:24:48,198 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-14 09:24:48,198 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:48,198 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:48,203 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-14 09:24:48,207 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-14 09:24:48,207 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-14 09:24:48,212 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-14 09:24:48,217 [ scc.git] DEBUG Already up to date.
2024-08-14 09:24:48,217 [ scc.git] DEBUG ## Unique users: []
2024-08-14 09:24:48,217 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:48,217 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:48,221 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-14 09:24:48,257 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:48,257 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:48,261 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-14 09:24:48,296 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-14 09:24:48,301 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc2c461d30> has no local changes
2024-08-14 09:24:48,301 [ 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#153 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/)'
2024-08-14 09:24:48,308 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:24:48,308 [ scc.git] DEBUG [detached HEAD 9cb4098] merge master -Dorg -Ssuccess-only
2024-08-14 09:24:48,309 [ scc.git] INFO Overriding base-branch from master to main
2024-08-14 09:24:48,309 [ scc.repo] DEBUG ## PRs found:
2024-08-14 09:24:48,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-08-14 09:24:49,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-08-14 09:24:49,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-08-14 09:24:50,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-08-14 09:24:50,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-14 09:24:51,046 [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-14 09:24:51,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-14 09:24:51,993 [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-14 09:24:51,993 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-14 09:24:51,994 [ scc.repo] DEBUG ## Branches found:
2024-08-14 09:24:51,994 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-14 09:24:51,994 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:51,994 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:51,999 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-08-14 09:24:52,004 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-14 09:24:52,004 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-08-14 09:24:52,008 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-08-14 09:24:52,013 [ scc.git] DEBUG Already up to date.
2024-08-14 09:24:52,014 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-08-14 09:24:52,451 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-08-14 09:24:52,451 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-08-14 09:24:52,455 [ scc.git] DEBUG ## Unique users: []
2024-08-14 09:24:52,455 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:52,455 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:52,459 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-14 09:24:52,465 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:52,469 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-14 09:24:52,491 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-08-14 09:24:52,492 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-08-14 09:24:52,492 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-14 09:24:52,492 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-14 09:24:52,497 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-14 09:24:52,502 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-08-14 09:24:52,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:24:52,675 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-14 09:24:52,680 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-14 09:24:52,684 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#153](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-08-14 09:24:52,689 [ scc.config] DEBUG Found github.token
2024-08-14 09:24:52,689 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-08-14 09:24:52,689 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-14 09:24:52,724 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:52,724 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:52,729 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-14 09:24:52,763 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-14 09:24:52,769 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc2c481fa0> has no local changes
2024-08-14 09:24:52,769 [ 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#153 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/)'
2024-08-14 09:24:52,776 [ scc.git] DEBUG [detached HEAD 37bce62] merge master -Dorg -Ssuccess-only
2024-08-14 09:24:52,776 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:24:52,776 [ scc.repo] DEBUG ## PRs found:
2024-08-14 09:24:53,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-08-14 09:24:53,095 [ scc.repo] DEBUG ## Branches found:
2024-08-14 09:24:53,095 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-14 09:24:53,095 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:53,095 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:53,099 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-14 09:24:53,104 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-14 09:24:53,104 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-14 09:24:53,108 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-14 09:24:53,113 [ scc.git] DEBUG Already up to date.
2024-08-14 09:24:53,113 [ scc.git] DEBUG ## Unique users: []
2024-08-14 09:24:53,113 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:53,113 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:53,118 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-14 09:24:53,153 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:53,153 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:53,158 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-14 09:24:53,192 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-14 09:24:53,197 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc2c4137c0> has no local changes
2024-08-14 09:24:53,197 [ 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#153 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/)'
2024-08-14 09:24:53,204 [ scc.git] DEBUG [detached HEAD 49f93f9] merge master -Dorg -Ssuccess-only
2024-08-14 09:24:53,205 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:24:53,205 [ scc.repo] DEBUG ## PRs found:
2024-08-14 09:24:53,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-08-14 09:24:53,514 [ scc.repo] DEBUG ## Branches found:
2024-08-14 09:24:53,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-14 09:24:53,514 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:53,514 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:53,518 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-14 09:24:53,523 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-14 09:24:53,523 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-14 09:24:53,527 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-14 09:24:53,532 [ scc.git] DEBUG Already up to date.
2024-08-14 09:24:53,532 [ scc.git] DEBUG ## Unique users: []
2024-08-14 09:24:53,532 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:53,532 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:53,537 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-14 09:24:53,572 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:53,572 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:53,576 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-14 09:24:53,611 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-14 09:24:53,616 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc2c3d3490> has no local changes
2024-08-14 09:24:53,616 [ 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#153 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/)'
2024-08-14 09:24:53,624 [ scc.git] DEBUG [detached HEAD a35f334] merge master -Dorg -Ssuccess-only
2024-08-14 09:24:53,624 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:24:53,624 [ scc.repo] DEBUG ## PRs found:
2024-08-14 09:24:54,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-08-14 09:24:54,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-08-14 09:24:54,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-08-14 09:24:55,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-14 09:24:55,853 [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-14 09:24:56,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-14 09:24:56,767 [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-14 09:24:56,768 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-08-14 09:24:56,768 [ scc.repo] DEBUG ## Branches found:
2024-08-14 09:24:56,768 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-14 09:24:56,768 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:56,768 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:56,772 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-14 09:24:56,777 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-14 09:24:56,777 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-14 09:24:56,782 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-14 09:24:56,786 [ scc.git] DEBUG Already up to date.
2024-08-14 09:24:56,787 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-08-14 09:24:57,135 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-08-14 09:24:57,135 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-08-14 09:24:57,139 [ scc.git] DEBUG ## Unique users: []
2024-08-14 09:24:57,139 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:57,139 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:57,144 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-14 09:24:57,149 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:57,153 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-14 09:24:57,361 [ scc.git] DEBUG Auto-merging Dockerfile
2024-08-14 09:24:57,361 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-08-14 09:24:57,361 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-14 09:24:57,361 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-14 09:24:57,366 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-14 09:24:57,372 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-08-14 09:24:57,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:24:57,516 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-14 09:24:57,520 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-14 09:24:57,525 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#153](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-08-14 09:24:57,529 [ scc.config] DEBUG Found github.token
2024-08-14 09:24:57,529 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-08-14 09:24:57,530 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-14 09:24:57,565 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:24:57,565 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:24:57,570 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-14 09:24:57,604 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-14 09:24:57,610 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc2c3f58b0> has no local changes
2024-08-14 09:24:57,610 [ 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#153 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/)'
2024-08-14 09:24:57,617 [ scc.git] DEBUG [detached HEAD d2ebdc8] merge master -Dorg -Ssuccess-only
2024-08-14 09:24:57,618 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:24:57,618 [ scc.git] INFO Overriding base-branch from master to develop
2024-08-14 09:24:57,618 [ scc.repo] DEBUG ## PRs found:
2024-08-14 09:24:58,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-08-14 09:24:58,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-08-14 09:24:59,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-08-14 09:24:59,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-08-14 09:25:00,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-08-14 09:25:00,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-08-14 09:25:01,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-08-14 09:25:01,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-14 09:25:02,048 [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-14 09:25:02,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-14 09:25:02,918 [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-14 09:25:02,919 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-14 09:25:03,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-08-14 09:25:03,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-08-14 09:25:04,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-08-14 09:25:04,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-08-14 09:25:04,930 [ scc.repo] DEBUG ## Branches found:
2024-08-14 09:25:04,930 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-14 09:25:04,930 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:25:04,930 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:25:04,936 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-08-14 09:25:04,940 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-14 09:25:04,940 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-08-14 09:25:04,945 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-08-14 09:25:04,950 [ scc.git] DEBUG Already up to date.
2024-08-14 09:25:04,950 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-08-14 09:25:05,254 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-08-14 09:25:05,254 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-08-14 09:25:05,257 [ scc.git] DEBUG ## Unique users: []
2024-08-14 09:25:05,257 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:25:05,258 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:25:05,263 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-14 09:25:05,270 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:25:05,274 [ 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-14 09:25:05,298 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-08-14 09:25:05,298 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-08-14 09:25:05,298 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-14 09:25:05,299 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-14 09:25:05,303 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-14 09:25:05,309 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-08-14 09:25:05,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:25:05,456 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-14 09:25:05,462 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-14 09:25:05,467 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#153](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-08-14 09:25:05,471 [ scc.config] DEBUG Found github.token
2024-08-14 09:25:05,471 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-08-14 09:25:05,472 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-14 09:25:05,507 [ scc.git] DEBUG Get sha1 of %s
2024-08-14 09:25:05,507 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-14 09:25:05,511 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-14 09:25:05,546 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-14 09:25:05,551 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc2c3f55b0> has no local changes
2024-08-14 09:25:05,552 [ 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#153 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/)'
2024-08-14 09:25:05,559 [ scc.git] DEBUG [detached HEAD dc84cab] merge master -Dorg -Ssuccess-only
2024-08-14 09:25:05,560 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:25:05,560 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-14 09:25:05,628 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-08-14 09:25:05,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:25:05,878 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-08-14 09:25:05,882 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-08-14 09:25:06,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:25:06,263 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-08-14 09:25:06,267 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-08-14 09:25:06,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:25:06,705 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-08-14 09:25:06,709 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-08-14 09:25:07,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:25:07,091 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-08-14 09:25:07,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:25:07,469 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-08-14 09:25:07,474 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-08-14 09:25:07,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:25:07,850 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-08-14 09:25:07,854 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-08-14 09:25:08,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:25:08,233 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-08-14 09:25:08,237 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-08-14 09:25:08,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:25:08,636 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-08-14 09:25:08,640 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-08-14 09:25:09,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:25:09,029 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-08-14 09:25:09,033 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-08-14 09:25:09,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:25:09,416 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-08-14 09:25:09,421 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-08-14 09:25:09,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:25:09,829 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-08-14 09:25:09,833 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-08-14 09:25:10,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:25:10,213 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-08-14 09:25:10,218 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-08-14 09:25:10,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:25:10,611 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-08-14 09:25:10,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:25:11,005 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-08-14 09:25:11,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:25:11,414 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-08-14 09:25:11,418 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-08-14 09:25:11,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:25:11,803 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-08-14 09:25:12,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:25:12,189 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-08-14 09:25:12,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:25:12,569 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-08-14 09:25:12,573 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-08-14 09:25:12,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:25:12,958 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-08-14 09:25:12,962 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-08-14 09:25:13,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:25:13,367 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-08-14 09:25:13,371 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-08-14 09:25:13,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:25:13,748 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-08-14 09:25:13,752 [ scc.config] DEBUG Found submodule.scripts.url
2024-08-14 09:25:14,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-14 09:25:14,126 [ scc.config] DEBUG Found submodule.scripts.branch
2024-08-14 09:25:14,126 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-14 09:25:14,201 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efc2f62b790> has local changes
2024-08-14 09:25:14,201 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 384 dependabot[bot] 'Bump omero-figure from `fefe87c` to `430fc3f`'
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 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 85 sbesson 'Add support for OMERO.web 5.27.0' (status: failure)
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#153 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/153/)'
2024-08-14 09:25:14,215 [ scc.git] DEBUG [detached HEAD 8fc159b] merge master -Dorg -Ssuccess-only
2024-08-14 09:25:14,215 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-08-14 09:25:14,216 [ scc.merge] INFO Repository: ome/omero-plugins
2024-08-14 09:25:14,216 [ scc.merge] INFO Already up to date.
2024-08-14 09:25:14,216 [ scc.merge] INFO
2024-08-14 09:25:14,216 [ scc.merge] INFO Merged PRs:
2024-08-14 09:25:14,216 [ scc.merge] INFO - PR 384 dependabot[bot] 'Bump omero-figure from `fefe87c` to `430fc3f`'
2024-08-14 09:25:14,216 [ scc.merge] INFO
2024-08-14 09:25:14,216 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-08-14 09:25:14,216 [ scc.merge] INFO Already up to date.
2024-08-14 09:25:14,216 [ scc.merge] INFO
2024-08-14 09:25:14,216 [ scc.merge] INFO Merged PRs:
2024-08-14 09:25:14,216 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-08-14 09:25:14,216 [ scc.merge] INFO
2024-08-14 09:25:14,216 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-08-14 09:25:14,216 [ scc.merge] INFO Excluded PRs:
2024-08-14 09:25:14,216 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-08-14 09:25:14,216 [ scc.merge] INFO Already up to date.
2024-08-14 09:25:14,216 [ scc.merge] INFO
2024-08-14 09:25:14,216 [ scc.merge] INFO Merged PRs:
2024-08-14 09:25:14,216 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-08-14 09:25:14,216 [ scc.merge] INFO
2024-08-14 09:25:14,216 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-08-14 09:25:14,216 [ scc.merge] INFO Excluded PRs:
2024-08-14 09:25:14,216 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-08-14 09:25:14,216 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-08-14 09:25:14,216 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-08-14 09:25:14,216 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-08-14 09:25:14,217 [ scc.merge] INFO Already up to date.
2024-08-14 09:25:14,217 [ scc.merge] INFO
2024-08-14 09:25:14,217 [ scc.merge] INFO Merged PRs:
2024-08-14 09:25:14,217 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-08-14 09:25:14,217 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-08-14 09:25:14,217 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-08-14 09:25:14,217 [ scc.merge] INFO
2024-08-14 09:25:14,217 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-08-14 09:25:14,217 [ scc.merge] INFO Excluded PRs:
2024-08-14 09:25:14,217 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-14 09:25:14,217 [ scc.merge] INFO Already up to date.
2024-08-14 09:25:14,217 [ scc.merge] INFO
2024-08-14 09:25:14,217 [ scc.merge] INFO Merged PRs:
2024-08-14 09:25:14,217 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-08-14 09:25:14,217 [ scc.merge] INFO
2024-08-14 09:25:14,217 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-14 09:25:14,217 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-08-14 09:25:14,217 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-08-14 09:25:14,217 [ scc.merge] INFO
2024-08-14 09:25:14,217 [ scc.merge] INFO Repository: ome/omero-figure
2024-08-14 09:25:14,217 [ scc.merge] INFO Excluded PRs:
2024-08-14 09:25:14,217 [ scc.merge] INFO - PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
2024-08-14 09:25:14,217 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-08-14 09:25:14,217 [ scc.merge] INFO - PR 578 Rdornier 'Image outline' (user: Rdornier)
2024-08-14 09:25:14,217 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' (user: Rdornier)
2024-08-14 09:25:14,217 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-08-14 09:25:14,217 [ scc.merge] INFO Already up to date.
2024-08-14 09:25:14,217 [ scc.merge] INFO
2024-08-14 09:25:14,217 [ scc.merge] INFO Merged PRs:
2024-08-14 09:25:14,217 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-08-14 09:25:14,217 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-08-14 09:25:14,217 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-08-14 09:25:14,217 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-08-14 09:25:14,217 [ scc.merge] INFO - PR 576 Rdornier 'Color picker - popup update'
2024-08-14 09:25:14,217 [ scc.merge] INFO
2024-08-14 09:25:14,217 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-08-14 09:25:14,217 [ scc.merge] INFO Already up to date.
2024-08-14 09:25:14,217 [ scc.merge] INFO
2024-08-14 09:25:14,218 [ scc.merge] INFO Merged PRs:
2024-08-14 09:25:14,218 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-08-14 09:25:14,218 [ scc.merge] INFO
2024-08-14 09:25:14,218 [ scc.merge] INFO Repository: ome/omero-gallery
2024-08-14 09:25:14,218 [ scc.merge] INFO Already up to date.
2024-08-14 09:25:14,218 [ scc.merge] INFO
2024-08-14 09:25:14,218 [ scc.merge] INFO Merged PRs:
2024-08-14 09:25:14,218 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-14 09:25:14,218 [ scc.merge] INFO
2024-08-14 09:25:14,218 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-08-14 09:25:14,218 [ scc.merge] INFO Excluded PRs:
2024-08-14 09:25:14,218 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-08-14 09:25:14,218 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-08-14 09:25:14,218 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-08-14 09:25:14,218 [ scc.merge] INFO Already up to date.
2024-08-14 09:25:14,218 [ scc.merge] INFO
2024-08-14 09:25:14,218 [ scc.merge] INFO Merged PRs:
2024-08-14 09:25:14,218 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-08-14 09:25:14,218 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-08-14 09:25:14,218 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-14 09:25:14,218 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-14 09:25:14,218 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-14 09:25:14,218 [ scc.merge] INFO
2024-08-14 09:25:14,218 [ scc.merge] INFO Repository: ome/omero-mapr
2024-08-14 09:25:14,218 [ scc.merge] INFO Excluded PRs:
2024-08-14 09:25:14,218 [ scc.merge] INFO - PR 85 sbesson 'Add support for OMERO.web 5.27.0' (status: failure)
2024-08-14 09:25:14,218 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-08-14 09:25:14,218 [ scc.merge] INFO Already up to date.
2024-08-14 09:25:14,218 [ scc.merge] INFO
2024-08-14 09:25:14,218 [ scc.merge] INFO Merged PRs:
2024-08-14 09:25:14,218 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-08-14 09:25:14,218 [ scc.merge] INFO
2024-08-14 09:25:14,218 [ scc.merge] INFO Repository: ome/omero-metadata
2024-08-14 09:25:14,218 [ scc.merge] INFO Already up to date.
2024-08-14 09:25:14,218 [ scc.merge] INFO
2024-08-14 09:25:14,218 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-14 09:25:14,218 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-14 09:25:14,218 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-14 09:25:14,218 [ scc.merge] INFO
2024-08-14 09:25:14,218 [ scc.merge] INFO Repository: ome/omero-parade
2024-08-14 09:25:14,218 [ scc.merge] INFO Excluded PRs:
2024-08-14 09:25:14,219 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-08-14 09:25:14,219 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-08-14 09:25:14,219 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-08-14 09:25:14,219 [ scc.merge] INFO Already up to date.
2024-08-14 09:25:14,219 [ scc.merge] INFO
2024-08-14 09:25:14,219 [ scc.merge] INFO Merged PRs:
2024-08-14 09:25:14,219 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-14 09:25:14,219 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-14 09:25:14,219 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-14 09:25:14,219 [ scc.merge] INFO
2024-08-14 09:25:14,219 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-08-14 09:25:14,219 [ scc.merge] INFO Already up to date.
2024-08-14 09:25:14,219 [ scc.merge] INFO
2024-08-14 09:25:14,219 [ scc.merge] INFO Merged PRs:
2024-08-14 09:25:14,219 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-08-14 09:25:14,219 [ scc.merge] INFO
2024-08-14 09:25:14,219 [ scc.merge] INFO Repository: ome/omero-rois
2024-08-14 09:25:14,219 [ scc.merge] INFO Excluded PRs:
2024-08-14 09:25:14,219 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-14 09:25:14,219 [ scc.merge] INFO Already up to date.
2024-08-14 09:25:14,219 [ scc.merge] INFO
2024-08-14 09:25:14,219 [ scc.merge] INFO Merged PRs:
2024-08-14 09:25:14,219 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-14 09:25:14,219 [ scc.merge] INFO
2024-08-14 09:25:14,219 [ scc.merge] INFO Repository: ome/omero-signup
2024-08-14 09:25:14,219 [ scc.merge] INFO Already up to date.
2024-08-14 09:25:14,219 [ scc.merge] INFO
2024-08-14 09:25:14,219 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-14 09:25:14,219 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-14 09:25:14,219 [ scc.merge] INFO
2024-08-14 09:25:14,219 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-08-14 09:25:14,219 [ scc.merge] INFO Already up to date.
2024-08-14 09:25:14,219 [ scc.merge] INFO
2024-08-14 09:25:14,219 [ scc.merge] INFO Merged PRs:
2024-08-14 09:25:14,219 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-14 09:25:14,219 [ scc.merge] INFO
2024-08-14 09:25:14,219 [ scc.merge] INFO Repository: ome/omero-upload
2024-08-14 09:25:14,219 [ scc.merge] INFO Already up to date.
2024-08-14 09:25:14,219 [ scc.merge] INFO
2024-08-14 09:25:14,219 [ scc.merge] INFO
2024-08-14 09:25:14,219 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-08-14 09:25:14,220 [ scc.merge] INFO Already up to date.
2024-08-14 09:25:14,220 [ scc.merge] INFO
2024-08-14 09:25:14,220 [ scc.merge] INFO
2024-08-14 09:25:14,220 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-08-14 09:25:14,220 [ scc.merge] INFO Excluded PRs:
2024-08-14 09:25:14,220 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-08-14 09:25:14,220 [ scc.merge] INFO Already up to date.
2024-08-14 09:25:14,220 [ scc.merge] INFO
2024-08-14 09:25:14,220 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-14 09:25:14,220 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-14 09:25:14,220 [ scc.merge] INFO
2024-08-14 09:25:14,220 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-08-14 09:25:14,220 [ scc.merge] INFO Already up to date.
2024-08-14 09:25:14,220 [ scc.merge] INFO
2024-08-14 09:25:14,220 [ scc.merge] INFO
2024-08-14 09:25:14,220 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-08-14 09:25:14,220 [ scc.merge] INFO Already up to date.
2024-08-14 09:25:14,220 [ scc.merge] INFO
2024-08-14 09:25:14,220 [ scc.merge] INFO
2024-08-14 09:25:14,220 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-08-14 09:25:14,220 [ scc.merge] INFO Already up to date.
2024-08-14 09:25:14,220 [ scc.merge] INFO
2024-08-14 09:25:14,220 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-14 09:25:14,220 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-08-14 09:25:14,220 [ scc.merge] INFO
2024-08-14 09:25:14,220 [ scc.merge] INFO Repository: ome/scripts
2024-08-14 09:25:14,220 [ scc.merge] INFO Excluded PRs:
2024-08-14 09:25:14,220 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-08-14 09:25:14,220 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-08-14 09:25:14,220 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-08-14 09:25:14,220 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-08-14 09:25:14,220 [ scc.merge] INFO Already up to date.
2024-08-14 09:25:14,220 [ scc.merge] INFO
2024-08-14 09:25:14,220 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-14 09:25:14,220 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-14 09:25:14,220 [ scc.merge] INFO
2024-08-14 09:25:14,220 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-08-14 09:25:14,221 [ scc.git] DEBUG Calling 'git remote'
2024-08-14 09:25:14,225 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-08-14 09:25:14,225 [ scc.git] DEBUG Calling 'git remote'
2024-08-14 09:25:14,230 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:25:14,230 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-08-14 09:25:14,230 [ scc.git] DEBUG Calling 'git remote'
2024-08-14 09:25:14,234 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:25:14,234 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-08-14 09:25:14,234 [ scc.git] DEBUG Calling 'git remote'
2024-08-14 09:25:14,238 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:25:14,239 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-08-14 09:25:14,239 [ scc.git] DEBUG Calling 'git remote'
2024-08-14 09:25:14,243 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:25:14,243 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-08-14 09:25:14,243 [ scc.git] DEBUG Calling 'git remote'
2024-08-14 09:25:14,247 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:25:14,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-14 09:25:14,248 [ scc.git] DEBUG Calling 'git remote'
2024-08-14 09:25:14,252 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:25:14,252 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-14 09:25:14,252 [ scc.git] DEBUG Calling 'git remote'
2024-08-14 09:25:14,256 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:25:14,257 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-14 09:25:14,257 [ scc.git] DEBUG Calling 'git remote'
2024-08-14 09:25:14,261 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:25:14,261 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-14 09:25:14,261 [ scc.git] DEBUG Calling 'git remote'
2024-08-14 09:25:14,266 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:25:14,266 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-14 09:25:14,266 [ scc.git] DEBUG Calling 'git remote'
2024-08-14 09:25:14,270 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:25:14,270 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-14 09:25:14,270 [ scc.git] DEBUG Calling 'git remote'
2024-08-14 09:25:14,275 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:25:14,275 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-14 09:25:14,275 [ scc.git] DEBUG Calling 'git remote'
2024-08-14 09:25:14,279 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:25:14,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-14 09:25:14,280 [ scc.git] DEBUG Calling 'git remote'
2024-08-14 09:25:14,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:25:14,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-14 09:25:14,284 [ scc.git] DEBUG Calling 'git remote'
2024-08-14 09:25:14,288 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:25:14,289 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-14 09:25:14,289 [ scc.git] DEBUG Calling 'git remote'
2024-08-14 09:25:14,293 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:25:14,293 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-14 09:25:14,293 [ scc.git] DEBUG Calling 'git remote'
2024-08-14 09:25:14,297 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:25:14,297 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-14 09:25:14,298 [ scc.git] DEBUG Calling 'git remote'
2024-08-14 09:25:14,302 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:25:14,302 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-14 09:25:14,302 [ scc.git] DEBUG Calling 'git remote'
2024-08-14 09:25:14,306 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:25:14,306 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-14 09:25:14,306 [ scc.git] DEBUG Calling 'git remote'
2024-08-14 09:25:14,311 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:25:14,311 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-14 09:25:14,311 [ scc.git] DEBUG Calling 'git remote'
2024-08-14 09:25:14,315 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:25:14,315 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-14 09:25:14,315 [ scc.git] DEBUG Calling 'git remote'
2024-08-14 09:25:14,320 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-14 09:25:14,320 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-14 09:25:14,320 [ scc.git] DEBUG Calling 'git remote'
2024-08-14 09:25:14,324 [ 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 63bac47] 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 430fc3f8
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 0de5bc3] 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-14 09:26:00,208 [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-14 09:26:08,957 [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-14 09:26:11,248 [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-14 09:26:15,756 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-08-14 09:26:55,307 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/f6f303f9/images/svgs/logo.svg){kind=logo}
