Console Output
Skipping 91 KB..
Full Log59944f9c24?per_page=1 HTTP/1.1" 200 2
2024-05-08 00:42:16,860 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-05-08 00:42:17,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543 HTTP/1.1" 200 None
2024-05-08 00:42:17,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543/comments HTTP/1.1" 200 None
2024-05-08 00:42:17,757 [ scc.repo] DEBUG ## Branches found:
2024-05-08 00:42:17,757 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-08 00:42:17,757 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:42:17,757 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:42:17,763 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-08 00:42:17,768 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-08 00:42:17,769 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-08 00:42:17,775 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-08 00:42:17,786 [ scc.git] DEBUG Updating 6bdf72cb..f8b3e4c7
2024-05-08 00:42:18,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls/561 HTTP/1.1" 200 None
2024-05-08 00:42:18,451 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-05-08 00:42:19,723 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-08 00:42:19,723 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-05-08 00:42:19,726 [ scc.git] DEBUG Calling 'git fetch origin pull/554/head'
2024-05-08 00:42:20,203 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-08 00:42:20,203 [ scc.git] DEBUG * branch refs/pull/554/head -> FETCH_HEAD
2024-05-08 00:42:20,208 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-05-08 00:42:20,820 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-08 00:42:20,820 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-05-08 00:42:20,826 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-05-08 00:42:21,396 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-08 00:42:21,396 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-05-08 00:42:21,401 [ scc.git] DEBUG ## Unique users: []
2024-05-08 00:42:21,401 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:42:21,401 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:42:21,407 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-08 00:42:21,415 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:42:21,420 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-08 00:42:21,470 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:42:21,478 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-05-08 00:42:21,478 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-05-08 00:42:21,478 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-05-08 00:42:21,478 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-05-08 00:42:21,479 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-05-08 00:42:21,479 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-05-08 00:42:21,479 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-05-08 00:42:21,479 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-05-08 00:42:21,479 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-05-08 00:42:21,479 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-05-08 00:42:21,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:42:21,643 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...902c4461b9479c4681e6bf71114616299e2adde5'
2024-05-08 00:42:21,653 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:42:21,659 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 554 (Update publish) 902c4461b9479c4681e6bf71114616299e2adde5'
2024-05-08 00:42:21,678 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:42:21,680 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++---
2024-05-08 00:42:21,680 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-05-08 00:42:22,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:42:22,048 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-08 00:42:22,056 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:42:22,062 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-08 00:42:22,140 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-08 00:42:22,141 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-05-08 00:42:22,141 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-05-08 00:42:22,141 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:42:22,147 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-05-08 00:42:22,147 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-05-08 00:42:22,147 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-05-08 00:42:22,147 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-05-08 00:42:22,147 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-05-08 00:42:22,147 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-05-08 00:42:22,148 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-05-08 00:42:22,148 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-05-08 00:42:22,148 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-05-08 00:42:22,148 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-05-08 00:42:22,148 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-05-08 00:42:22,148 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-05-08 00:42:22,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:42:22,466 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...385502576c168df58f51bc14bff6bd62a76fc15b'
2024-05-08 00:42:22,474 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:42:22,479 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) 385502576c168df58f51bc14bff6bd62a76fc15b'
2024-05-08 00:42:22,540 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-05-08 00:42:22,540 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-05-08 00:42:22,540 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-08 00:42:22,540 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-05-08 00:42:22,541 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:42:22,548 [ scc.git] DEBUG omero_figure/urls.py | 8 +++
2024-05-08 00:42:22,548 [ scc.git] DEBUG omero_figure/views.py | 69 +++++++++++++++++++++++
2024-05-08 00:42:22,548 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-05-08 00:42:22,548 [ scc.git] DEBUG src/index.html | 1 +
2024-05-08 00:42:22,548 [ scc.git] DEBUG src/js/models/figure_model.js | 29 +++++++++-
2024-05-08 00:42:22,548 [ scc.git] DEBUG src/js/models/panel_model.js | 37 +++++++++++-
2024-05-08 00:42:22,548 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-05-08 00:42:22,548 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-05-08 00:42:22,548 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-05-08 00:42:22,548 [ scc.git] DEBUG src/js/views/right_panel_view.js | 8 +++
2024-05-08 00:42:22,548 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-05-08 00:42:22,548 [ scc.git] DEBUG src/templates/image_display_options.template.html | 9 +++
2024-05-08 00:42:22,549 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-05-08 00:42:22,549 [ scc.git] DEBUG 13 files changed, 168 insertions(+), 10 deletions(-)
2024-05-08 00:42:22,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:42:22,868 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-08 00:42:22,913 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:42:22,913 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:42:22,920 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:42:22,962 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-08 00:42:22,973 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ef6486be0> has no local changes
2024-05-08 00:42:22,974 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 543 will-moore 'Plate well labels' (stage: draft)
Updating 6bdf72cb..f8b3e4c7
Previously merged:
- PR 561 will-moore 'Bugfixes may2024'
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 554 jburel 'Update publish'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
Generated by OMERO-plugins-push#59 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/)'
2024-05-08 00:42:22,991 [ scc.git] DEBUG [detached HEAD ffe86bc4] merge master -Dorg -Ssuccess-only
2024-05-08 00:42:22,991 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:42:22,992 [ scc.repo] DEBUG ## PRs found:
2024-05-08 00:42:23,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-05-08 00:42:23,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-05-08 00:42:24,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-05-08 00:42:24,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-08 00:42:25,167 [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-05-08 00:42:25,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-08 00:42:26,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-05-08 00:42:26,068 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-05-08 00:42:26,068 [ scc.repo] DEBUG ## Branches found:
2024-05-08 00:42:26,068 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-08 00:42:26,068 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:42:26,068 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:42:26,074 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-08 00:42:26,079 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-08 00:42:26,079 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-08 00:42:26,085 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-08 00:42:26,091 [ scc.git] DEBUG Already up to date.
2024-05-08 00:42:26,091 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-05-08 00:42:26,491 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-05-08 00:42:26,492 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-05-08 00:42:26,495 [ scc.git] DEBUG ## Unique users: []
2024-05-08 00:42:26,495 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:42:26,495 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:42:26,502 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-08 00:42:26,507 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:42:26,512 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-08 00:42:26,539 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-05-08 00:42:26,539 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:42:26,542 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-05-08 00:42:26,542 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-05-08 00:42:26,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:42:26,691 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-08 00:42:26,731 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:42:26,731 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:42:26,737 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:42:26,775 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-08 00:42:26,782 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ef643e550> has no local changes
2024-05-08 00:42:26,783 [ 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#59 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/)'
2024-05-08 00:42:26,794 [ scc.git] DEBUG [detached HEAD 34cbc8e] merge master -Dorg -Ssuccess-only
2024-05-08 00:42:26,795 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:42:26,795 [ scc.repo] DEBUG ## PRs found:
2024-05-08 00:42:27,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-05-08 00:42:27,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-05-08 00:42:27,645 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-08 00:42:28,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-08 00:42:28,609 [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-05-08 00:42:29,094 [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-05-08 00:42:29,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-08 00:42:29,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-05-08 00:42:29,971 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-08 00:42:29,971 [ scc.repo] DEBUG ## Branches found:
2024-05-08 00:42:29,971 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-08 00:42:29,972 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:42:29,972 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:42:29,978 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-08 00:42:29,983 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-08 00:42:29,983 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-08 00:42:29,989 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-08 00:42:29,994 [ scc.git] DEBUG Already up to date.
2024-05-08 00:42:29,994 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-05-08 00:42:30,357 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-05-08 00:42:30,357 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-05-08 00:42:30,361 [ scc.git] DEBUG ## Unique users: []
2024-05-08 00:42:30,361 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:42:30,362 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:42:30,367 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-05-08 00:42:30,372 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:42:30,378 [ 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-05-08 00:42:30,389 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:42:30,393 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-05-08 00:42:30,393 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-05-08 00:42:30,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:42:30,555 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-08 00:42:30,593 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:42:30,594 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:42:30,599 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:42:30,636 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-08 00:42:30,645 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ef64309d0> has no local changes
2024-05-08 00:42:30,645 [ 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#59 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/)'
2024-05-08 00:42:30,655 [ scc.git] DEBUG [detached HEAD cc4f744] merge master -Dorg -Ssuccess-only
2024-05-08 00:42:30,655 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:42:30,655 [ scc.repo] DEBUG ## PRs found:
2024-05-08 00:42:31,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-05-08 00:42:31,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/474 HTTP/1.1" 200 None
2024-05-08 00:42:32,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/474/comments HTTP/1.1" 200 None
2024-05-08 00:42:32,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/8a03e780c490251af547bc7f26a31af056816ad5 HTTP/1.1" 200 None
2024-05-08 00:42:32,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/8a03e780c490251af547bc7f26a31af056816ad5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-08 00:42:33,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/8a03e780c490251af547bc7f26a31af056816ad5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-08 00:42:33,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/8a03e780c490251af547bc7f26a31af056816ad5 HTTP/1.1" 200 None
2024-05-08 00:42:34,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/8a03e780c490251af547bc7f26a31af056816ad5?per_page=1 HTTP/1.1" 200 2
2024-05-08 00:42:34,260 [ scc.repo] DEBUG - PR 474 will-moore 'Img data error handling'
2024-05-08 00:42:34,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-05-08 00:42:35,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-05-08 00:42:35,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-08 00:42:36,309 [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-05-08 00:42:36,767 [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-05-08 00:42:37,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-08 00:42:37,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-05-08 00:42:37,617 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-08 00:42:38,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470 HTTP/1.1" 200 None
2024-05-08 00:42:38,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470/comments HTTP/1.1" 200 None
2024-05-08 00:42:39,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99 HTTP/1.1" 200 None
2024-05-08 00:42:39,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-08 00:42:40,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-08 00:42:40,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99 HTTP/1.1" 200 None
2024-05-08 00:42:40,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99?per_page=1 HTTP/1.1" 200 2
2024-05-08 00:42:40,866 [ scc.repo] DEBUG - PR 470 will-moore 'Movie playing waits for planes'
2024-05-08 00:42:41,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469 HTTP/1.1" 200 None
2024-05-08 00:42:41,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-05-08 00:42:42,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-08 00:42:42,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-08 00:42:43,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-05-08 00:42:43,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/ca8b5aabef9a5358f93add750f4cbb51c864b7fe?per_page=1 HTTP/1.1" 200 2
2024-05-08 00:42:43,558 [ scc.repo] DEBUG - PR 469 will-moore 'changelog 0.14.0'
2024-05-08 00:42:44,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-05-08 00:42:44,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-05-08 00:42:44,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-05-08 00:42:45,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-08 00:42:45,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-08 00:42:46,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-05-08 00:42:46,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/409c3429dd72d05fef895dcca6d133f8340eabf4?per_page=1 HTTP/1.1" 200 2
2024-05-08 00:42:46,795 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-05-08 00:42:47,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-05-08 00:42:47,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-05-08 00:42:48,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-08 00:42:48,699 [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-05-08 00:42:49,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-08 00:42:49,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-05-08 00:42:49,552 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-05-08 00:42:49,553 [ scc.repo] DEBUG ## Branches found:
2024-05-08 00:42:49,553 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-08 00:42:49,553 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:42:49,553 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:42:49,559 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-08 00:42:49,564 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-08 00:42:49,564 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-08 00:42:49,584 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-08 00:42:49,614 [ scc.git] DEBUG Already up to date.
2024-05-08 00:42:49,616 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-05-08 00:42:50,069 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-08 00:42:50,069 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-05-08 00:42:50,074 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-05-08 00:42:50,985 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-08 00:42:50,986 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-05-08 00:42:50,999 [ scc.git] DEBUG Calling 'git fetch origin pull/469/head'
2024-05-08 00:42:51,417 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-08 00:42:51,417 [ scc.git] DEBUG * branch refs/pull/469/head -> FETCH_HEAD
2024-05-08 00:42:51,424 [ scc.git] DEBUG Calling 'git fetch origin pull/470/head'
2024-05-08 00:42:52,188 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-08 00:42:52,188 [ scc.git] DEBUG * branch refs/pull/470/head -> FETCH_HEAD
2024-05-08 00:42:52,194 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-05-08 00:42:52,664 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-08 00:42:52,664 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-05-08 00:42:52,671 [ scc.git] DEBUG Calling 'git fetch origin pull/474/head'
2024-05-08 00:42:53,209 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-08 00:42:53,210 [ scc.git] DEBUG * branch refs/pull/474/head -> FETCH_HEAD
2024-05-08 00:42:53,218 [ scc.git] DEBUG ## Unique users: []
2024-05-08 00:42:53,218 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:42:53,218 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:42:53,227 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-08 00:42:53,238 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:42:53,247 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-08 00:42:53,271 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:42:53,275 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-05-08 00:42:53,275 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-05-08 00:42:53,275 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-05-08 00:42:53,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:42:53,442 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-05-08 00:42:53,456 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:42:53,466 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-05-08 00:42:53,541 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:42:53,549 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-05-08 00:42:53,549 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-05-08 00:42:53,549 [ scc.git] DEBUG src/app/header.html | 5 +
2024-05-08 00:42:53,549 [ scc.git] DEBUG src/app/header.js | 46 ++++++++-
2024-05-08 00:42:53,549 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-05-08 00:42:53,549 [ scc.git] DEBUG src/utils/figure.js | 220 ++++++++++++++++++++++++++++++++++++++++++
2024-05-08 00:42:53,549 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 1 -
2024-05-08 00:42:53,550 [ scc.git] DEBUG 7 files changed, 294 insertions(+), 7 deletions(-)
2024-05-08 00:42:53,550 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-05-08 00:42:53,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:42:53,850 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-05-08 00:42:53,861 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:42:53,867 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 469 (changelog 0.14.0) ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-05-08 00:42:53,899 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:42:53,902 [ scc.git] DEBUG CHANGELOG.md | 9 ++++++++-
2024-05-08 00:42:53,902 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-05-08 00:42:54,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:42:54,260 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99'
2024-05-08 00:42:54,272 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:42:54,285 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 470 (Movie playing waits for planes) 6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99'
2024-05-08 00:42:54,354 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-05-08 00:42:54,355 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:42:54,362 [ scc.git] DEBUG css/app.css | 30 +++++++
2024-05-08 00:42:54,362 [ scc.git] DEBUG src/controls/dimension-slider.js | 6 +-
2024-05-08 00:42:54,362 [ scc.git] DEBUG src/events/events.js | 4 +
2024-05-08 00:42:54,362 [ scc.git] DEBUG src/index-dev.html | 6 +-
2024-05-08 00:42:54,362 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 4 +-
2024-05-08 00:42:54,362 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 165 +++++++++++++++++++++++++------------
2024-05-08 00:42:54,362 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 61 +++++++++++++-
2024-05-08 00:42:54,362 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 15 +++-
2024-05-08 00:42:54,362 [ scc.git] DEBUG 8 files changed, 228 insertions(+), 63 deletions(-)
2024-05-08 00:42:54,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:42:54,674 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-08 00:42:54,686 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:42:54,695 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-08 00:42:54,749 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-05-08 00:42:54,750 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:42:54,754 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-05-08 00:42:54,754 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-05-08 00:42:54,754 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-05-08 00:42:55,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:42:55,093 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8a03e780c490251af547bc7f26a31af056816ad5'
2024-05-08 00:42:55,105 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:42:55,114 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 474 (Img data error handling) 8a03e780c490251af547bc7f26a31af056816ad5'
2024-05-08 00:42:55,182 [ scc.git] DEBUG Auto-merging css/app.css
2024-05-08 00:42:55,182 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-05-08 00:42:55,182 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-05-08 00:42:55,183 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-05-08 00:42:55,183 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-05-08 00:42:55,183 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:42:55,188 [ scc.git] DEBUG css/app.css | 4 ++++
2024-05-08 00:42:55,188 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 18 +++++++++++-----
2024-05-08 00:42:55,188 [ scc.git] DEBUG src/app/context.js | 3 +++
2024-05-08 00:42:55,188 [ scc.git] DEBUG src/model/image_info.js | 50 +++++++++++++++++++++++++++++++++++++++++++
2024-05-08 00:42:55,189 [ scc.git] DEBUG src/utils/constants.js | 1 +
2024-05-08 00:42:55,189 [ scc.git] DEBUG 5 files changed, 71 insertions(+), 5 deletions(-)
2024-05-08 00:42:55,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:42:55,517 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-08 00:42:55,594 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:42:55,594 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:42:55,604 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:42:55,663 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-08 00:42:55,680 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ef64165b0> has no local changes
2024-05-08 00:42:55,681 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- 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 469 will-moore 'changelog 0.14.0'
- PR 470 will-moore 'Movie playing waits for planes'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 474 will-moore 'Img data error handling'
Generated by OMERO-plugins-push#59 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/)'
2024-05-08 00:42:55,699 [ scc.git] DEBUG [detached HEAD aa87c73] merge master -Dorg -Ssuccess-only
2024-05-08 00:42:55,700 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:42:55,701 [ scc.repo] DEBUG ## PRs found:
2024-05-08 00:42:56,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-05-08 00:42:56,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-05-08 00:42:56,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-05-08 00:42:57,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-08 00:42:57,911 [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-05-08 00:42:58,376 [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-05-08 00:42:58,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-08 00:42:59,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-05-08 00:42:59,220 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-05-08 00:42:59,221 [ scc.repo] DEBUG ## Branches found:
2024-05-08 00:42:59,221 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-08 00:42:59,221 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:42:59,221 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:42:59,229 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-08 00:42:59,237 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-08 00:42:59,238 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-08 00:42:59,246 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-08 00:42:59,255 [ scc.git] DEBUG Already up to date.
2024-05-08 00:42:59,256 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-05-08 00:42:59,670 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-05-08 00:42:59,670 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-05-08 00:42:59,676 [ scc.git] DEBUG ## Unique users: []
2024-05-08 00:42:59,676 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:42:59,676 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:42:59,683 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-08 00:42:59,691 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:42:59,698 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-08 00:42:59,709 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:42:59,712 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-05-08 00:42:59,712 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-05-08 00:42:59,712 [ scc.git] DEBUG requirements.txt | 2 +-
2024-05-08 00:42:59,714 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-05-08 00:42:59,714 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-05-08 00:42:59,715 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-05-08 00:42:59,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:42:59,874 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-08 00:42:59,921 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:42:59,921 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:42:59,927 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:42:59,968 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-08 00:42:59,976 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ef6414160> has no local changes
2024-05-08 00:42:59,977 [ 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#59 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/)'
2024-05-08 00:42:59,989 [ scc.git] DEBUG [detached HEAD 8370610] merge master -Dorg -Ssuccess-only
2024-05-08 00:42:59,990 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:42:59,990 [ scc.repo] DEBUG ## PRs found:
2024-05-08 00:43:00,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-05-08 00:43:00,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-05-08 00:43:01,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-05-08 00:43:01,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-08 00:43:02,310 [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-05-08 00:43:02,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-08 00:43:03,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-05-08 00:43:03,207 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-08 00:43:03,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-05-08 00:43:04,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-05-08 00:43:04,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-08 00:43:05,172 [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-05-08 00:43:05,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-08 00:43:06,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-05-08 00:43:06,023 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-08 00:43:06,023 [ scc.repo] DEBUG ## Branches found:
2024-05-08 00:43:06,023 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-08 00:43:06,023 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:06,023 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:06,030 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-08 00:43:06,036 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-08 00:43:06,036 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-08 00:43:06,042 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-08 00:43:06,049 [ scc.git] DEBUG Already up to date.
2024-05-08 00:43:06,049 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-05-08 00:43:06,672 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-08 00:43:06,672 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-05-08 00:43:06,677 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-05-08 00:43:07,221 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-08 00:43:07,222 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-05-08 00:43:07,226 [ scc.git] DEBUG ## Unique users: []
2024-05-08 00:43:07,226 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:07,226 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:07,231 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-08 00:43:07,238 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:07,242 [ 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-05-08 00:43:07,296 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-05-08 00:43:07,296 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-05-08 00:43:07,296 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-08 00:43:07,296 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-08 00:43:07,296 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-08 00:43:07,297 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-08 00:43:07,303 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-08 00:43:07,311 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-08 00:43:07,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:43:07,467 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-08 00:43:07,476 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-08 00:43:07,483 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#59](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-05-08 00:43:07,489 [ scc.config] DEBUG Found github.token
2024-05-08 00:43:07,490 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-05-08 00:43:07,490 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-08 00:43:07,498 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:07,503 [ 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-05-08 00:43:07,554 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-08 00:43:07,554 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-08 00:43:07,554 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-05-08 00:43:07,554 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-08 00:43:07,555 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-08 00:43:07,562 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-08 00:43:07,571 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-08 00:43:07,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:43:07,886 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-08 00:43:07,894 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-08 00:43:07,901 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#59](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/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-05-08 00:43:07,907 [ scc.config] DEBUG Found github.token
2024-05-08 00:43:07,908 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-05-08 00:43:07,908 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-08 00:43:07,948 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:07,949 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:07,954 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:43:07,990 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-08 00:43:07,998 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ef6416550> has no local changes
2024-05-08 00:43:07,998 [ 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#59 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/)'
2024-05-08 00:43:08,007 [ scc.git] DEBUG [detached HEAD 1e2c2cf] merge master -Dorg -Ssuccess-only
2024-05-08 00:43:08,008 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:43:08,008 [ scc.repo] DEBUG ## PRs found:
2024-05-08 00:43:08,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-05-08 00:43:08,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-05-08 00:43:08,948 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-08 00:43:09,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-08 00:43:09,877 [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-05-08 00:43:10,335 [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-05-08 00:43:10,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-08 00:43:11,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-05-08 00:43:11,208 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-08 00:43:11,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-05-08 00:43:11,679 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-08 00:43:12,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-08 00:43:12,736 [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-05-08 00:43:13,220 [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-05-08 00:43:13,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-08 00:43:14,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-05-08 00:43:14,087 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-08 00:43:14,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-05-08 00:43:14,562 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-08 00:43:15,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-08 00:43:15,524 [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-05-08 00:43:15,993 [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-05-08 00:43:16,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-08 00:43:16,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-05-08 00:43:16,864 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-08 00:43:17,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-05-08 00:43:17,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-05-08 00:43:18,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-05-08 00:43:18,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-05-08 00:43:19,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-05-08 00:43:19,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-05-08 00:43:19,699 [ scc.repo] DEBUG ## Branches found:
2024-05-08 00:43:19,699 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-08 00:43:19,699 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:19,699 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:19,705 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-08 00:43:19,711 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-08 00:43:19,711 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-08 00:43:19,718 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-08 00:43:19,724 [ scc.git] DEBUG Already up to date.
2024-05-08 00:43:19,725 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-05-08 00:43:20,128 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-08 00:43:20,129 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-05-08 00:43:20,133 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-05-08 00:43:20,505 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-08 00:43:20,506 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-05-08 00:43:20,511 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-05-08 00:43:20,892 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-08 00:43:20,892 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-05-08 00:43:20,897 [ scc.git] DEBUG ## Unique users: []
2024-05-08 00:43:20,897 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:20,897 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:20,902 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-05-08 00:43:20,907 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:20,912 [ 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-05-08 00:43:20,921 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:43:20,923 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-05-08 00:43:20,924 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-05-08 00:43:21,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:43:21,084 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-05-08 00:43:21,093 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:21,099 [ 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-05-08 00:43:21,126 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-08 00:43:21,127 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:43:21,130 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-05-08 00:43:21,130 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-05-08 00:43:21,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:43:21,500 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-05-08 00:43:21,506 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:21,511 [ 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-05-08 00:43:21,522 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-08 00:43:21,523 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:43:21,525 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-05-08 00:43:21,526 [ scc.git] DEBUG package.json | 2 +-
2024-05-08 00:43:21,526 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-05-08 00:43:21,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:43:21,908 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-08 00:43:21,956 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:21,956 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:21,963 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:43:22,003 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-08 00:43:22,011 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ef6418fd0> has no local changes
2024-05-08 00:43:22,011 [ 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#59 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/)'
2024-05-08 00:43:22,020 [ scc.git] DEBUG [detached HEAD adf37f4] merge master -Dorg -Ssuccess-only
2024-05-08 00:43:22,021 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:43:22,021 [ scc.repo] DEBUG ## PRs found:
2024-05-08 00:43:22,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-05-08 00:43:22,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-05-08 00:43:23,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-08 00:43:23,827 [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-05-08 00:43:24,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-08 00:43:24,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-05-08 00:43:24,710 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-05-08 00:43:24,710 [ scc.repo] DEBUG ## Branches found:
2024-05-08 00:43:24,710 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-08 00:43:24,710 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:24,710 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:24,717 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-08 00:43:24,722 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-08 00:43:24,723 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-08 00:43:24,729 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-08 00:43:24,738 [ scc.git] DEBUG Already up to date.
2024-05-08 00:43:24,738 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-08 00:43:25,120 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-05-08 00:43:25,121 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-08 00:43:25,127 [ scc.git] DEBUG ## Unique users: []
2024-05-08 00:43:25,128 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:25,128 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:25,134 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-08 00:43:25,139 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:25,146 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-08 00:43:25,157 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:43:25,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:43:25,320 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-08 00:43:25,366 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:25,367 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:25,374 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:43:25,415 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-08 00:43:25,422 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ef43ab340> has no local changes
2024-05-08 00:43:25,423 [ 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#59 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/)'
2024-05-08 00:43:25,431 [ scc.git] DEBUG [detached HEAD e574204] merge master -Dorg -Ssuccess-only
2024-05-08 00:43:25,431 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:43:25,432 [ scc.repo] DEBUG ## PRs found:
2024-05-08 00:43:25,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-05-08 00:43:26,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-05-08 00:43:26,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-05-08 00:43:27,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-05-08 00:43:27,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-08 00:43:28,151 [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-05-08 00:43:28,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-08 00:43:28,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-05-08 00:43:28,998 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-08 00:43:28,998 [ scc.repo] DEBUG ## Branches found:
2024-05-08 00:43:28,998 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-08 00:43:28,998 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:28,998 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:29,005 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-08 00:43:29,011 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-08 00:43:29,011 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-08 00:43:29,017 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-08 00:43:29,024 [ scc.git] DEBUG Already up to date.
2024-05-08 00:43:29,024 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-05-08 00:43:29,495 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-05-08 00:43:29,495 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-05-08 00:43:29,500 [ scc.git] DEBUG ## Unique users: []
2024-05-08 00:43:29,500 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:29,500 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:29,507 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-05-08 00:43:29,513 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:29,518 [ 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-05-08 00:43:29,527 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-05-08 00:43:29,527 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:43:29,529 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-05-08 00:43:29,529 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-05-08 00:43:29,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:43:29,684 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-08 00:43:29,722 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:29,722 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:29,727 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:43:29,767 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-08 00:43:29,773 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ef43e95b0> has no local changes
2024-05-08 00:43:29,774 [ 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#59 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/)'
2024-05-08 00:43:29,781 [ scc.git] DEBUG [detached HEAD f661987] merge master -Dorg -Ssuccess-only
2024-05-08 00:43:29,782 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:43:29,782 [ scc.repo] DEBUG ## PRs found:
2024-05-08 00:43:30,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-05-08 00:43:30,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-05-08 00:43:31,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-05-08 00:43:31,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-08 00:43:32,042 [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-05-08 00:43:32,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-08 00:43:32,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-05-08 00:43:32,973 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-08 00:43:32,973 [ scc.repo] DEBUG ## Branches found:
2024-05-08 00:43:32,973 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-08 00:43:32,973 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:32,973 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:32,983 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-08 00:43:32,991 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-08 00:43:32,991 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-08 00:43:33,001 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-08 00:43:33,013 [ scc.git] DEBUG Already up to date.
2024-05-08 00:43:33,014 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-08 00:43:33,452 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-05-08 00:43:33,452 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-08 00:43:33,457 [ scc.git] DEBUG ## Unique users: []
2024-05-08 00:43:33,458 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:33,458 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:33,472 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-08 00:43:33,480 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:33,487 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-08 00:43:33,544 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-05-08 00:43:33,544 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-05-08 00:43:33,544 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-05-08 00:43:33,544 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-05-08 00:43:33,544 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-05-08 00:43:33,544 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-05-08 00:43:33,545 [ scc.git] DEBUG Auto-merging setup.py
2024-05-08 00:43:33,545 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-05-08 00:43:33,545 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-08 00:43:33,545 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-08 00:43:33,553 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-08 00:43:33,560 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-05-08 00:43:33,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:43:33,718 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-08 00:43:33,724 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-08 00:43:33,731 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#59](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/signup_settings.py
- omero_signup/views.py
- omero_signup/urls.py
--conflicts
2024-05-08 00:43:33,737 [ scc.config] DEBUG Found github.token
2024-05-08 00:43:33,737 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-05-08 00:43:33,738 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-08 00:43:33,782 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:33,782 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:33,788 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:43:33,824 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-08 00:43:33,830 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ef6430e80> has no local changes
2024-05-08 00:43:33,830 [ 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#59 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/)'
2024-05-08 00:43:33,839 [ scc.git] DEBUG [detached HEAD 91fb404] merge master -Dorg -Ssuccess-only
2024-05-08 00:43:33,839 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:43:33,839 [ scc.repo] DEBUG ## PRs found:
2024-05-08 00:43:34,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-05-08 00:43:34,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-05-08 00:43:35,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-05-08 00:43:35,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-08 00:43:36,034 [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-05-08 00:43:36,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-08 00:43:36,896 [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-05-08 00:43:36,896 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-08 00:43:36,897 [ scc.repo] DEBUG ## Branches found:
2024-05-08 00:43:36,897 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-08 00:43:36,897 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:36,897 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:36,902 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-08 00:43:36,907 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-08 00:43:36,907 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-08 00:43:36,912 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-08 00:43:36,916 [ scc.git] DEBUG Already up to date.
2024-05-08 00:43:36,917 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-05-08 00:43:37,445 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-05-08 00:43:37,445 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-05-08 00:43:37,450 [ scc.git] DEBUG ## Unique users: []
2024-05-08 00:43:37,450 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:37,450 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:37,455 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-05-08 00:43:37,463 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:37,469 [ 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-05-08 00:43:37,482 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:43:37,485 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-05-08 00:43:37,485 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-05-08 00:43:37,485 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-05-08 00:43:37,485 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-05-08 00:43:37,485 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-05-08 00:43:37,487 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-05-08 00:43:37,487 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-05-08 00:43:37,487 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-05-08 00:43:37,487 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-05-08 00:43:37,487 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-05-08 00:43:37,488 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-05-08 00:43:37,488 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-05-08 00:43:37,488 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-05-08 00:43:37,488 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-05-08 00:43:37,488 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-05-08 00:43:37,488 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-05-08 00:43:37,488 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-05-08 00:43:37,488 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-05-08 00:43:37,488 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-05-08 00:43:37,488 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-05-08 00:43:37,488 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-05-08 00:43:37,488 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-05-08 00:43:37,488 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-05-08 00:43:37,488 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-05-08 00:43:37,488 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-05-08 00:43:37,488 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-05-08 00:43:37,488 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-05-08 00:43:37,489 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-05-08 00:43:37,489 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-05-08 00:43:37,489 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-05-08 00:43:37,489 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-05-08 00:43:37,489 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-05-08 00:43:37,489 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-05-08 00:43:37,489 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-05-08 00:43:37,489 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-05-08 00:43:37,489 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-05-08 00:43:37,489 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-05-08 00:43:37,489 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-05-08 00:43:37,489 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-05-08 00:43:37,489 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-05-08 00:43:37,489 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-05-08 00:43:37,489 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-05-08 00:43:37,489 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-05-08 00:43:37,489 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-05-08 00:43:37,489 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-05-08 00:43:37,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:43:37,664 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-08 00:43:37,705 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:37,705 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:37,712 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:43:37,753 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-08 00:43:37,762 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ef6418df0> has no local changes
2024-05-08 00:43:37,763 [ 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#59 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/)'
2024-05-08 00:43:37,773 [ scc.git] DEBUG [detached HEAD a1d572d] merge master -Dorg -Ssuccess-only
2024-05-08 00:43:37,774 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:43:37,774 [ scc.repo] DEBUG ## PRs found:
2024-05-08 00:43:38,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-05-08 00:43:38,091 [ scc.repo] DEBUG ## Branches found:
2024-05-08 00:43:38,091 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-08 00:43:38,091 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:38,092 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:38,099 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-08 00:43:38,105 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-08 00:43:38,105 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-08 00:43:38,112 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-08 00:43:38,119 [ scc.git] DEBUG Already up to date.
2024-05-08 00:43:38,119 [ scc.git] DEBUG ## Unique users: []
2024-05-08 00:43:38,119 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:38,120 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:38,126 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-08 00:43:38,166 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:38,166 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:38,172 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:43:38,212 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-08 00:43:38,219 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ef43f6fa0> has no local changes
2024-05-08 00:43:38,219 [ 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#59 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/)'
2024-05-08 00:43:38,228 [ scc.git] DEBUG [detached HEAD ecd18a2] merge master -Dorg -Ssuccess-only
2024-05-08 00:43:38,228 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:43:38,229 [ scc.repo] DEBUG ## PRs found:
2024-05-08 00:43:38,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-05-08 00:43:38,530 [ scc.repo] DEBUG ## Branches found:
2024-05-08 00:43:38,530 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-08 00:43:38,530 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:38,530 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:38,537 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-08 00:43:38,542 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-08 00:43:38,543 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-08 00:43:38,548 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-08 00:43:38,554 [ scc.git] DEBUG Already up to date.
2024-05-08 00:43:38,554 [ scc.git] DEBUG ## Unique users: []
2024-05-08 00:43:38,554 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:38,554 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:38,560 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-08 00:43:38,600 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:38,600 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:38,606 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:43:38,652 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-08 00:43:38,659 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ef4390f70> has no local changes
2024-05-08 00:43:38,659 [ 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#59 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/)'
2024-05-08 00:43:38,669 [ scc.git] DEBUG [detached HEAD ed9a183] merge master -Dorg -Ssuccess-only
2024-05-08 00:43:38,669 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:43:38,669 [ scc.git] INFO Overriding base-branch from master to main
2024-05-08 00:43:38,669 [ scc.repo] DEBUG ## PRs found:
2024-05-08 00:43:39,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-05-08 00:43:39,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-05-08 00:43:39,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-05-08 00:43:40,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-05-08 00:43:40,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-08 00:43:41,385 [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-05-08 00:43:41,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-08 00:43:42,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-08 00:43:42,722 [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-05-08 00:43:42,722 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-08 00:43:42,723 [ scc.repo] DEBUG ## Branches found:
2024-05-08 00:43:42,723 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-08 00:43:42,723 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:42,723 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:42,729 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-05-08 00:43:42,736 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-08 00:43:42,736 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-05-08 00:43:42,743 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-05-08 00:43:42,750 [ scc.git] DEBUG Already up to date.
2024-05-08 00:43:42,750 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-05-08 00:43:43,233 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-05-08 00:43:43,234 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-05-08 00:43:43,240 [ scc.git] DEBUG ## Unique users: []
2024-05-08 00:43:43,240 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:43,241 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:43,248 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-08 00:43:43,254 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:43,258 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-08 00:43:43,365 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-05-08 00:43:43,366 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-05-08 00:43:43,366 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-08 00:43:43,366 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-08 00:43:43,372 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-08 00:43:43,379 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-05-08 00:43:43,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:43:43,540 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-08 00:43:43,546 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-08 00:43:43,553 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#59](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-05-08 00:43:43,558 [ scc.config] DEBUG Found github.token
2024-05-08 00:43:43,558 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-05-08 00:43:43,558 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-08 00:43:43,596 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:43,596 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:43,602 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:43:43,638 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-08 00:43:43,645 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ef434c430> has no local changes
2024-05-08 00:43:43,645 [ 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#59 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/)'
2024-05-08 00:43:43,654 [ scc.git] DEBUG [detached HEAD d9c53b7] merge master -Dorg -Ssuccess-only
2024-05-08 00:43:43,654 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:43:43,654 [ scc.repo] DEBUG ## PRs found:
2024-05-08 00:43:43,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-05-08 00:43:43,960 [ scc.repo] DEBUG ## Branches found:
2024-05-08 00:43:43,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-08 00:43:43,961 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:43,961 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:43,967 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-08 00:43:43,972 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-08 00:43:43,972 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-08 00:43:43,977 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-08 00:43:43,983 [ scc.git] DEBUG Already up to date.
2024-05-08 00:43:43,983 [ scc.git] DEBUG ## Unique users: []
2024-05-08 00:43:43,983 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:43,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:43,988 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-08 00:43:44,031 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:44,031 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:44,037 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:43:44,080 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-08 00:43:44,087 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ef43a6e50> has no local changes
2024-05-08 00:43:44,087 [ 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#59 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/)'
2024-05-08 00:43:44,097 [ scc.git] DEBUG [detached HEAD c46b95b] merge master -Dorg -Ssuccess-only
2024-05-08 00:43:44,097 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:43:44,098 [ scc.repo] DEBUG ## PRs found:
2024-05-08 00:43:44,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-05-08 00:43:44,396 [ scc.repo] DEBUG ## Branches found:
2024-05-08 00:43:44,396 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-08 00:43:44,396 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:44,396 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:44,403 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-08 00:43:44,409 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-08 00:43:44,409 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-08 00:43:44,416 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-08 00:43:44,424 [ scc.git] DEBUG Already up to date.
2024-05-08 00:43:44,424 [ scc.git] DEBUG ## Unique users: []
2024-05-08 00:43:44,425 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:44,425 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:44,431 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-08 00:43:44,492 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:44,493 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:44,499 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:43:44,545 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-08 00:43:44,552 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ef42cd940> has no local changes
2024-05-08 00:43:44,552 [ 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#59 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/)'
2024-05-08 00:43:44,561 [ scc.git] DEBUG [detached HEAD b2754f0] merge master -Dorg -Ssuccess-only
2024-05-08 00:43:44,561 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:43:44,562 [ scc.repo] DEBUG ## PRs found:
2024-05-08 00:43:44,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-05-08 00:43:45,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-05-08 00:43:45,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-05-08 00:43:46,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-08 00:43:46,656 [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-05-08 00:43:47,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-08 00:43:47,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-05-08 00:43:47,521 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-05-08 00:43:47,521 [ scc.repo] DEBUG ## Branches found:
2024-05-08 00:43:47,521 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-08 00:43:47,521 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:47,521 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:47,527 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-08 00:43:47,532 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-08 00:43:47,533 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-08 00:43:47,538 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-08 00:43:47,544 [ scc.git] DEBUG Already up to date.
2024-05-08 00:43:47,544 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-05-08 00:43:47,959 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-05-08 00:43:47,959 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-05-08 00:43:47,964 [ scc.git] DEBUG ## Unique users: []
2024-05-08 00:43:47,964 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:47,964 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:47,977 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-08 00:43:47,984 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:47,989 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-08 00:43:48,001 [ scc.git] DEBUG Auto-merging Dockerfile
2024-05-08 00:43:48,001 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-05-08 00:43:48,001 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-08 00:43:48,001 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-08 00:43:48,007 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-08 00:43:48,014 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-05-08 00:43:48,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:43:48,178 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-08 00:43:48,185 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-08 00:43:48,191 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#59](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-05-08 00:43:48,197 [ scc.config] DEBUG Found github.token
2024-05-08 00:43:48,197 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-05-08 00:43:48,197 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-08 00:43:48,239 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:48,239 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:48,246 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:43:48,290 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-08 00:43:48,298 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ef431e9d0> has no local changes
2024-05-08 00:43:48,298 [ 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#59 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/)'
2024-05-08 00:43:48,307 [ scc.git] DEBUG [detached HEAD 3ef6773] merge master -Dorg -Ssuccess-only
2024-05-08 00:43:48,307 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:43:48,307 [ scc.git] INFO Overriding base-branch from master to develop
2024-05-08 00:43:48,307 [ scc.repo] DEBUG ## PRs found:
2024-05-08 00:43:48,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-05-08 00:43:49,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-05-08 00:43:49,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-05-08 00:43:50,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-05-08 00:43:50,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-05-08 00:43:51,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-05-08 00:43:51,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-05-08 00:43:51,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-08 00:43:52,407 [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-05-08 00:43:52,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-08 00:43:53,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-05-08 00:43:53,267 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-08 00:43:53,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-05-08 00:43:54,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-05-08 00:43:54,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-05-08 00:43:55,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-05-08 00:43:55,222 [ scc.repo] DEBUG ## Branches found:
2024-05-08 00:43:55,222 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-08 00:43:55,222 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:55,223 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:55,228 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-05-08 00:43:55,233 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-08 00:43:55,234 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-05-08 00:43:55,239 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-05-08 00:43:55,244 [ scc.git] DEBUG Already up to date.
2024-05-08 00:43:55,244 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-05-08 00:43:55,706 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-05-08 00:43:55,706 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-05-08 00:43:55,710 [ scc.git] DEBUG ## Unique users: []
2024-05-08 00:43:55,710 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:55,710 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:55,716 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-08 00:43:55,722 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:55,728 [ 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-05-08 00:43:55,788 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-05-08 00:43:55,788 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-05-08 00:43:55,788 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-08 00:43:55,788 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-08 00:43:55,794 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-08 00:43:55,801 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-08 00:43:55,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:43:55,984 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-08 00:43:55,991 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-08 00:43:55,997 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#59](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-05-08 00:43:56,002 [ scc.config] DEBUG Found github.token
2024-05-08 00:43:56,003 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-05-08 00:43:56,003 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-08 00:43:56,044 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:43:56,045 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:43:56,050 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:43:56,093 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-08 00:43:56,100 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ef42cdbb0> has no local changes
2024-05-08 00:43:56,100 [ 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#59 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/)'
2024-05-08 00:43:56,110 [ scc.git] DEBUG [detached HEAD c8f9124] merge master -Dorg -Ssuccess-only
2024-05-08 00:43:56,111 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:43:56,111 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:43:56,189 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-05-08 00:43:56,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:43:56,401 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-05-08 00:43:56,406 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-05-08 00:43:56,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:43:56,819 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-05-08 00:43:56,824 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-05-08 00:43:57,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:43:57,238 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-05-08 00:43:57,244 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-05-08 00:43:57,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:43:57,645 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-05-08 00:43:58,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:43:58,050 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-05-08 00:43:58,055 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-05-08 00:43:58,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:43:58,457 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-05-08 00:43:58,462 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-05-08 00:43:58,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:43:58,873 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-05-08 00:43:58,879 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-05-08 00:43:59,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:43:59,308 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-05-08 00:43:59,314 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-05-08 00:43:59,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:43:59,715 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-05-08 00:43:59,720 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-05-08 00:44:00,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:44:00,137 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-05-08 00:44:00,141 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-05-08 00:44:00,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:44:00,544 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-05-08 00:44:00,549 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-05-08 00:44:00,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:44:00,963 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-05-08 00:44:00,968 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-05-08 00:44:01,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:44:01,390 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-05-08 00:44:01,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:44:01,813 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-05-08 00:44:02,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:44:02,196 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-05-08 00:44:02,202 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-05-08 00:44:02,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:44:02,620 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-05-08 00:44:03,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:44:03,039 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-05-08 00:44:03,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:44:03,441 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-05-08 00:44:03,446 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-05-08 00:44:03,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:44:03,846 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-05-08 00:44:03,851 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-05-08 00:44:04,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:44:04,270 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-05-08 00:44:04,275 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-05-08 00:44:04,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:44:04,683 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-05-08 00:44:04,689 [ scc.config] DEBUG Found submodule.scripts.url
2024-05-08 00:44:05,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:44:05,122 [ scc.config] DEBUG Found submodule.scripts.branch
2024-05-08 00:44:05,123 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-08 00:44:05,210 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ef98f3460> has local changes
2024-05-08 00:44:05,210 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 362 dependabot[bot] 'Bump scripts from `2078ac7` to `5a90893`'
- PR 365 dependabot[bot] 'Bump omero-figure from `ded0caa` to `6bdf72c`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
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 543 will-moore 'Plate well labels' (stage: draft)
Updating 6bdf72cb..f8b3e4c7
Previously merged:
- PR 561 will-moore 'Bugfixes may2024'
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 554 jburel 'Update publish'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
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 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 469 will-moore 'changelog 0.14.0'
- PR 470 will-moore 'Movie playing waits for planes'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 474 will-moore 'Img data error handling'
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#59 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/59/)'
2024-05-08 00:44:05,225 [ scc.git] DEBUG [detached HEAD 4cf766c] merge master -Dorg -Ssuccess-only
2024-05-08 00:44:05,225 [ scc.merge] INFO Repository: ome/omero-plugins
2024-05-08 00:44:05,225 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-05-08 00:44:05,225 [ scc.merge] INFO Already up to date.
2024-05-08 00:44:05,225 [ scc.merge] INFO
2024-05-08 00:44:05,225 [ scc.merge] INFO Merged PRs:
2024-05-08 00:44:05,226 [ scc.merge] INFO - PR 362 dependabot[bot] 'Bump scripts from `2078ac7` to `5a90893`'
2024-05-08 00:44:05,226 [ scc.merge] INFO - PR 365 dependabot[bot] 'Bump omero-figure from `ded0caa` to `6bdf72c`'
2024-05-08 00:44:05,226 [ scc.merge] INFO
2024-05-08 00:44:05,226 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-05-08 00:44:05,226 [ scc.merge] INFO Already up to date.
2024-05-08 00:44:05,226 [ scc.merge] INFO
2024-05-08 00:44:05,226 [ scc.merge] INFO
2024-05-08 00:44:05,226 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-05-08 00:44:05,226 [ scc.merge] INFO Excluded PRs:
2024-05-08 00:44:05,226 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-05-08 00:44:05,226 [ scc.merge] INFO Already up to date.
2024-05-08 00:44:05,226 [ scc.merge] INFO
2024-05-08 00:44:05,226 [ scc.merge] INFO Merged PRs:
2024-05-08 00:44:05,226 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-05-08 00:44:05,226 [ scc.merge] INFO
2024-05-08 00:44:05,226 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-05-08 00:44:05,226 [ scc.merge] INFO Excluded PRs:
2024-05-08 00:44:05,226 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-05-08 00:44:05,226 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-05-08 00:44:05,226 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-05-08 00:44:05,226 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-05-08 00:44:05,226 [ scc.merge] INFO Already up to date.
2024-05-08 00:44:05,226 [ scc.merge] INFO
2024-05-08 00:44:05,226 [ scc.merge] INFO Merged PRs:
2024-05-08 00:44:05,226 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-05-08 00:44:05,226 [ scc.merge] INFO
2024-05-08 00:44:05,226 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-05-08 00:44:05,226 [ scc.merge] INFO Excluded PRs:
2024-05-08 00:44:05,226 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-08 00:44:05,226 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-05-08 00:44:05,226 [ scc.merge] INFO Already up to date.
2024-05-08 00:44:05,226 [ scc.merge] INFO
2024-05-08 00:44:05,226 [ scc.merge] INFO Merged PRs:
2024-05-08 00:44:05,226 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-05-08 00:44:05,226 [ scc.merge] INFO
2024-05-08 00:44:05,226 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-08 00:44:05,227 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-05-08 00:44:05,227 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-05-08 00:44:05,227 [ scc.merge] INFO
2024-05-08 00:44:05,227 [ scc.merge] INFO Repository: ome/omero-figure
2024-05-08 00:44:05,227 [ scc.merge] INFO Excluded PRs:
2024-05-08 00:44:05,227 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-05-08 00:44:05,227 [ scc.merge] INFO Updating 6bdf72cb..f8b3e4c7
2024-05-08 00:44:05,227 [ scc.merge] INFO Previously merged:
2024-05-08 00:44:05,227 [ scc.merge] INFO - PR 561 will-moore 'Bugfixes may2024'
2024-05-08 00:44:05,227 [ scc.merge] INFO
2024-05-08 00:44:05,227 [ scc.merge] INFO Merged PRs:
2024-05-08 00:44:05,227 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-05-08 00:44:05,227 [ scc.merge] INFO - PR 554 jburel 'Update publish'
2024-05-08 00:44:05,227 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-05-08 00:44:05,227 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-05-08 00:44:05,227 [ scc.merge] INFO
2024-05-08 00:44:05,227 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-05-08 00:44:05,227 [ scc.merge] INFO Already up to date.
2024-05-08 00:44:05,227 [ scc.merge] INFO
2024-05-08 00:44:05,227 [ scc.merge] INFO Merged PRs:
2024-05-08 00:44:05,227 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-05-08 00:44:05,227 [ scc.merge] INFO
2024-05-08 00:44:05,227 [ scc.merge] INFO Repository: ome/omero-gallery
2024-05-08 00:44:05,227 [ scc.merge] INFO Already up to date.
2024-05-08 00:44:05,227 [ scc.merge] INFO
2024-05-08 00:44:05,227 [ scc.merge] INFO Merged PRs:
2024-05-08 00:44:05,227 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-08 00:44:05,227 [ scc.merge] INFO
2024-05-08 00:44:05,227 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-05-08 00:44:05,227 [ scc.merge] INFO Excluded PRs:
2024-05-08 00:44:05,227 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-05-08 00:44:05,227 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-05-08 00:44:05,227 [ scc.merge] INFO Already up to date.
2024-05-08 00:44:05,227 [ scc.merge] INFO
2024-05-08 00:44:05,227 [ scc.merge] INFO Merged PRs:
2024-05-08 00:44:05,227 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-05-08 00:44:05,227 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-05-08 00:44:05,227 [ scc.merge] INFO - PR 469 will-moore 'changelog 0.14.0'
2024-05-08 00:44:05,228 [ scc.merge] INFO - PR 470 will-moore 'Movie playing waits for planes'
2024-05-08 00:44:05,228 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-08 00:44:05,228 [ scc.merge] INFO - PR 474 will-moore 'Img data error handling'
2024-05-08 00:44:05,228 [ scc.merge] INFO
2024-05-08 00:44:05,228 [ scc.merge] INFO Repository: ome/omero-mapr
2024-05-08 00:44:05,228 [ scc.merge] INFO Excluded PRs:
2024-05-08 00:44:05,228 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-05-08 00:44:05,228 [ scc.merge] INFO Already up to date.
2024-05-08 00:44:05,228 [ scc.merge] INFO
2024-05-08 00:44:05,228 [ scc.merge] INFO Merged PRs:
2024-05-08 00:44:05,228 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-05-08 00:44:05,228 [ scc.merge] INFO
2024-05-08 00:44:05,228 [ scc.merge] INFO Repository: ome/omero-metadata
2024-05-08 00:44:05,228 [ scc.merge] INFO Already up to date.
2024-05-08 00:44:05,228 [ scc.merge] INFO
2024-05-08 00:44:05,228 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-08 00:44:05,228 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-08 00:44:05,228 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-08 00:44:05,228 [ scc.merge] INFO
2024-05-08 00:44:05,228 [ scc.merge] INFO Repository: ome/omero-parade
2024-05-08 00:44:05,228 [ scc.merge] INFO Excluded PRs:
2024-05-08 00:44:05,228 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-05-08 00:44:05,228 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-05-08 00:44:05,228 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-05-08 00:44:05,228 [ scc.merge] INFO Already up to date.
2024-05-08 00:44:05,228 [ scc.merge] INFO
2024-05-08 00:44:05,228 [ scc.merge] INFO Merged PRs:
2024-05-08 00:44:05,228 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-08 00:44:05,228 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-08 00:44:05,228 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-08 00:44:05,228 [ scc.merge] INFO
2024-05-08 00:44:05,228 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-05-08 00:44:05,228 [ scc.merge] INFO Already up to date.
2024-05-08 00:44:05,228 [ scc.merge] INFO
2024-05-08 00:44:05,228 [ scc.merge] INFO Merged PRs:
2024-05-08 00:44:05,228 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-05-08 00:44:05,228 [ scc.merge] INFO
2024-05-08 00:44:05,229 [ scc.merge] INFO Repository: ome/omero-rois
2024-05-08 00:44:05,229 [ scc.merge] INFO Excluded PRs:
2024-05-08 00:44:05,229 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-08 00:44:05,229 [ scc.merge] INFO Already up to date.
2024-05-08 00:44:05,229 [ scc.merge] INFO
2024-05-08 00:44:05,229 [ scc.merge] INFO Merged PRs:
2024-05-08 00:44:05,229 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-08 00:44:05,229 [ scc.merge] INFO
2024-05-08 00:44:05,229 [ scc.merge] INFO Repository: ome/omero-signup
2024-05-08 00:44:05,229 [ scc.merge] INFO Already up to date.
2024-05-08 00:44:05,229 [ scc.merge] INFO
2024-05-08 00:44:05,229 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-08 00:44:05,229 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-08 00:44:05,229 [ scc.merge] INFO
2024-05-08 00:44:05,229 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-05-08 00:44:05,229 [ scc.merge] INFO Already up to date.
2024-05-08 00:44:05,229 [ scc.merge] INFO
2024-05-08 00:44:05,229 [ scc.merge] INFO Merged PRs:
2024-05-08 00:44:05,229 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-08 00:44:05,229 [ scc.merge] INFO
2024-05-08 00:44:05,229 [ scc.merge] INFO Repository: ome/omero-upload
2024-05-08 00:44:05,229 [ scc.merge] INFO Already up to date.
2024-05-08 00:44:05,229 [ scc.merge] INFO
2024-05-08 00:44:05,229 [ scc.merge] INFO
2024-05-08 00:44:05,229 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-05-08 00:44:05,229 [ scc.merge] INFO Already up to date.
2024-05-08 00:44:05,229 [ scc.merge] INFO
2024-05-08 00:44:05,229 [ scc.merge] INFO
2024-05-08 00:44:05,229 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-05-08 00:44:05,229 [ scc.merge] INFO Excluded PRs:
2024-05-08 00:44:05,229 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-05-08 00:44:05,229 [ scc.merge] INFO Already up to date.
2024-05-08 00:44:05,229 [ scc.merge] INFO
2024-05-08 00:44:05,229 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-08 00:44:05,230 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-08 00:44:05,230 [ scc.merge] INFO
2024-05-08 00:44:05,230 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-05-08 00:44:05,230 [ scc.merge] INFO Already up to date.
2024-05-08 00:44:05,230 [ scc.merge] INFO
2024-05-08 00:44:05,230 [ scc.merge] INFO
2024-05-08 00:44:05,230 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-05-08 00:44:05,230 [ scc.merge] INFO Already up to date.
2024-05-08 00:44:05,230 [ scc.merge] INFO
2024-05-08 00:44:05,230 [ scc.merge] INFO
2024-05-08 00:44:05,230 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-05-08 00:44:05,230 [ scc.merge] INFO Already up to date.
2024-05-08 00:44:05,230 [ scc.merge] INFO
2024-05-08 00:44:05,230 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-08 00:44:05,230 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-05-08 00:44:05,230 [ scc.merge] INFO
2024-05-08 00:44:05,230 [ scc.merge] INFO Repository: ome/scripts
2024-05-08 00:44:05,230 [ scc.merge] INFO Excluded PRs:
2024-05-08 00:44:05,230 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-05-08 00:44:05,230 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-05-08 00:44:05,230 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-05-08 00:44:05,230 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-05-08 00:44:05,230 [ scc.merge] INFO Already up to date.
2024-05-08 00:44:05,230 [ scc.merge] INFO
2024-05-08 00:44:05,230 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-08 00:44:05,230 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-08 00:44:05,230 [ scc.merge] INFO
2024-05-08 00:44:05,230 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-08 00:44:05,230 [ scc.git] DEBUG Calling 'git remote'
2024-05-08 00:44:05,236 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-05-08 00:44:05,237 [ scc.git] DEBUG Calling 'git remote'
2024-05-08 00:44:05,242 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:44:05,242 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-05-08 00:44:05,242 [ scc.git] DEBUG Calling 'git remote'
2024-05-08 00:44:05,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:44:05,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-05-08 00:44:05,248 [ scc.git] DEBUG Calling 'git remote'
2024-05-08 00:44:05,253 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:44:05,253 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-05-08 00:44:05,254 [ scc.git] DEBUG Calling 'git remote'
2024-05-08 00:44:05,259 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:44:05,259 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-08 00:44:05,259 [ scc.git] DEBUG Calling 'git remote'
2024-05-08 00:44:05,266 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:44:05,266 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-08 00:44:05,266 [ scc.git] DEBUG Calling 'git remote'
2024-05-08 00:44:05,272 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:44:05,272 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-08 00:44:05,272 [ scc.git] DEBUG Calling 'git remote'
2024-05-08 00:44:05,277 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:44:05,277 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-08 00:44:05,277 [ scc.git] DEBUG Calling 'git remote'
2024-05-08 00:44:05,282 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:44:05,282 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-08 00:44:05,282 [ scc.git] DEBUG Calling 'git remote'
2024-05-08 00:44:05,287 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:44:05,288 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-08 00:44:05,288 [ scc.git] DEBUG Calling 'git remote'
2024-05-08 00:44:05,292 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:44:05,293 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-08 00:44:05,293 [ scc.git] DEBUG Calling 'git remote'
2024-05-08 00:44:05,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:44:05,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-08 00:44:05,298 [ scc.git] DEBUG Calling 'git remote'
2024-05-08 00:44:05,303 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:44:05,303 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-08 00:44:05,303 [ scc.git] DEBUG Calling 'git remote'
2024-05-08 00:44:05,309 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:44:05,309 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-08 00:44:05,309 [ scc.git] DEBUG Calling 'git remote'
2024-05-08 00:44:05,314 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:44:05,314 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-08 00:44:05,314 [ scc.git] DEBUG Calling 'git remote'
2024-05-08 00:44:05,319 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:44:05,319 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-08 00:44:05,319 [ scc.git] DEBUG Calling 'git remote'
2024-05-08 00:44:05,325 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:44:05,325 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-08 00:44:05,326 [ scc.git] DEBUG Calling 'git remote'
2024-05-08 00:44:05,331 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:44:05,331 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-08 00:44:05,331 [ scc.git] DEBUG Calling 'git remote'
2024-05-08 00:44:05,337 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:44:05,337 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-08 00:44:05,337 [ scc.git] DEBUG Calling 'git remote'
2024-05-08 00:44:05,343 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:44:05,343 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-08 00:44:05,343 [ scc.git] DEBUG Calling 'git remote'
2024-05-08 00:44:05,349 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:44:05,349 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-08 00:44:05,349 [ scc.git] DEBUG Calling 'git remote'
2024-05-08 00:44:05,355 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-08 00:44:05,355 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-08 00:44:05,355 [ scc.git] DEBUG Calling 'git remote'
2024-05-08 00:44:05,360 [ 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.8.2 to 5.9.2-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD 037693e] 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 2ca566b
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 6bdf72cb
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 9d8d147
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 a0148a6
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 5a90893
nothing to commit, working tree clean
[detached HEAD 6f31aa1] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-05-08 00:44:52,512 [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-05-08 00:45:01,570 [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-05-08 00:45:03,964 [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-05-08 00:45:08,633 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-05-08 00:45:54,865 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/f5fa13f0/images/svgs/logo.svg){kind=logo}
