Console Output
Skipping 98 KB..
Full Logs-push/omero-figure
2024-08-17 00:41:23,140 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:41:23,140 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:41:23,147 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-17 00:41:23,152 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-17 00:41:23,152 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-17 00:41:23,158 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-17 00:41:23,166 [ scc.git] DEBUG Already up to date.
2024-08-17 00:41:23,166 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-08-17 00:41:23,512 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-17 00:41:23,512 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-08-17 00:41:23,519 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-08-17 00:41:24,058 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-17 00:41:24,059 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-08-17 00:41:24,064 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-08-17 00:41:24,689 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-17 00:41:24,690 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-08-17 00:41:24,695 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-08-17 00:41:24,999 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-17 00:41:25,000 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-08-17 00:41:25,005 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-08-17 00:41:25,574 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-17 00:41:25,574 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-08-17 00:41:25,580 [ scc.git] DEBUG ## Unique users: []
2024-08-17 00:41:25,580 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:41:25,580 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:41:25,586 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-08-17 00:41:25,594 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:41:25,600 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-08-17 00:41:25,618 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-17 00:41:25,618 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-17 00:41:25,618 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-17 00:41:25,625 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-08-17 00:41:25,625 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-08-17 00:41:25,625 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-08-17 00:41:25,625 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-08-17 00:41:25,625 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-08-17 00:41:25,625 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-08-17 00:41:25,625 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-08-17 00:41:25,625 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-08-17 00:41:25,625 [ scc.git] DEBUG src/templates/rois_form.template.html | 8 ++++
2024-08-17 00:41:25,625 [ scc.git] DEBUG 9 files changed, 271 insertions(+), 5 deletions(-)
2024-08-17 00:41:25,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:41:25,763 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-08-17 00:41:25,771 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:41:25,776 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-08-17 00:41:25,806 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-17 00:41:25,806 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-17 00:41:25,807 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-08-17 00:41:25,807 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-08-17 00:41:25,807 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-17 00:41:25,813 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-08-17 00:41:25,813 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-08-17 00:41:25,813 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-08-17 00:41:25,813 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-08-17 00:41:25,813 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-08-17 00:41:25,813 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-08-17 00:41:25,813 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-08-17 00:41:25,813 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-08-17 00:41:25,813 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-08-17 00:41:25,813 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-08-17 00:41:25,813 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-08-17 00:41:25,813 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-08-17 00:41:26,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:41:26,144 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-08-17 00:41:26,153 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:41:26,159 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) 3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-08-17 00:41:26,422 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-08-17 00:41:26,422 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-17 00:41:26,423 [ scc.git] DEBUG Auto-merging src/index.html
2024-08-17 00:41:26,423 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-08-17 00:41:26,423 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-17 00:41:26,423 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-17 00:41:26,423 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-17 00:41:26,431 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-08-17 00:41:26,431 [ scc.git] DEBUG omero_figure/urls.py | 10 +++-
2024-08-17 00:41:26,431 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-08-17 00:41:26,431 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-08-17 00:41:26,431 [ scc.git] DEBUG src/index.html | 1 +
2024-08-17 00:41:26,431 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-08-17 00:41:26,431 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-08-17 00:41:26,431 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-08-17 00:41:26,431 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-08-17 00:41:26,431 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-08-17 00:41:26,431 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-08-17 00:41:26,433 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-08-17 00:41:26,433 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-08-17 00:41:26,433 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-08-17 00:41:26,433 [ scc.git] DEBUG 14 files changed, 162 insertions(+), 15 deletions(-)
2024-08-17 00:41:26,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:41:26,560 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-08-17 00:41:26,569 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:41:26,574 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 568 (Remove numpy from tests_require in setup.py) 15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-08-17 00:41:26,600 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-17 00:41:26,603 [ scc.git] DEBUG setup.py | 2 +-
2024-08-17 00:41:26,603 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-17 00:41:26,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:41:26,949 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...84186c0c62398b8ddbbe47dabea7f16cb7913e99'
2024-08-17 00:41:26,959 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:41:26,963 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 576 (Color picker - popup update) 84186c0c62398b8ddbbe47dabea7f16cb7913e99'
2024-08-17 00:41:27,009 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-17 00:41:27,009 [ scc.git] DEBUG Auto-merging src/index.html
2024-08-17 00:41:27,009 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-17 00:41:27,014 [ scc.git] DEBUG src/css/figure.css | 3 +++
2024-08-17 00:41:27,014 [ scc.git] DEBUG src/index.html | 5 ++++-
2024-08-17 00:41:27,014 [ scc.git] DEBUG src/js/views/colorpicker.js | 14 ++++++++++++--
2024-08-17 00:41:27,014 [ scc.git] DEBUG 3 files changed, 19 insertions(+), 3 deletions(-)
2024-08-17 00:41:27,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:41:27,358 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-17 00:41:27,400 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:41:27,401 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:41:27,406 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-17 00:41:27,445 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-17 00:41:27,452 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0fb868a4f0> has no local changes
2024-08-17 00:41:27,452 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 578 Rdornier 'Image outline' (user: Rdornier)
- PR 577 Rdornier 'Fill rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 576 Rdornier 'Color picker - popup update'
Generated by OMERO-plugins-push#156 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/)'
2024-08-17 00:41:27,468 [ scc.git] DEBUG [detached HEAD 8c4fe521] merge master -Dorg -Ssuccess-only
2024-08-17 00:41:27,470 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:41:27,470 [ scc.repo] DEBUG ## PRs found:
2024-08-17 00:41:27,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-08-17 00:41:28,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-08-17 00:41:28,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-08-17 00:41:29,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-17 00:41:29,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-17 00:41:30,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-17 00:41:30,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-08-17 00:41:30,570 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-08-17 00:41:30,570 [ scc.repo] DEBUG ## Branches found:
2024-08-17 00:41:30,570 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-17 00:41:30,570 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:41:30,570 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:41:30,576 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-17 00:41:30,581 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-17 00:41:30,581 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-17 00:41:30,586 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-17 00:41:30,592 [ scc.git] DEBUG Already up to date.
2024-08-17 00:41:30,592 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-08-17 00:41:30,935 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-08-17 00:41:30,935 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-08-17 00:41:30,940 [ scc.git] DEBUG ## Unique users: []
2024-08-17 00:41:30,941 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:41:30,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:41:30,947 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-17 00:41:30,952 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:41:30,957 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-17 00:41:31,164 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-08-17 00:41:31,165 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-17 00:41:31,168 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-08-17 00:41:31,168 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-08-17 00:41:31,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:41:31,295 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-17 00:41:31,336 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:41:31,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:41:31,342 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-17 00:41:31,382 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-17 00:41:31,388 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0fba6ea700> has no local changes
2024-08-17 00:41:31,388 [ 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#156 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/)'
2024-08-17 00:41:31,396 [ scc.git] DEBUG [detached HEAD d3022a4] merge master -Dorg -Ssuccess-only
2024-08-17 00:41:31,396 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:41:31,396 [ scc.repo] DEBUG ## PRs found:
2024-08-17 00:41:31,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-08-17 00:41:32,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-08-17 00:41:32,176 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-17 00:41:32,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-17 00:41:33,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-17 00:41:33,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-17 00:41:34,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-17 00:41:34,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-08-17 00:41:34,504 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-17 00:41:34,504 [ scc.repo] DEBUG ## Branches found:
2024-08-17 00:41:34,504 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-17 00:41:34,505 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:41:34,505 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:41:34,510 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-17 00:41:34,514 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-17 00:41:34,515 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-17 00:41:34,519 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-17 00:41:34,524 [ scc.git] DEBUG Already up to date.
2024-08-17 00:41:34,524 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-08-17 00:41:34,846 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-08-17 00:41:34,847 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-08-17 00:41:34,851 [ scc.git] DEBUG ## Unique users: []
2024-08-17 00:41:34,851 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:41:34,852 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:41:34,857 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-08-17 00:41:34,862 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:41:34,866 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-08-17 00:41:34,876 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-17 00:41:34,880 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-08-17 00:41:34,880 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-08-17 00:41:35,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:41:35,011 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-17 00:41:35,051 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:41:35,052 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:41:35,057 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-17 00:41:35,096 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-17 00:41:35,103 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0fba731b50> has no local changes
2024-08-17 00:41:35,103 [ 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#156 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/)'
2024-08-17 00:41:35,111 [ scc.git] DEBUG [detached HEAD 118d598] merge master -Dorg -Ssuccess-only
2024-08-17 00:41:35,111 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:41:35,112 [ scc.repo] DEBUG ## PRs found:
2024-08-17 00:41:35,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-08-17 00:41:36,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-08-17 00:41:36,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-08-17 00:41:36,462 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-17 00:41:37,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-17 00:41:37,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-17 00:41:38,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-17 00:41:38,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-17 00:41:39,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-08-17 00:41:39,070 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-17 00:41:39,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-08-17 00:41:39,507 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-17 00:41:40,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-17 00:41:40,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-17 00:41:40,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-17 00:41:41,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-17 00:41:41,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-08-17 00:41:41,900 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-17 00:41:42,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-08-17 00:41:42,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-08-17 00:41:43,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-17 00:41:43,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-17 00:41:44,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-17 00:41:44,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-17 00:41:45,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-08-17 00:41:45,201 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-17 00:41:45,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-08-17 00:41:46,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-08-17 00:41:46,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-17 00:41:47,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-17 00:41:47,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-17 00:41:48,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-17 00:41:48,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-08-17 00:41:48,570 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-08-17 00:41:49,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-08-17 00:41:49,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-08-17 00:41:49,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-17 00:41:50,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-17 00:41:50,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-17 00:41:51,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-08-17 00:41:51,206 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-08-17 00:41:51,207 [ scc.repo] DEBUG ## Branches found:
2024-08-17 00:41:51,207 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-17 00:41:51,208 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:41:51,208 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:41:51,215 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-17 00:41:51,220 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-17 00:41:51,220 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-17 00:41:51,254 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-17 00:41:51,261 [ scc.git] DEBUG Already up to date.
2024-08-17 00:41:51,261 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-08-17 00:41:51,577 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-17 00:41:51,577 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-08-17 00:41:51,582 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-08-17 00:41:52,335 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-17 00:41:52,336 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-08-17 00:41:52,344 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-08-17 00:41:52,639 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-17 00:41:52,639 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-08-17 00:41:52,646 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-08-17 00:41:52,927 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-17 00:41:52,927 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-08-17 00:41:52,934 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-08-17 00:41:53,245 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-17 00:41:53,246 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-08-17 00:41:53,266 [ scc.git] DEBUG ## Unique users: []
2024-08-17 00:41:53,266 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:41:53,266 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:41:53,274 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-17 00:41:53,280 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:41:53,285 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-17 00:41:53,342 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-08-17 00:41:53,342 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-17 00:41:53,346 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-08-17 00:41:53,346 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-08-17 00:41:53,346 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-08-17 00:41:53,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:41:53,475 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-17 00:41:53,483 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:41:53,489 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-17 00:41:53,509 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-08-17 00:41:53,510 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-08-17 00:41:53,510 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-08-17 00:41:53,510 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-08-17 00:41:53,510 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-17 00:41:53,514 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-08-17 00:41:53,514 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-08-17 00:41:53,515 [ scc.git] DEBUG src/app/header.html | 5 +
2024-08-17 00:41:53,515 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-08-17 00:41:53,515 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-08-17 00:41:53,515 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-08-17 00:41:53,515 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-08-17 00:41:53,515 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-08-17 00:41:53,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:41:53,895 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-17 00:41:53,905 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:41:53,910 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-17 00:41:53,965 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-08-17 00:41:53,966 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-17 00:41:53,969 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-08-17 00:41:53,969 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-08-17 00:41:53,969 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-08-17 00:41:54,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:41:54,278 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-17 00:41:54,287 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:41:54,294 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-17 00:41:54,311 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-17 00:41:54,321 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-08-17 00:41:54,321 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-08-17 00:41:54,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:41:54,663 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-08-17 00:41:54,672 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:41:54,677 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 478 (Bump socket.io from 4.6.1 to 4.7.5) 91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-08-17 00:41:54,714 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-17 00:41:54,715 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-17 00:41:55,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:41:55,035 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-17 00:41:55,077 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:41:55,077 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:41:55,083 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-17 00:41:55,129 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-17 00:41:55,141 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0fba70abe0> has no local changes
2024-08-17 00:41:55,141 [ 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#156 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/)'
2024-08-17 00:41:55,152 [ scc.git] DEBUG [detached HEAD 7a16d35] merge master -Dorg -Ssuccess-only
2024-08-17 00:41:55,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:41:55,152 [ scc.repo] DEBUG ## PRs found:
2024-08-17 00:41:55,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-08-17 00:41:55,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/85 HTTP/1.1" 200 None
2024-08-17 00:41:56,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/85/comments HTTP/1.1" 200 None
2024-08-17 00:41:56,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/5166040a15b493631009b9e446f25b6a724289e3 HTTP/1.1" 200 None
2024-08-17 00:41:57,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/5166040a15b493631009b9e446f25b6a724289e3/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-17 00:41:57,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/5166040a15b493631009b9e446f25b6a724289e3/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-17 00:41:58,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-08-17 00:41:58,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-08-17 00:41:59,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-17 00:41:59,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-17 00:42:00,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-17 00:42:00,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-17 00:42:01,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-08-17 00:42:01,073 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-08-17 00:42:01,074 [ scc.repo] DEBUG ## Branches found:
2024-08-17 00:42:01,074 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-17 00:42:01,074 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:01,074 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:01,082 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-17 00:42:01,088 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-17 00:42:01,088 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-17 00:42:01,095 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-17 00:42:01,103 [ scc.git] DEBUG Already up to date.
2024-08-17 00:42:01,103 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-08-17 00:42:01,419 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-08-17 00:42:01,420 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-08-17 00:42:01,431 [ scc.git] DEBUG ## Unique users: []
2024-08-17 00:42:01,431 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:01,431 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:01,438 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-17 00:42:01,445 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:01,450 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-17 00:42:01,462 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-17 00:42:01,465 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-08-17 00:42:01,466 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-08-17 00:42:01,466 [ scc.git] DEBUG requirements.txt | 2 +-
2024-08-17 00:42:01,466 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-08-17 00:42:01,466 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-08-17 00:42:01,466 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-08-17 00:42:01,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:42:01,637 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-17 00:42:01,688 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:01,688 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:01,696 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-17 00:42:01,764 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-17 00:42:01,776 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0fba6ddf10> has no local changes
2024-08-17 00:42:01,776 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- PR 85 sbesson 'Add support for OMERO.web 5.27.0' (status: failure)
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Generated by OMERO-plugins-push#156 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/)'
2024-08-17 00:42:01,790 [ scc.git] DEBUG [detached HEAD 4dc5f77] merge master -Dorg -Ssuccess-only
2024-08-17 00:42:01,790 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:42:01,791 [ scc.repo] DEBUG ## PRs found:
2024-08-17 00:42:02,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-08-17 00:42:02,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-08-17 00:42:03,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-08-17 00:42:03,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-17 00:42:04,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-17 00:42:04,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-17 00:42:04,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-08-17 00:42:04,880 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-17 00:42:05,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-08-17 00:42:05,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-08-17 00:42:06,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-17 00:42:06,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-17 00:42:07,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-17 00:42:07,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-08-17 00:42:07,663 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-17 00:42:07,663 [ scc.repo] DEBUG ## Branches found:
2024-08-17 00:42:07,663 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-17 00:42:07,663 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:07,663 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:07,670 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-17 00:42:07,676 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-17 00:42:07,676 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-17 00:42:07,681 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-17 00:42:07,688 [ scc.git] DEBUG Already up to date.
2024-08-17 00:42:07,688 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-08-17 00:42:08,162 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-17 00:42:08,162 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-08-17 00:42:08,169 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-08-17 00:42:08,628 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-17 00:42:08,629 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-08-17 00:42:08,636 [ scc.git] DEBUG ## Unique users: []
2024-08-17 00:42:08,636 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:08,636 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:08,643 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-17 00:42:08,657 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:08,664 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-17 00:42:08,720 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-08-17 00:42:08,720 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-08-17 00:42:08,720 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-17 00:42:08,720 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-17 00:42:08,721 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-17 00:42:08,722 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-17 00:42:08,731 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-17 00:42:08,739 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-17 00:42:08,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:42:08,876 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-17 00:42:08,885 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-17 00:42:08,894 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#156](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-08-17 00:42:08,901 [ scc.config] DEBUG Found github.token
2024-08-17 00:42:08,901 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-08-17 00:42:08,902 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-17 00:42:08,911 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:08,918 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-17 00:42:08,956 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-17 00:42:08,956 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-17 00:42:08,956 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-08-17 00:42:08,956 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-17 00:42:08,957 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-17 00:42:08,964 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-17 00:42:08,973 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-17 00:42:09,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:42:09,258 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-17 00:42:09,268 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-17 00:42:09,274 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#156](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-08-17 00:42:09,280 [ scc.config] DEBUG Found github.token
2024-08-17 00:42:09,281 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-08-17 00:42:09,281 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-17 00:42:09,321 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:09,321 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:09,327 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-17 00:42:09,371 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-17 00:42:09,379 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0fb86bef40> has no local changes
2024-08-17 00:42:09,379 [ 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#156 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/)'
2024-08-17 00:42:09,388 [ scc.git] DEBUG [detached HEAD d642cd1] merge master -Dorg -Ssuccess-only
2024-08-17 00:42:09,389 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:42:09,389 [ scc.repo] DEBUG ## PRs found:
2024-08-17 00:42:09,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-08-17 00:42:10,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-08-17 00:42:10,257 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-17 00:42:10,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-17 00:42:11,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-17 00:42:11,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-17 00:42:12,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-17 00:42:12,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-08-17 00:42:12,769 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-17 00:42:13,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-08-17 00:42:13,209 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-17 00:42:13,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-17 00:42:14,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-17 00:42:14,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-17 00:42:15,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-17 00:42:15,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-08-17 00:42:15,610 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-17 00:42:16,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-08-17 00:42:16,044 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-17 00:42:16,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-17 00:42:17,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-17 00:42:17,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-17 00:42:18,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-17 00:42:18,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-08-17 00:42:18,472 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-17 00:42:18,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-08-17 00:42:19,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-08-17 00:42:19,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-08-17 00:42:20,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-08-17 00:42:20,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-08-17 00:42:21,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-08-17 00:42:21,123 [ scc.repo] DEBUG ## Branches found:
2024-08-17 00:42:21,123 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-17 00:42:21,123 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:21,123 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:21,130 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-17 00:42:21,135 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-17 00:42:21,136 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-17 00:42:21,142 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-17 00:42:21,148 [ scc.git] DEBUG Already up to date.
2024-08-17 00:42:21,149 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-08-17 00:42:21,460 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-17 00:42:21,460 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-08-17 00:42:21,464 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-08-17 00:42:21,765 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-17 00:42:21,765 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-08-17 00:42:21,778 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-08-17 00:42:22,068 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-17 00:42:22,069 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-08-17 00:42:22,073 [ scc.git] DEBUG ## Unique users: []
2024-08-17 00:42:22,074 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:22,074 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:22,081 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-08-17 00:42:22,086 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:22,090 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-08-17 00:42:22,099 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-17 00:42:22,103 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-08-17 00:42:22,103 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-08-17 00:42:22,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:42:22,237 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-08-17 00:42:22,245 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:22,250 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 129 (Bump @babel/traverse from 7.21.4 to 7.23.2) 733f52703019d4b6d7e375c121a25c107b64dbec'
2024-08-17 00:42:22,261 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-17 00:42:22,262 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-17 00:42:22,265 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-08-17 00:42:22,265 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-08-17 00:42:22,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:42:22,665 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-08-17 00:42:22,675 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:22,683 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (Bump axios from 1.3.5 to 1.6.0) a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-08-17 00:42:22,698 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-17 00:42:22,698 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-17 00:42:22,702 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-08-17 00:42:22,702 [ scc.git] DEBUG package.json | 2 +-
2024-08-17 00:42:22,702 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-08-17 00:42:23,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:42:23,047 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-17 00:42:23,092 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:23,093 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:23,100 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-17 00:42:23,144 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-17 00:42:23,152 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0fb867a580> has no local changes
2024-08-17 00:42:23,152 [ 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#156 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/)'
2024-08-17 00:42:23,161 [ scc.git] DEBUG [detached HEAD 25c4806] merge master -Dorg -Ssuccess-only
2024-08-17 00:42:23,162 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:42:23,162 [ scc.repo] DEBUG ## PRs found:
2024-08-17 00:42:23,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-08-17 00:42:23,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-08-17 00:42:24,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-17 00:42:25,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-17 00:42:25,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-17 00:42:25,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-08-17 00:42:25,942 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-08-17 00:42:25,942 [ scc.repo] DEBUG ## Branches found:
2024-08-17 00:42:25,942 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-17 00:42:25,943 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:25,943 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:25,951 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-17 00:42:25,957 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-17 00:42:25,957 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-17 00:42:25,962 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-17 00:42:25,968 [ scc.git] DEBUG Already up to date.
2024-08-17 00:42:25,968 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-17 00:42:26,287 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-08-17 00:42:26,287 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-17 00:42:26,292 [ scc.git] DEBUG ## Unique users: []
2024-08-17 00:42:26,292 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:26,292 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:26,298 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-17 00:42:26,305 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:26,311 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-17 00:42:26,322 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-17 00:42:26,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:42:26,458 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-17 00:42:26,502 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:26,502 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:26,508 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-17 00:42:26,551 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-17 00:42:26,559 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0fb86bae80> has no local changes
2024-08-17 00:42:26,559 [ 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#156 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/)'
2024-08-17 00:42:26,569 [ scc.git] DEBUG [detached HEAD c12a0df] merge master -Dorg -Ssuccess-only
2024-08-17 00:42:26,569 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:42:26,569 [ scc.repo] DEBUG ## PRs found:
2024-08-17 00:42:26,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-08-17 00:42:27,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-08-17 00:42:27,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-08-17 00:42:28,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-08-17 00:42:28,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-17 00:42:29,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-17 00:42:29,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-17 00:42:30,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-08-17 00:42:30,202 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-17 00:42:30,202 [ scc.repo] DEBUG ## Branches found:
2024-08-17 00:42:30,202 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-17 00:42:30,203 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:30,203 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:30,209 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-17 00:42:30,215 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-17 00:42:30,215 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-17 00:42:30,222 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-17 00:42:30,229 [ scc.git] DEBUG Already up to date.
2024-08-17 00:42:30,229 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-08-17 00:42:30,616 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-08-17 00:42:30,616 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-08-17 00:42:30,627 [ scc.git] DEBUG ## Unique users: []
2024-08-17 00:42:30,627 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:30,628 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:30,636 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-08-17 00:42:30,643 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:30,648 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-08-17 00:42:30,658 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-08-17 00:42:30,659 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-17 00:42:30,662 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-08-17 00:42:30,662 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-08-17 00:42:30,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:42:30,797 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-17 00:42:30,839 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:30,840 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:30,849 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-17 00:42:30,900 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-17 00:42:30,908 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0fb860eb50> has no local changes
2024-08-17 00:42:30,908 [ 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#156 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/)'
2024-08-17 00:42:30,918 [ scc.git] DEBUG [detached HEAD 32d9c40] merge master -Dorg -Ssuccess-only
2024-08-17 00:42:30,919 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:42:30,919 [ scc.repo] DEBUG ## PRs found:
2024-08-17 00:42:31,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-08-17 00:42:31,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-08-17 00:42:32,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-08-17 00:42:32,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-17 00:42:33,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-17 00:42:33,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-17 00:42:34,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-08-17 00:42:34,029 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-17 00:42:34,029 [ scc.repo] DEBUG ## Branches found:
2024-08-17 00:42:34,029 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-17 00:42:34,029 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:34,029 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:34,039 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-17 00:42:34,051 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-17 00:42:34,052 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-17 00:42:34,064 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-17 00:42:34,078 [ scc.git] DEBUG Already up to date.
2024-08-17 00:42:34,078 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-17 00:42:34,420 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-08-17 00:42:34,420 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-17 00:42:34,428 [ scc.git] DEBUG ## Unique users: []
2024-08-17 00:42:34,429 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:34,429 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:34,440 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-17 00:42:34,451 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:34,458 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-17 00:42:34,474 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-08-17 00:42:34,474 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-08-17 00:42:34,474 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-08-17 00:42:34,474 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-08-17 00:42:34,474 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-08-17 00:42:34,474 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-08-17 00:42:34,475 [ scc.git] DEBUG Auto-merging setup.py
2024-08-17 00:42:34,475 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-08-17 00:42:34,475 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-17 00:42:34,475 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-17 00:42:34,487 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-17 00:42:34,498 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-08-17 00:42:34,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:42:34,635 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-17 00:42:34,642 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-17 00:42:34,651 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#156](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/urls.py
- omero_signup/signup_settings.py
- setup.py
--conflicts
2024-08-17 00:42:34,658 [ scc.config] DEBUG Found github.token
2024-08-17 00:42:34,659 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-08-17 00:42:34,659 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-17 00:42:34,708 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:34,708 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:34,715 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-17 00:42:34,767 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-17 00:42:34,776 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0fb867a730> has no local changes
2024-08-17 00:42:34,776 [ 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#156 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/)'
2024-08-17 00:42:34,791 [ scc.git] DEBUG [detached HEAD b921276] merge master -Dorg -Ssuccess-only
2024-08-17 00:42:34,791 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:42:34,792 [ scc.repo] DEBUG ## PRs found:
2024-08-17 00:42:35,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-08-17 00:42:35,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-08-17 00:42:36,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-08-17 00:42:36,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-17 00:42:37,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-17 00:42:37,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-17 00:42:37,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-08-17 00:42:37,884 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-17 00:42:37,884 [ scc.repo] DEBUG ## Branches found:
2024-08-17 00:42:37,884 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-17 00:42:37,884 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:37,884 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:37,900 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-17 00:42:37,915 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-17 00:42:37,915 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-17 00:42:37,929 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-17 00:42:37,944 [ scc.git] DEBUG Already up to date.
2024-08-17 00:42:37,944 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-08-17 00:42:38,406 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-08-17 00:42:38,407 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-08-17 00:42:38,421 [ scc.git] DEBUG ## Unique users: []
2024-08-17 00:42:38,422 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:38,422 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:38,440 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-08-17 00:42:38,458 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:38,481 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-08-17 00:42:38,533 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-17 00:42:38,538 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-08-17 00:42:38,538 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-08-17 00:42:38,538 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-08-17 00:42:38,538 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-08-17 00:42:38,538 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-08-17 00:42:38,538 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-08-17 00:42:38,538 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-08-17 00:42:38,538 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-08-17 00:42:38,538 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-08-17 00:42:38,539 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-08-17 00:42:38,544 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-08-17 00:42:38,545 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-08-17 00:42:38,546 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-08-17 00:42:38,546 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-08-17 00:42:38,546 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-08-17 00:42:38,546 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-08-17 00:42:38,546 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-08-17 00:42:38,546 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-08-17 00:42:38,546 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-08-17 00:42:38,546 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-08-17 00:42:38,546 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-08-17 00:42:38,546 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-08-17 00:42:38,546 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-08-17 00:42:38,547 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-08-17 00:42:38,547 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-08-17 00:42:38,547 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-08-17 00:42:38,547 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-08-17 00:42:38,547 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-08-17 00:42:38,547 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-08-17 00:42:38,547 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-08-17 00:42:38,547 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-08-17 00:42:38,547 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-08-17 00:42:38,547 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-08-17 00:42:38,547 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-08-17 00:42:38,547 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-08-17 00:42:38,547 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-08-17 00:42:38,547 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-08-17 00:42:38,547 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-08-17 00:42:38,547 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-08-17 00:42:38,547 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-08-17 00:42:38,547 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-08-17 00:42:38,548 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-08-17 00:42:38,548 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-08-17 00:42:38,548 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-08-17 00:42:38,548 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-08-17 00:42:38,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:42:38,675 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-17 00:42:38,797 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:38,797 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:38,819 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-17 00:42:38,951 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-17 00:42:38,968 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0fb8647640> has no local changes
2024-08-17 00:42:38,969 [ 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#156 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/)'
2024-08-17 00:42:38,994 [ scc.git] DEBUG [detached HEAD 8bd8153] merge master -Dorg -Ssuccess-only
2024-08-17 00:42:38,996 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:42:38,997 [ scc.repo] DEBUG ## PRs found:
2024-08-17 00:42:39,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-08-17 00:42:39,155 [ scc.repo] DEBUG ## Branches found:
2024-08-17 00:42:39,155 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-17 00:42:39,155 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:39,155 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:39,175 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-17 00:42:39,192 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-17 00:42:39,193 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-17 00:42:39,206 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-17 00:42:39,223 [ scc.git] DEBUG Already up to date.
2024-08-17 00:42:39,223 [ scc.git] DEBUG ## Unique users: []
2024-08-17 00:42:39,223 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:39,223 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:39,236 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-17 00:42:39,319 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:39,320 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:39,336 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-17 00:42:39,456 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-17 00:42:39,469 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0fb85e0e80> has no local changes
2024-08-17 00:42:39,470 [ 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#156 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/)'
2024-08-17 00:42:39,491 [ scc.git] DEBUG [detached HEAD bf37f02] merge master -Dorg -Ssuccess-only
2024-08-17 00:42:39,492 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:42:39,492 [ scc.repo] DEBUG ## PRs found:
2024-08-17 00:42:39,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-08-17 00:42:39,662 [ scc.repo] DEBUG ## Branches found:
2024-08-17 00:42:39,662 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-17 00:42:39,663 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:39,663 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:39,689 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-17 00:42:39,712 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-17 00:42:39,713 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-17 00:42:39,735 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-17 00:42:39,753 [ scc.git] DEBUG Already up to date.
2024-08-17 00:42:39,753 [ scc.git] DEBUG ## Unique users: []
2024-08-17 00:42:39,753 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:39,753 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:39,767 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-17 00:42:39,872 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:39,873 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:39,888 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-17 00:42:39,954 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-17 00:42:39,970 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0fb8609d30> has no local changes
2024-08-17 00:42:39,970 [ 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#156 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/)'
2024-08-17 00:42:39,989 [ scc.git] DEBUG [detached HEAD 07399e5] merge master -Dorg -Ssuccess-only
2024-08-17 00:42:39,989 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:42:39,990 [ scc.git] INFO Overriding base-branch from master to main
2024-08-17 00:42:39,990 [ scc.repo] DEBUG ## PRs found:
2024-08-17 00:42:40,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-08-17 00:42:40,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-08-17 00:42:41,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-08-17 00:42:41,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-08-17 00:42:42,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-17 00:42:42,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-17 00:42:43,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-17 00:42:43,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-08-17 00:42:43,472 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-17 00:42:43,473 [ scc.repo] DEBUG ## Branches found:
2024-08-17 00:42:43,473 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-17 00:42:43,473 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:43,473 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:43,480 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-08-17 00:42:43,486 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-17 00:42:43,487 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-08-17 00:42:43,495 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-08-17 00:42:43,502 [ scc.git] DEBUG Already up to date.
2024-08-17 00:42:43,502 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-08-17 00:42:43,842 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-08-17 00:42:43,843 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-08-17 00:42:43,850 [ scc.git] DEBUG ## Unique users: []
2024-08-17 00:42:43,851 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:43,851 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:43,859 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-17 00:42:43,866 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:43,872 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-17 00:42:43,901 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-08-17 00:42:43,901 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-08-17 00:42:43,901 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-17 00:42:43,901 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-17 00:42:43,907 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-17 00:42:43,914 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-08-17 00:42:44,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:42:44,056 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-17 00:42:44,071 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-17 00:42:44,079 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#156](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-08-17 00:42:44,085 [ scc.config] DEBUG Found github.token
2024-08-17 00:42:44,085 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-08-17 00:42:44,086 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-17 00:42:44,131 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:44,132 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:44,139 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-17 00:42:44,185 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-17 00:42:44,213 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0fb862af40> has no local changes
2024-08-17 00:42:44,213 [ 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#156 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/)'
2024-08-17 00:42:44,225 [ scc.git] DEBUG [detached HEAD 58fd59b] merge master -Dorg -Ssuccess-only
2024-08-17 00:42:44,226 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:42:44,226 [ scc.repo] DEBUG ## PRs found:
2024-08-17 00:42:44,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-08-17 00:42:44,498 [ scc.repo] DEBUG ## Branches found:
2024-08-17 00:42:44,498 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-17 00:42:44,498 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:44,498 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:44,519 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-17 00:42:44,539 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-17 00:42:44,539 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-17 00:42:44,562 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-17 00:42:44,583 [ scc.git] DEBUG Already up to date.
2024-08-17 00:42:44,584 [ scc.git] DEBUG ## Unique users: []
2024-08-17 00:42:44,584 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:44,584 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:44,601 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-17 00:42:44,695 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:44,695 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:44,715 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-17 00:42:44,801 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-17 00:42:44,825 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0fb85ed130> has no local changes
2024-08-17 00:42:44,826 [ 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#156 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/)'
2024-08-17 00:42:44,847 [ scc.git] DEBUG [detached HEAD a7c105f] merge master -Dorg -Ssuccess-only
2024-08-17 00:42:44,848 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:42:44,849 [ scc.repo] DEBUG ## PRs found:
2024-08-17 00:42:45,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-08-17 00:42:45,011 [ scc.repo] DEBUG ## Branches found:
2024-08-17 00:42:45,011 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-17 00:42:45,011 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:45,011 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:45,022 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-17 00:42:45,028 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-17 00:42:45,028 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-17 00:42:45,035 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-17 00:42:45,042 [ scc.git] DEBUG Already up to date.
2024-08-17 00:42:45,042 [ scc.git] DEBUG ## Unique users: []
2024-08-17 00:42:45,042 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:45,042 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:45,048 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-17 00:42:45,091 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:45,091 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:45,099 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-17 00:42:45,154 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-17 00:42:45,163 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0fb858a490> has no local changes
2024-08-17 00:42:45,164 [ 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#156 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/)'
2024-08-17 00:42:45,174 [ scc.git] DEBUG [detached HEAD c41a3b6] merge master -Dorg -Ssuccess-only
2024-08-17 00:42:45,174 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:42:45,175 [ scc.repo] DEBUG ## PRs found:
2024-08-17 00:42:45,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-08-17 00:42:45,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-08-17 00:42:46,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-08-17 00:42:46,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-17 00:42:47,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-17 00:42:47,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-17 00:42:48,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-08-17 00:42:48,234 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-08-17 00:42:48,234 [ scc.repo] DEBUG ## Branches found:
2024-08-17 00:42:48,234 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-17 00:42:48,235 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:48,235 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:48,245 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-17 00:42:48,254 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-17 00:42:48,254 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-17 00:42:48,264 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-17 00:42:48,272 [ scc.git] DEBUG Already up to date.
2024-08-17 00:42:48,273 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-08-17 00:42:48,655 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-08-17 00:42:48,655 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-08-17 00:42:48,664 [ scc.git] DEBUG ## Unique users: []
2024-08-17 00:42:48,664 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:48,664 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:48,671 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-17 00:42:48,679 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:48,685 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-17 00:42:48,697 [ scc.git] DEBUG Auto-merging Dockerfile
2024-08-17 00:42:48,698 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-08-17 00:42:48,698 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-17 00:42:48,699 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-17 00:42:48,709 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-17 00:42:48,720 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-08-17 00:42:48,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:42:48,873 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-17 00:42:48,883 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-17 00:42:48,892 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#156](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-08-17 00:42:48,899 [ scc.config] DEBUG Found github.token
2024-08-17 00:42:48,899 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-08-17 00:42:48,900 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-17 00:42:48,942 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:48,942 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:48,949 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-17 00:42:48,990 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-17 00:42:48,999 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0fb85ac8b0> has no local changes
2024-08-17 00:42:49,000 [ 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#156 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/)'
2024-08-17 00:42:49,014 [ scc.git] DEBUG [detached HEAD dbe785e] merge master -Dorg -Ssuccess-only
2024-08-17 00:42:49,016 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:42:49,016 [ scc.git] INFO Overriding base-branch from master to develop
2024-08-17 00:42:49,017 [ scc.repo] DEBUG ## PRs found:
2024-08-17 00:42:49,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-08-17 00:42:49,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-08-17 00:42:50,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-08-17 00:42:50,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-08-17 00:42:51,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-08-17 00:42:51,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-08-17 00:42:52,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-08-17 00:42:52,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-17 00:42:53,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-17 00:42:53,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-17 00:42:53,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-08-17 00:42:53,908 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-17 00:42:54,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-08-17 00:42:54,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-08-17 00:42:55,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-08-17 00:42:55,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-08-17 00:42:55,769 [ scc.repo] DEBUG ## Branches found:
2024-08-17 00:42:55,769 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-17 00:42:55,769 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:55,770 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:55,784 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-08-17 00:42:55,796 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-17 00:42:55,796 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-08-17 00:42:55,806 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-08-17 00:42:55,817 [ scc.git] DEBUG Already up to date.
2024-08-17 00:42:55,817 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-08-17 00:42:56,166 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-08-17 00:42:56,166 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-08-17 00:42:56,172 [ scc.git] DEBUG ## Unique users: []
2024-08-17 00:42:56,172 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:56,172 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:56,183 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-17 00:42:56,194 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:56,204 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-17 00:42:56,224 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-08-17 00:42:56,225 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-08-17 00:42:56,225 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-17 00:42:56,225 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-17 00:42:56,236 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-17 00:42:56,246 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-08-17 00:42:56,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:42:56,377 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-17 00:42:56,392 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-17 00:42:56,403 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#156](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-08-17 00:42:56,412 [ scc.config] DEBUG Found github.token
2024-08-17 00:42:56,412 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-08-17 00:42:56,412 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-17 00:42:56,462 [ scc.git] DEBUG Get sha1 of %s
2024-08-17 00:42:56,462 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-17 00:42:56,470 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-17 00:42:56,519 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-17 00:42:56,528 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0fb85ac5b0> has no local changes
2024-08-17 00:42:56,528 [ 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#156 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/)'
2024-08-17 00:42:56,539 [ scc.git] DEBUG [detached HEAD 3a0197e] merge master -Dorg -Ssuccess-only
2024-08-17 00:42:56,539 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:42:56,539 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-17 00:42:56,626 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-08-17 00:42:56,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:42:56,784 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-08-17 00:42:56,810 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-08-17 00:42:57,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:42:57,152 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-08-17 00:42:57,160 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-08-17 00:42:57,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:42:57,535 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-08-17 00:42:57,541 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-08-17 00:42:57,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:42:57,943 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-08-17 00:42:58,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:42:58,343 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-08-17 00:42:58,362 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-08-17 00:42:58,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:42:58,720 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-08-17 00:42:58,727 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-08-17 00:42:59,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:42:59,100 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-08-17 00:42:59,105 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-08-17 00:42:59,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:42:59,481 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-08-17 00:42:59,486 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-08-17 00:42:59,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:42:59,863 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-08-17 00:42:59,867 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-08-17 00:43:00,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:43:00,249 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-08-17 00:43:00,253 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-08-17 00:43:00,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:43:00,638 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-08-17 00:43:00,643 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-08-17 00:43:01,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:43:01,033 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-08-17 00:43:01,037 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-08-17 00:43:01,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:43:01,416 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-08-17 00:43:01,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:43:01,797 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-08-17 00:43:02,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:43:02,188 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-08-17 00:43:02,194 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-08-17 00:43:02,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:43:02,579 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-08-17 00:43:02,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:43:02,971 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-08-17 00:43:03,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:43:03,345 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-08-17 00:43:03,350 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-08-17 00:43:03,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:43:03,724 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-08-17 00:43:03,730 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-08-17 00:43:04,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:43:04,099 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-08-17 00:43:04,105 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-08-17 00:43:04,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:43:04,482 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-08-17 00:43:04,489 [ scc.config] DEBUG Found submodule.scripts.url
2024-08-17 00:43:04,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-17 00:43:04,855 [ scc.config] DEBUG Found submodule.scripts.branch
2024-08-17 00:43:04,855 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-17 00:43:04,955 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0fbb7e2790> has local changes
2024-08-17 00:43:04,956 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 384 dependabot[bot] 'Bump omero-figure from `fefe87c` to `430fc3f`'
Repository: ome/minimal-omero-client
Already up to date.
Merged PRs:
- PR 66 jburel 'Gateway 5 9 2'
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 63 sbesson 'Remove python-future dependency'
- PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 578 Rdornier 'Image outline' (user: Rdornier)
- PR 577 Rdornier 'Fill rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 576 Rdornier 'Color picker - popup update'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
Repository: ome/omero-mapr
Excluded PRs:
- PR 85 sbesson 'Add support for OMERO.web 5.27.0' (status: failure)
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#156 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/156/)'
2024-08-17 00:43:04,978 [ scc.git] DEBUG [detached HEAD 67f5845] merge master -Dorg -Ssuccess-only
2024-08-17 00:43:04,979 [ scc.merge] INFO Repository: ome/omero-plugins
2024-08-17 00:43:04,979 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-08-17 00:43:04,979 [ scc.merge] INFO Already up to date.
2024-08-17 00:43:04,979 [ scc.merge] INFO
2024-08-17 00:43:04,979 [ scc.merge] INFO Merged PRs:
2024-08-17 00:43:04,979 [ scc.merge] INFO - PR 384 dependabot[bot] 'Bump omero-figure from `fefe87c` to `430fc3f`'
2024-08-17 00:43:04,979 [ scc.merge] INFO
2024-08-17 00:43:04,979 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-08-17 00:43:04,979 [ scc.merge] INFO Already up to date.
2024-08-17 00:43:04,979 [ scc.merge] INFO
2024-08-17 00:43:04,979 [ scc.merge] INFO Merged PRs:
2024-08-17 00:43:04,979 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-08-17 00:43:04,979 [ scc.merge] INFO
2024-08-17 00:43:04,979 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-08-17 00:43:04,979 [ scc.merge] INFO Excluded PRs:
2024-08-17 00:43:04,979 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-08-17 00:43:04,979 [ scc.merge] INFO Already up to date.
2024-08-17 00:43:04,979 [ scc.merge] INFO
2024-08-17 00:43:04,979 [ scc.merge] INFO Merged PRs:
2024-08-17 00:43:04,980 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-08-17 00:43:04,980 [ scc.merge] INFO
2024-08-17 00:43:04,980 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-08-17 00:43:04,980 [ scc.merge] INFO Excluded PRs:
2024-08-17 00:43:04,980 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-08-17 00:43:04,980 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-08-17 00:43:04,980 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-08-17 00:43:04,980 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-08-17 00:43:04,980 [ scc.merge] INFO Already up to date.
2024-08-17 00:43:04,980 [ scc.merge] INFO
2024-08-17 00:43:04,980 [ scc.merge] INFO Merged PRs:
2024-08-17 00:43:04,980 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-08-17 00:43:04,980 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-08-17 00:43:04,980 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-08-17 00:43:04,980 [ scc.merge] INFO
2024-08-17 00:43:04,980 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-08-17 00:43:04,980 [ scc.merge] INFO Excluded PRs:
2024-08-17 00:43:04,980 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-17 00:43:04,980 [ scc.merge] INFO Already up to date.
2024-08-17 00:43:04,980 [ scc.merge] INFO
2024-08-17 00:43:04,980 [ scc.merge] INFO Merged PRs:
2024-08-17 00:43:04,980 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-08-17 00:43:04,980 [ scc.merge] INFO
2024-08-17 00:43:04,980 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-17 00:43:04,980 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-08-17 00:43:04,980 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-08-17 00:43:04,980 [ scc.merge] INFO
2024-08-17 00:43:04,980 [ scc.merge] INFO Repository: ome/omero-figure
2024-08-17 00:43:04,980 [ scc.merge] INFO Excluded PRs:
2024-08-17 00:43:04,980 [ scc.merge] INFO - PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
2024-08-17 00:43:04,980 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-08-17 00:43:04,980 [ scc.merge] INFO - PR 578 Rdornier 'Image outline' (user: Rdornier)
2024-08-17 00:43:04,980 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' (user: Rdornier)
2024-08-17 00:43:04,980 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-08-17 00:43:04,980 [ scc.merge] INFO Already up to date.
2024-08-17 00:43:04,981 [ scc.merge] INFO
2024-08-17 00:43:04,981 [ scc.merge] INFO Merged PRs:
2024-08-17 00:43:04,981 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-08-17 00:43:04,981 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-08-17 00:43:04,981 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-08-17 00:43:04,981 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-08-17 00:43:04,981 [ scc.merge] INFO - PR 576 Rdornier 'Color picker - popup update'
2024-08-17 00:43:04,981 [ scc.merge] INFO
2024-08-17 00:43:04,981 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-08-17 00:43:04,981 [ scc.merge] INFO Already up to date.
2024-08-17 00:43:04,981 [ scc.merge] INFO
2024-08-17 00:43:04,981 [ scc.merge] INFO Merged PRs:
2024-08-17 00:43:04,981 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-08-17 00:43:04,981 [ scc.merge] INFO
2024-08-17 00:43:04,981 [ scc.merge] INFO Repository: ome/omero-gallery
2024-08-17 00:43:04,981 [ scc.merge] INFO Already up to date.
2024-08-17 00:43:04,981 [ scc.merge] INFO
2024-08-17 00:43:04,981 [ scc.merge] INFO Merged PRs:
2024-08-17 00:43:04,981 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-17 00:43:04,981 [ scc.merge] INFO
2024-08-17 00:43:04,981 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-08-17 00:43:04,981 [ scc.merge] INFO Excluded PRs:
2024-08-17 00:43:04,981 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-08-17 00:43:04,981 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-08-17 00:43:04,981 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-08-17 00:43:04,981 [ scc.merge] INFO Already up to date.
2024-08-17 00:43:04,981 [ scc.merge] INFO
2024-08-17 00:43:04,981 [ scc.merge] INFO Merged PRs:
2024-08-17 00:43:04,981 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-08-17 00:43:04,981 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-08-17 00:43:04,981 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-17 00:43:04,981 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-17 00:43:04,981 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-17 00:43:04,981 [ scc.merge] INFO
2024-08-17 00:43:04,982 [ scc.merge] INFO Repository: ome/omero-mapr
2024-08-17 00:43:04,982 [ scc.merge] INFO Excluded PRs:
2024-08-17 00:43:04,982 [ scc.merge] INFO - PR 85 sbesson 'Add support for OMERO.web 5.27.0' (status: failure)
2024-08-17 00:43:04,982 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-08-17 00:43:04,982 [ scc.merge] INFO Already up to date.
2024-08-17 00:43:04,982 [ scc.merge] INFO
2024-08-17 00:43:04,982 [ scc.merge] INFO Merged PRs:
2024-08-17 00:43:04,982 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-08-17 00:43:04,982 [ scc.merge] INFO
2024-08-17 00:43:04,982 [ scc.merge] INFO Repository: ome/omero-metadata
2024-08-17 00:43:04,982 [ scc.merge] INFO Already up to date.
2024-08-17 00:43:04,982 [ scc.merge] INFO
2024-08-17 00:43:04,982 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-17 00:43:04,982 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-17 00:43:04,982 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-17 00:43:04,982 [ scc.merge] INFO
2024-08-17 00:43:04,982 [ scc.merge] INFO Repository: ome/omero-parade
2024-08-17 00:43:04,982 [ scc.merge] INFO Excluded PRs:
2024-08-17 00:43:04,982 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-08-17 00:43:04,982 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-08-17 00:43:04,982 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-08-17 00:43:04,982 [ scc.merge] INFO Already up to date.
2024-08-17 00:43:04,982 [ scc.merge] INFO
2024-08-17 00:43:04,982 [ scc.merge] INFO Merged PRs:
2024-08-17 00:43:04,982 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-17 00:43:04,982 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-17 00:43:04,982 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-17 00:43:04,982 [ scc.merge] INFO
2024-08-17 00:43:04,982 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-08-17 00:43:04,982 [ scc.merge] INFO Already up to date.
2024-08-17 00:43:04,982 [ scc.merge] INFO
2024-08-17 00:43:04,982 [ scc.merge] INFO Merged PRs:
2024-08-17 00:43:04,982 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-08-17 00:43:04,982 [ scc.merge] INFO
2024-08-17 00:43:04,983 [ scc.merge] INFO Repository: ome/omero-rois
2024-08-17 00:43:04,983 [ scc.merge] INFO Excluded PRs:
2024-08-17 00:43:04,983 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-17 00:43:04,983 [ scc.merge] INFO Already up to date.
2024-08-17 00:43:04,983 [ scc.merge] INFO
2024-08-17 00:43:04,983 [ scc.merge] INFO Merged PRs:
2024-08-17 00:43:04,983 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-17 00:43:04,983 [ scc.merge] INFO
2024-08-17 00:43:04,983 [ scc.merge] INFO Repository: ome/omero-signup
2024-08-17 00:43:04,983 [ scc.merge] INFO Already up to date.
2024-08-17 00:43:04,983 [ scc.merge] INFO
2024-08-17 00:43:04,983 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-17 00:43:04,983 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-17 00:43:04,983 [ scc.merge] INFO
2024-08-17 00:43:04,983 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-08-17 00:43:04,983 [ scc.merge] INFO Already up to date.
2024-08-17 00:43:04,983 [ scc.merge] INFO
2024-08-17 00:43:04,983 [ scc.merge] INFO Merged PRs:
2024-08-17 00:43:04,983 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-17 00:43:04,983 [ scc.merge] INFO
2024-08-17 00:43:04,983 [ scc.merge] INFO Repository: ome/omero-upload
2024-08-17 00:43:04,983 [ scc.merge] INFO Already up to date.
2024-08-17 00:43:04,983 [ scc.merge] INFO
2024-08-17 00:43:04,983 [ scc.merge] INFO
2024-08-17 00:43:04,983 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-08-17 00:43:04,983 [ scc.merge] INFO Already up to date.
2024-08-17 00:43:04,983 [ scc.merge] INFO
2024-08-17 00:43:04,983 [ scc.merge] INFO
2024-08-17 00:43:04,983 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-08-17 00:43:04,983 [ scc.merge] INFO Excluded PRs:
2024-08-17 00:43:04,983 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-08-17 00:43:04,984 [ scc.merge] INFO Already up to date.
2024-08-17 00:43:04,984 [ scc.merge] INFO
2024-08-17 00:43:04,984 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-17 00:43:04,984 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-17 00:43:04,984 [ scc.merge] INFO
2024-08-17 00:43:04,984 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-08-17 00:43:04,984 [ scc.merge] INFO Already up to date.
2024-08-17 00:43:04,984 [ scc.merge] INFO
2024-08-17 00:43:04,984 [ scc.merge] INFO
2024-08-17 00:43:04,984 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-08-17 00:43:04,984 [ scc.merge] INFO Already up to date.
2024-08-17 00:43:04,984 [ scc.merge] INFO
2024-08-17 00:43:04,984 [ scc.merge] INFO
2024-08-17 00:43:04,984 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-08-17 00:43:04,984 [ scc.merge] INFO Already up to date.
2024-08-17 00:43:04,984 [ scc.merge] INFO
2024-08-17 00:43:04,984 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-17 00:43:04,984 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-08-17 00:43:04,984 [ scc.merge] INFO
2024-08-17 00:43:04,984 [ scc.merge] INFO Repository: ome/scripts
2024-08-17 00:43:04,984 [ scc.merge] INFO Excluded PRs:
2024-08-17 00:43:04,984 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-08-17 00:43:04,984 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-08-17 00:43:04,984 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-08-17 00:43:04,984 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-08-17 00:43:04,984 [ scc.merge] INFO Already up to date.
2024-08-17 00:43:04,984 [ scc.merge] INFO
2024-08-17 00:43:04,984 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-17 00:43:04,984 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-17 00:43:04,984 [ scc.merge] INFO
2024-08-17 00:43:04,984 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-08-17 00:43:04,985 [ scc.git] DEBUG Calling 'git remote'
2024-08-17 00:43:04,991 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-08-17 00:43:04,991 [ scc.git] DEBUG Calling 'git remote'
2024-08-17 00:43:04,996 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:43:04,997 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-08-17 00:43:04,997 [ scc.git] DEBUG Calling 'git remote'
2024-08-17 00:43:05,003 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:43:05,003 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-08-17 00:43:05,003 [ scc.git] DEBUG Calling 'git remote'
2024-08-17 00:43:05,010 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:43:05,010 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-08-17 00:43:05,010 [ scc.git] DEBUG Calling 'git remote'
2024-08-17 00:43:05,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:43:05,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-08-17 00:43:05,018 [ scc.git] DEBUG Calling 'git remote'
2024-08-17 00:43:05,025 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:43:05,026 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-17 00:43:05,026 [ scc.git] DEBUG Calling 'git remote'
2024-08-17 00:43:05,032 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:43:05,033 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-17 00:43:05,033 [ scc.git] DEBUG Calling 'git remote'
2024-08-17 00:43:05,039 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:43:05,039 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-17 00:43:05,039 [ scc.git] DEBUG Calling 'git remote'
2024-08-17 00:43:05,045 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:43:05,045 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-17 00:43:05,045 [ scc.git] DEBUG Calling 'git remote'
2024-08-17 00:43:05,052 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:43:05,052 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-17 00:43:05,052 [ scc.git] DEBUG Calling 'git remote'
2024-08-17 00:43:05,058 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:43:05,058 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-17 00:43:05,058 [ scc.git] DEBUG Calling 'git remote'
2024-08-17 00:43:05,065 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:43:05,065 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-17 00:43:05,065 [ scc.git] DEBUG Calling 'git remote'
2024-08-17 00:43:05,071 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:43:05,072 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-17 00:43:05,072 [ scc.git] DEBUG Calling 'git remote'
2024-08-17 00:43:05,078 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:43:05,078 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-17 00:43:05,078 [ scc.git] DEBUG Calling 'git remote'
2024-08-17 00:43:05,084 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:43:05,084 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-17 00:43:05,084 [ scc.git] DEBUG Calling 'git remote'
2024-08-17 00:43:05,089 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:43:05,090 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-17 00:43:05,090 [ scc.git] DEBUG Calling 'git remote'
2024-08-17 00:43:05,095 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:43:05,095 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-17 00:43:05,095 [ scc.git] DEBUG Calling 'git remote'
2024-08-17 00:43:05,102 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:43:05,102 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-17 00:43:05,102 [ scc.git] DEBUG Calling 'git remote'
2024-08-17 00:43:05,109 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:43:05,109 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-17 00:43:05,109 [ scc.git] DEBUG Calling 'git remote'
2024-08-17 00:43:05,115 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:43:05,115 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-17 00:43:05,115 [ scc.git] DEBUG Calling 'git remote'
2024-08-17 00:43:05,120 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:43:05,120 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-17 00:43:05,120 [ scc.git] DEBUG Calling 'git remote'
2024-08-17 00:43:05,125 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-17 00:43:05,125 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-17 00:43:05,125 [ scc.git] DEBUG Calling 'git remote'
2024-08-17 00:43:05,130 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.9.2 to 5.9.3-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD d53263d] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 9b73dd9
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from 430fc3f8
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from a8f380f
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 312afbe
nothing to commit, working tree clean
[detached HEAD d229180] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-08-17 00:43:50,404 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-08-17 00:43:59,031 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-08-17 00:44:01,380 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-08-17 00:44:05,741 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-08-17 00:44:44,777 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/f6f303f9/images/svgs/logo.svg){kind=logo}
