Skipping 110 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-07-25 10:20:32,484 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-25 10:20:32,490 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-25 10:20:32,491 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-25 10:20:32,498 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-25 10:20:32,505 [ scc.git] DEBUG Already up to date.
2024-07-25 10:20:32,505 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-07-25 10:20:32,889 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-25 10:20:32,889 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-07-25 10:20:32,896 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-07-25 10:20:33,246 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-25 10:20:33,246 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-07-25 10:20:33,252 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-07-25 10:20:33,641 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-25 10:20:33,642 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-07-25 10:20:33,661 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-07-25 10:20:34,041 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-25 10:20:34,041 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-07-25 10:20:34,046 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-07-25 10:20:34,390 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-07-25 10:20:34,390 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-07-25 10:20:34,395 [ scc.git] DEBUG ## Unique users: []
2024-07-25 10:20:34,395 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:20:34,395 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:20:34,401 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-07-25 10:20:34,409 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:20:34,415 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-07-25 10:20:34,432 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-07-25 10:20:34,433 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-25 10:20:34,439 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-07-25 10:20:34,439 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-07-25 10:20:34,440 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-07-25 10:20:34,440 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-07-25 10:20:34,440 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-07-25 10:20:34,440 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-07-25 10:20:34,440 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-07-25 10:20:34,440 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-07-25 10:20:34,440 [ scc.git] DEBUG src/templates/rois_form.template.html | 8 ++++
2024-07-25 10:20:34,440 [ scc.git] DEBUG 9 files changed, 271 insertions(+), 5 deletions(-)
2024-07-25 10:20:34,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:20:34,610 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-07-25 10:20:34,619 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:20:34,625 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-07-25 10:20:34,648 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-25 10:20:34,648 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-07-25 10:20:34,648 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-07-25 10:20:34,648 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-07-25 10:20:34,648 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-25 10:20:34,657 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-07-25 10:20:34,657 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-07-25 10:20:34,657 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-07-25 10:20:34,657 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-07-25 10:20:34,657 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-07-25 10:20:34,658 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-07-25 10:20:34,658 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-07-25 10:20:34,658 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-07-25 10:20:34,658 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-07-25 10:20:34,658 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-07-25 10:20:34,658 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-07-25 10:20:34,658 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-07-25 10:20:35,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:20:35,020 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-07-25 10:20:35,029 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:20:35,035 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) 3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-07-25 10:20:35,065 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-07-25 10:20:35,065 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-25 10:20:35,066 [ scc.git] DEBUG Auto-merging src/index.html
2024-07-25 10:20:35,066 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-07-25 10:20:35,066 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-07-25 10:20:35,066 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-07-25 10:20:35,066 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-25 10:20:35,074 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-07-25 10:20:35,074 [ scc.git] DEBUG omero_figure/urls.py | 10 +++-
2024-07-25 10:20:35,074 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-07-25 10:20:35,074 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-07-25 10:20:35,074 [ scc.git] DEBUG src/index.html | 1 +
2024-07-25 10:20:35,074 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-07-25 10:20:35,074 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-07-25 10:20:35,074 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-07-25 10:20:35,074 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-07-25 10:20:35,074 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-07-25 10:20:35,074 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-07-25 10:20:35,075 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-07-25 10:20:35,075 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-07-25 10:20:35,075 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-07-25 10:20:35,075 [ scc.git] DEBUG 14 files changed, 162 insertions(+), 15 deletions(-)
2024-07-25 10:20:35,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:20:35,431 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-07-25 10:20:35,440 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:20:35,445 [ 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-25 10:20:35,464 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-25 10:20:35,467 [ scc.git] DEBUG setup.py | 2 +-
2024-07-25 10:20:35,467 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-07-25 10:20:35,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:20:35,876 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...88901984c22249d20925e53c455cd822700be6d4'
2024-07-25 10:20:35,885 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:20:35,890 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 576 (Color picker - popup update) 88901984c22249d20925e53c455cd822700be6d4'
2024-07-25 10:20:35,912 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-07-25 10:20:35,912 [ scc.git] DEBUG Auto-merging src/index.html
2024-07-25 10:20:35,913 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-25 10:20:35,918 [ scc.git] DEBUG .gitignore | 2 +-
2024-07-25 10:20:35,918 [ scc.git] DEBUG src/css/figure.css | 3 +++
2024-07-25 10:20:35,918 [ scc.git] DEBUG src/index.html | 3 +++
2024-07-25 10:20:35,918 [ scc.git] DEBUG src/js/views/colorpicker.js | 10 ++++++++--
2024-07-25 10:20:35,918 [ scc.git] DEBUG 4 files changed, 15 insertions(+), 3 deletions(-)
2024-07-25 10:20:36,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:20:36,282 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-25 10:20:36,324 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:20:36,324 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:20:36,330 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-25 10:20:36,373 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-25 10:20:36,383 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2f2ae96490> has no local changes
2024-07-25 10:20:36,383 [ 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#135 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/)'
2024-07-25 10:20:36,393 [ scc.git] DEBUG [detached HEAD fad7b817] merge master -Dorg -Ssuccess-only
2024-07-25 10:20:36,393 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:20:36,394 [ scc.repo] DEBUG ## PRs found:
2024-07-25 10:20:36,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-07-25 10:20:37,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-07-25 10:20:37,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-07-25 10:20:38,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-07-25 10:20:38,908 [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-25 10:20:39,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-07-25 10:20:39,829 [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-25 10:20:39,830 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-07-25 10:20:39,830 [ scc.repo] DEBUG ## Branches found:
2024-07-25 10:20:39,830 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-07-25 10:20:39,830 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:20:39,830 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:20:39,836 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-25 10:20:39,841 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-25 10:20:39,841 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-25 10:20:39,847 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-25 10:20:39,853 [ scc.git] DEBUG Already up to date.
2024-07-25 10:20:39,853 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-07-25 10:20:40,226 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-07-25 10:20:40,226 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-07-25 10:20:40,231 [ scc.git] DEBUG ## Unique users: []
2024-07-25 10:20:40,231 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:20:40,231 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:20:40,238 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-07-25 10:20:40,244 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:20:40,250 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-07-25 10:20:40,260 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-07-25 10:20:40,261 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-25 10:20:40,263 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-07-25 10:20:40,263 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-07-25 10:20:40,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:20:40,441 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-25 10:20:40,484 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:20:40,484 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:20:40,491 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-25 10:20:40,534 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-25 10:20:40,541 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2f2aeafa60> has no local changes
2024-07-25 10:20:40,542 [ 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#135 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/)'
2024-07-25 10:20:40,551 [ scc.git] DEBUG [detached HEAD b6fb2a6] merge master -Dorg -Ssuccess-only
2024-07-25 10:20:40,552 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:20:40,552 [ scc.repo] DEBUG ## PRs found:
2024-07-25 10:20:40,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-07-25 10:20:41,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-07-25 10:20:41,443 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-25 10:20:42,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-07-25 10:20:42,553 [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-25 10:20:43,093 [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-25 10:20:43,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-07-25 10:20:44,117 [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-25 10:20:44,118 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-07-25 10:20:44,118 [ scc.repo] DEBUG ## Branches found:
2024-07-25 10:20:44,118 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-07-25 10:20:44,119 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:20:44,119 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:20:44,125 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-25 10:20:44,132 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-25 10:20:44,132 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-25 10:20:44,140 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-25 10:20:44,147 [ scc.git] DEBUG Already up to date.
2024-07-25 10:20:44,148 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-07-25 10:20:44,530 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-07-25 10:20:44,531 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-07-25 10:20:44,536 [ scc.git] DEBUG ## Unique users: []
2024-07-25 10:20:44,536 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:20:44,536 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:20:44,543 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-07-25 10:20:44,548 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:20:44,553 [ 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-25 10:20:44,566 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-25 10:20:44,570 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-07-25 10:20:44,571 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-07-25 10:20:44,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:20:44,754 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-25 10:20:44,797 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:20:44,798 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:20:44,804 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-25 10:20:44,850 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-25 10:20:44,859 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2f2aeb2af0> has no local changes
2024-07-25 10:20:44,859 [ 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#135 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/)'
2024-07-25 10:20:44,870 [ scc.git] DEBUG [detached HEAD 6ea7895] merge master -Dorg -Ssuccess-only
2024-07-25 10:20:44,870 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:20:44,871 [ scc.repo] DEBUG ## PRs found:
2024-07-25 10:20:45,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-07-25 10:20:45,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-07-25 10:20:46,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-07-25 10:20:46,362 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-25 10:20:46,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-07-25 10:20:47,494 [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-25 10:20:48,033 [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-25 10:20:48,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-07-25 10:20:48,907 [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-25 10:20:48,908 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-07-25 10:20:49,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-07-25 10:20:49,418 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-25 10:20:49,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-07-25 10:20:50,557 [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-25 10:20:51,091 [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-25 10:20:51,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-07-25 10:20:52,083 [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-25 10:20:52,085 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-07-25 10:20:52,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-07-25 10:20:53,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-07-25 10:20:53,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-07-25 10:20:54,120 [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-25 10:20:54,619 [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-25 10:20:55,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-07-25 10:20:55,578 [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-25 10:20:55,580 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-07-25 10:20:56,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-07-25 10:20:56,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-07-25 10:20:57,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-07-25 10:20:57,651 [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-25 10:20:58,139 [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-25 10:20:58,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-07-25 10:20:59,030 [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-25 10:20:59,031 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-07-25 10:20:59,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-07-25 10:21:00,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-07-25 10:21:00,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-07-25 10:21:01,048 [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-25 10:21:01,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-07-25 10:21:01,982 [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-25 10:21:01,983 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-07-25 10:21:01,983 [ scc.repo] DEBUG ## Branches found:
2024-07-25 10:21:01,983 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-07-25 10:21:01,984 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:01,984 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:01,990 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-25 10:21:01,996 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-25 10:21:01,996 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-25 10:21:02,002 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-25 10:21:02,008 [ scc.git] DEBUG Already up to date.
2024-07-25 10:21:02,008 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-07-25 10:21:02,399 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-25 10:21:02,400 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-07-25 10:21:02,405 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-07-25 10:21:02,740 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-25 10:21:02,741 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-07-25 10:21:02,747 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-07-25 10:21:03,119 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-25 10:21:03,119 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-07-25 10:21:03,125 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-07-25 10:21:03,485 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-25 10:21:03,485 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-07-25 10:21:03,493 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-07-25 10:21:03,847 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-07-25 10:21:03,847 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-07-25 10:21:03,852 [ scc.git] DEBUG ## Unique users: []
2024-07-25 10:21:03,852 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:03,853 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:03,860 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-07-25 10:21:03,867 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:03,874 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-07-25 10:21:03,887 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-07-25 10:21:03,887 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-25 10:21:03,891 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-07-25 10:21:03,891 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-07-25 10:21:03,891 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-07-25 10:21:04,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:21:04,071 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-07-25 10:21:04,079 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:04,086 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-07-25 10:21:04,109 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-07-25 10:21:04,109 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-07-25 10:21:04,109 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-07-25 10:21:04,109 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-07-25 10:21:04,109 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-25 10:21:04,115 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-07-25 10:21:04,115 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-07-25 10:21:04,115 [ scc.git] DEBUG src/app/header.html | 5 +
2024-07-25 10:21:04,115 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-07-25 10:21:04,115 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-07-25 10:21:04,115 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-07-25 10:21:04,115 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-07-25 10:21:04,115 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-07-25 10:21:04,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:21:04,481 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-07-25 10:21:04,492 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:04,500 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-07-25 10:21:04,518 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-07-25 10:21:04,519 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-25 10:21:04,525 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-07-25 10:21:04,525 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-07-25 10:21:04,525 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-07-25 10:21:04,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:21:04,903 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-07-25 10:21:04,911 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:04,918 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-07-25 10:21:04,936 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-25 10:21:04,945 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-07-25 10:21:04,945 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-07-25 10:21:05,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:21:05,308 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-07-25 10:21:05,317 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:05,323 [ 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-25 10:21:05,364 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-25 10:21:05,365 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-25 10:21:05,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:21:05,724 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-25 10:21:05,764 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:05,764 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:05,771 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-25 10:21:05,809 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-25 10:21:05,816 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2f2ae65d30> has no local changes
2024-07-25 10:21:05,817 [ 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#135 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/)'
2024-07-25 10:21:05,826 [ scc.git] DEBUG [detached HEAD 365cddb] merge master -Dorg -Ssuccess-only
2024-07-25 10:21:05,826 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:21:05,827 [ scc.repo] DEBUG ## PRs found:
2024-07-25 10:21:06,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-07-25 10:21:06,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-07-25 10:21:07,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-07-25 10:21:07,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-07-25 10:21:08,333 [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-25 10:21:08,834 [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-25 10:21:09,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-07-25 10:21:09,781 [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-25 10:21:09,781 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-07-25 10:21:09,781 [ scc.repo] DEBUG ## Branches found:
2024-07-25 10:21:09,782 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-07-25 10:21:09,782 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:09,782 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:09,787 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-25 10:21:09,792 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-25 10:21:09,792 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-25 10:21:09,797 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-25 10:21:09,803 [ scc.git] DEBUG Already up to date.
2024-07-25 10:21:09,803 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-07-25 10:21:10,188 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-07-25 10:21:10,189 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-07-25 10:21:10,193 [ scc.git] DEBUG ## Unique users: []
2024-07-25 10:21:10,194 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:10,194 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:10,199 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-07-25 10:21:10,205 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:10,211 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-07-25 10:21:10,221 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-25 10:21:10,224 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-07-25 10:21:10,224 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-07-25 10:21:10,224 [ scc.git] DEBUG requirements.txt | 2 +-
2024-07-25 10:21:10,224 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-07-25 10:21:10,224 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-07-25 10:21:10,224 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-07-25 10:21:10,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:21:10,384 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-25 10:21:10,426 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:10,426 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:10,432 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-25 10:21:10,474 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-25 10:21:10,481 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2f2ae8fdf0> has no local changes
2024-07-25 10:21:10,482 [ 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#135 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/)'
2024-07-25 10:21:10,492 [ scc.git] DEBUG [detached HEAD dc50b87] merge master -Dorg -Ssuccess-only
2024-07-25 10:21:10,492 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:21:10,492 [ scc.repo] DEBUG ## PRs found:
2024-07-25 10:21:10,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-07-25 10:21:11,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-07-25 10:21:11,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-07-25 10:21:12,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-07-25 10:21:12,997 [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-25 10:21:13,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-07-25 10:21:13,985 [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-25 10:21:13,986 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-07-25 10:21:14,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-07-25 10:21:14,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-07-25 10:21:15,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-07-25 10:21:15,944 [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-25 10:21:16,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-07-25 10:21:16,903 [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-25 10:21:16,903 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-07-25 10:21:16,904 [ scc.repo] DEBUG ## Branches found:
2024-07-25 10:21:16,904 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-07-25 10:21:16,904 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:16,904 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:16,915 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-25 10:21:16,924 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-25 10:21:16,925 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-25 10:21:16,937 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-25 10:21:16,947 [ scc.git] DEBUG Already up to date.
2024-07-25 10:21:16,947 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-07-25 10:21:17,333 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-07-25 10:21:17,333 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-07-25 10:21:17,339 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-07-25 10:21:17,661 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-07-25 10:21:17,661 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-07-25 10:21:17,668 [ scc.git] DEBUG ## Unique users: []
2024-07-25 10:21:17,668 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:17,668 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:17,676 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-25 10:21:17,685 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:17,691 [ 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-25 10:21:17,707 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-07-25 10:21:17,707 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-07-25 10:21:17,707 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-07-25 10:21:17,707 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-07-25 10:21:17,708 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-25 10:21:17,709 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-25 10:21:17,717 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-25 10:21:17,728 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-07-25 10:21:17,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:21:17,889 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-07-25 10:21:17,898 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-25 10:21:17,905 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#135](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-07-25 10:21:17,912 [ scc.config] DEBUG Found github.token
2024-07-25 10:21:17,912 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-07-25 10:21:17,912 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-25 10:21:17,920 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:17,927 [ 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-25 10:21:17,952 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-07-25 10:21:17,953 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-07-25 10:21:17,953 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-07-25 10:21:17,953 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-25 10:21:17,953 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-25 10:21:17,960 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-25 10:21:17,969 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-07-25 10:21:18,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:21:18,317 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-07-25 10:21:18,325 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-07-25 10:21:18,332 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#135](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/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-25 10:21:18,338 [ scc.config] DEBUG Found github.token
2024-07-25 10:21:18,338 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-07-25 10:21:18,338 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-25 10:21:18,381 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:18,382 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:18,388 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-25 10:21:18,430 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-25 10:21:18,438 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2f28640f10> has no local changes
2024-07-25 10:21:18,438 [ 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#135 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/)'
2024-07-25 10:21:18,448 [ scc.git] DEBUG [detached HEAD 1856822] merge master -Dorg -Ssuccess-only
2024-07-25 10:21:18,448 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:21:18,448 [ scc.repo] DEBUG ## PRs found:
2024-07-25 10:21:18,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-07-25 10:21:19,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-07-25 10:21:19,497 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-25 10:21:20,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-07-25 10:21:20,705 [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-25 10:21:21,216 [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-25 10:21:21,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-07-25 10:21:22,201 [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-25 10:21:22,202 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-07-25 10:21:22,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-07-25 10:21:22,669 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-25 10:21:23,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-07-25 10:21:23,809 [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-25 10:21:24,343 [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-25 10:21:24,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-07-25 10:21:25,238 [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-25 10:21:25,239 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-07-25 10:21:25,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-07-25 10:21:25,730 [ scc.repo] DEBUG # ... Include label: dependencies
2024-07-25 10:21:26,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-07-25 10:21:26,797 [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-25 10:21:27,286 [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-25 10:21:27,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-07-25 10:21:28,187 [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-25 10:21:28,188 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-07-25 10:21:28,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-07-25 10:21:29,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-07-25 10:21:29,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-07-25 10:21:30,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-07-25 10:21:30,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-07-25 10:21:31,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-07-25 10:21:31,313 [ scc.repo] DEBUG ## Branches found:
2024-07-25 10:21:31,313 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-07-25 10:21:31,313 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:31,313 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:31,320 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-25 10:21:31,326 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-25 10:21:31,326 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-25 10:21:31,333 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-25 10:21:31,342 [ scc.git] DEBUG Already up to date.
2024-07-25 10:21:31,342 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-07-25 10:21:31,717 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-25 10:21:31,718 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-07-25 10:21:31,726 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-07-25 10:21:32,093 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-25 10:21:32,093 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-07-25 10:21:32,099 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-07-25 10:21:32,474 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-07-25 10:21:32,474 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-07-25 10:21:32,481 [ scc.git] DEBUG ## Unique users: []
2024-07-25 10:21:32,481 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:32,481 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:32,489 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-07-25 10:21:32,497 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:32,505 [ 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-25 10:21:32,518 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-25 10:21:32,522 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-07-25 10:21:32,522 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-07-25 10:21:32,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:21:32,695 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-07-25 10:21:32,703 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:32,710 [ 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-25 10:21:32,726 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-25 10:21:32,727 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-25 10:21:32,730 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-07-25 10:21:32,730 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-07-25 10:21:33,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:21:33,141 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-07-25 10:21:33,148 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:33,155 [ 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-25 10:21:33,168 [ scc.git] DEBUG Auto-merging package-lock.json
2024-07-25 10:21:33,169 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-25 10:21:33,173 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-07-25 10:21:33,173 [ scc.git] DEBUG package.json | 2 +-
2024-07-25 10:21:33,173 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-07-25 10:21:33,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:21:33,636 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-25 10:21:33,694 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:33,695 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:33,707 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-25 10:21:33,751 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-25 10:21:33,759 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2f285df4f0> has no local changes
2024-07-25 10:21:33,760 [ 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#135 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/)'
2024-07-25 10:21:33,770 [ scc.git] DEBUG [detached HEAD 2f594e2] merge master -Dorg -Ssuccess-only
2024-07-25 10:21:33,771 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:21:33,771 [ scc.repo] DEBUG ## PRs found:
2024-07-25 10:21:34,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-07-25 10:21:34,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-07-25 10:21:35,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-07-25 10:21:35,658 [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-25 10:21:36,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-07-25 10:21:36,586 [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-25 10:21:36,587 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-07-25 10:21:36,587 [ scc.repo] DEBUG ## Branches found:
2024-07-25 10:21:36,587 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-07-25 10:21:36,587 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:36,587 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:36,593 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-25 10:21:36,599 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-25 10:21:36,599 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-25 10:21:36,605 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-25 10:21:36,611 [ scc.git] DEBUG Already up to date.
2024-07-25 10:21:36,611 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-07-25 10:21:36,970 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-07-25 10:21:36,971 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-07-25 10:21:36,975 [ scc.git] DEBUG ## Unique users: []
2024-07-25 10:21:36,976 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:36,976 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:36,984 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-07-25 10:21:36,991 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:36,997 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-07-25 10:21:37,007 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-25 10:21:37,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:21:37,180 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-25 10:21:37,223 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:37,223 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:37,229 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-25 10:21:37,270 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-25 10:21:37,277 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2f2861df40> has no local changes
2024-07-25 10:21:37,277 [ 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#135 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/)'
2024-07-25 10:21:37,286 [ scc.git] DEBUG [detached HEAD 1982082] merge master -Dorg -Ssuccess-only
2024-07-25 10:21:37,287 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:21:37,287 [ scc.repo] DEBUG ## PRs found:
2024-07-25 10:21:37,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-07-25 10:21:38,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-07-25 10:21:38,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-07-25 10:21:39,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-07-25 10:21:39,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-07-25 10:21:40,396 [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-25 10:21:40,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-07-25 10:21:41,355 [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-25 10:21:41,355 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-07-25 10:21:41,355 [ scc.repo] DEBUG ## Branches found:
2024-07-25 10:21:41,355 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-07-25 10:21:41,356 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:41,356 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:41,361 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-25 10:21:41,367 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-25 10:21:41,367 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-25 10:21:41,372 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-25 10:21:41,378 [ scc.git] DEBUG Already up to date.
2024-07-25 10:21:41,378 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-07-25 10:21:41,753 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-07-25 10:21:41,753 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-07-25 10:21:41,760 [ scc.git] DEBUG ## Unique users: []
2024-07-25 10:21:41,760 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:41,760 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:41,766 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-07-25 10:21:41,773 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:41,780 [ 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-25 10:21:41,791 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-07-25 10:21:41,791 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-25 10:21:41,794 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-07-25 10:21:41,794 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-07-25 10:21:41,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:21:41,960 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-25 10:21:42,002 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:42,002 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:42,008 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-25 10:21:42,050 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-25 10:21:42,057 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2f28614bb0> has no local changes
2024-07-25 10:21:42,057 [ 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#135 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/)'
2024-07-25 10:21:42,066 [ scc.git] DEBUG [detached HEAD 950c861] merge master -Dorg -Ssuccess-only
2024-07-25 10:21:42,066 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:21:42,067 [ scc.repo] DEBUG ## PRs found:
2024-07-25 10:21:42,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-07-25 10:21:42,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-07-25 10:21:43,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-07-25 10:21:44,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-07-25 10:21:44,469 [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-25 10:21:45,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-07-25 10:21:45,503 [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-25 10:21:45,504 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-07-25 10:21:45,504 [ scc.repo] DEBUG ## Branches found:
2024-07-25 10:21:45,504 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-07-25 10:21:45,505 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:45,505 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:45,512 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-25 10:21:45,521 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-25 10:21:45,521 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-25 10:21:45,529 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-25 10:21:45,537 [ scc.git] DEBUG Already up to date.
2024-07-25 10:21:45,538 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-07-25 10:21:45,902 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-07-25 10:21:45,902 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-07-25 10:21:45,908 [ scc.git] DEBUG ## Unique users: []
2024-07-25 10:21:45,908 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:45,908 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:45,915 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-25 10:21:45,922 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:45,929 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-25 10:21:45,941 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-07-25 10:21:45,942 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-07-25 10:21:45,942 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-07-25 10:21:45,942 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-07-25 10:21:45,942 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-07-25 10:21:45,942 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-07-25 10:21:45,942 [ scc.git] DEBUG Auto-merging setup.py
2024-07-25 10:21:45,942 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-07-25 10:21:45,942 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-25 10:21:45,942 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-25 10:21:45,949 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-07-25 10:21:45,958 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-07-25 10:21:46,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:21:46,112 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-07-25 10:21:46,123 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-07-25 10:21:46,131 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#135](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/views.py
- omero_signup/urls.py
- setup.py
--conflicts
2024-07-25 10:21:46,140 [ scc.config] DEBUG Found github.token
2024-07-25 10:21:46,141 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-07-25 10:21:46,141 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-25 10:21:46,192 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:46,192 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:46,200 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-25 10:21:46,253 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-25 10:21:46,262 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2f28604700> has no local changes
2024-07-25 10:21:46,262 [ 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#135 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/)'
2024-07-25 10:21:46,274 [ scc.git] DEBUG [detached HEAD 28f01d2] merge master -Dorg -Ssuccess-only
2024-07-25 10:21:46,274 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:21:46,274 [ scc.repo] DEBUG ## PRs found:
2024-07-25 10:21:46,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-07-25 10:21:47,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-07-25 10:21:47,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-07-25 10:21:48,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-07-25 10:21:48,772 [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-25 10:21:49,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-07-25 10:21:49,762 [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-25 10:21:49,762 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-07-25 10:21:49,762 [ scc.repo] DEBUG ## Branches found:
2024-07-25 10:21:49,763 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-07-25 10:21:49,763 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:49,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:49,769 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-25 10:21:49,774 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-25 10:21:49,774 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-25 10:21:49,780 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-25 10:21:49,786 [ scc.git] DEBUG Already up to date.
2024-07-25 10:21:49,787 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-07-25 10:21:50,167 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-07-25 10:21:50,167 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-07-25 10:21:50,172 [ scc.git] DEBUG ## Unique users: []
2024-07-25 10:21:50,172 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:50,172 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:50,178 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-07-25 10:21:50,187 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:50,194 [ 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-25 10:21:50,209 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-25 10:21:50,213 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-07-25 10:21:50,213 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-07-25 10:21:50,213 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-07-25 10:21:50,213 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-07-25 10:21:50,213 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-07-25 10:21:50,213 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-07-25 10:21:50,213 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-07-25 10:21:50,213 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-07-25 10:21:50,213 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-07-25 10:21:50,213 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-07-25 10:21:50,213 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-07-25 10:21:50,213 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-07-25 10:21:50,213 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-07-25 10:21:50,213 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-07-25 10:21:50,214 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-07-25 10:21:50,214 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-07-25 10:21:50,214 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-07-25 10:21:50,214 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-07-25 10:21:50,214 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-07-25 10:21:50,214 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-07-25 10:21:50,214 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-07-25 10:21:50,214 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-07-25 10:21:50,214 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-07-25 10:21:50,214 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-07-25 10:21:50,214 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-07-25 10:21:50,214 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-07-25 10:21:50,214 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-07-25 10:21:50,214 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-07-25 10:21:50,214 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-07-25 10:21:50,218 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-07-25 10:21:50,218 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-07-25 10:21:50,218 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-07-25 10:21:50,218 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-07-25 10:21:50,218 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-07-25 10:21:50,218 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-07-25 10:21:50,218 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-07-25 10:21:50,218 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-07-25 10:21:50,218 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-07-25 10:21:50,218 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-07-25 10:21:50,219 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-07-25 10:21:50,219 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-07-25 10:21:50,219 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-07-25 10:21:50,219 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-07-25 10:21:50,219 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-07-25 10:21:50,219 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-07-25 10:21:50,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:21:50,402 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-25 10:21:50,444 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:50,445 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:50,453 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-25 10:21:50,497 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-25 10:21:50,506 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2f285ce610> has no local changes
2024-07-25 10:21:50,507 [ 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#135 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/)'
2024-07-25 10:21:50,519 [ scc.git] DEBUG [detached HEAD 58d376f] merge master -Dorg -Ssuccess-only
2024-07-25 10:21:50,519 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:21:50,519 [ scc.repo] DEBUG ## PRs found:
2024-07-25 10:21:50,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-07-25 10:21:50,843 [ scc.repo] DEBUG ## Branches found:
2024-07-25 10:21:50,843 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-07-25 10:21:50,843 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:50,844 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:50,850 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-25 10:21:50,857 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-25 10:21:50,857 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-25 10:21:50,864 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-25 10:21:50,871 [ scc.git] DEBUG Already up to date.
2024-07-25 10:21:50,871 [ scc.git] DEBUG ## Unique users: []
2024-07-25 10:21:50,871 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:50,872 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:50,879 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-25 10:21:50,922 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:50,922 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:50,929 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-25 10:21:50,973 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-25 10:21:50,982 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2f28569fd0> has no local changes
2024-07-25 10:21:50,982 [ 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#135 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/)'
2024-07-25 10:21:50,991 [ scc.git] DEBUG [detached HEAD 294dcda] merge master -Dorg -Ssuccess-only
2024-07-25 10:21:50,992 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:21:50,992 [ scc.repo] DEBUG ## PRs found:
2024-07-25 10:21:51,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-07-25 10:21:51,273 [ scc.repo] DEBUG ## Branches found:
2024-07-25 10:21:51,274 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-07-25 10:21:51,274 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:51,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:51,280 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-25 10:21:51,288 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-25 10:21:51,288 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-25 10:21:51,296 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-25 10:21:51,305 [ scc.git] DEBUG Already up to date.
2024-07-25 10:21:51,305 [ scc.git] DEBUG ## Unique users: []
2024-07-25 10:21:51,305 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:51,305 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:51,312 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-25 10:21:51,356 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:51,356 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:51,363 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-25 10:21:51,402 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-25 10:21:51,408 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2f285d6d00> has no local changes
2024-07-25 10:21:51,408 [ 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#135 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/)'
2024-07-25 10:21:51,417 [ scc.git] DEBUG [detached HEAD 4534db0] merge master -Dorg -Ssuccess-only
2024-07-25 10:21:51,417 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:21:51,418 [ scc.git] INFO Overriding base-branch from master to main
2024-07-25 10:21:51,418 [ scc.repo] DEBUG ## PRs found:
2024-07-25 10:21:51,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-07-25 10:21:52,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-07-25 10:21:52,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-07-25 10:21:53,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-07-25 10:21:53,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-07-25 10:21:54,308 [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-25 10:21:54,795 [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-25 10:21:55,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-07-25 10:21:55,677 [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-25 10:21:55,678 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-07-25 10:21:55,678 [ scc.repo] DEBUG ## Branches found:
2024-07-25 10:21:55,678 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-07-25 10:21:55,678 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:55,678 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:55,684 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-07-25 10:21:55,690 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-25 10:21:55,690 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-07-25 10:21:55,696 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-07-25 10:21:55,702 [ scc.git] DEBUG Already up to date.
2024-07-25 10:21:55,703 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-07-25 10:21:56,063 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-07-25 10:21:56,063 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-07-25 10:21:56,068 [ scc.git] DEBUG ## Unique users: []
2024-07-25 10:21:56,068 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:56,068 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:56,074 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-25 10:21:56,081 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:56,088 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-25 10:21:56,101 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-07-25 10:21:56,101 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-07-25 10:21:56,101 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-25 10:21:56,102 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-25 10:21:56,110 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-07-25 10:21:56,117 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-07-25 10:21:56,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:21:56,280 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-07-25 10:21:56,287 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-07-25 10:21:56,293 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#135](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-07-25 10:21:56,299 [ scc.config] DEBUG Found github.token
2024-07-25 10:21:56,299 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-07-25 10:21:56,299 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-25 10:21:56,340 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:56,341 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:56,346 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-25 10:21:56,391 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-25 10:21:56,398 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2f285c0e20> has no local changes
2024-07-25 10:21:56,398 [ 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#135 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/)'
2024-07-25 10:21:56,408 [ scc.git] DEBUG [detached HEAD 0aaa6a3] merge master -Dorg -Ssuccess-only
2024-07-25 10:21:56,409 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:21:56,409 [ scc.repo] DEBUG ## PRs found:
2024-07-25 10:21:56,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-07-25 10:21:56,724 [ scc.repo] DEBUG ## Branches found:
2024-07-25 10:21:56,724 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-07-25 10:21:56,724 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:56,724 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:56,731 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-25 10:21:56,737 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-25 10:21:56,737 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-25 10:21:56,744 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-25 10:21:56,751 [ scc.git] DEBUG Already up to date.
2024-07-25 10:21:56,751 [ scc.git] DEBUG ## Unique users: []
2024-07-25 10:21:56,751 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:56,752 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:56,758 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-25 10:21:56,805 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:56,805 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:56,811 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-25 10:21:56,859 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-25 10:21:56,866 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2f285b6700> has no local changes
2024-07-25 10:21:56,867 [ 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#135 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/)'
2024-07-25 10:21:56,877 [ scc.git] DEBUG [detached HEAD af11517] merge master -Dorg -Ssuccess-only
2024-07-25 10:21:56,878 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:21:56,878 [ scc.repo] DEBUG ## PRs found:
2024-07-25 10:21:57,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-07-25 10:21:57,157 [ scc.repo] DEBUG ## Branches found:
2024-07-25 10:21:57,157 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-07-25 10:21:57,157 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:57,157 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:57,163 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-25 10:21:57,168 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-25 10:21:57,168 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-25 10:21:57,175 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-25 10:21:57,182 [ scc.git] DEBUG Already up to date.
2024-07-25 10:21:57,182 [ scc.git] DEBUG ## Unique users: []
2024-07-25 10:21:57,182 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:57,182 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:57,188 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-25 10:21:57,229 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:21:57,229 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:21:57,235 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-25 10:21:57,277 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-25 10:21:57,288 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2f285924f0> has no local changes
2024-07-25 10:21:57,288 [ 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#135 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/)'
2024-07-25 10:21:57,298 [ scc.git] DEBUG [detached HEAD 2310b60] merge master -Dorg -Ssuccess-only
2024-07-25 10:21:57,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:21:57,298 [ scc.repo] DEBUG ## PRs found:
2024-07-25 10:21:57,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-07-25 10:21:58,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-07-25 10:21:58,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-07-25 10:21:59,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-07-25 10:21:59,589 [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-25 10:22:00,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-07-25 10:22:00,515 [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-25 10:22:00,517 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-07-25 10:22:00,518 [ scc.repo] DEBUG ## Branches found:
2024-07-25 10:22:00,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-07-25 10:22:00,518 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:22:00,518 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:22:00,526 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-25 10:22:00,536 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-25 10:22:00,536 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-25 10:22:00,545 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-25 10:22:00,553 [ scc.git] DEBUG Already up to date.
2024-07-25 10:22:00,554 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-07-25 10:22:00,950 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-07-25 10:22:00,951 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-07-25 10:22:00,957 [ scc.git] DEBUG ## Unique users: []
2024-07-25 10:22:00,957 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:22:00,957 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:22:00,964 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-25 10:22:00,972 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:22:00,979 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-25 10:22:00,992 [ scc.git] DEBUG Auto-merging Dockerfile
2024-07-25 10:22:00,992 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-07-25 10:22:00,992 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-25 10:22:00,992 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-25 10:22:01,000 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-07-25 10:22:01,011 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-07-25 10:22:01,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:22:01,188 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-07-25 10:22:01,197 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-07-25 10:22:01,206 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#135](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-07-25 10:22:01,213 [ scc.config] DEBUG Found github.token
2024-07-25 10:22:01,214 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-07-25 10:22:01,214 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-25 10:22:01,268 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:22:01,269 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:22:01,277 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-25 10:22:01,328 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-25 10:22:01,337 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2f285358b0> has no local changes
2024-07-25 10:22:01,338 [ 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#135 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/)'
2024-07-25 10:22:01,350 [ scc.git] DEBUG [detached HEAD d5bff98] merge master -Dorg -Ssuccess-only
2024-07-25 10:22:01,350 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:22:01,350 [ scc.git] INFO Overriding base-branch from master to develop
2024-07-25 10:22:01,350 [ scc.repo] DEBUG ## PRs found:
2024-07-25 10:22:01,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-07-25 10:22:02,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-07-25 10:22:02,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-07-25 10:22:03,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-07-25 10:22:03,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-07-25 10:22:04,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-07-25 10:22:04,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-07-25 10:22:05,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-25 10:22:05,853 [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-25 10:22:06,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-25 10:22:06,746 [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-25 10:22:06,747 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-25 10:22:07,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-07-25 10:22:07,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-07-25 10:22:08,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-07-25 10:22:08,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-07-25 10:22:08,921 [ scc.repo] DEBUG ## Branches found:
2024-07-25 10:22:08,921 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-07-25 10:22:08,921 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:22:08,921 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:22:08,931 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-07-25 10:22:08,943 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-25 10:22:08,943 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-07-25 10:22:08,955 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-07-25 10:22:08,968 [ scc.git] DEBUG Already up to date.
2024-07-25 10:22:08,968 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-07-25 10:22:09,377 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-07-25 10:22:09,378 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-07-25 10:22:09,386 [ scc.git] DEBUG ## Unique users: []
2024-07-25 10:22:09,386 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:22:09,387 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:22:09,396 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-25 10:22:09,407 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:22:09,418 [ 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-25 10:22:09,434 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-07-25 10:22:09,434 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-07-25 10:22:09,434 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-25 10:22:09,435 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-25 10:22:09,445 [ scc.git] DEBUG Calling 'git reset --hard c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-25 10:22:09,454 [ scc.git] DEBUG HEAD is now at c20d273 Merge pull request #221 from imcf/fix-typechecking
2024-07-25 10:22:09,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:22:09,613 [ scc.git] DEBUG Calling 'git merge-base c20d2734b711c659cecea83db6e2ebd7b7013636 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-25 10:22:09,625 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-25 10:22:09,637 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#135](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-07-25 10:22:09,647 [ scc.config] DEBUG Found github.token
2024-07-25 10:22:09,648 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-07-25 10:22:09,648 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-25 10:22:09,721 [ scc.git] DEBUG Get sha1 of %s
2024-07-25 10:22:09,722 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-25 10:22:09,732 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-25 10:22:09,781 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-25 10:22:09,790 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2f28535580> has no local changes
2024-07-25 10:22:09,790 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#135 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/)'
2024-07-25 10:22:09,801 [ scc.git] DEBUG [detached HEAD 49da4d2] merge master -Dorg -Ssuccess-only
2024-07-25 10:22:09,802 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:22:09,802 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-25 10:22:09,888 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-07-25 10:22:10,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:22:10,058 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-07-25 10:22:10,064 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-07-25 10:22:10,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:22:10,478 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-07-25 10:22:10,485 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-07-25 10:22:10,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:22:10,903 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-07-25 10:22:10,910 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-07-25 10:22:11,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:22:11,335 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-07-25 10:22:11,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:22:11,756 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-07-25 10:22:11,764 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-07-25 10:22:12,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:22:12,185 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-07-25 10:22:12,192 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-07-25 10:22:12,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:22:12,604 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-07-25 10:22:12,611 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-07-25 10:22:13,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:22:13,022 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-07-25 10:22:13,027 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-07-25 10:22:13,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:22:13,473 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-07-25 10:22:13,488 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-07-25 10:22:13,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:22:13,876 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-07-25 10:22:13,884 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-07-25 10:22:14,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:22:14,292 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-07-25 10:22:14,302 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-07-25 10:22:14,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:22:14,711 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-07-25 10:22:14,716 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-07-25 10:22:15,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:22:15,134 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-07-25 10:22:15,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:22:15,549 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-07-25 10:22:15,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:22:15,957 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-07-25 10:22:15,961 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-07-25 10:22:16,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:22:16,402 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-07-25 10:22:16,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:22:16,824 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-07-25 10:22:17,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:22:17,226 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-07-25 10:22:17,231 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-07-25 10:22:17,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:22:17,648 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-07-25 10:22:17,655 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-07-25 10:22:18,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:22:18,065 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-07-25 10:22:18,072 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-07-25 10:22:18,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:22:18,482 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-07-25 10:22:18,488 [ scc.config] DEBUG Found submodule.scripts.url
2024-07-25 10:22:18,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-25 10:22:18,896 [ scc.config] DEBUG Found submodule.scripts.branch
2024-07-25 10:22:18,897 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-25 10:22:18,980 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2f2bfc3d30> has local changes
2024-07-25 10:22:18,980 [ 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)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#135 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/135/)'
2024-07-25 10:22:18,995 [ scc.git] DEBUG [detached HEAD 057a2bf] merge master -Dorg -Ssuccess-only
2024-07-25 10:22:18,996 [ scc.merge] INFO Repository: ome/omero-plugins
2024-07-25 10:22:18,996 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-07-25 10:22:18,996 [ scc.merge] INFO Already up to date.
2024-07-25 10:22:18,996 [ scc.merge] INFO
2024-07-25 10:22:18,996 [ scc.merge] INFO
2024-07-25 10:22:18,996 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-07-25 10:22:18,996 [ scc.merge] INFO Already up to date.
2024-07-25 10:22:18,996 [ scc.merge] INFO
2024-07-25 10:22:18,996 [ scc.merge] INFO
2024-07-25 10:22:18,996 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-07-25 10:22:18,996 [ scc.merge] INFO Excluded PRs:
2024-07-25 10:22:18,996 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-07-25 10:22:18,996 [ scc.merge] INFO Already up to date.
2024-07-25 10:22:18,996 [ scc.merge] INFO
2024-07-25 10:22:18,996 [ scc.merge] INFO Merged PRs:
2024-07-25 10:22:18,996 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-07-25 10:22:18,996 [ scc.merge] INFO
2024-07-25 10:22:18,996 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-07-25 10:22:18,996 [ scc.merge] INFO Excluded PRs:
2024-07-25 10:22:18,996 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-07-25 10:22:18,997 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-07-25 10:22:18,997 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-07-25 10:22:18,997 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-07-25 10:22:18,997 [ scc.merge] INFO Already up to date.
2024-07-25 10:22:18,997 [ scc.merge] INFO
2024-07-25 10:22:18,997 [ scc.merge] INFO Merged PRs:
2024-07-25 10:22:18,997 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-07-25 10:22:18,997 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-07-25 10:22:18,997 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-07-25 10:22:18,997 [ scc.merge] INFO
2024-07-25 10:22:18,997 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-07-25 10:22:18,997 [ scc.merge] INFO Excluded PRs:
2024-07-25 10:22:18,997 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-07-25 10:22:18,997 [ scc.merge] INFO Already up to date.
2024-07-25 10:22:18,997 [ scc.merge] INFO
2024-07-25 10:22:18,997 [ scc.merge] INFO Merged PRs:
2024-07-25 10:22:18,997 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-07-25 10:22:18,997 [ scc.merge] INFO
2024-07-25 10:22:18,997 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-25 10:22:18,997 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-07-25 10:22:18,997 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-07-25 10:22:18,997 [ scc.merge] INFO
2024-07-25 10:22:18,997 [ scc.merge] INFO Repository: ome/omero-figure
2024-07-25 10:22:18,997 [ scc.merge] INFO Excluded PRs:
2024-07-25 10:22:18,997 [ scc.merge] INFO - PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
2024-07-25 10:22:18,997 [ scc.merge] INFO - PR 580 Rdornier 'Weird translation' (user: Rdornier)
2024-07-25 10:22:18,997 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-07-25 10:22:18,997 [ scc.merge] INFO - PR 578 Rdornier 'Image outline' (user: Rdornier)
2024-07-25 10:22:18,997 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' (user: Rdornier)
2024-07-25 10:22:18,997 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-07-25 10:22:18,997 [ scc.merge] INFO Already up to date.
2024-07-25 10:22:18,997 [ scc.merge] INFO
2024-07-25 10:22:18,997 [ scc.merge] INFO Merged PRs:
2024-07-25 10:22:18,997 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-07-25 10:22:18,997 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-07-25 10:22:18,997 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-07-25 10:22:18,997 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-07-25 10:22:18,997 [ scc.merge] INFO - PR 576 Rdornier 'Color picker - popup update'
2024-07-25 10:22:18,997 [ scc.merge] INFO
2024-07-25 10:22:18,998 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-07-25 10:22:18,998 [ scc.merge] INFO Already up to date.
2024-07-25 10:22:18,998 [ scc.merge] INFO
2024-07-25 10:22:18,998 [ scc.merge] INFO Merged PRs:
2024-07-25 10:22:18,998 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-07-25 10:22:18,998 [ scc.merge] INFO
2024-07-25 10:22:18,998 [ scc.merge] INFO Repository: ome/omero-gallery
2024-07-25 10:22:18,998 [ scc.merge] INFO Already up to date.
2024-07-25 10:22:18,998 [ scc.merge] INFO
2024-07-25 10:22:18,998 [ scc.merge] INFO Merged PRs:
2024-07-25 10:22:18,998 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-07-25 10:22:18,998 [ scc.merge] INFO
2024-07-25 10:22:18,998 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-07-25 10:22:18,998 [ scc.merge] INFO Excluded PRs:
2024-07-25 10:22:18,998 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-07-25 10:22:18,998 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-07-25 10:22:18,998 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-07-25 10:22:18,998 [ scc.merge] INFO Already up to date.
2024-07-25 10:22:18,998 [ scc.merge] INFO
2024-07-25 10:22:18,998 [ scc.merge] INFO Merged PRs:
2024-07-25 10:22:18,998 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-07-25 10:22:18,998 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-07-25 10:22:18,998 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-07-25 10:22:18,998 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-07-25 10:22:18,998 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-07-25 10:22:18,998 [ scc.merge] INFO
2024-07-25 10:22:18,998 [ scc.merge] INFO Repository: ome/omero-mapr
2024-07-25 10:22:18,998 [ scc.merge] INFO Excluded PRs:
2024-07-25 10:22:18,998 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-07-25 10:22:18,998 [ scc.merge] INFO Already up to date.
2024-07-25 10:22:18,998 [ scc.merge] INFO
2024-07-25 10:22:18,998 [ scc.merge] INFO Merged PRs:
2024-07-25 10:22:18,998 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-07-25 10:22:18,998 [ scc.merge] INFO
2024-07-25 10:22:18,998 [ scc.merge] INFO Repository: ome/omero-metadata
2024-07-25 10:22:18,998 [ scc.merge] INFO Already up to date.
2024-07-25 10:22:18,998 [ scc.merge] INFO
2024-07-25 10:22:18,998 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-25 10:22:18,998 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-07-25 10:22:18,999 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-07-25 10:22:18,999 [ scc.merge] INFO
2024-07-25 10:22:18,999 [ scc.merge] INFO Repository: ome/omero-parade
2024-07-25 10:22:18,999 [ scc.merge] INFO Excluded PRs:
2024-07-25 10:22:18,999 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-07-25 10:22:18,999 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-07-25 10:22:18,999 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-07-25 10:22:18,999 [ scc.merge] INFO Already up to date.
2024-07-25 10:22:18,999 [ scc.merge] INFO
2024-07-25 10:22:18,999 [ scc.merge] INFO Merged PRs:
2024-07-25 10:22:18,999 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-07-25 10:22:18,999 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-07-25 10:22:18,999 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-07-25 10:22:18,999 [ scc.merge] INFO
2024-07-25 10:22:18,999 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-07-25 10:22:18,999 [ scc.merge] INFO Already up to date.
2024-07-25 10:22:18,999 [ scc.merge] INFO
2024-07-25 10:22:18,999 [ scc.merge] INFO Merged PRs:
2024-07-25 10:22:18,999 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-07-25 10:22:18,999 [ scc.merge] INFO
2024-07-25 10:22:18,999 [ scc.merge] INFO Repository: ome/omero-rois
2024-07-25 10:22:18,999 [ scc.merge] INFO Excluded PRs:
2024-07-25 10:22:18,999 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-07-25 10:22:18,999 [ scc.merge] INFO Already up to date.
2024-07-25 10:22:18,999 [ scc.merge] INFO
2024-07-25 10:22:18,999 [ scc.merge] INFO Merged PRs:
2024-07-25 10:22:18,999 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-07-25 10:22:18,999 [ scc.merge] INFO
2024-07-25 10:22:18,999 [ scc.merge] INFO Repository: ome/omero-signup
2024-07-25 10:22:18,999 [ scc.merge] INFO Already up to date.
2024-07-25 10:22:18,999 [ scc.merge] INFO
2024-07-25 10:22:18,999 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-25 10:22:18,999 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-07-25 10:22:18,999 [ scc.merge] INFO
2024-07-25 10:22:18,999 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-07-25 10:22:18,999 [ scc.merge] INFO Already up to date.
2024-07-25 10:22:18,999 [ scc.merge] INFO
2024-07-25 10:22:18,999 [ scc.merge] INFO Merged PRs:
2024-07-25 10:22:18,999 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-07-25 10:22:18,999 [ scc.merge] INFO
2024-07-25 10:22:19,000 [ scc.merge] INFO Repository: ome/omero-upload
2024-07-25 10:22:19,000 [ scc.merge] INFO Already up to date.
2024-07-25 10:22:19,000 [ scc.merge] INFO
2024-07-25 10:22:19,000 [ scc.merge] INFO
2024-07-25 10:22:19,000 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-07-25 10:22:19,000 [ scc.merge] INFO Already up to date.
2024-07-25 10:22:19,000 [ scc.merge] INFO
2024-07-25 10:22:19,000 [ scc.merge] INFO
2024-07-25 10:22:19,000 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-07-25 10:22:19,000 [ scc.merge] INFO Excluded PRs:
2024-07-25 10:22:19,000 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-07-25 10:22:19,000 [ scc.merge] INFO Already up to date.
2024-07-25 10:22:19,000 [ scc.merge] INFO
2024-07-25 10:22:19,000 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-25 10:22:19,000 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-07-25 10:22:19,000 [ scc.merge] INFO
2024-07-25 10:22:19,000 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-07-25 10:22:19,000 [ scc.merge] INFO Already up to date.
2024-07-25 10:22:19,000 [ scc.merge] INFO
2024-07-25 10:22:19,000 [ scc.merge] INFO
2024-07-25 10:22:19,000 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-07-25 10:22:19,000 [ scc.merge] INFO Already up to date.
2024-07-25 10:22:19,000 [ scc.merge] INFO
2024-07-25 10:22:19,000 [ scc.merge] INFO
2024-07-25 10:22:19,000 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-07-25 10:22:19,000 [ scc.merge] INFO Already up to date.
2024-07-25 10:22:19,000 [ scc.merge] INFO
2024-07-25 10:22:19,000 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-25 10:22:19,000 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-07-25 10:22:19,000 [ scc.merge] INFO
2024-07-25 10:22:19,000 [ scc.merge] INFO Repository: ome/scripts
2024-07-25 10:22:19,000 [ scc.merge] INFO Excluded PRs:
2024-07-25 10:22:19,000 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-07-25 10:22:19,000 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-07-25 10:22:19,000 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-07-25 10:22:19,000 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-07-25 10:22:19,001 [ scc.merge] INFO Already up to date.
2024-07-25 10:22:19,001 [ scc.merge] INFO
2024-07-25 10:22:19,001 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-25 10:22:19,001 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-25 10:22:19,001 [ scc.merge] INFO
2024-07-25 10:22:19,001 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-25 10:22:19,001 [ scc.git] DEBUG Calling 'git remote'
2024-07-25 10:22:19,007 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-07-25 10:22:19,007 [ scc.git] DEBUG Calling 'git remote'
2024-07-25 10:22:19,012 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:22:19,013 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-07-25 10:22:19,013 [ scc.git] DEBUG Calling 'git remote'
2024-07-25 10:22:19,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:22:19,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-07-25 10:22:19,018 [ scc.git] DEBUG Calling 'git remote'
2024-07-25 10:22:19,025 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:22:19,025 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-07-25 10:22:19,025 [ scc.git] DEBUG Calling 'git remote'
2024-07-25 10:22:19,031 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:22:19,032 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-07-25 10:22:19,032 [ scc.git] DEBUG Calling 'git remote'
2024-07-25 10:22:19,038 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:22:19,038 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-07-25 10:22:19,038 [ scc.git] DEBUG Calling 'git remote'
2024-07-25 10:22:19,044 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:22:19,045 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-07-25 10:22:19,045 [ scc.git] DEBUG Calling 'git remote'
2024-07-25 10:22:19,051 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:22:19,051 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-07-25 10:22:19,051 [ scc.git] DEBUG Calling 'git remote'
2024-07-25 10:22:19,057 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:22:19,058 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-07-25 10:22:19,058 [ scc.git] DEBUG Calling 'git remote'
2024-07-25 10:22:19,064 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:22:19,064 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-07-25 10:22:19,064 [ scc.git] DEBUG Calling 'git remote'
2024-07-25 10:22:19,070 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:22:19,070 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-07-25 10:22:19,070 [ scc.git] DEBUG Calling 'git remote'
2024-07-25 10:22:19,076 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:22:19,076 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-07-25 10:22:19,076 [ scc.git] DEBUG Calling 'git remote'
2024-07-25 10:22:19,082 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:22:19,082 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-07-25 10:22:19,082 [ scc.git] DEBUG Calling 'git remote'
2024-07-25 10:22:19,088 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:22:19,088 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-07-25 10:22:19,089 [ scc.git] DEBUG Calling 'git remote'
2024-07-25 10:22:19,095 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:22:19,096 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-07-25 10:22:19,096 [ scc.git] DEBUG Calling 'git remote'
2024-07-25 10:22:19,102 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:22:19,102 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-07-25 10:22:19,102 [ scc.git] DEBUG Calling 'git remote'
2024-07-25 10:22:19,108 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:22:19,109 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-07-25 10:22:19,109 [ scc.git] DEBUG Calling 'git remote'
2024-07-25 10:22:19,115 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:22:19,115 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-07-25 10:22:19,115 [ scc.git] DEBUG Calling 'git remote'
2024-07-25 10:22:19,121 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:22:19,121 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-07-25 10:22:19,121 [ scc.git] DEBUG Calling 'git remote'
2024-07-25 10:22:19,126 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:22:19,127 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-07-25 10:22:19,127 [ scc.git] DEBUG Calling 'git remote'
2024-07-25 10:22:19,132 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:22:19,132 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-07-25 10:22:19,132 [ scc.git] DEBUG Calling 'git remote'
2024-07-25 10:22:19,138 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-07-25 10:22:19,138 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-07-25 10:22:19,138 [ scc.git] DEBUG Calling 'git remote'
2024-07-25 10:22:19,143 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.9.1 to 5.9.2-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD 36ce48c] 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 7b65e50] 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-25 10:23:05,962 [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-25 10:23:15,449 [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-25 10:23:17,871 [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-25 10:23:22,740 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-07-25 10:24:11,698 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS