Console Output
Skipping 91 KB..
Full Log6748446f2395c77 HTTP/1.1" 200 None
2024-07-26 00:45:16,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-26 00:45:16,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-26 00:45:17,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-07-26 00:45:17,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/f7d26b972bfe9a7105c4f94776748446f2395c77?per_page=1 HTTP/1.1" 200 2
2024-07-26 00:45:17,774 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-07-26 00:45:17,774 [ scc.repo] DEBUG ## Branches found:
2024-07-26 00:45:17,774 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-07-26 00:45:17,775 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:45:17,775 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:45:17,781 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-26 00:45:17,787 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-26 00:45:17,787 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-26 00:45:17,793 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-26 00:45:17,800 [ scc.git] DEBUG Already up to date.
2024-07-26 00:45:17,800 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-07-26 00:45:18,244 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-26 00:45:18,245 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-07-26 00:45:18,251 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-07-26 00:45:19,111 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-26 00:45:19,112 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-07-26 00:45:19,117 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-07-26 00:45:20,406 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-26 00:45:20,406 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-07-26 00:45:20,411 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-07-26 00:45:21,090 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-26 00:45:21,091 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-07-26 00:45:21,097 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-07-26 00:45:21,734 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-26 00:45:21,734 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-07-26 00:45:21,739 [ scc.git] DEBUG ## Unique users: []
2024-07-26 00:45:21,740 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:45:21,740 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:45:21,745 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-07-26 00:45:21,752 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:45:21,759 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-07-26 00:45:21,853 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-07-26 00:45:21,853 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:45:21,859 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-07-26 00:45:21,860 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-07-26 00:45:21,860 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-07-26 00:45:21,860 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-07-26 00:45:21,860 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-07-26 00:45:21,860 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-07-26 00:45:21,860 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-07-26 00:45:21,860 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-07-26 00:45:21,860 [ scc.git] DEBUG src/templates/rois_form.template.html | 8 ++++
2024-07-26 00:45:21,860 [ scc.git] DEBUG 9 files changed, 271 insertions(+), 5 deletions(-)
2024-07-26 00:45:22,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:45:22,052 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-07-26 00:45:22,060 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:45:22,066 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-07-26 00:45:22,458 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-26 00:45:22,458 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-07-26 00:45:22,458 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-07-26 00:45:22,458 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-07-26 00:45:22,459 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:45:22,465 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-07-26 00:45:22,466 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-07-26 00:45:22,466 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-07-26 00:45:22,466 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-07-26 00:45:22,466 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-07-26 00:45:22,466 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-07-26 00:45:22,466 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-07-26 00:45:22,466 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-07-26 00:45:22,466 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-07-26 00:45:22,466 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-07-26 00:45:22,466 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-07-26 00:45:22,466 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-07-26 00:45:22,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:45:22,622 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-07-26 00:45:22,633 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:45:22,639 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) 3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-07-26 00:45:23,096 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-07-26 00:45:23,096 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-26 00:45:23,096 [ scc.git] DEBUG Auto-merging src/index.html
2024-07-26 00:45:23,096 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-07-26 00:45:23,097 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-07-26 00:45:23,097 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-07-26 00:45:23,097 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:45:23,105 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-07-26 00:45:23,105 [ scc.git] DEBUG omero_figure/urls.py | 10 +++-
2024-07-26 00:45:23,105 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-07-26 00:45:23,105 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-07-26 00:45:23,105 [ scc.git] DEBUG src/index.html | 1 +
2024-07-26 00:45:23,105 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-07-26 00:45:23,105 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-07-26 00:45:23,105 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-07-26 00:45:23,105 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-07-26 00:45:23,105 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-07-26 00:45:23,105 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-07-26 00:45:23,105 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-07-26 00:45:23,105 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-07-26 00:45:23,105 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-07-26 00:45:23,105 [ scc.git] DEBUG 14 files changed, 162 insertions(+), 15 deletions(-)
2024-07-26 00:45:23,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:45:23,270 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-07-26 00:45:23,280 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:45:23,286 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 568 (Remove numpy from tests_require in setup.py) 15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-07-26 00:45:23,332 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:45:23,336 [ scc.git] DEBUG setup.py | 2 +-
2024-07-26 00:45:23,336 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-07-26 00:45:23,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:45:23,781 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...88901984c22249d20925e53c455cd822700be6d4'
2024-07-26 00:45:23,793 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:45:23,798 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 576 (Color picker - popup update) 88901984c22249d20925e53c455cd822700be6d4'
2024-07-26 00:45:23,913 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-26 00:45:23,914 [ scc.git] DEBUG Auto-merging src/index.html
2024-07-26 00:45:23,914 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:45:23,919 [ scc.git] DEBUG .gitignore | 2 +-
2024-07-26 00:45:23,919 [ scc.git] DEBUG src/css/figure.css | 3 +++
2024-07-26 00:45:23,919 [ scc.git] DEBUG src/index.html | 3 +++
2024-07-26 00:45:23,919 [ scc.git] DEBUG src/js/views/colorpicker.js | 10 ++++++++--
2024-07-26 00:45:23,919 [ scc.git] DEBUG 4 files changed, 15 insertions(+), 3 deletions(-)
2024-07-26 00:45:24,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:45:24,204 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-26 00:45:24,248 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:45:24,248 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:45:24,254 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:45:24,314 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-26 00:45:24,325 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9db4187490> has no local changes
2024-07-26 00:45:24,325 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
- PR 580 Rdornier 'Weird translation' (user: Rdornier)
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 578 Rdornier 'Image outline' (user: Rdornier)
- PR 577 Rdornier 'Fill rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 576 Rdornier 'Color picker - popup update'
Generated by OMERO-plugins-push#136 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/)'
2024-07-26 00:45:24,337 [ scc.git] DEBUG [detached HEAD aec678a6] merge master -Dorg -Ssuccess-only
2024-07-26 00:45:24,338 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:45:24,338 [ scc.repo] DEBUG ## PRs found:
2024-07-26 00:45:24,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-07-26 00:45:25,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-07-26 00:45:25,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-07-26 00:45:26,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-07-26 00:45:26,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-26 00:45:27,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-07-26 00:45:27,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-07-26 00:45:27,558 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-07-26 00:45:27,558 [ scc.repo] DEBUG ## Branches found:
2024-07-26 00:45:27,558 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-07-26 00:45:27,558 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:45:27,558 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:45:27,565 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-26 00:45:27,570 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-26 00:45:27,570 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-26 00:45:27,576 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-26 00:45:27,582 [ scc.git] DEBUG Already up to date.
2024-07-26 00:45:27,583 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-07-26 00:45:28,020 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-07-26 00:45:28,021 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-07-26 00:45:28,026 [ scc.git] DEBUG ## Unique users: []
2024-07-26 00:45:28,026 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:45:28,026 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:45:28,032 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-07-26 00:45:28,040 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:45:28,046 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-07-26 00:45:28,087 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-07-26 00:45:28,088 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:45:28,091 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-07-26 00:45:28,091 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-07-26 00:45:28,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:45:28,256 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-26 00:45:28,299 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:45:28,299 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:45:28,306 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:45:28,358 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-26 00:45:28,365 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9db419fa60> has no local changes
2024-07-26 00:45:28,366 [ 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#136 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/)'
2024-07-26 00:45:28,375 [ scc.git] DEBUG [detached HEAD a33ae9f] merge master -Dorg -Ssuccess-only
2024-07-26 00:45:28,375 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:45:28,376 [ scc.repo] DEBUG ## PRs found:
2024-07-26 00:45:28,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-07-26 00:45:29,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-07-26 00:45:29,230 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-26 00:45:29,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-07-26 00:45:30,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-26 00:45:30,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-26 00:45:31,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-07-26 00:45:31,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-07-26 00:45:31,801 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-07-26 00:45:31,801 [ scc.repo] DEBUG ## Branches found:
2024-07-26 00:45:31,801 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-07-26 00:45:31,801 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:45:31,801 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:45:31,807 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-26 00:45:31,812 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-26 00:45:31,812 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-26 00:45:31,817 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-26 00:45:31,824 [ scc.git] DEBUG Already up to date.
2024-07-26 00:45:31,824 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-07-26 00:45:32,197 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-07-26 00:45:32,197 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-07-26 00:45:32,201 [ scc.git] DEBUG ## Unique users: []
2024-07-26 00:45:32,202 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:45:32,202 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:45:32,207 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-07-26 00:45:32,212 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:45:32,217 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-07-26 00:45:32,228 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:45:32,232 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-07-26 00:45:32,232 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-07-26 00:45:32,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:45:32,426 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-26 00:45:32,524 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:45:32,525 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:45:32,536 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:45:32,597 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-26 00:45:32,613 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9db41beaf0> has no local changes
2024-07-26 00:45:32,613 [ 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#136 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/)'
2024-07-26 00:45:32,632 [ scc.git] DEBUG [detached HEAD 5d2c7b7] merge master -Dorg -Ssuccess-only
2024-07-26 00:45:32,634 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:45:32,634 [ scc.repo] DEBUG ## PRs found:
2024-07-26 00:45:32,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-07-26 00:45:33,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-07-26 00:45:33,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-07-26 00:45:33,961 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-26 00:45:34,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-07-26 00:45:35,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-26 00:45:35,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-26 00:45:36,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-07-26 00:45:36,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-07-26 00:45:36,746 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-07-26 00:45:37,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-07-26 00:45:37,252 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-26 00:45:37,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-07-26 00:45:38,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-26 00:45:38,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-26 00:45:39,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-07-26 00:45:39,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-07-26 00:45:39,805 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-07-26 00:45:40,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-07-26 00:45:40,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-07-26 00:45:41,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-07-26 00:45:41,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-26 00:45:42,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-26 00:45:42,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-07-26 00:45:43,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-07-26 00:45:43,123 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-07-26 00:45:43,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-07-26 00:45:44,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-07-26 00:45:44,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-07-26 00:45:45,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-26 00:45:45,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-26 00:45:46,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-07-26 00:45:46,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-07-26 00:45:46,563 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-07-26 00:45:47,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-07-26 00:45:47,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-07-26 00:45:48,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-07-26 00:45:48,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-26 00:45:48,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-07-26 00:45:49,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-07-26 00:45:49,410 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-07-26 00:45:49,410 [ scc.repo] DEBUG ## Branches found:
2024-07-26 00:45:49,410 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-07-26 00:45:49,411 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:45:49,411 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:45:49,417 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-26 00:45:49,423 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-26 00:45:49,423 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-26 00:45:49,472 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-26 00:45:49,479 [ scc.git] DEBUG Already up to date.
2024-07-26 00:45:49,479 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-07-26 00:45:50,048 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-26 00:45:50,048 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-07-26 00:45:50,057 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-07-26 00:45:51,113 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-26 00:45:51,113 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-07-26 00:45:51,120 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-07-26 00:45:51,648 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-26 00:45:51,649 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-07-26 00:45:51,654 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-07-26 00:45:52,003 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-26 00:45:52,003 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-07-26 00:45:52,014 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-07-26 00:45:52,394 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-26 00:45:52,394 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-07-26 00:45:52,399 [ scc.git] DEBUG ## Unique users: []
2024-07-26 00:45:52,399 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:45:52,399 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:45:52,406 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-07-26 00:45:52,413 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:45:52,418 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-07-26 00:45:52,474 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-07-26 00:45:52,475 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:45:52,479 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-07-26 00:45:52,480 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-07-26 00:45:52,480 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-07-26 00:45:52,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:45:52,649 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-07-26 00:45:52,657 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:45:52,662 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-07-26 00:45:52,827 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-07-26 00:45:52,827 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-07-26 00:45:52,827 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-07-26 00:45:52,827 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-07-26 00:45:52,827 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:45:52,832 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-07-26 00:45:52,832 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-07-26 00:45:52,832 [ scc.git] DEBUG src/app/header.html | 5 +
2024-07-26 00:45:52,832 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-07-26 00:45:52,832 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-07-26 00:45:52,832 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-07-26 00:45:52,832 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-07-26 00:45:52,833 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-07-26 00:45:53,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:45:53,063 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-07-26 00:45:53,072 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:45:53,079 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-07-26 00:45:53,141 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-07-26 00:45:53,142 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:45:53,146 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-07-26 00:45:53,147 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-07-26 00:45:53,147 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-07-26 00:45:53,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:45:53,472 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-07-26 00:45:53,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:45:53,528 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-07-26 00:45:53,579 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:45:53,595 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-07-26 00:45:53,595 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-07-26 00:45:53,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:45:53,888 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-07-26 00:45:53,904 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:45:53,912 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 478 (Bump socket.io from 4.6.1 to 4.7.5) 91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-07-26 00:45:53,974 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-26 00:45:53,976 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:45:54,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:45:54,328 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-26 00:45:54,391 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:45:54,392 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:45:54,402 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:45:54,476 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-26 00:45:54,492 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9db4158880> has no local changes
2024-07-26 00:45:54,492 [ 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#136 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/)'
2024-07-26 00:45:54,506 [ scc.git] DEBUG [detached HEAD 7ca9f21] merge master -Dorg -Ssuccess-only
2024-07-26 00:45:54,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:45:54,507 [ scc.repo] DEBUG ## PRs found:
2024-07-26 00:45:54,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-07-26 00:45:55,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-07-26 00:45:55,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-07-26 00:45:56,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-07-26 00:45:56,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-26 00:45:57,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-26 00:45:57,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-07-26 00:45:58,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-07-26 00:45:58,273 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-07-26 00:45:58,273 [ scc.repo] DEBUG ## Branches found:
2024-07-26 00:45:58,273 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-07-26 00:45:58,273 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:45:58,273 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:45:58,279 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-26 00:45:58,285 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-26 00:45:58,285 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-26 00:45:58,292 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-26 00:45:58,299 [ scc.git] DEBUG Already up to date.
2024-07-26 00:45:58,299 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-07-26 00:45:58,733 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-07-26 00:45:58,733 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-07-26 00:45:58,741 [ scc.git] DEBUG ## Unique users: []
2024-07-26 00:45:58,741 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:45:58,741 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:45:58,748 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-07-26 00:45:58,755 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:45:58,764 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-07-26 00:45:58,779 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:45:58,783 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-07-26 00:45:58,783 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-07-26 00:45:58,783 [ scc.git] DEBUG requirements.txt | 2 +-
2024-07-26 00:45:58,783 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-07-26 00:45:58,783 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-07-26 00:45:58,783 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-07-26 00:45:58,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:45:58,953 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-26 00:45:59,002 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:45:59,002 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:45:59,009 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:45:59,057 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-26 00:45:59,064 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9db4164df0> has no local changes
2024-07-26 00:45:59,065 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Generated by OMERO-plugins-push#136 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/)'
2024-07-26 00:45:59,077 [ scc.git] DEBUG [detached HEAD 2e0152c] merge master -Dorg -Ssuccess-only
2024-07-26 00:45:59,077 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:45:59,077 [ scc.repo] DEBUG ## PRs found:
2024-07-26 00:45:59,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-07-26 00:45:59,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-07-26 00:46:00,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-07-26 00:46:01,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-07-26 00:46:01,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-26 00:46:02,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-07-26 00:46:02,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-07-26 00:46:02,445 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-07-26 00:46:02,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-07-26 00:46:03,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-07-26 00:46:03,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-07-26 00:46:04,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-26 00:46:04,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-07-26 00:46:05,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-07-26 00:46:05,428 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-07-26 00:46:05,428 [ scc.repo] DEBUG ## Branches found:
2024-07-26 00:46:05,428 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-07-26 00:46:05,428 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:05,428 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:05,435 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-26 00:46:05,441 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-26 00:46:05,441 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-26 00:46:05,447 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-26 00:46:05,454 [ scc.git] DEBUG Already up to date.
2024-07-26 00:46:05,454 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-07-26 00:46:06,013 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-07-26 00:46:06,014 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-07-26 00:46:06,021 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-07-26 00:46:06,612 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-07-26 00:46:06,613 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-07-26 00:46:06,618 [ scc.git] DEBUG ## Unique users: []
2024-07-26 00:46:06,618 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:06,619 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:06,624 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-26 00:46:06,632 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:06,638 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-26 00:46:06,699 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-07-26 00:46:06,700 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-07-26 00:46:06,700 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-07-26 00:46:06,700 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-07-26 00:46:06,700 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-26 00:46:06,701 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-26 00:46:06,708 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-26 00:46:06,716 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-07-26 00:46:06,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:46:06,877 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-26 00:46:06,886 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-26 00:46:06,894 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#136](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-07-26 00:46:06,900 [ scc.config] DEBUG Found github.token
2024-07-26 00:46:06,900 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-07-26 00:46:06,900 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-26 00:46:06,907 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:06,913 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-26 00:46:06,945 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-07-26 00:46:06,945 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-07-26 00:46:06,945 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-07-26 00:46:06,945 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-26 00:46:06,946 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-26 00:46:06,953 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-26 00:46:06,963 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-07-26 00:46:07,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:46:07,303 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-26 00:46:07,311 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-26 00:46:07,318 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#136](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-07-26 00:46:07,324 [ scc.config] DEBUG Found github.token
2024-07-26 00:46:07,325 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-07-26 00:46:07,325 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-26 00:46:07,367 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:07,367 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:07,373 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:46:07,414 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-26 00:46:07,421 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9db4136f10> has no local changes
2024-07-26 00:46:07,421 [ 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#136 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/)'
2024-07-26 00:46:07,430 [ scc.git] DEBUG [detached HEAD 3dd74dd] merge master -Dorg -Ssuccess-only
2024-07-26 00:46:07,431 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:46:07,431 [ scc.repo] DEBUG ## PRs found:
2024-07-26 00:46:07,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-07-26 00:46:08,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-07-26 00:46:08,380 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-26 00:46:08,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-07-26 00:46:09,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-26 00:46:10,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-26 00:46:10,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-07-26 00:46:11,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-07-26 00:46:11,109 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-07-26 00:46:11,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-07-26 00:46:11,594 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-26 00:46:12,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-07-26 00:46:12,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-26 00:46:13,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-26 00:46:13,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-07-26 00:46:14,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-07-26 00:46:14,359 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-07-26 00:46:14,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-07-26 00:46:14,828 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-26 00:46:15,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-07-26 00:46:15,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-26 00:46:16,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-26 00:46:16,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-07-26 00:46:17,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-07-26 00:46:17,324 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-07-26 00:46:17,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-07-26 00:46:18,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-07-26 00:46:18,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-07-26 00:46:19,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-07-26 00:46:19,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-07-26 00:46:20,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-07-26 00:46:20,402 [ scc.repo] DEBUG ## Branches found:
2024-07-26 00:46:20,402 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-07-26 00:46:20,402 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:20,402 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:20,408 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-26 00:46:20,413 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-26 00:46:20,413 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-26 00:46:20,420 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-26 00:46:20,427 [ scc.git] DEBUG Already up to date.
2024-07-26 00:46:20,428 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-07-26 00:46:20,829 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-26 00:46:20,830 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-07-26 00:46:20,836 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-07-26 00:46:21,195 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-26 00:46:21,195 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-07-26 00:46:21,201 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-07-26 00:46:21,539 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-26 00:46:21,539 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-07-26 00:46:21,548 [ scc.git] DEBUG ## Unique users: []
2024-07-26 00:46:21,549 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:21,549 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:21,563 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-07-26 00:46:21,581 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:21,596 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-07-26 00:46:21,620 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:46:21,626 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-07-26 00:46:21,626 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-07-26 00:46:21,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:46:21,790 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-07-26 00:46:21,800 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:21,810 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 129 (Bump @babel/traverse from 7.21.4 to 7.23.2) 733f52703019d4b6d7e375c121a25c107b64dbec'
2024-07-26 00:46:21,875 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-26 00:46:21,875 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:46:21,881 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-07-26 00:46:21,881 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-07-26 00:46:22,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:46:22,196 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-07-26 00:46:22,209 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:22,217 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (Bump axios from 1.3.5 to 1.6.0) a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-07-26 00:46:22,253 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-26 00:46:22,254 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:46:22,261 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-07-26 00:46:22,261 [ scc.git] DEBUG package.json | 2 +-
2024-07-26 00:46:22,261 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-07-26 00:46:22,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:46:22,636 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-26 00:46:22,724 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:22,725 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:22,741 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:46:22,798 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-26 00:46:22,807 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9db40d54f0> has no local changes
2024-07-26 00:46:22,807 [ 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#136 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/)'
2024-07-26 00:46:22,818 [ scc.git] DEBUG [detached HEAD 2daee5f] merge master -Dorg -Ssuccess-only
2024-07-26 00:46:22,818 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:46:22,818 [ scc.repo] DEBUG ## PRs found:
2024-07-26 00:46:23,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-07-26 00:46:23,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-07-26 00:46:24,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-07-26 00:46:24,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-26 00:46:25,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-07-26 00:46:25,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-07-26 00:46:25,527 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-07-26 00:46:25,527 [ scc.repo] DEBUG ## Branches found:
2024-07-26 00:46:25,527 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-07-26 00:46:25,527 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:25,527 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:25,535 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-26 00:46:25,547 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-26 00:46:25,548 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-26 00:46:25,556 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-26 00:46:25,565 [ scc.git] DEBUG Already up to date.
2024-07-26 00:46:25,565 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-07-26 00:46:25,986 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-07-26 00:46:25,986 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-07-26 00:46:25,992 [ scc.git] DEBUG ## Unique users: []
2024-07-26 00:46:25,992 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:25,993 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:26,001 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-07-26 00:46:26,011 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:26,019 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-07-26 00:46:26,033 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:46:26,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:46:26,213 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-26 00:46:26,274 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:26,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:26,282 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:46:26,351 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-26 00:46:26,364 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9db410ddf0> has no local changes
2024-07-26 00:46:26,365 [ 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#136 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/)'
2024-07-26 00:46:26,383 [ scc.git] DEBUG [detached HEAD 7759348] merge master -Dorg -Ssuccess-only
2024-07-26 00:46:26,384 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:46:26,384 [ scc.repo] DEBUG ## PRs found:
2024-07-26 00:46:26,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-07-26 00:46:27,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-07-26 00:46:27,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-07-26 00:46:28,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-07-26 00:46:28,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-07-26 00:46:29,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-26 00:46:29,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-07-26 00:46:30,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-07-26 00:46:30,197 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-07-26 00:46:30,198 [ scc.repo] DEBUG ## Branches found:
2024-07-26 00:46:30,198 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-07-26 00:46:30,198 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:30,198 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:30,206 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-26 00:46:30,212 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-26 00:46:30,213 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-26 00:46:30,219 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-26 00:46:30,227 [ scc.git] DEBUG Already up to date.
2024-07-26 00:46:30,227 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-07-26 00:46:30,707 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-07-26 00:46:30,707 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-07-26 00:46:30,713 [ scc.git] DEBUG ## Unique users: []
2024-07-26 00:46:30,713 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:30,714 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:30,721 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-07-26 00:46:30,727 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:30,734 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-07-26 00:46:30,746 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-07-26 00:46:30,746 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:46:30,749 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-07-26 00:46:30,749 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-07-26 00:46:30,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:46:30,909 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-26 00:46:30,955 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:30,955 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:30,964 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:46:31,011 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-26 00:46:31,018 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9db410bbb0> has no local changes
2024-07-26 00:46:31,019 [ 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#136 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/)'
2024-07-26 00:46:31,027 [ scc.git] DEBUG [detached HEAD ed7a608] merge master -Dorg -Ssuccess-only
2024-07-26 00:46:31,027 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:46:31,028 [ scc.repo] DEBUG ## PRs found:
2024-07-26 00:46:31,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-07-26 00:46:31,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-07-26 00:46:32,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-07-26 00:46:32,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-07-26 00:46:33,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-26 00:46:34,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-07-26 00:46:34,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-07-26 00:46:34,436 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-07-26 00:46:34,436 [ scc.repo] DEBUG ## Branches found:
2024-07-26 00:46:34,436 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-07-26 00:46:34,436 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:34,436 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:34,443 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-26 00:46:34,450 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-26 00:46:34,450 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-26 00:46:34,460 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-26 00:46:34,471 [ scc.git] DEBUG Already up to date.
2024-07-26 00:46:34,472 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-07-26 00:46:34,901 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-07-26 00:46:34,901 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-07-26 00:46:34,912 [ scc.git] DEBUG ## Unique users: []
2024-07-26 00:46:34,912 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:34,912 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:34,922 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-26 00:46:34,936 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:34,947 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-26 00:46:35,002 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-07-26 00:46:35,003 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-07-26 00:46:35,003 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-07-26 00:46:35,003 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-07-26 00:46:35,003 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-07-26 00:46:35,003 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-07-26 00:46:35,003 [ scc.git] DEBUG Auto-merging setup.py
2024-07-26 00:46:35,003 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-07-26 00:46:35,003 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-26 00:46:35,004 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-26 00:46:35,020 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-07-26 00:46:35,038 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-07-26 00:46:35,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:46:35,226 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-26 00:46:35,239 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-07-26 00:46:35,251 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#136](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/urls.py
- omero_signup/signup_settings.py
- omero_signup/views.py
--conflicts
2024-07-26 00:46:35,263 [ scc.config] DEBUG Found github.token
2024-07-26 00:46:35,264 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-07-26 00:46:35,264 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-26 00:46:35,327 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:35,328 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:35,341 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:46:35,407 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-26 00:46:35,416 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9db40fb700> has no local changes
2024-07-26 00:46:35,416 [ 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#136 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/)'
2024-07-26 00:46:35,429 [ scc.git] DEBUG [detached HEAD 647d7f7] merge master -Dorg -Ssuccess-only
2024-07-26 00:46:35,429 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:46:35,430 [ scc.repo] DEBUG ## PRs found:
2024-07-26 00:46:35,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-07-26 00:46:36,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-07-26 00:46:36,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-07-26 00:46:37,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-07-26 00:46:37,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-26 00:46:38,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-07-26 00:46:38,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-07-26 00:46:38,709 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-07-26 00:46:38,709 [ scc.repo] DEBUG ## Branches found:
2024-07-26 00:46:38,709 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-07-26 00:46:38,709 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:38,709 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:38,717 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-26 00:46:38,724 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-26 00:46:38,724 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-26 00:46:38,732 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-26 00:46:38,739 [ scc.git] DEBUG Already up to date.
2024-07-26 00:46:38,740 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-07-26 00:46:39,268 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-07-26 00:46:39,269 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-07-26 00:46:39,283 [ scc.git] DEBUG ## Unique users: []
2024-07-26 00:46:39,283 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:39,283 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:39,292 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-07-26 00:46:39,302 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:39,311 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-07-26 00:46:39,428 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-26 00:46:39,434 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-07-26 00:46:39,435 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-07-26 00:46:39,435 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-07-26 00:46:39,435 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-07-26 00:46:39,435 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-07-26 00:46:39,435 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-07-26 00:46:39,435 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-07-26 00:46:39,435 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-07-26 00:46:39,435 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-07-26 00:46:39,435 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-07-26 00:46:39,435 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-07-26 00:46:39,435 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-07-26 00:46:39,435 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-07-26 00:46:39,435 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-07-26 00:46:39,440 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-07-26 00:46:39,440 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-07-26 00:46:39,440 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-07-26 00:46:39,440 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-07-26 00:46:39,440 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-07-26 00:46:39,440 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-07-26 00:46:39,440 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-07-26 00:46:39,440 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-07-26 00:46:39,440 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-07-26 00:46:39,440 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-07-26 00:46:39,440 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-07-26 00:46:39,440 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-07-26 00:46:39,440 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-07-26 00:46:39,440 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-07-26 00:46:39,440 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-07-26 00:46:39,440 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-07-26 00:46:39,440 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-07-26 00:46:39,441 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-07-26 00:46:39,441 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-07-26 00:46:39,441 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-07-26 00:46:39,441 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-07-26 00:46:39,441 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-07-26 00:46:39,441 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-07-26 00:46:39,441 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-07-26 00:46:39,441 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-07-26 00:46:39,441 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-07-26 00:46:39,441 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-07-26 00:46:39,441 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-07-26 00:46:39,441 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-07-26 00:46:39,441 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-07-26 00:46:39,441 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-07-26 00:46:39,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:46:39,617 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-26 00:46:39,671 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:39,671 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:39,679 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:46:39,728 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-26 00:46:39,736 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9db40c5610> has no local changes
2024-07-26 00:46:39,736 [ 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#136 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/)'
2024-07-26 00:46:39,747 [ scc.git] DEBUG [detached HEAD 9f4ecb0] merge master -Dorg -Ssuccess-only
2024-07-26 00:46:39,748 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:46:39,748 [ scc.repo] DEBUG ## PRs found:
2024-07-26 00:46:40,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-07-26 00:46:40,049 [ scc.repo] DEBUG ## Branches found:
2024-07-26 00:46:40,049 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-07-26 00:46:40,049 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:40,049 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:40,056 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-26 00:46:40,063 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-26 00:46:40,063 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-26 00:46:40,071 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-26 00:46:40,078 [ scc.git] DEBUG Already up to date.
2024-07-26 00:46:40,078 [ scc.git] DEBUG ## Unique users: []
2024-07-26 00:46:40,078 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:40,078 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:40,085 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-26 00:46:40,133 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:40,133 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:40,142 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:46:40,192 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-26 00:46:40,200 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9db4061fd0> has no local changes
2024-07-26 00:46:40,200 [ 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#136 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/)'
2024-07-26 00:46:40,212 [ scc.git] DEBUG [detached HEAD 1b713c5] merge master -Dorg -Ssuccess-only
2024-07-26 00:46:40,212 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:46:40,212 [ scc.repo] DEBUG ## PRs found:
2024-07-26 00:46:40,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-07-26 00:46:40,493 [ scc.repo] DEBUG ## Branches found:
2024-07-26 00:46:40,493 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-07-26 00:46:40,493 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:40,493 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:40,500 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-26 00:46:40,506 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-26 00:46:40,506 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-26 00:46:40,512 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-26 00:46:40,520 [ scc.git] DEBUG Already up to date.
2024-07-26 00:46:40,520 [ scc.git] DEBUG ## Unique users: []
2024-07-26 00:46:40,520 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:40,520 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:40,527 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-26 00:46:40,577 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:40,577 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:40,584 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:46:40,629 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-26 00:46:40,636 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9db40c2d00> has no local changes
2024-07-26 00:46:40,636 [ 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#136 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/)'
2024-07-26 00:46:40,655 [ scc.git] DEBUG [detached HEAD 9f5f430] merge master -Dorg -Ssuccess-only
2024-07-26 00:46:40,656 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:46:40,656 [ scc.git] INFO Overriding base-branch from master to main
2024-07-26 00:46:40,656 [ scc.repo] DEBUG ## PRs found:
2024-07-26 00:46:41,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-07-26 00:46:41,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-07-26 00:46:41,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-07-26 00:46:42,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-07-26 00:46:42,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-07-26 00:46:43,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-26 00:46:43,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-26 00:46:44,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-07-26 00:46:44,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-07-26 00:46:44,975 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-07-26 00:46:44,975 [ scc.repo] DEBUG ## Branches found:
2024-07-26 00:46:44,975 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-07-26 00:46:44,976 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:44,976 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:44,982 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-07-26 00:46:44,987 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-26 00:46:44,988 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-07-26 00:46:44,994 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-07-26 00:46:45,000 [ scc.git] DEBUG Already up to date.
2024-07-26 00:46:45,001 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-07-26 00:46:45,441 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-07-26 00:46:45,442 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-07-26 00:46:45,447 [ scc.git] DEBUG ## Unique users: []
2024-07-26 00:46:45,447 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:45,448 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:45,454 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-26 00:46:45,461 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:45,467 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-26 00:46:45,538 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-07-26 00:46:45,538 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-07-26 00:46:45,538 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-26 00:46:45,539 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-26 00:46:45,545 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-07-26 00:46:45,552 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-07-26 00:46:45,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:46:45,737 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-26 00:46:45,743 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-07-26 00:46:45,750 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#136](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-07-26 00:46:45,755 [ scc.config] DEBUG Found github.token
2024-07-26 00:46:45,756 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-07-26 00:46:45,756 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-26 00:46:45,799 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:45,800 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:45,806 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:46:45,851 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-26 00:46:45,861 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9db40b6f10> has no local changes
2024-07-26 00:46:45,862 [ 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#136 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/)'
2024-07-26 00:46:45,874 [ scc.git] DEBUG [detached HEAD ae6698c] merge master -Dorg -Ssuccess-only
2024-07-26 00:46:45,875 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:46:45,875 [ scc.repo] DEBUG ## PRs found:
2024-07-26 00:46:46,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-07-26 00:46:46,178 [ scc.repo] DEBUG ## Branches found:
2024-07-26 00:46:46,178 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-07-26 00:46:46,178 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:46,178 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:46,184 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-26 00:46:46,191 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-26 00:46:46,192 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-26 00:46:46,199 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-26 00:46:46,207 [ scc.git] DEBUG Already up to date.
2024-07-26 00:46:46,207 [ scc.git] DEBUG ## Unique users: []
2024-07-26 00:46:46,207 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:46,207 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:46,215 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-26 00:46:46,272 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:46,272 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:46,280 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:46:46,339 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-26 00:46:46,348 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9db4065700> has no local changes
2024-07-26 00:46:46,349 [ 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#136 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/)'
2024-07-26 00:46:46,360 [ scc.git] DEBUG [detached HEAD e37a8e0] merge master -Dorg -Ssuccess-only
2024-07-26 00:46:46,360 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:46:46,361 [ scc.repo] DEBUG ## PRs found:
2024-07-26 00:46:46,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-07-26 00:46:46,626 [ scc.repo] DEBUG ## Branches found:
2024-07-26 00:46:46,626 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-07-26 00:46:46,626 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:46,626 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:46,635 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-26 00:46:46,643 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-26 00:46:46,643 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-26 00:46:46,652 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-26 00:46:46,660 [ scc.git] DEBUG Already up to date.
2024-07-26 00:46:46,661 [ scc.git] DEBUG ## Unique users: []
2024-07-26 00:46:46,661 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:46,661 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:46,668 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-26 00:46:46,711 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:46,711 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:46,718 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:46:46,758 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-26 00:46:46,765 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9db40894f0> has no local changes
2024-07-26 00:46:46,765 [ 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#136 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/)'
2024-07-26 00:46:46,776 [ scc.git] DEBUG [detached HEAD f8b856a] merge master -Dorg -Ssuccess-only
2024-07-26 00:46:46,776 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:46:46,776 [ scc.repo] DEBUG ## PRs found:
2024-07-26 00:46:47,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-07-26 00:46:47,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-07-26 00:46:48,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-07-26 00:46:48,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-07-26 00:46:49,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-26 00:46:49,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-07-26 00:46:50,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-07-26 00:46:50,130 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-07-26 00:46:50,130 [ scc.repo] DEBUG ## Branches found:
2024-07-26 00:46:50,130 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-07-26 00:46:50,130 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:50,130 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:50,137 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-26 00:46:50,142 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-26 00:46:50,143 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-26 00:46:50,150 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-26 00:46:50,158 [ scc.git] DEBUG Already up to date.
2024-07-26 00:46:50,159 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-07-26 00:46:50,560 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-07-26 00:46:50,560 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-07-26 00:46:50,566 [ scc.git] DEBUG ## Unique users: []
2024-07-26 00:46:50,566 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:50,567 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:50,574 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-26 00:46:50,582 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:50,589 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-26 00:46:50,621 [ scc.git] DEBUG Auto-merging Dockerfile
2024-07-26 00:46:50,622 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-07-26 00:46:50,622 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-26 00:46:50,622 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-26 00:46:50,630 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-07-26 00:46:50,640 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-07-26 00:46:50,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:46:50,816 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-26 00:46:50,823 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-07-26 00:46:50,829 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#136](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-07-26 00:46:50,835 [ scc.config] DEBUG Found github.token
2024-07-26 00:46:50,835 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-07-26 00:46:50,835 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-26 00:46:50,876 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:50,876 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:50,882 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:46:50,926 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-26 00:46:50,936 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9db402b8b0> has no local changes
2024-07-26 00:46:50,937 [ 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#136 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/)'
2024-07-26 00:46:50,947 [ scc.git] DEBUG [detached HEAD 660b487] merge master -Dorg -Ssuccess-only
2024-07-26 00:46:50,947 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:46:50,948 [ scc.git] INFO Overriding base-branch from master to develop
2024-07-26 00:46:50,948 [ scc.repo] DEBUG ## PRs found:
2024-07-26 00:46:51,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-07-26 00:46:51,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-07-26 00:46:52,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-07-26 00:46:52,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-07-26 00:46:53,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-07-26 00:46:53,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-07-26 00:46:54,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-07-26 00:46:54,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-26 00:46:55,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-26 00:46:55,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-26 00:46:56,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-07-26 00:46:56,243 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-26 00:46:56,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-07-26 00:46:57,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-07-26 00:46:57,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-07-26 00:46:58,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-07-26 00:46:58,274 [ scc.repo] DEBUG ## Branches found:
2024-07-26 00:46:58,274 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-07-26 00:46:58,274 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:58,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:58,280 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-07-26 00:46:58,285 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-26 00:46:58,285 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-07-26 00:46:58,291 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-07-26 00:46:58,302 [ scc.git] DEBUG Updating c20d273..312afbe
2024-07-26 00:46:58,303 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-07-26 00:46:58,715 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-07-26 00:46:58,716 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-07-26 00:46:58,723 [ scc.git] DEBUG ## Unique users: []
2024-07-26 00:46:58,723 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:58,723 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:58,730 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-26 00:46:58,738 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:58,745 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-26 00:46:58,771 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-07-26 00:46:58,771 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-07-26 00:46:58,771 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-26 00:46:58,772 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-26 00:46:58,780 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-07-26 00:46:58,788 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-07-26 00:46:58,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:46:58,951 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-26 00:46:58,960 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-07-26 00:46:58,967 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#136](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-07-26 00:46:58,973 [ scc.config] DEBUG Found github.token
2024-07-26 00:46:58,973 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-07-26 00:46:58,973 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-26 00:46:59,020 [ scc.git] DEBUG Get sha1 of %s
2024-07-26 00:46:59,020 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-26 00:46:59,026 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:46:59,081 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-26 00:46:59,089 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9db402b580> has no local changes
2024-07-26 00:46:59,089 [ 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)
Updating c20d273..312afbe
Previously merged:
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#136 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/)'
2024-07-26 00:46:59,100 [ scc.git] DEBUG [detached HEAD ed5f853] merge master -Dorg -Ssuccess-only
2024-07-26 00:46:59,100 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:46:59,101 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-26 00:46:59,200 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-07-26 00:46:59,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:46:59,390 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-07-26 00:46:59,395 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-07-26 00:46:59,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:46:59,807 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-07-26 00:46:59,815 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-07-26 00:47:00,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:47:00,236 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-07-26 00:47:00,242 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-07-26 00:47:00,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:47:00,668 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-07-26 00:47:01,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:47:01,087 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-07-26 00:47:01,095 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-07-26 00:47:01,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:47:01,504 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-07-26 00:47:01,511 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-07-26 00:47:01,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:47:01,903 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-07-26 00:47:01,909 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-07-26 00:47:02,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:47:02,329 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-07-26 00:47:02,336 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-07-26 00:47:02,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:47:02,747 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-07-26 00:47:02,755 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-07-26 00:47:03,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:47:03,155 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-07-26 00:47:03,161 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-07-26 00:47:03,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:47:03,574 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-07-26 00:47:03,580 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-07-26 00:47:03,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:47:04,009 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-07-26 00:47:04,019 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-07-26 00:47:04,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:47:04,441 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-07-26 00:47:04,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:47:04,857 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-07-26 00:47:05,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:47:05,257 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-07-26 00:47:05,264 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-07-26 00:47:05,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:47:05,693 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-07-26 00:47:06,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:47:06,128 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-07-26 00:47:06,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:47:06,549 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-07-26 00:47:06,557 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-07-26 00:47:06,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:47:06,978 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-07-26 00:47:06,984 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-07-26 00:47:07,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:47:07,423 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-07-26 00:47:07,440 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-07-26 00:47:07,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:47:07,828 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-07-26 00:47:07,836 [ scc.config] DEBUG Found submodule.scripts.url
2024-07-26 00:47:08,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-26 00:47:08,242 [ scc.config] DEBUG Found submodule.scripts.branch
2024-07-26 00:47:08,243 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-26 00:47:08,354 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9db767d460> has local changes
2024-07-26 00:47:08,354 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 63 sbesson 'Remove python-future dependency'
- PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
- PR 580 Rdornier 'Weird translation' (user: Rdornier)
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 578 Rdornier 'Image outline' (user: Rdornier)
- PR 577 Rdornier 'Fill rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 576 Rdornier 'Color picker - popup update'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating c20d273..312afbe
Previously merged:
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#136 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/136/)'
2024-07-26 00:47:08,371 [ scc.git] DEBUG [detached HEAD b2c4f3b] merge master -Dorg -Ssuccess-only
2024-07-26 00:47:08,371 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-07-26 00:47:08,371 [ scc.merge] INFO Repository: ome/omero-plugins
2024-07-26 00:47:08,371 [ scc.merge] INFO Already up to date.
2024-07-26 00:47:08,371 [ scc.merge] INFO
2024-07-26 00:47:08,371 [ scc.merge] INFO
2024-07-26 00:47:08,371 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-07-26 00:47:08,371 [ scc.merge] INFO Already up to date.
2024-07-26 00:47:08,371 [ scc.merge] INFO
2024-07-26 00:47:08,371 [ scc.merge] INFO
2024-07-26 00:47:08,371 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-07-26 00:47:08,371 [ scc.merge] INFO Excluded PRs:
2024-07-26 00:47:08,371 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-07-26 00:47:08,371 [ scc.merge] INFO Already up to date.
2024-07-26 00:47:08,371 [ scc.merge] INFO
2024-07-26 00:47:08,371 [ scc.merge] INFO Merged PRs:
2024-07-26 00:47:08,372 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-07-26 00:47:08,372 [ scc.merge] INFO
2024-07-26 00:47:08,372 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-07-26 00:47:08,372 [ scc.merge] INFO Excluded PRs:
2024-07-26 00:47:08,372 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-07-26 00:47:08,372 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-07-26 00:47:08,372 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-07-26 00:47:08,372 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-07-26 00:47:08,372 [ scc.merge] INFO Already up to date.
2024-07-26 00:47:08,372 [ scc.merge] INFO
2024-07-26 00:47:08,372 [ scc.merge] INFO Merged PRs:
2024-07-26 00:47:08,372 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-07-26 00:47:08,372 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-07-26 00:47:08,372 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-07-26 00:47:08,372 [ scc.merge] INFO
2024-07-26 00:47:08,372 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-07-26 00:47:08,372 [ scc.merge] INFO Excluded PRs:
2024-07-26 00:47:08,372 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-07-26 00:47:08,372 [ scc.merge] INFO Already up to date.
2024-07-26 00:47:08,372 [ scc.merge] INFO
2024-07-26 00:47:08,372 [ scc.merge] INFO Merged PRs:
2024-07-26 00:47:08,372 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-07-26 00:47:08,372 [ scc.merge] INFO
2024-07-26 00:47:08,372 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-26 00:47:08,372 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-07-26 00:47:08,372 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-07-26 00:47:08,372 [ scc.merge] INFO
2024-07-26 00:47:08,372 [ scc.merge] INFO Repository: ome/omero-figure
2024-07-26 00:47:08,372 [ scc.merge] INFO Excluded PRs:
2024-07-26 00:47:08,372 [ scc.merge] INFO - PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
2024-07-26 00:47:08,372 [ scc.merge] INFO - PR 580 Rdornier 'Weird translation' (user: Rdornier)
2024-07-26 00:47:08,372 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-07-26 00:47:08,372 [ scc.merge] INFO - PR 578 Rdornier 'Image outline' (user: Rdornier)
2024-07-26 00:47:08,372 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' (user: Rdornier)
2024-07-26 00:47:08,372 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-07-26 00:47:08,372 [ scc.merge] INFO Already up to date.
2024-07-26 00:47:08,372 [ scc.merge] INFO
2024-07-26 00:47:08,373 [ scc.merge] INFO Merged PRs:
2024-07-26 00:47:08,373 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-07-26 00:47:08,373 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-07-26 00:47:08,373 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-07-26 00:47:08,373 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-07-26 00:47:08,373 [ scc.merge] INFO - PR 576 Rdornier 'Color picker - popup update'
2024-07-26 00:47:08,373 [ scc.merge] INFO
2024-07-26 00:47:08,373 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-07-26 00:47:08,373 [ scc.merge] INFO Already up to date.
2024-07-26 00:47:08,373 [ scc.merge] INFO
2024-07-26 00:47:08,373 [ scc.merge] INFO Merged PRs:
2024-07-26 00:47:08,373 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-07-26 00:47:08,373 [ scc.merge] INFO
2024-07-26 00:47:08,373 [ scc.merge] INFO Repository: ome/omero-gallery
2024-07-26 00:47:08,373 [ scc.merge] INFO Already up to date.
2024-07-26 00:47:08,373 [ scc.merge] INFO
2024-07-26 00:47:08,373 [ scc.merge] INFO Merged PRs:
2024-07-26 00:47:08,373 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-07-26 00:47:08,373 [ scc.merge] INFO
2024-07-26 00:47:08,373 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-07-26 00:47:08,373 [ scc.merge] INFO Excluded PRs:
2024-07-26 00:47:08,373 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-07-26 00:47:08,373 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-07-26 00:47:08,373 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-07-26 00:47:08,373 [ scc.merge] INFO Already up to date.
2024-07-26 00:47:08,373 [ scc.merge] INFO
2024-07-26 00:47:08,373 [ scc.merge] INFO Merged PRs:
2024-07-26 00:47:08,373 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-07-26 00:47:08,373 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-07-26 00:47:08,373 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-07-26 00:47:08,373 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-07-26 00:47:08,373 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-07-26 00:47:08,373 [ scc.merge] INFO
2024-07-26 00:47:08,373 [ scc.merge] INFO Repository: ome/omero-mapr
2024-07-26 00:47:08,373 [ scc.merge] INFO Excluded PRs:
2024-07-26 00:47:08,373 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-07-26 00:47:08,374 [ scc.merge] INFO Already up to date.
2024-07-26 00:47:08,374 [ scc.merge] INFO
2024-07-26 00:47:08,374 [ scc.merge] INFO Merged PRs:
2024-07-26 00:47:08,374 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-07-26 00:47:08,374 [ scc.merge] INFO
2024-07-26 00:47:08,374 [ scc.merge] INFO Repository: ome/omero-metadata
2024-07-26 00:47:08,374 [ scc.merge] INFO Already up to date.
2024-07-26 00:47:08,374 [ scc.merge] INFO
2024-07-26 00:47:08,374 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-26 00:47:08,374 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-07-26 00:47:08,374 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-07-26 00:47:08,374 [ scc.merge] INFO
2024-07-26 00:47:08,374 [ scc.merge] INFO Repository: ome/omero-parade
2024-07-26 00:47:08,374 [ scc.merge] INFO Excluded PRs:
2024-07-26 00:47:08,374 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-07-26 00:47:08,374 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-07-26 00:47:08,374 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-07-26 00:47:08,374 [ scc.merge] INFO Already up to date.
2024-07-26 00:47:08,374 [ scc.merge] INFO
2024-07-26 00:47:08,374 [ scc.merge] INFO Merged PRs:
2024-07-26 00:47:08,374 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-07-26 00:47:08,374 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-07-26 00:47:08,374 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-07-26 00:47:08,374 [ scc.merge] INFO
2024-07-26 00:47:08,374 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-07-26 00:47:08,374 [ scc.merge] INFO Already up to date.
2024-07-26 00:47:08,374 [ scc.merge] INFO
2024-07-26 00:47:08,374 [ scc.merge] INFO Merged PRs:
2024-07-26 00:47:08,374 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-07-26 00:47:08,374 [ scc.merge] INFO
2024-07-26 00:47:08,374 [ scc.merge] INFO Repository: ome/omero-rois
2024-07-26 00:47:08,374 [ scc.merge] INFO Excluded PRs:
2024-07-26 00:47:08,374 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-07-26 00:47:08,374 [ scc.merge] INFO Already up to date.
2024-07-26 00:47:08,374 [ scc.merge] INFO
2024-07-26 00:47:08,374 [ scc.merge] INFO Merged PRs:
2024-07-26 00:47:08,375 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-07-26 00:47:08,375 [ scc.merge] INFO
2024-07-26 00:47:08,375 [ scc.merge] INFO Repository: ome/omero-signup
2024-07-26 00:47:08,375 [ scc.merge] INFO Already up to date.
2024-07-26 00:47:08,375 [ scc.merge] INFO
2024-07-26 00:47:08,375 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-26 00:47:08,375 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-07-26 00:47:08,375 [ scc.merge] INFO
2024-07-26 00:47:08,375 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-07-26 00:47:08,375 [ scc.merge] INFO Already up to date.
2024-07-26 00:47:08,375 [ scc.merge] INFO
2024-07-26 00:47:08,375 [ scc.merge] INFO Merged PRs:
2024-07-26 00:47:08,375 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-07-26 00:47:08,375 [ scc.merge] INFO
2024-07-26 00:47:08,375 [ scc.merge] INFO Repository: ome/omero-upload
2024-07-26 00:47:08,375 [ scc.merge] INFO Already up to date.
2024-07-26 00:47:08,375 [ scc.merge] INFO
2024-07-26 00:47:08,375 [ scc.merge] INFO
2024-07-26 00:47:08,375 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-07-26 00:47:08,375 [ scc.merge] INFO Already up to date.
2024-07-26 00:47:08,375 [ scc.merge] INFO
2024-07-26 00:47:08,375 [ scc.merge] INFO
2024-07-26 00:47:08,375 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-07-26 00:47:08,375 [ scc.merge] INFO Excluded PRs:
2024-07-26 00:47:08,375 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-07-26 00:47:08,375 [ scc.merge] INFO Already up to date.
2024-07-26 00:47:08,375 [ scc.merge] INFO
2024-07-26 00:47:08,375 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-26 00:47:08,375 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-07-26 00:47:08,375 [ scc.merge] INFO
2024-07-26 00:47:08,375 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-07-26 00:47:08,375 [ scc.merge] INFO Already up to date.
2024-07-26 00:47:08,375 [ scc.merge] INFO
2024-07-26 00:47:08,375 [ scc.merge] INFO
2024-07-26 00:47:08,375 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-07-26 00:47:08,375 [ scc.merge] INFO Already up to date.
2024-07-26 00:47:08,375 [ scc.merge] INFO
2024-07-26 00:47:08,376 [ scc.merge] INFO
2024-07-26 00:47:08,376 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-07-26 00:47:08,376 [ scc.merge] INFO Already up to date.
2024-07-26 00:47:08,376 [ scc.merge] INFO
2024-07-26 00:47:08,376 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-26 00:47:08,376 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-07-26 00:47:08,376 [ scc.merge] INFO
2024-07-26 00:47:08,376 [ scc.merge] INFO Repository: ome/scripts
2024-07-26 00:47:08,376 [ scc.merge] INFO Excluded PRs:
2024-07-26 00:47:08,376 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-07-26 00:47:08,376 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-07-26 00:47:08,376 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-07-26 00:47:08,376 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-07-26 00:47:08,376 [ scc.merge] INFO Updating c20d273..312afbe
2024-07-26 00:47:08,376 [ scc.merge] INFO Previously merged:
2024-07-26 00:47:08,376 [ scc.merge] INFO
2024-07-26 00:47:08,376 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-26 00:47:08,376 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-26 00:47:08,376 [ scc.merge] INFO
2024-07-26 00:47:08,376 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-26 00:47:08,376 [ scc.git] DEBUG Calling 'git remote'
2024-07-26 00:47:08,384 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-07-26 00:47:08,384 [ scc.git] DEBUG Calling 'git remote'
2024-07-26 00:47:08,391 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:47:08,391 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-07-26 00:47:08,392 [ scc.git] DEBUG Calling 'git remote'
2024-07-26 00:47:08,399 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:47:08,399 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-07-26 00:47:08,399 [ scc.git] DEBUG Calling 'git remote'
2024-07-26 00:47:08,405 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:47:08,405 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-07-26 00:47:08,406 [ scc.git] DEBUG Calling 'git remote'
2024-07-26 00:47:08,412 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:47:08,413 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-07-26 00:47:08,413 [ scc.git] DEBUG Calling 'git remote'
2024-07-26 00:47:08,420 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:47:08,421 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-07-26 00:47:08,421 [ scc.git] DEBUG Calling 'git remote'
2024-07-26 00:47:08,426 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:47:08,427 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-07-26 00:47:08,427 [ scc.git] DEBUG Calling 'git remote'
2024-07-26 00:47:08,432 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:47:08,432 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-07-26 00:47:08,432 [ scc.git] DEBUG Calling 'git remote'
2024-07-26 00:47:08,437 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:47:08,437 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-07-26 00:47:08,437 [ scc.git] DEBUG Calling 'git remote'
2024-07-26 00:47:08,442 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:47:08,442 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-07-26 00:47:08,442 [ scc.git] DEBUG Calling 'git remote'
2024-07-26 00:47:08,447 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:47:08,447 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-07-26 00:47:08,447 [ scc.git] DEBUG Calling 'git remote'
2024-07-26 00:47:08,453 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:47:08,453 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-07-26 00:47:08,453 [ scc.git] DEBUG Calling 'git remote'
2024-07-26 00:47:08,459 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:47:08,459 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-07-26 00:47:08,459 [ scc.git] DEBUG Calling 'git remote'
2024-07-26 00:47:08,467 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:47:08,467 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-07-26 00:47:08,467 [ scc.git] DEBUG Calling 'git remote'
2024-07-26 00:47:08,475 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:47:08,475 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-07-26 00:47:08,475 [ scc.git] DEBUG Calling 'git remote'
2024-07-26 00:47:08,482 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:47:08,482 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-07-26 00:47:08,483 [ scc.git] DEBUG Calling 'git remote'
2024-07-26 00:47:08,490 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:47:08,490 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-07-26 00:47:08,490 [ scc.git] DEBUG Calling 'git remote'
2024-07-26 00:47:08,496 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:47:08,497 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-07-26 00:47:08,497 [ scc.git] DEBUG Calling 'git remote'
2024-07-26 00:47:08,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:47:08,506 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-07-26 00:47:08,506 [ scc.git] DEBUG Calling 'git remote'
2024-07-26 00:47:08,515 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:47:08,515 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-07-26 00:47:08,515 [ scc.git] DEBUG Calling 'git remote'
2024-07-26 00:47:08,522 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:47:08,522 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-07-26 00:47:08,523 [ scc.git] DEBUG Calling 'git remote'
2024-07-26 00:47:08,531 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-26 00:47:08,531 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-07-26 00:47:08,531 [ scc.git] DEBUG Calling 'git remote'
2024-07-26 00:47:08,538 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.9.1 to 5.9.2
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 f52cb09] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 9b73dd9
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from fefe87cf
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from a8f380f
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from c20d273
nothing to commit, working tree clean
[detached HEAD ba699fe] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-07-26 00:47:56,765 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-07-26 00:48:06,005 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-07-26 00:48:08,434 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-07-26 00:48:13,214 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-07-26 00:49:02,841 [ 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}
