Console Output
Skipping 94 KB..
Full Logs://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-11 00:42:36,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-11 00:42:36,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f7d26b972bfe9a7105c4f94776748446f2395c77 HTTP/1.1" 200 None
2024-08-11 00:42:37,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/f7d26b972bfe9a7105c4f94776748446f2395c77?per_page=1 HTTP/1.1" 200 2
2024-08-11 00:42:37,309 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-08-11 00:42:37,310 [ scc.repo] DEBUG ## Branches found:
2024-08-11 00:42:37,310 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-08-11 00:42:37,311 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:42:37,311 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:42:37,319 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-11 00:42:37,356 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-11 00:42:37,356 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-11 00:42:37,371 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-11 00:42:37,385 [ scc.git] DEBUG Updating fefe87cf..430fc3f8
2024-08-11 00:42:37,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls/580 HTTP/1.1" 200 None
2024-08-11 00:42:37,949 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-08-11 00:42:38,363 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-11 00:42:38,363 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-08-11 00:42:38,369 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-08-11 00:42:39,065 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-11 00:42:39,065 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-08-11 00:42:39,072 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-08-11 00:42:40,535 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-11 00:42:40,536 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-08-11 00:42:40,542 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-08-11 00:42:40,842 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-11 00:42:40,842 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-08-11 00:42:40,848 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-08-11 00:42:41,491 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-11 00:42:41,492 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-08-11 00:42:41,497 [ scc.git] DEBUG ## Unique users: []
2024-08-11 00:42:41,498 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:42:41,498 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:42:41,505 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-08-11 00:42:41,512 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:42:41,517 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-08-11 00:42:41,642 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-11 00:42:41,642 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-11 00:42:41,643 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-11 00:42:41,651 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-08-11 00:42:41,651 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-08-11 00:42:41,651 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-08-11 00:42:41,651 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-08-11 00:42:41,651 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-08-11 00:42:41,651 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-08-11 00:42:41,651 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-08-11 00:42:41,651 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-08-11 00:42:41,651 [ scc.git] DEBUG src/templates/rois_form.template.html | 8 ++++
2024-08-11 00:42:41,651 [ scc.git] DEBUG 9 files changed, 271 insertions(+), 5 deletions(-)
2024-08-11 00:42:41,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:42:41,788 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-08-11 00:42:41,799 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:42:41,805 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-08-11 00:42:42,020 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-11 00:42:42,021 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-11 00:42:42,021 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-08-11 00:42:42,021 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-08-11 00:42:42,021 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-11 00:42:42,028 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-08-11 00:42:42,028 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-08-11 00:42:42,028 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-08-11 00:42:42,028 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-08-11 00:42:42,028 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-08-11 00:42:42,028 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-08-11 00:42:42,028 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-08-11 00:42:42,028 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-08-11 00:42:42,028 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-08-11 00:42:42,028 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-08-11 00:42:42,028 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-08-11 00:42:42,028 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-08-11 00:42:42,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:42:42,170 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-08-11 00:42:42,180 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:42:42,196 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) 3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-08-11 00:42:42,642 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-08-11 00:42:42,642 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-11 00:42:42,642 [ scc.git] DEBUG Auto-merging src/index.html
2024-08-11 00:42:42,642 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-08-11 00:42:42,642 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-11 00:42:42,642 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-11 00:42:42,642 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-11 00:42:42,650 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-08-11 00:42:42,650 [ scc.git] DEBUG omero_figure/urls.py | 10 +++-
2024-08-11 00:42:42,650 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-08-11 00:42:42,650 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-08-11 00:42:42,650 [ scc.git] DEBUG src/index.html | 1 +
2024-08-11 00:42:42,650 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-08-11 00:42:42,650 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-08-11 00:42:42,650 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-08-11 00:42:42,650 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-08-11 00:42:42,650 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-08-11 00:42:42,651 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-08-11 00:42:42,651 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-08-11 00:42:42,651 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-08-11 00:42:42,651 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-08-11 00:42:42,651 [ scc.git] DEBUG 14 files changed, 162 insertions(+), 15 deletions(-)
2024-08-11 00:42:42,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:42:42,844 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-08-11 00:42:42,855 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:42:42,861 [ 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-11 00:42:42,921 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-11 00:42:42,925 [ scc.git] DEBUG setup.py | 2 +-
2024-08-11 00:42:42,925 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-11 00:42:43,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:42:43,231 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...88901984c22249d20925e53c455cd822700be6d4'
2024-08-11 00:42:43,240 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:42:43,245 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 576 (Color picker - popup update) 88901984c22249d20925e53c455cd822700be6d4'
2024-08-11 00:42:43,318 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-11 00:42:43,318 [ scc.git] DEBUG Auto-merging src/index.html
2024-08-11 00:42:43,319 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-11 00:42:43,323 [ scc.git] DEBUG src/css/figure.css | 3 +++
2024-08-11 00:42:43,323 [ scc.git] DEBUG src/index.html | 3 +++
2024-08-11 00:42:43,323 [ scc.git] DEBUG src/js/views/colorpicker.js | 10 ++++++++--
2024-08-11 00:42:43,323 [ scc.git] DEBUG 3 files changed, 14 insertions(+), 2 deletions(-)
2024-08-11 00:42:43,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:42:43,611 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-11 00:42:43,656 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:42:43,656 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:42:43,661 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-11 00:42:43,701 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-11 00:42:43,710 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff5d05f54f0> has no local changes
2024-08-11 00:42:43,710 [ 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)
Updating fefe87cf..430fc3f8
Previously merged:
- PR 580 Rdornier 'Weird translation'
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#149 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/)'
2024-08-11 00:42:43,736 [ scc.git] DEBUG [detached HEAD 3e796cae] merge master -Dorg -Ssuccess-only
2024-08-11 00:42:43,737 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:42:43,737 [ scc.repo] DEBUG ## PRs found:
2024-08-11 00:42:44,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-08-11 00:42:44,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-08-11 00:42:44,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-08-11 00:42:45,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-11 00:42:45,897 [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-11 00:42:46,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-11 00:42:46,797 [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-11 00:42:46,798 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-08-11 00:42:46,798 [ scc.repo] DEBUG ## Branches found:
2024-08-11 00:42:46,798 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-11 00:42:46,798 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:42:46,798 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:42:46,806 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-11 00:42:46,812 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-11 00:42:46,812 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-11 00:42:46,819 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-11 00:42:46,825 [ scc.git] DEBUG Already up to date.
2024-08-11 00:42:46,825 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-08-11 00:42:47,198 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-08-11 00:42:47,198 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-08-11 00:42:47,203 [ scc.git] DEBUG ## Unique users: []
2024-08-11 00:42:47,203 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:42:47,203 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:42:47,210 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-11 00:42:47,216 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:42:47,222 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-11 00:42:47,258 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-08-11 00:42:47,259 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-11 00:42:47,262 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-08-11 00:42:47,262 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-08-11 00:42:47,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:42:47,395 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-11 00:42:47,439 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:42:47,440 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:42:47,445 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-11 00:42:47,486 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-11 00:42:47,494 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff5d0651700> has no local changes
2024-08-11 00:42:47,494 [ 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#149 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/)'
2024-08-11 00:42:47,514 [ scc.git] DEBUG [detached HEAD 303bbaa] merge master -Dorg -Ssuccess-only
2024-08-11 00:42:47,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:42:47,514 [ scc.repo] DEBUG ## PRs found:
2024-08-11 00:42:47,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-08-11 00:42:48,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-08-11 00:42:48,338 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-11 00:42:48,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-11 00:42:49,338 [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-11 00:42:49,795 [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-11 00:42:50,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-11 00:42:50,757 [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-11 00:42:50,758 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-11 00:42:50,758 [ scc.repo] DEBUG ## Branches found:
2024-08-11 00:42:50,758 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-11 00:42:50,758 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:42:50,758 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:42:50,765 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-11 00:42:50,774 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-11 00:42:50,775 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-11 00:42:50,782 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-11 00:42:50,789 [ scc.git] DEBUG Already up to date.
2024-08-11 00:42:50,790 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-08-11 00:42:51,107 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-08-11 00:42:51,108 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-08-11 00:42:51,112 [ scc.git] DEBUG ## Unique users: []
2024-08-11 00:42:51,112 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:42:51,112 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:42:51,118 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-08-11 00:42:51,123 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:42:51,128 [ 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-11 00:42:51,150 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-11 00:42:51,154 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-08-11 00:42:51,155 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-08-11 00:42:51,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:42:51,285 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-11 00:42:51,326 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:42:51,326 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:42:51,332 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-11 00:42:51,368 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-11 00:42:51,376 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff5d06afb50> has no local changes
2024-08-11 00:42:51,376 [ 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#149 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/)'
2024-08-11 00:42:51,385 [ scc.git] DEBUG [detached HEAD 739f7e1] merge master -Dorg -Ssuccess-only
2024-08-11 00:42:51,386 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:42:51,386 [ scc.repo] DEBUG ## PRs found:
2024-08-11 00:42:51,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-08-11 00:42:52,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-08-11 00:42:52,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-08-11 00:42:52,735 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-11 00:42:53,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-11 00:42:53,837 [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-11 00:42:54,325 [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-11 00:42:54,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-11 00:42:55,157 [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-11 00:42:55,157 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-11 00:42:55,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-08-11 00:42:55,606 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-11 00:42:56,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-11 00:42:56,653 [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-11 00:42:57,217 [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-11 00:42:57,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-11 00:42:58,046 [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-11 00:42:58,047 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-11 00:42:58,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-08-11 00:42:58,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-08-11 00:42:59,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-11 00:42:59,863 [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-11 00:43:00,319 [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-11 00:43:00,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-11 00:43:01,292 [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-11 00:43:01,293 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-11 00:43:01,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-08-11 00:43:02,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-08-11 00:43:02,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-11 00:43:03,235 [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-11 00:43:03,693 [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-11 00:43:04,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-11 00:43:04,557 [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-11 00:43:04,559 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-08-11 00:43:05,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-08-11 00:43:05,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-08-11 00:43:05,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-11 00:43:06,407 [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-11 00:43:06,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-11 00:43:07,262 [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-11 00:43:07,263 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-08-11 00:43:07,264 [ scc.repo] DEBUG ## Branches found:
2024-08-11 00:43:07,264 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-11 00:43:07,264 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:07,264 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:07,271 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-11 00:43:07,276 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-11 00:43:07,277 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-11 00:43:07,386 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-11 00:43:07,392 [ scc.git] DEBUG Already up to date.
2024-08-11 00:43:07,392 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-08-11 00:43:08,050 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-11 00:43:08,050 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-08-11 00:43:08,056 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-08-11 00:43:09,268 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-11 00:43:09,268 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-08-11 00:43:09,276 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-08-11 00:43:09,659 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-11 00:43:09,660 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-08-11 00:43:09,668 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-08-11 00:43:09,964 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-11 00:43:09,965 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-08-11 00:43:09,976 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-08-11 00:43:10,312 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-11 00:43:10,312 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-08-11 00:43:10,319 [ scc.git] DEBUG ## Unique users: []
2024-08-11 00:43:10,319 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:10,319 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:10,332 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-11 00:43:10,342 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:10,351 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-11 00:43:10,420 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-08-11 00:43:10,420 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-11 00:43:10,424 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-08-11 00:43:10,424 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-08-11 00:43:10,424 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-08-11 00:43:10,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:43:10,565 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-11 00:43:10,583 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:10,598 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-11 00:43:10,767 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-08-11 00:43:10,767 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-08-11 00:43:10,767 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-08-11 00:43:10,767 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-08-11 00:43:10,767 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-11 00:43:10,772 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-08-11 00:43:10,772 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-08-11 00:43:10,772 [ scc.git] DEBUG src/app/header.html | 5 +
2024-08-11 00:43:10,772 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-08-11 00:43:10,772 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-08-11 00:43:10,772 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-08-11 00:43:10,772 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-08-11 00:43:10,772 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-08-11 00:43:10,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:43:10,951 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-11 00:43:10,966 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:10,975 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-11 00:43:11,041 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-08-11 00:43:11,041 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-11 00:43:11,045 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-08-11 00:43:11,045 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-08-11 00:43:11,045 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-08-11 00:43:11,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:43:11,353 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-11 00:43:11,381 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:11,390 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-11 00:43:11,440 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-11 00:43:11,450 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-08-11 00:43:11,450 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-08-11 00:43:11,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:43:11,745 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-08-11 00:43:11,779 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:11,785 [ 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-11 00:43:11,856 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-11 00:43:11,857 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-11 00:43:12,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:43:12,129 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-11 00:43:12,174 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:12,174 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:12,181 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-11 00:43:12,226 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-11 00:43:12,239 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff5d0638be0> has no local changes
2024-08-11 00:43:12,239 [ 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#149 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/)'
2024-08-11 00:43:12,262 [ scc.git] DEBUG [detached HEAD c05234d] merge master -Dorg -Ssuccess-only
2024-08-11 00:43:12,262 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:43:12,263 [ scc.repo] DEBUG ## PRs found:
2024-08-11 00:43:12,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-08-11 00:43:13,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-08-11 00:43:13,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-08-11 00:43:14,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-11 00:43:14,588 [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-11 00:43:15,016 [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-11 00:43:15,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-11 00:43:15,878 [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-11 00:43:15,879 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-08-11 00:43:15,880 [ scc.repo] DEBUG ## Branches found:
2024-08-11 00:43:15,880 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-11 00:43:15,880 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:15,880 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:15,887 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-11 00:43:15,892 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-11 00:43:15,892 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-11 00:43:15,898 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-11 00:43:15,903 [ scc.git] DEBUG Already up to date.
2024-08-11 00:43:15,903 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-08-11 00:43:16,196 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-08-11 00:43:16,197 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-08-11 00:43:16,201 [ scc.git] DEBUG ## Unique users: []
2024-08-11 00:43:16,201 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:16,201 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:16,206 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-11 00:43:16,213 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:16,217 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-11 00:43:16,233 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-11 00:43:16,236 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-08-11 00:43:16,236 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-08-11 00:43:16,236 [ scc.git] DEBUG requirements.txt | 2 +-
2024-08-11 00:43:16,236 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-08-11 00:43:16,236 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-08-11 00:43:16,236 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-08-11 00:43:16,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:43:16,366 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-11 00:43:16,409 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:16,410 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:16,415 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-11 00:43:16,457 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-11 00:43:16,465 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff5d0658d30> has no local changes
2024-08-11 00:43:16,466 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Generated by OMERO-plugins-push#149 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/)'
2024-08-11 00:43:16,475 [ scc.git] DEBUG [detached HEAD 779e29e] merge master -Dorg -Ssuccess-only
2024-08-11 00:43:16,475 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:43:16,476 [ scc.repo] DEBUG ## PRs found:
2024-08-11 00:43:16,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-08-11 00:43:17,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-08-11 00:43:17,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-08-11 00:43:18,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-11 00:43:18,897 [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-11 00:43:19,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-11 00:43:19,801 [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-11 00:43:19,802 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-11 00:43:20,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-08-11 00:43:20,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-08-11 00:43:21,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-11 00:43:21,655 [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-11 00:43:22,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-11 00:43:22,616 [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-11 00:43:22,616 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-11 00:43:22,616 [ scc.repo] DEBUG ## Branches found:
2024-08-11 00:43:22,616 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-11 00:43:22,616 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:22,617 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:22,622 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-11 00:43:22,629 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-11 00:43:22,629 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-11 00:43:22,635 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-11 00:43:22,641 [ scc.git] DEBUG Already up to date.
2024-08-11 00:43:22,641 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-08-11 00:43:23,178 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-11 00:43:23,178 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-08-11 00:43:23,185 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-08-11 00:43:23,570 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-11 00:43:23,570 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-08-11 00:43:23,576 [ scc.git] DEBUG ## Unique users: []
2024-08-11 00:43:23,577 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:23,577 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:23,584 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-11 00:43:23,594 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:23,601 [ 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-11 00:43:23,647 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-08-11 00:43:23,647 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-08-11 00:43:23,647 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-11 00:43:23,647 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-11 00:43:23,647 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-11 00:43:23,648 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-11 00:43:23,658 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-11 00:43:23,667 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-11 00:43:23,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:43:23,795 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-11 00:43:23,803 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-11 00:43:23,809 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#149](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-08-11 00:43:23,815 [ scc.config] DEBUG Found github.token
2024-08-11 00:43:23,815 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-08-11 00:43:23,815 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-11 00:43:23,823 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:23,829 [ 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-11 00:43:23,850 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-11 00:43:23,850 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-11 00:43:23,850 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-08-11 00:43:23,850 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-11 00:43:23,851 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-11 00:43:23,860 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-11 00:43:23,869 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-11 00:43:24,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:43:24,195 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-11 00:43:24,203 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-11 00:43:24,210 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#149](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/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-11 00:43:24,216 [ scc.config] DEBUG Found github.token
2024-08-11 00:43:24,217 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-08-11 00:43:24,217 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-11 00:43:24,264 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:24,265 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:24,272 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-11 00:43:24,319 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-11 00:43:24,327 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff5d0629f40> has no local changes
2024-08-11 00:43:24,328 [ 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#149 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/)'
2024-08-11 00:43:24,336 [ scc.git] DEBUG [detached HEAD c33f225] merge master -Dorg -Ssuccess-only
2024-08-11 00:43:24,336 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:43:24,337 [ scc.repo] DEBUG ## PRs found:
2024-08-11 00:43:24,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-08-11 00:43:25,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-08-11 00:43:25,227 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-11 00:43:25,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-11 00:43:26,202 [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-11 00:43:26,727 [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-11 00:43:27,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-11 00:43:27,637 [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-11 00:43:27,638 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-11 00:43:28,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-08-11 00:43:28,098 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-11 00:43:28,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-11 00:43:29,099 [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-11 00:43:29,554 [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-11 00:43:29,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-11 00:43:30,381 [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-11 00:43:30,381 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-11 00:43:30,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-08-11 00:43:30,832 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-11 00:43:31,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-11 00:43:31,834 [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-11 00:43:32,325 [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-11 00:43:32,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-11 00:43:33,251 [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-11 00:43:33,251 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-11 00:43:33,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-08-11 00:43:34,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-08-11 00:43:34,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-08-11 00:43:35,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-08-11 00:43:35,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-08-11 00:43:35,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-08-11 00:43:35,981 [ scc.repo] DEBUG ## Branches found:
2024-08-11 00:43:35,981 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-11 00:43:35,982 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:35,982 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:35,988 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-11 00:43:35,994 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-11 00:43:35,995 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-11 00:43:36,001 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-11 00:43:36,009 [ scc.git] DEBUG Already up to date.
2024-08-11 00:43:36,009 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-08-11 00:43:36,317 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-11 00:43:36,317 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-08-11 00:43:36,323 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-08-11 00:43:36,618 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-11 00:43:36,618 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-08-11 00:43:36,623 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-08-11 00:43:36,919 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-11 00:43:36,920 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-08-11 00:43:36,924 [ scc.git] DEBUG ## Unique users: []
2024-08-11 00:43:36,924 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:36,924 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:36,930 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-08-11 00:43:36,935 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:36,940 [ 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-11 00:43:36,949 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-11 00:43:36,952 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-08-11 00:43:36,952 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-08-11 00:43:37,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:43:37,082 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-08-11 00:43:37,088 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:37,094 [ 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-11 00:43:37,150 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-11 00:43:37,150 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-11 00:43:37,154 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-08-11 00:43:37,154 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-08-11 00:43:37,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:43:37,464 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-08-11 00:43:37,471 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:37,477 [ 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-11 00:43:37,511 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-11 00:43:37,512 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-11 00:43:37,515 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-08-11 00:43:37,515 [ scc.git] DEBUG package.json | 2 +-
2024-08-11 00:43:37,515 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-08-11 00:43:37,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:43:37,859 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-11 00:43:37,905 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:37,906 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:37,912 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-11 00:43:37,955 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-11 00:43:37,963 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff5d05e7580> has no local changes
2024-08-11 00:43:37,963 [ 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#149 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/)'
2024-08-11 00:43:37,982 [ scc.git] DEBUG [detached HEAD 69a0b73] merge master -Dorg -Ssuccess-only
2024-08-11 00:43:37,982 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:43:37,983 [ scc.repo] DEBUG ## PRs found:
2024-08-11 00:43:38,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-08-11 00:43:38,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-08-11 00:43:39,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-11 00:43:39,800 [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-11 00:43:40,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-11 00:43:40,709 [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-11 00:43:40,709 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-08-11 00:43:40,709 [ scc.repo] DEBUG ## Branches found:
2024-08-11 00:43:40,710 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-11 00:43:40,710 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:40,710 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:40,722 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-11 00:43:40,730 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-11 00:43:40,730 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-11 00:43:40,737 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-11 00:43:40,745 [ scc.git] DEBUG Already up to date.
2024-08-11 00:43:40,745 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-11 00:43:41,067 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-08-11 00:43:41,067 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-11 00:43:41,073 [ scc.git] DEBUG ## Unique users: []
2024-08-11 00:43:41,073 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:41,074 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:41,080 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-11 00:43:41,090 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:41,098 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-11 00:43:41,125 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-11 00:43:41,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:43:41,264 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-11 00:43:41,314 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:41,315 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:41,325 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-11 00:43:41,378 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-11 00:43:41,389 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff5d0624e80> has no local changes
2024-08-11 00:43:41,389 [ 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#149 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/)'
2024-08-11 00:43:41,403 [ scc.git] DEBUG [detached HEAD 58876e9] merge master -Dorg -Ssuccess-only
2024-08-11 00:43:41,404 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:43:41,405 [ scc.repo] DEBUG ## PRs found:
2024-08-11 00:43:41,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-08-11 00:43:42,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-08-11 00:43:42,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-08-11 00:43:43,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-08-11 00:43:43,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-11 00:43:44,071 [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-11 00:43:44,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-11 00:43:44,995 [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-11 00:43:44,996 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-11 00:43:44,996 [ scc.repo] DEBUG ## Branches found:
2024-08-11 00:43:44,996 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-11 00:43:44,996 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:44,996 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:45,003 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-11 00:43:45,010 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-11 00:43:45,010 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-11 00:43:45,020 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-11 00:43:45,029 [ scc.git] DEBUG Already up to date.
2024-08-11 00:43:45,030 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-08-11 00:43:45,450 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-08-11 00:43:45,451 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-08-11 00:43:45,455 [ scc.git] DEBUG ## Unique users: []
2024-08-11 00:43:45,456 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:45,456 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:45,462 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-08-11 00:43:45,469 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:45,476 [ 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-11 00:43:45,488 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-08-11 00:43:45,488 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-11 00:43:45,491 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-08-11 00:43:45,491 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-08-11 00:43:45,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:43:45,668 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-11 00:43:45,721 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:45,722 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:45,729 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-11 00:43:45,784 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-11 00:43:45,795 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff5d057bb50> has no local changes
2024-08-11 00:43:45,795 [ 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#149 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/)'
2024-08-11 00:43:45,812 [ scc.git] DEBUG [detached HEAD 76a5769] merge master -Dorg -Ssuccess-only
2024-08-11 00:43:45,812 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:43:45,813 [ scc.repo] DEBUG ## PRs found:
2024-08-11 00:43:46,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-08-11 00:43:46,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-08-11 00:43:47,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-08-11 00:43:47,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-11 00:43:48,031 [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-11 00:43:48,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-11 00:43:48,952 [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-11 00:43:48,953 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-11 00:43:48,953 [ scc.repo] DEBUG ## Branches found:
2024-08-11 00:43:48,953 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-11 00:43:48,953 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:48,953 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:48,959 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-11 00:43:48,964 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-11 00:43:48,964 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-11 00:43:48,972 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-11 00:43:48,978 [ scc.git] DEBUG Already up to date.
2024-08-11 00:43:48,978 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-11 00:43:49,299 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-08-11 00:43:49,299 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-11 00:43:49,303 [ scc.git] DEBUG ## Unique users: []
2024-08-11 00:43:49,303 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:49,304 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:49,310 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-11 00:43:49,316 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:49,322 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-11 00:43:49,372 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-08-11 00:43:49,372 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-08-11 00:43:49,372 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-08-11 00:43:49,372 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-08-11 00:43:49,372 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-08-11 00:43:49,372 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-08-11 00:43:49,372 [ scc.git] DEBUG Auto-merging setup.py
2024-08-11 00:43:49,372 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-08-11 00:43:49,372 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-11 00:43:49,372 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-11 00:43:49,379 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-11 00:43:49,386 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-08-11 00:43:49,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:43:49,532 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-11 00:43:49,540 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-11 00:43:49,545 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#149](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/signup_settings.py
- setup.py
- omero_signup/views.py
--conflicts
2024-08-11 00:43:49,550 [ scc.config] DEBUG Found github.token
2024-08-11 00:43:49,550 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-08-11 00:43:49,550 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-11 00:43:49,589 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:49,589 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:49,594 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-11 00:43:49,638 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-11 00:43:49,645 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff5d05e7730> has no local changes
2024-08-11 00:43:49,645 [ 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#149 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/)'
2024-08-11 00:43:49,653 [ scc.git] DEBUG [detached HEAD 9ba04e2] merge master -Dorg -Ssuccess-only
2024-08-11 00:43:49,653 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:43:49,653 [ scc.repo] DEBUG ## PRs found:
2024-08-11 00:43:50,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-08-11 00:43:50,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-08-11 00:43:50,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-08-11 00:43:51,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-11 00:43:51,763 [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-11 00:43:52,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-11 00:43:52,687 [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-11 00:43:52,688 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-11 00:43:52,688 [ scc.repo] DEBUG ## Branches found:
2024-08-11 00:43:52,688 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-11 00:43:52,688 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:52,688 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:52,694 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-11 00:43:52,700 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-11 00:43:52,700 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-11 00:43:52,708 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-11 00:43:52,715 [ scc.git] DEBUG Already up to date.
2024-08-11 00:43:52,715 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-08-11 00:43:53,129 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-08-11 00:43:53,129 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-08-11 00:43:53,135 [ scc.git] DEBUG ## Unique users: []
2024-08-11 00:43:53,135 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:53,135 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:53,141 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-08-11 00:43:53,148 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:53,153 [ 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-11 00:43:53,175 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-11 00:43:53,178 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-08-11 00:43:53,178 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-08-11 00:43:53,178 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-08-11 00:43:53,178 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-08-11 00:43:53,178 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-08-11 00:43:53,179 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-08-11 00:43:53,179 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-08-11 00:43:53,179 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-08-11 00:43:53,181 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-08-11 00:43:53,181 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-08-11 00:43:53,181 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-08-11 00:43:53,181 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-08-11 00:43:53,181 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-08-11 00:43:53,181 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-08-11 00:43:53,181 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-08-11 00:43:53,181 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-08-11 00:43:53,181 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-08-11 00:43:53,181 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-08-11 00:43:53,181 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-08-11 00:43:53,181 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-08-11 00:43:53,181 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-08-11 00:43:53,181 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-08-11 00:43:53,181 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-08-11 00:43:53,181 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-08-11 00:43:53,181 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-08-11 00:43:53,181 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-08-11 00:43:53,181 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-08-11 00:43:53,181 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-08-11 00:43:53,181 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-08-11 00:43:53,182 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-08-11 00:43:53,182 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-08-11 00:43:53,182 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-08-11 00:43:53,182 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-08-11 00:43:53,182 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-08-11 00:43:53,182 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-08-11 00:43:53,182 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-08-11 00:43:53,182 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-08-11 00:43:53,182 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-08-11 00:43:53,182 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-08-11 00:43:53,182 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-08-11 00:43:53,182 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-08-11 00:43:53,182 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-08-11 00:43:53,182 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-08-11 00:43:53,182 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-08-11 00:43:53,182 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-08-11 00:43:53,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:43:53,315 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-11 00:43:53,359 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:53,359 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:53,364 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-11 00:43:53,406 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-11 00:43:53,413 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff5d05b3640> has no local changes
2024-08-11 00:43:53,414 [ 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#149 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/)'
2024-08-11 00:43:53,426 [ scc.git] DEBUG [detached HEAD fd792ba] merge master -Dorg -Ssuccess-only
2024-08-11 00:43:53,426 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:43:53,427 [ scc.repo] DEBUG ## PRs found:
2024-08-11 00:43:53,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-08-11 00:43:53,723 [ scc.repo] DEBUG ## Branches found:
2024-08-11 00:43:53,724 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-11 00:43:53,724 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:53,724 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:53,731 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-11 00:43:53,738 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-11 00:43:53,738 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-11 00:43:53,745 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-11 00:43:53,752 [ scc.git] DEBUG Already up to date.
2024-08-11 00:43:53,752 [ scc.git] DEBUG ## Unique users: []
2024-08-11 00:43:53,752 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:53,752 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:53,758 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-11 00:43:53,797 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:53,797 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:53,803 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-11 00:43:53,849 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-11 00:43:53,855 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff5d054ce80> has no local changes
2024-08-11 00:43:53,856 [ 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#149 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/)'
2024-08-11 00:43:53,864 [ scc.git] DEBUG [detached HEAD 6dcacdb] merge master -Dorg -Ssuccess-only
2024-08-11 00:43:53,864 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:43:53,864 [ scc.repo] DEBUG ## PRs found:
2024-08-11 00:43:54,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-08-11 00:43:54,141 [ scc.repo] DEBUG ## Branches found:
2024-08-11 00:43:54,142 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-11 00:43:54,142 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:54,142 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:54,149 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-11 00:43:54,157 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-11 00:43:54,157 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-11 00:43:54,165 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-11 00:43:54,174 [ scc.git] DEBUG Already up to date.
2024-08-11 00:43:54,174 [ scc.git] DEBUG ## Unique users: []
2024-08-11 00:43:54,174 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:54,174 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:54,180 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-11 00:43:54,220 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:54,221 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:54,226 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-11 00:43:54,264 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-11 00:43:54,271 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff5d0575d30> has no local changes
2024-08-11 00:43:54,271 [ 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#149 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/)'
2024-08-11 00:43:54,279 [ scc.git] DEBUG [detached HEAD bbbec68] merge master -Dorg -Ssuccess-only
2024-08-11 00:43:54,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:43:54,280 [ scc.git] INFO Overriding base-branch from master to main
2024-08-11 00:43:54,280 [ scc.repo] DEBUG ## PRs found:
2024-08-11 00:43:54,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-08-11 00:43:55,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-08-11 00:43:55,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-08-11 00:43:55,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-08-11 00:43:56,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-11 00:43:56,910 [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-11 00:43:57,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-11 00:43:57,881 [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-11 00:43:57,882 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-11 00:43:57,882 [ scc.repo] DEBUG ## Branches found:
2024-08-11 00:43:57,882 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-11 00:43:57,883 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:57,883 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:57,890 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-08-11 00:43:57,896 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-11 00:43:57,896 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-08-11 00:43:57,902 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-08-11 00:43:57,909 [ scc.git] DEBUG Already up to date.
2024-08-11 00:43:57,909 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-08-11 00:43:58,295 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-08-11 00:43:58,295 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-08-11 00:43:58,300 [ scc.git] DEBUG ## Unique users: []
2024-08-11 00:43:58,300 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:58,300 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:58,307 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-11 00:43:58,314 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:58,321 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-11 00:43:58,370 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-08-11 00:43:58,370 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-08-11 00:43:58,370 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-11 00:43:58,370 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-11 00:43:58,378 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-11 00:43:58,385 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-08-11 00:43:58,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:43:58,520 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-11 00:43:58,527 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-11 00:43:58,533 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#149](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-08-11 00:43:58,539 [ scc.config] DEBUG Found github.token
2024-08-11 00:43:58,539 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-08-11 00:43:58,540 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-11 00:43:58,582 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:58,582 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:58,590 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-11 00:43:58,633 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-11 00:43:58,640 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff5d0580f40> has no local changes
2024-08-11 00:43:58,641 [ 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#149 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/)'
2024-08-11 00:43:58,649 [ scc.git] DEBUG [detached HEAD cb52f6a] merge master -Dorg -Ssuccess-only
2024-08-11 00:43:58,650 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:43:58,650 [ scc.repo] DEBUG ## PRs found:
2024-08-11 00:43:58,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-08-11 00:43:58,925 [ scc.repo] DEBUG ## Branches found:
2024-08-11 00:43:58,925 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-11 00:43:58,925 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:58,925 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:58,932 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-11 00:43:58,940 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-11 00:43:58,941 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-11 00:43:58,947 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-11 00:43:58,953 [ scc.git] DEBUG Already up to date.
2024-08-11 00:43:58,954 [ scc.git] DEBUG ## Unique users: []
2024-08-11 00:43:58,954 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:58,954 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:58,960 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-11 00:43:59,004 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:59,004 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:59,011 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-11 00:43:59,054 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-11 00:43:59,061 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff5d0558130> has no local changes
2024-08-11 00:43:59,061 [ 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#149 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/)'
2024-08-11 00:43:59,070 [ scc.git] DEBUG [detached HEAD 2980e67] merge master -Dorg -Ssuccess-only
2024-08-11 00:43:59,071 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:43:59,071 [ scc.repo] DEBUG ## PRs found:
2024-08-11 00:43:59,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-08-11 00:43:59,408 [ scc.repo] DEBUG ## Branches found:
2024-08-11 00:43:59,408 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-11 00:43:59,408 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:59,408 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:59,414 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-11 00:43:59,419 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-11 00:43:59,419 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-11 00:43:59,424 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-11 00:43:59,429 [ scc.git] DEBUG Already up to date.
2024-08-11 00:43:59,429 [ scc.git] DEBUG ## Unique users: []
2024-08-11 00:43:59,430 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:59,430 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:59,434 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-11 00:43:59,472 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:43:59,472 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:43:59,478 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-11 00:43:59,517 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-11 00:43:59,524 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff5d04f7490> has no local changes
2024-08-11 00:43:59,524 [ 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#149 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/)'
2024-08-11 00:43:59,532 [ scc.git] DEBUG [detached HEAD 1837d49] merge master -Dorg -Ssuccess-only
2024-08-11 00:43:59,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:43:59,533 [ scc.repo] DEBUG ## PRs found:
2024-08-11 00:43:59,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-08-11 00:44:00,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-08-11 00:44:00,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-08-11 00:44:01,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-11 00:44:01,690 [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-11 00:44:02,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-11 00:44:02,569 [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-11 00:44:02,570 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-08-11 00:44:02,570 [ scc.repo] DEBUG ## Branches found:
2024-08-11 00:44:02,570 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-11 00:44:02,570 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:44:02,570 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:44:02,576 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-11 00:44:02,582 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-11 00:44:02,582 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-11 00:44:02,587 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-11 00:44:02,593 [ scc.git] DEBUG Already up to date.
2024-08-11 00:44:02,593 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-08-11 00:44:02,952 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-08-11 00:44:02,952 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-08-11 00:44:02,958 [ scc.git] DEBUG ## Unique users: []
2024-08-11 00:44:02,958 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:44:02,958 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:44:02,964 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-11 00:44:02,970 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:44:02,975 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-11 00:44:03,016 [ scc.git] DEBUG Auto-merging Dockerfile
2024-08-11 00:44:03,016 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-08-11 00:44:03,016 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-11 00:44:03,016 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-11 00:44:03,024 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-11 00:44:03,032 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-08-11 00:44:03,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:44:03,195 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-11 00:44:03,203 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-11 00:44:03,208 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#149](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-08-11 00:44:03,213 [ scc.config] DEBUG Found github.token
2024-08-11 00:44:03,213 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-08-11 00:44:03,213 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-11 00:44:03,250 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:44:03,250 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:44:03,256 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-11 00:44:03,294 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-11 00:44:03,301 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff5d05188b0> has no local changes
2024-08-11 00:44:03,301 [ 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#149 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/)'
2024-08-11 00:44:03,310 [ scc.git] DEBUG [detached HEAD 02e8b57] merge master -Dorg -Ssuccess-only
2024-08-11 00:44:03,311 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:44:03,311 [ scc.git] INFO Overriding base-branch from master to develop
2024-08-11 00:44:03,311 [ scc.repo] DEBUG ## PRs found:
2024-08-11 00:44:03,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-08-11 00:44:04,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-08-11 00:44:04,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-08-11 00:44:05,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-08-11 00:44:05,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-08-11 00:44:05,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-08-11 00:44:06,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-08-11 00:44:06,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-11 00:44:07,360 [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-11 00:44:07,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-11 00:44:08,177 [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-11 00:44:08,178 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-11 00:44:08,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-08-11 00:44:09,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-08-11 00:44:09,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-08-11 00:44:10,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-08-11 00:44:10,266 [ scc.repo] DEBUG ## Branches found:
2024-08-11 00:44:10,266 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-11 00:44:10,267 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:44:10,267 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:44:10,273 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-08-11 00:44:10,280 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-11 00:44:10,281 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-08-11 00:44:10,287 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-08-11 00:44:10,294 [ scc.git] DEBUG Already up to date.
2024-08-11 00:44:10,294 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-08-11 00:44:10,746 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-08-11 00:44:10,746 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-08-11 00:44:10,752 [ scc.git] DEBUG ## Unique users: []
2024-08-11 00:44:10,752 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:44:10,752 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:44:10,760 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-11 00:44:10,769 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:44:10,774 [ 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-11 00:44:10,844 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-08-11 00:44:10,845 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-08-11 00:44:10,845 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-11 00:44:10,845 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-11 00:44:10,854 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-11 00:44:10,862 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-08-11 00:44:10,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:44:11,001 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-11 00:44:11,010 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-11 00:44:11,017 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#149](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-08-11 00:44:11,023 [ scc.config] DEBUG Found github.token
2024-08-11 00:44:11,023 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-08-11 00:44:11,023 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-11 00:44:11,065 [ scc.git] DEBUG Get sha1 of %s
2024-08-11 00:44:11,065 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-11 00:44:11,072 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-11 00:44:11,115 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-11 00:44:11,122 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff5d05185b0> has no local changes
2024-08-11 00:44:11,122 [ 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#149 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/)'
2024-08-11 00:44:11,130 [ scc.git] DEBUG [detached HEAD b74ae8d] merge master -Dorg -Ssuccess-only
2024-08-11 00:44:11,131 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:44:11,131 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-11 00:44:11,207 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-08-11 00:44:11,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:44:11,407 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-08-11 00:44:11,413 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-08-11 00:44:11,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:44:11,785 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-08-11 00:44:11,791 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-08-11 00:44:12,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:44:12,165 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-08-11 00:44:12,170 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-08-11 00:44:12,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:44:12,571 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-08-11 00:44:12,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:44:12,947 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-08-11 00:44:12,952 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-08-11 00:44:13,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:44:13,329 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-08-11 00:44:13,334 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-08-11 00:44:13,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:44:13,712 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-08-11 00:44:13,717 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-08-11 00:44:14,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:44:14,090 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-08-11 00:44:14,096 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-08-11 00:44:14,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:44:14,473 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-08-11 00:44:14,478 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-08-11 00:44:14,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:44:14,860 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-08-11 00:44:14,865 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-08-11 00:44:15,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:44:15,245 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-08-11 00:44:15,250 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-08-11 00:44:15,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:44:15,634 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-08-11 00:44:15,639 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-08-11 00:44:16,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:44:16,049 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-08-11 00:44:16,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:44:16,430 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-08-11 00:44:16,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:44:16,810 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-08-11 00:44:16,816 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-08-11 00:44:17,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:44:17,201 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-08-11 00:44:17,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:44:17,599 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-08-11 00:44:17,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:44:17,971 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-08-11 00:44:17,976 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-08-11 00:44:18,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:44:18,352 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-08-11 00:44:18,357 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-08-11 00:44:18,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:44:18,753 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-08-11 00:44:18,758 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-08-11 00:44:19,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:44:19,138 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-08-11 00:44:19,144 [ scc.config] DEBUG Found submodule.scripts.url
2024-08-11 00:44:19,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-11 00:44:19,527 [ scc.config] DEBUG Found submodule.scripts.branch
2024-08-11 00:44:19,527 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-11 00:44:19,621 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff5d17a2d30> has local changes
2024-08-11 00:44:19,622 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
Merged PRs:
- PR 66 jburel 'Gateway 5 9 2'
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 63 sbesson 'Remove python-future dependency'
- PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
- PR 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)
Updating fefe87cf..430fc3f8
Previously merged:
- PR 580 Rdornier 'Weird translation'
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 576 Rdornier 'Color picker - popup update'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#149 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/149/)'
2024-08-11 00:44:19,636 [ scc.git] DEBUG [detached HEAD 9288667] merge master -Dorg -Ssuccess-only
2024-08-11 00:44:19,637 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-08-11 00:44:19,637 [ scc.merge] INFO Repository: ome/omero-plugins
2024-08-11 00:44:19,637 [ scc.merge] INFO Already up to date.
2024-08-11 00:44:19,637 [ scc.merge] INFO
2024-08-11 00:44:19,637 [ scc.merge] INFO
2024-08-11 00:44:19,637 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-08-11 00:44:19,637 [ scc.merge] INFO Already up to date.
2024-08-11 00:44:19,637 [ scc.merge] INFO
2024-08-11 00:44:19,637 [ scc.merge] INFO Merged PRs:
2024-08-11 00:44:19,637 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-08-11 00:44:19,637 [ scc.merge] INFO
2024-08-11 00:44:19,637 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-08-11 00:44:19,637 [ scc.merge] INFO Excluded PRs:
2024-08-11 00:44:19,637 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-08-11 00:44:19,637 [ scc.merge] INFO Already up to date.
2024-08-11 00:44:19,637 [ scc.merge] INFO
2024-08-11 00:44:19,637 [ scc.merge] INFO Merged PRs:
2024-08-11 00:44:19,637 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-08-11 00:44:19,637 [ scc.merge] INFO
2024-08-11 00:44:19,637 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-08-11 00:44:19,637 [ scc.merge] INFO Excluded PRs:
2024-08-11 00:44:19,637 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-08-11 00:44:19,637 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-08-11 00:44:19,638 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-08-11 00:44:19,638 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-08-11 00:44:19,638 [ scc.merge] INFO Already up to date.
2024-08-11 00:44:19,638 [ scc.merge] INFO
2024-08-11 00:44:19,638 [ scc.merge] INFO Merged PRs:
2024-08-11 00:44:19,638 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-08-11 00:44:19,638 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-08-11 00:44:19,638 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-08-11 00:44:19,638 [ scc.merge] INFO
2024-08-11 00:44:19,638 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-08-11 00:44:19,638 [ scc.merge] INFO Excluded PRs:
2024-08-11 00:44:19,638 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-11 00:44:19,638 [ scc.merge] INFO Already up to date.
2024-08-11 00:44:19,638 [ scc.merge] INFO
2024-08-11 00:44:19,638 [ scc.merge] INFO Merged PRs:
2024-08-11 00:44:19,638 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-08-11 00:44:19,638 [ scc.merge] INFO
2024-08-11 00:44:19,638 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-11 00:44:19,638 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-08-11 00:44:19,638 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-08-11 00:44:19,638 [ scc.merge] INFO
2024-08-11 00:44:19,638 [ scc.merge] INFO Repository: ome/omero-figure
2024-08-11 00:44:19,638 [ scc.merge] INFO Excluded PRs:
2024-08-11 00:44:19,638 [ scc.merge] INFO - PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
2024-08-11 00:44:19,638 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-08-11 00:44:19,638 [ scc.merge] INFO - PR 578 Rdornier 'Image outline' (user: Rdornier)
2024-08-11 00:44:19,638 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' (user: Rdornier)
2024-08-11 00:44:19,638 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-08-11 00:44:19,638 [ scc.merge] INFO Updating fefe87cf..430fc3f8
2024-08-11 00:44:19,638 [ scc.merge] INFO Previously merged:
2024-08-11 00:44:19,638 [ scc.merge] INFO - PR 580 Rdornier 'Weird translation'
2024-08-11 00:44:19,638 [ scc.merge] INFO
2024-08-11 00:44:19,638 [ scc.merge] INFO Merged PRs:
2024-08-11 00:44:19,638 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-08-11 00:44:19,638 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-08-11 00:44:19,638 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-08-11 00:44:19,638 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-08-11 00:44:19,638 [ scc.merge] INFO - PR 576 Rdornier 'Color picker - popup update'
2024-08-11 00:44:19,639 [ scc.merge] INFO
2024-08-11 00:44:19,639 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-08-11 00:44:19,639 [ scc.merge] INFO Already up to date.
2024-08-11 00:44:19,639 [ scc.merge] INFO
2024-08-11 00:44:19,639 [ scc.merge] INFO Merged PRs:
2024-08-11 00:44:19,639 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-08-11 00:44:19,639 [ scc.merge] INFO
2024-08-11 00:44:19,639 [ scc.merge] INFO Repository: ome/omero-gallery
2024-08-11 00:44:19,639 [ scc.merge] INFO Already up to date.
2024-08-11 00:44:19,639 [ scc.merge] INFO
2024-08-11 00:44:19,639 [ scc.merge] INFO Merged PRs:
2024-08-11 00:44:19,639 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-11 00:44:19,639 [ scc.merge] INFO
2024-08-11 00:44:19,639 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-08-11 00:44:19,639 [ scc.merge] INFO Excluded PRs:
2024-08-11 00:44:19,639 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-08-11 00:44:19,639 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-08-11 00:44:19,639 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-08-11 00:44:19,639 [ scc.merge] INFO Already up to date.
2024-08-11 00:44:19,639 [ scc.merge] INFO
2024-08-11 00:44:19,639 [ scc.merge] INFO Merged PRs:
2024-08-11 00:44:19,639 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-08-11 00:44:19,639 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-08-11 00:44:19,639 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-11 00:44:19,639 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-11 00:44:19,639 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-11 00:44:19,639 [ scc.merge] INFO
2024-08-11 00:44:19,639 [ scc.merge] INFO Repository: ome/omero-mapr
2024-08-11 00:44:19,639 [ scc.merge] INFO Excluded PRs:
2024-08-11 00:44:19,639 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-08-11 00:44:19,639 [ scc.merge] INFO Already up to date.
2024-08-11 00:44:19,639 [ scc.merge] INFO
2024-08-11 00:44:19,639 [ scc.merge] INFO Merged PRs:
2024-08-11 00:44:19,639 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-08-11 00:44:19,639 [ scc.merge] INFO
2024-08-11 00:44:19,639 [ scc.merge] INFO Repository: ome/omero-metadata
2024-08-11 00:44:19,639 [ scc.merge] INFO Already up to date.
2024-08-11 00:44:19,639 [ scc.merge] INFO
2024-08-11 00:44:19,639 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-11 00:44:19,640 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-11 00:44:19,640 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-11 00:44:19,640 [ scc.merge] INFO
2024-08-11 00:44:19,640 [ scc.merge] INFO Repository: ome/omero-parade
2024-08-11 00:44:19,640 [ scc.merge] INFO Excluded PRs:
2024-08-11 00:44:19,640 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-08-11 00:44:19,640 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-08-11 00:44:19,640 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-08-11 00:44:19,640 [ scc.merge] INFO Already up to date.
2024-08-11 00:44:19,640 [ scc.merge] INFO
2024-08-11 00:44:19,640 [ scc.merge] INFO Merged PRs:
2024-08-11 00:44:19,640 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-11 00:44:19,640 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-11 00:44:19,640 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-11 00:44:19,640 [ scc.merge] INFO
2024-08-11 00:44:19,640 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-08-11 00:44:19,640 [ scc.merge] INFO Already up to date.
2024-08-11 00:44:19,640 [ scc.merge] INFO
2024-08-11 00:44:19,640 [ scc.merge] INFO Merged PRs:
2024-08-11 00:44:19,640 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-08-11 00:44:19,640 [ scc.merge] INFO
2024-08-11 00:44:19,640 [ scc.merge] INFO Repository: ome/omero-rois
2024-08-11 00:44:19,640 [ scc.merge] INFO Excluded PRs:
2024-08-11 00:44:19,640 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-11 00:44:19,640 [ scc.merge] INFO Already up to date.
2024-08-11 00:44:19,640 [ scc.merge] INFO
2024-08-11 00:44:19,640 [ scc.merge] INFO Merged PRs:
2024-08-11 00:44:19,640 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-11 00:44:19,640 [ scc.merge] INFO
2024-08-11 00:44:19,640 [ scc.merge] INFO Repository: ome/omero-signup
2024-08-11 00:44:19,640 [ scc.merge] INFO Already up to date.
2024-08-11 00:44:19,640 [ scc.merge] INFO
2024-08-11 00:44:19,640 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-11 00:44:19,640 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-11 00:44:19,640 [ scc.merge] INFO
2024-08-11 00:44:19,640 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-08-11 00:44:19,640 [ scc.merge] INFO Already up to date.
2024-08-11 00:44:19,640 [ scc.merge] INFO
2024-08-11 00:44:19,640 [ scc.merge] INFO Merged PRs:
2024-08-11 00:44:19,640 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-11 00:44:19,641 [ scc.merge] INFO
2024-08-11 00:44:19,641 [ scc.merge] INFO Repository: ome/omero-upload
2024-08-11 00:44:19,641 [ scc.merge] INFO Already up to date.
2024-08-11 00:44:19,641 [ scc.merge] INFO
2024-08-11 00:44:19,641 [ scc.merge] INFO
2024-08-11 00:44:19,641 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-08-11 00:44:19,641 [ scc.merge] INFO Already up to date.
2024-08-11 00:44:19,641 [ scc.merge] INFO
2024-08-11 00:44:19,641 [ scc.merge] INFO
2024-08-11 00:44:19,641 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-08-11 00:44:19,641 [ scc.merge] INFO Excluded PRs:
2024-08-11 00:44:19,641 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-08-11 00:44:19,641 [ scc.merge] INFO Already up to date.
2024-08-11 00:44:19,641 [ scc.merge] INFO
2024-08-11 00:44:19,641 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-11 00:44:19,641 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-11 00:44:19,641 [ scc.merge] INFO
2024-08-11 00:44:19,641 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-08-11 00:44:19,641 [ scc.merge] INFO Already up to date.
2024-08-11 00:44:19,641 [ scc.merge] INFO
2024-08-11 00:44:19,641 [ scc.merge] INFO
2024-08-11 00:44:19,641 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-08-11 00:44:19,641 [ scc.merge] INFO Already up to date.
2024-08-11 00:44:19,641 [ scc.merge] INFO
2024-08-11 00:44:19,641 [ scc.merge] INFO
2024-08-11 00:44:19,641 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-08-11 00:44:19,641 [ scc.merge] INFO Already up to date.
2024-08-11 00:44:19,641 [ scc.merge] INFO
2024-08-11 00:44:19,641 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-11 00:44:19,641 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-08-11 00:44:19,641 [ scc.merge] INFO
2024-08-11 00:44:19,641 [ scc.merge] INFO Repository: ome/scripts
2024-08-11 00:44:19,641 [ scc.merge] INFO Excluded PRs:
2024-08-11 00:44:19,641 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-08-11 00:44:19,641 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-08-11 00:44:19,641 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-08-11 00:44:19,641 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-08-11 00:44:19,641 [ scc.merge] INFO Already up to date.
2024-08-11 00:44:19,641 [ scc.merge] INFO
2024-08-11 00:44:19,642 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-11 00:44:19,642 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-11 00:44:19,642 [ scc.merge] INFO
2024-08-11 00:44:19,642 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-08-11 00:44:19,642 [ scc.git] DEBUG Calling 'git remote'
2024-08-11 00:44:19,647 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-08-11 00:44:19,648 [ scc.git] DEBUG Calling 'git remote'
2024-08-11 00:44:19,653 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:44:19,654 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-08-11 00:44:19,654 [ scc.git] DEBUG Calling 'git remote'
2024-08-11 00:44:19,659 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:44:19,660 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-08-11 00:44:19,660 [ scc.git] DEBUG Calling 'git remote'
2024-08-11 00:44:19,665 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:44:19,665 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-08-11 00:44:19,665 [ scc.git] DEBUG Calling 'git remote'
2024-08-11 00:44:19,670 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:44:19,670 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-08-11 00:44:19,670 [ scc.git] DEBUG Calling 'git remote'
2024-08-11 00:44:19,675 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:44:19,675 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-11 00:44:19,675 [ scc.git] DEBUG Calling 'git remote'
2024-08-11 00:44:19,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:44:19,680 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-11 00:44:19,680 [ scc.git] DEBUG Calling 'git remote'
2024-08-11 00:44:19,684 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:44:19,684 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-11 00:44:19,684 [ scc.git] DEBUG Calling 'git remote'
2024-08-11 00:44:19,690 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:44:19,690 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-11 00:44:19,690 [ scc.git] DEBUG Calling 'git remote'
2024-08-11 00:44:19,696 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:44:19,696 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-11 00:44:19,696 [ scc.git] DEBUG Calling 'git remote'
2024-08-11 00:44:19,701 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:44:19,702 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-11 00:44:19,702 [ scc.git] DEBUG Calling 'git remote'
2024-08-11 00:44:19,706 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:44:19,706 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-11 00:44:19,706 [ scc.git] DEBUG Calling 'git remote'
2024-08-11 00:44:19,711 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:44:19,711 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-11 00:44:19,711 [ scc.git] DEBUG Calling 'git remote'
2024-08-11 00:44:19,716 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:44:19,716 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-11 00:44:19,716 [ scc.git] DEBUG Calling 'git remote'
2024-08-11 00:44:19,720 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:44:19,721 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-11 00:44:19,721 [ scc.git] DEBUG Calling 'git remote'
2024-08-11 00:44:19,725 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:44:19,726 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-11 00:44:19,726 [ scc.git] DEBUG Calling 'git remote'
2024-08-11 00:44:19,730 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:44:19,730 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-11 00:44:19,730 [ scc.git] DEBUG Calling 'git remote'
2024-08-11 00:44:19,735 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:44:19,735 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-11 00:44:19,735 [ scc.git] DEBUG Calling 'git remote'
2024-08-11 00:44:19,739 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:44:19,740 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-11 00:44:19,740 [ scc.git] DEBUG Calling 'git remote'
2024-08-11 00:44:19,744 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:44:19,744 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-11 00:44:19,744 [ scc.git] DEBUG Calling 'git remote'
2024-08-11 00:44:19,749 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:44:19,749 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-11 00:44:19,749 [ scc.git] DEBUG Calling 'git remote'
2024-08-11 00:44:19,754 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-11 00:44:19,754 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-11 00:44:19,754 [ scc.git] DEBUG Calling 'git remote'
2024-08-11 00:44:19,758 [ 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 cf25def] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 9b73dd9
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from fefe87cf
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from a8f380f
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 312afbe
nothing to commit, working tree clean
[detached HEAD d28af21] 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-11 00:45:05,190 [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-11 00:45:13,885 [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-11 00:45:16,160 [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-11 00:45:20,566 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-08-11 00:46:00,243 [ 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}
