Console Output
Skipping 83 KB..
Full Logcc.git] DEBUG Calling 'git submodule update'
2024-05-30 00:44:46,658 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:44:46,659 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:44:46,665 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-30 00:44:46,712 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-30 00:44:46,722 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7effe7f4cee0> has no local changes
2024-05-30 00:44:46,723 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
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'
Generated by OMERO-plugins-push#81 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/)'
2024-05-30 00:44:46,735 [ scc.git] DEBUG [detached HEAD b7da820] merge master -Dorg -Ssuccess-only
2024-05-30 00:44:46,736 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:44:46,736 [ scc.repo] DEBUG ## PRs found:
2024-05-30 00:44:47,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-05-30 00:44:47,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562 HTTP/1.1" 200 None
2024-05-30 00:44:48,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562/comments HTTP/1.1" 200 None
2024-05-30 00:44:48,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23 HTTP/1.1" 200 None
2024-05-30 00:44:49,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-30 00:44:49,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-30 00:44:50,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23 HTTP/1.1" 200 None
2024-05-30 00:44:50,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/0c814d66251860ddb01c00ade8469e45f7a1be23?per_page=1 HTTP/1.1" 200 2
2024-05-30 00:44:50,518 [ scc.repo] DEBUG - PR 562 will-moore 'Add changelog 7.0.0'
2024-05-30 00:44:50,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560 HTTP/1.1" 200 None
2024-05-30 00:44:51,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560/comments HTTP/1.1" 200 None
2024-05-30 00:44:51,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569 HTTP/1.1" 200 None
2024-05-30 00:44:52,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-30 00:44:52,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-30 00:44:53,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569 HTTP/1.1" 200 None
2024-05-30 00:44:53,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/b7cad07be139b0ba61a8d0fc2bf3033f90909569?per_page=1 HTTP/1.1" 200 2
2024-05-30 00:44:53,847 [ scc.repo] DEBUG - PR 560 will-moore 'Max projection bytes'
2024-05-30 00:44:54,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-05-30 00:44:54,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-05-30 00:44:55,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-30 00:44:55,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-30 00:44:56,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-30 00:44:56,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-30 00:44:57,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/3179811fd0a1d65e2dc5f56013cf92e086da24ab?per_page=1 HTTP/1.1" 200 2
2024-05-30 00:44:57,100 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-05-30 00:44:57,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-05-30 00:44:58,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-30 00:44:58,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-30 00:44:59,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-30 00:44:59,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-30 00:45:00,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24?per_page=1 HTTP/1.1" 200 2
2024-05-30 00:45:00,024 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-05-30 00:45:00,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543 HTTP/1.1" 200 None
2024-05-30 00:45:00,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543/comments HTTP/1.1" 200 None
2024-05-30 00:45:00,959 [ scc.repo] DEBUG ## Branches found:
2024-05-30 00:45:00,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-30 00:45:00,960 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:45:00,960 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:00,967 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-30 00:45:00,982 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-30 00:45:00,982 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-30 00:45:00,989 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-30 00:45:00,996 [ scc.git] DEBUG Already up to date.
2024-05-30 00:45:00,997 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-05-30 00:45:01,897 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-30 00:45:01,897 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-05-30 00:45:01,903 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-05-30 00:45:02,445 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-30 00:45:02,445 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-05-30 00:45:02,451 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-05-30 00:45:03,267 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-30 00:45:03,268 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-05-30 00:45:03,273 [ scc.git] DEBUG Calling 'git fetch origin pull/562/head'
2024-05-30 00:45:03,661 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-30 00:45:03,661 [ scc.git] DEBUG * branch refs/pull/562/head -> FETCH_HEAD
2024-05-30 00:45:03,666 [ scc.git] DEBUG ## Unique users: []
2024-05-30 00:45:03,666 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:45:03,666 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:03,673 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-30 00:45:03,680 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:03,687 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-30 00:45:03,835 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-30 00:45:03,841 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-05-30 00:45:03,841 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-05-30 00:45:03,841 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-05-30 00:45:03,841 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-05-30 00:45:03,841 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-05-30 00:45:03,841 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-05-30 00:45:03,841 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-05-30 00:45:03,842 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-05-30 00:45:03,842 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-05-30 00:45:03,842 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-05-30 00:45:04,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:45:04,006 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-30 00:45:04,015 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:04,021 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-30 00:45:04,212 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-30 00:45:04,213 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-05-30 00:45:04,213 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-05-30 00:45:04,213 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-30 00:45:04,220 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-05-30 00:45:04,220 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-05-30 00:45:04,220 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-05-30 00:45:04,220 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-05-30 00:45:04,220 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-05-30 00:45:04,220 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-05-30 00:45:04,220 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-05-30 00:45:04,220 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-05-30 00:45:04,220 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-05-30 00:45:04,220 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-05-30 00:45:04,220 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-05-30 00:45:04,220 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-05-30 00:45:04,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:45:04,426 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b7cad07be139b0ba61a8d0fc2bf3033f90909569'
2024-05-30 00:45:04,435 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:04,441 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) b7cad07be139b0ba61a8d0fc2bf3033f90909569'
2024-05-30 00:45:04,650 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-05-30 00:45:04,650 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-05-30 00:45:04,650 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-05-30 00:45:04,650 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-30 00:45:04,650 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-05-30 00:45:04,651 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-30 00:45:04,661 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-05-30 00:45:04,661 [ scc.git] DEBUG omero_figure/urls.py | 8 +++
2024-05-30 00:45:04,661 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-05-30 00:45:04,661 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-05-30 00:45:04,661 [ scc.git] DEBUG src/index.html | 1 +
2024-05-30 00:45:04,661 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-05-30 00:45:04,661 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-05-30 00:45:04,661 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-05-30 00:45:04,661 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-05-30 00:45:04,661 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-05-30 00:45:04,661 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-05-30 00:45:04,662 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-05-30 00:45:04,662 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-05-30 00:45:04,662 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-05-30 00:45:04,662 [ scc.git] DEBUG 14 files changed, 161 insertions(+), 14 deletions(-)
2024-05-30 00:45:04,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:45:04,846 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0c814d66251860ddb01c00ade8469e45f7a1be23'
2024-05-30 00:45:04,855 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:04,862 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 562 (Add changelog 7.0.0) 0c814d66251860ddb01c00ade8469e45f7a1be23'
2024-05-30 00:45:04,888 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-30 00:45:04,891 [ scc.git] DEBUG CHANGELOG.md | 10 ++++++++++
2024-05-30 00:45:04,891 [ scc.git] DEBUG 1 file changed, 10 insertions(+)
2024-05-30 00:45:05,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:45:05,260 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-30 00:45:05,305 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:45:05,306 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:05,313 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-30 00:45:05,357 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-30 00:45:05,367 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7effe6ea0bb0> has no local changes
2024-05-30 00:45:05,368 [ 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)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 562 will-moore 'Add changelog 7.0.0'
Generated by OMERO-plugins-push#81 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/)'
2024-05-30 00:45:05,380 [ scc.git] DEBUG [detached HEAD 86145bcf] merge master -Dorg -Ssuccess-only
2024-05-30 00:45:05,380 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:45:05,380 [ scc.repo] DEBUG ## PRs found:
2024-05-30 00:45:05,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-05-30 00:45:06,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-05-30 00:45:06,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-05-30 00:45:07,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-30 00:45:07,725 [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-30 00:45:08,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-30 00:45:08,638 [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-30 00:45:08,639 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-05-30 00:45:08,639 [ scc.repo] DEBUG ## Branches found:
2024-05-30 00:45:08,639 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-30 00:45:08,639 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:45:08,639 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:08,646 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-30 00:45:08,652 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-30 00:45:08,653 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-30 00:45:08,659 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-30 00:45:08,667 [ scc.git] DEBUG Already up to date.
2024-05-30 00:45:08,668 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-05-30 00:45:09,074 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-05-30 00:45:09,074 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-05-30 00:45:09,081 [ scc.git] DEBUG ## Unique users: []
2024-05-30 00:45:09,081 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:45:09,081 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:09,089 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-30 00:45:09,097 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:09,105 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-30 00:45:09,133 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-05-30 00:45:09,134 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-30 00:45:09,137 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-05-30 00:45:09,137 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-05-30 00:45:09,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:45:09,289 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-30 00:45:09,340 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:45:09,340 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:09,346 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-30 00:45:09,386 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-30 00:45:09,394 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7effe464c490> has no local changes
2024-05-30 00:45:09,395 [ 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#81 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/)'
2024-05-30 00:45:09,404 [ scc.git] DEBUG [detached HEAD 79501c0] merge master -Dorg -Ssuccess-only
2024-05-30 00:45:09,405 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:45:09,405 [ scc.repo] DEBUG ## PRs found:
2024-05-30 00:45:09,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-05-30 00:45:10,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-05-30 00:45:10,277 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-30 00:45:10,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-30 00:45:11,420 [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-30 00:45:11,917 [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-30 00:45:12,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-30 00:45:12,872 [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-30 00:45:12,873 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-30 00:45:12,873 [ scc.repo] DEBUG ## Branches found:
2024-05-30 00:45:12,873 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-30 00:45:12,873 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:45:12,873 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:12,881 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-30 00:45:12,889 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-30 00:45:12,889 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-30 00:45:12,897 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-30 00:45:12,917 [ scc.git] DEBUG Already up to date.
2024-05-30 00:45:12,918 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-05-30 00:45:13,337 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-05-30 00:45:13,337 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-05-30 00:45:13,344 [ scc.git] DEBUG ## Unique users: []
2024-05-30 00:45:13,344 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:45:13,344 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:13,355 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-05-30 00:45:13,364 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:13,372 [ 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-30 00:45:13,388 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-30 00:45:13,394 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-05-30 00:45:13,394 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-05-30 00:45:13,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:45:13,601 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-30 00:45:13,668 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:45:13,669 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:13,677 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-30 00:45:13,731 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-30 00:45:13,740 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7effe6f05d90> has no local changes
2024-05-30 00:45:13,740 [ 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#81 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/)'
2024-05-30 00:45:13,752 [ scc.git] DEBUG [detached HEAD 6b46511] merge master -Dorg -Ssuccess-only
2024-05-30 00:45:13,752 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:45:13,753 [ scc.repo] DEBUG ## PRs found:
2024-05-30 00:45:14,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-05-30 00:45:14,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-05-30 00:45:15,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-05-30 00:45:15,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-30 00:45:16,124 [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-30 00:45:16,657 [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-30 00:45:17,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-30 00:45:17,569 [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-30 00:45:17,571 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-30 00:45:18,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-05-30 00:45:18,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-05-30 00:45:19,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-05-30 00:45:19,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-30 00:45:20,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-30 00:45:20,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-05-30 00:45:20,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-05-30 00:45:20,994 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-05-30 00:45:21,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-05-30 00:45:21,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-05-30 00:45:22,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-30 00:45:22,941 [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-30 00:45:23,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-30 00:45:23,809 [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-30 00:45:23,810 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-05-30 00:45:23,810 [ scc.repo] DEBUG ## Branches found:
2024-05-30 00:45:23,810 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-30 00:45:23,811 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:45:23,811 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:23,819 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-30 00:45:23,828 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-30 00:45:23,828 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-30 00:45:23,838 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-30 00:45:23,847 [ scc.git] DEBUG Already up to date.
2024-05-30 00:45:23,848 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-05-30 00:45:24,455 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-30 00:45:24,455 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-05-30 00:45:24,460 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-05-30 00:45:25,390 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-30 00:45:25,390 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-05-30 00:45:25,395 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-05-30 00:45:25,863 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-30 00:45:25,863 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-05-30 00:45:25,868 [ scc.git] DEBUG ## Unique users: []
2024-05-30 00:45:25,868 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:45:25,868 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:25,876 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-30 00:45:25,883 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:25,890 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-30 00:45:25,957 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-05-30 00:45:25,957 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-30 00:45:25,961 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-05-30 00:45:25,961 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-05-30 00:45:25,961 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-05-30 00:45:26,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:45:26,116 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-05-30 00:45:26,129 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:26,137 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-05-30 00:45:26,246 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-05-30 00:45:26,246 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-05-30 00:45:26,246 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-05-30 00:45:26,246 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-05-30 00:45:26,246 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-30 00:45:26,251 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-05-30 00:45:26,251 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-05-30 00:45:26,251 [ scc.git] DEBUG src/app/header.html | 5 +
2024-05-30 00:45:26,251 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-05-30 00:45:26,251 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-05-30 00:45:26,251 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-05-30 00:45:26,251 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-05-30 00:45:26,251 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-05-30 00:45:26,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:45:26,527 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-30 00:45:26,537 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:26,544 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-30 00:45:26,618 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-05-30 00:45:26,619 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-30 00:45:26,622 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-05-30 00:45:26,623 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-05-30 00:45:26,623 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-05-30 00:45:26,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:45:26,929 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-30 00:45:26,973 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:45:26,973 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:26,979 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-30 00:45:27,020 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-30 00:45:27,030 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7effe4655280> has no local changes
2024-05-30 00:45:27,030 [ 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 471 will-moore 'Z projection disabled tooltip'
Generated by OMERO-plugins-push#81 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/)'
2024-05-30 00:45:27,041 [ scc.git] DEBUG [detached HEAD ff634a2] merge master -Dorg -Ssuccess-only
2024-05-30 00:45:27,042 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:45:27,042 [ scc.repo] DEBUG ## PRs found:
2024-05-30 00:45:27,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-05-30 00:45:27,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-05-30 00:45:28,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-05-30 00:45:28,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-30 00:45:29,456 [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-30 00:45:29,942 [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-30 00:45:30,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-30 00:45:30,886 [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-30 00:45:30,887 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-05-30 00:45:30,888 [ scc.repo] DEBUG ## Branches found:
2024-05-30 00:45:30,888 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-30 00:45:30,888 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:45:30,888 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:30,896 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-30 00:45:30,904 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-30 00:45:30,904 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-30 00:45:30,912 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-30 00:45:30,920 [ scc.git] DEBUG Already up to date.
2024-05-30 00:45:30,920 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-05-30 00:45:31,321 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-05-30 00:45:31,321 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-05-30 00:45:31,326 [ scc.git] DEBUG ## Unique users: []
2024-05-30 00:45:31,326 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:45:31,326 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:31,334 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-30 00:45:31,342 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:31,348 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-30 00:45:31,360 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-30 00:45:31,363 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-05-30 00:45:31,363 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-05-30 00:45:31,363 [ scc.git] DEBUG requirements.txt | 2 +-
2024-05-30 00:45:31,363 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-05-30 00:45:31,363 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-05-30 00:45:31,363 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-05-30 00:45:31,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:45:31,535 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-30 00:45:31,577 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:45:31,577 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:31,583 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-30 00:45:31,626 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-30 00:45:31,633 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7effe4668460> has no local changes
2024-05-30 00:45:31,634 [ 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#81 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/)'
2024-05-30 00:45:31,643 [ scc.git] DEBUG [detached HEAD 815acb2] merge master -Dorg -Ssuccess-only
2024-05-30 00:45:31,643 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:45:31,643 [ scc.repo] DEBUG ## PRs found:
2024-05-30 00:45:32,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-05-30 00:45:32,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-05-30 00:45:33,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-05-30 00:45:33,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-30 00:45:34,080 [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-30 00:45:34,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-30 00:45:34,994 [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-30 00:45:34,995 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-30 00:45:35,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-05-30 00:45:35,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-05-30 00:45:36,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-30 00:45:36,886 [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-30 00:45:37,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-30 00:45:37,785 [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-30 00:45:37,786 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-30 00:45:37,786 [ scc.repo] DEBUG ## Branches found:
2024-05-30 00:45:37,786 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-30 00:45:37,786 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:45:37,786 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:37,792 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-30 00:45:37,798 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-30 00:45:37,798 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-30 00:45:37,805 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-30 00:45:37,812 [ scc.git] DEBUG Already up to date.
2024-05-30 00:45:37,812 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-05-30 00:45:38,399 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-30 00:45:38,399 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-05-30 00:45:38,404 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-05-30 00:45:39,017 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-30 00:45:39,017 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-05-30 00:45:39,022 [ scc.git] DEBUG ## Unique users: []
2024-05-30 00:45:39,022 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:45:39,022 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:39,029 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-30 00:45:39,038 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:39,046 [ 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-30 00:45:39,138 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-05-30 00:45:39,139 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-05-30 00:45:39,139 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-30 00:45:39,139 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-30 00:45:39,139 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-30 00:45:39,140 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-30 00:45:39,146 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-30 00:45:39,154 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-30 00:45:39,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:45:39,315 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-30 00:45:39,325 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-30 00:45:39,333 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#81](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-05-30 00:45:39,340 [ scc.config] DEBUG Found github.token
2024-05-30 00:45:39,341 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-05-30 00:45:39,341 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-30 00:45:39,350 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:39,357 [ 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-30 00:45:39,397 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-30 00:45:39,397 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-30 00:45:39,397 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-05-30 00:45:39,397 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-30 00:45:39,398 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-30 00:45:39,407 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-30 00:45:39,419 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-30 00:45:39,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:45:39,728 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-30 00:45:39,737 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-30 00:45:39,744 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#81](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/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-30 00:45:39,749 [ scc.config] DEBUG Found github.token
2024-05-30 00:45:39,750 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-05-30 00:45:39,750 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-30 00:45:39,791 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:45:39,791 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:39,797 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-30 00:45:39,838 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-30 00:45:39,846 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7effe460e640> has no local changes
2024-05-30 00:45:39,846 [ 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#81 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/)'
2024-05-30 00:45:39,857 [ scc.git] DEBUG [detached HEAD 00260d2] merge master -Dorg -Ssuccess-only
2024-05-30 00:45:39,858 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:45:39,858 [ scc.repo] DEBUG ## PRs found:
2024-05-30 00:45:40,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-05-30 00:45:40,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-05-30 00:45:40,772 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-30 00:45:41,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-30 00:45:41,928 [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-30 00:45:42,397 [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-30 00:45:42,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-30 00:45:43,405 [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-30 00:45:43,405 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-30 00:45:43,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-05-30 00:45:43,887 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-30 00:45:44,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-30 00:45:44,946 [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-30 00:45:45,416 [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-30 00:45:45,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-30 00:45:46,312 [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-30 00:45:46,314 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-30 00:45:46,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-05-30 00:45:46,782 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-30 00:45:47,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-30 00:45:47,856 [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-30 00:45:48,345 [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-30 00:45:48,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-30 00:45:49,304 [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-30 00:45:49,305 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-30 00:45:49,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-05-30 00:45:50,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-05-30 00:45:50,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-05-30 00:45:51,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-05-30 00:45:51,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-05-30 00:45:52,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-05-30 00:45:52,184 [ scc.repo] DEBUG ## Branches found:
2024-05-30 00:45:52,184 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-30 00:45:52,185 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:45:52,185 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:52,199 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-30 00:45:52,206 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-30 00:45:52,207 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-30 00:45:52,215 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-30 00:45:52,223 [ scc.git] DEBUG Already up to date.
2024-05-30 00:45:52,223 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-05-30 00:45:52,602 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-30 00:45:52,602 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-05-30 00:45:52,608 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-05-30 00:45:52,995 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-30 00:45:52,995 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-05-30 00:45:53,004 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-05-30 00:45:53,417 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-30 00:45:53,418 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-05-30 00:45:53,424 [ scc.git] DEBUG ## Unique users: []
2024-05-30 00:45:53,424 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:45:53,424 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:53,431 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-05-30 00:45:53,440 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:53,450 [ 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-30 00:45:53,462 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-30 00:45:53,465 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-05-30 00:45:53,465 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-05-30 00:45:53,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:45:53,629 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-05-30 00:45:53,638 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:53,644 [ 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-30 00:45:53,703 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-30 00:45:53,704 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-30 00:45:53,708 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-05-30 00:45:53,708 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-05-30 00:45:54,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:45:54,044 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-05-30 00:45:54,052 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:54,060 [ 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-30 00:45:54,104 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-30 00:45:54,105 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-30 00:45:54,109 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-05-30 00:45:54,109 [ scc.git] DEBUG package.json | 2 +-
2024-05-30 00:45:54,109 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-05-30 00:45:54,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:45:54,462 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-30 00:45:54,512 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:45:54,512 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:54,519 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-30 00:45:54,569 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-30 00:45:54,578 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7effe460e580> has no local changes
2024-05-30 00:45:54,578 [ 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#81 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/)'
2024-05-30 00:45:54,589 [ scc.git] DEBUG [detached HEAD b9e6617] merge master -Dorg -Ssuccess-only
2024-05-30 00:45:54,590 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:45:54,590 [ scc.repo] DEBUG ## PRs found:
2024-05-30 00:45:54,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-05-30 00:45:55,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-05-30 00:45:55,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-30 00:45:56,426 [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-30 00:45:56,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-30 00:45:57,340 [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-30 00:45:57,341 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-05-30 00:45:57,342 [ scc.repo] DEBUG ## Branches found:
2024-05-30 00:45:57,342 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-30 00:45:57,342 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:45:57,342 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:57,351 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-30 00:45:57,363 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-30 00:45:57,363 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-30 00:45:57,372 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-30 00:45:57,382 [ scc.git] DEBUG Already up to date.
2024-05-30 00:45:57,382 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-30 00:45:57,770 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-05-30 00:45:57,770 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-30 00:45:57,776 [ scc.git] DEBUG ## Unique users: []
2024-05-30 00:45:57,776 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:45:57,776 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:57,785 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-30 00:45:57,794 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:57,801 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-30 00:45:57,811 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-30 00:45:57,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:45:57,974 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-30 00:45:58,025 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:45:58,025 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:45:58,033 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-30 00:45:58,074 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-30 00:45:58,081 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7effe4620c10> has no local changes
2024-05-30 00:45:58,082 [ 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#81 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/)'
2024-05-30 00:45:58,092 [ scc.git] DEBUG [detached HEAD cef3ff5] merge master -Dorg -Ssuccess-only
2024-05-30 00:45:58,092 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:45:58,092 [ scc.repo] DEBUG ## PRs found:
2024-05-30 00:45:58,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-05-30 00:45:58,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-05-30 00:45:59,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-05-30 00:45:59,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-05-30 00:46:00,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-30 00:46:00,919 [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-30 00:46:01,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-30 00:46:01,802 [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-30 00:46:01,803 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-30 00:46:01,804 [ scc.repo] DEBUG ## Branches found:
2024-05-30 00:46:01,804 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-30 00:46:01,804 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:01,804 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:01,812 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-30 00:46:01,818 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-30 00:46:01,818 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-30 00:46:01,825 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-30 00:46:01,834 [ scc.git] DEBUG Already up to date.
2024-05-30 00:46:01,834 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-05-30 00:46:02,307 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-05-30 00:46:02,308 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-05-30 00:46:02,314 [ scc.git] DEBUG ## Unique users: []
2024-05-30 00:46:02,314 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:02,314 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:02,321 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-05-30 00:46:02,330 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:02,338 [ 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-30 00:46:02,351 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-05-30 00:46:02,352 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-30 00:46:02,355 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-05-30 00:46:02,355 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-05-30 00:46:02,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:46:02,505 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-30 00:46:02,557 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:02,558 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:02,566 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-30 00:46:02,619 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-30 00:46:02,629 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7effe45d65b0> has no local changes
2024-05-30 00:46:02,629 [ 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#81 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/)'
2024-05-30 00:46:02,642 [ scc.git] DEBUG [detached HEAD b57e67d] merge master -Dorg -Ssuccess-only
2024-05-30 00:46:02,642 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:02,643 [ scc.repo] DEBUG ## PRs found:
2024-05-30 00:46:03,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-05-30 00:46:03,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-05-30 00:46:03,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-05-30 00:46:04,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-30 00:46:04,898 [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-30 00:46:05,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-30 00:46:05,867 [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-30 00:46:05,867 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-30 00:46:05,867 [ scc.repo] DEBUG ## Branches found:
2024-05-30 00:46:05,867 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-30 00:46:05,868 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:05,868 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:05,874 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-30 00:46:05,882 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-30 00:46:05,882 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-30 00:46:05,890 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-30 00:46:05,899 [ scc.git] DEBUG Already up to date.
2024-05-30 00:46:05,899 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-30 00:46:06,293 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-05-30 00:46:06,293 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-30 00:46:06,297 [ scc.git] DEBUG ## Unique users: []
2024-05-30 00:46:06,298 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:06,298 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:06,304 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-30 00:46:06,310 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:06,316 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-30 00:46:06,336 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-05-30 00:46:06,337 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-05-30 00:46:06,337 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-05-30 00:46:06,337 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-05-30 00:46:06,337 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-05-30 00:46:06,337 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-05-30 00:46:06,337 [ scc.git] DEBUG Auto-merging setup.py
2024-05-30 00:46:06,337 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-05-30 00:46:06,337 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-30 00:46:06,337 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-30 00:46:06,345 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-30 00:46:06,352 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-05-30 00:46:06,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:46:06,525 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-30 00:46:06,533 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-30 00:46:06,538 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#81](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/signup_settings.py
- setup.py
- omero_signup/views.py
--conflicts
2024-05-30 00:46:06,543 [ scc.config] DEBUG Found github.token
2024-05-30 00:46:06,544 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-05-30 00:46:06,544 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-30 00:46:06,585 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:06,585 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:06,592 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-30 00:46:06,631 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-30 00:46:06,639 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7effe4650e80> has no local changes
2024-05-30 00:46:06,639 [ 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#81 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/)'
2024-05-30 00:46:06,648 [ scc.git] DEBUG [detached HEAD a19ed75] merge master -Dorg -Ssuccess-only
2024-05-30 00:46:06,648 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:06,648 [ scc.repo] DEBUG ## PRs found:
2024-05-30 00:46:07,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-05-30 00:46:07,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/70 HTTP/1.1" 200 None
2024-05-30 00:46:07,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/70/comments HTTP/1.1" 200 None
2024-05-30 00:46:08,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/7a15634965188ef2714e60d4e60db61e6b1efc0f HTTP/1.1" 200 None
2024-05-30 00:46:08,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/7a15634965188ef2714e60d4e60db61e6b1efc0f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-30 00:46:09,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/7a15634965188ef2714e60d4e60db61e6b1efc0f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-30 00:46:09,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/7a15634965188ef2714e60d4e60db61e6b1efc0f HTTP/1.1" 200 None
2024-05-30 00:46:10,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/7a15634965188ef2714e60d4e60db61e6b1efc0f?per_page=1 HTTP/1.1" 200 2
2024-05-30 00:46:10,383 [ scc.repo] DEBUG - PR 70 jburel 'Toml support'
2024-05-30 00:46:10,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-05-30 00:46:11,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-05-30 00:46:11,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-30 00:46:12,298 [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-30 00:46:12,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-30 00:46:13,201 [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-30 00:46:13,202 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-30 00:46:13,202 [ scc.repo] DEBUG ## Branches found:
2024-05-30 00:46:13,202 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-30 00:46:13,202 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:13,203 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:13,210 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-30 00:46:13,217 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-30 00:46:13,217 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-30 00:46:13,224 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-30 00:46:13,230 [ scc.git] DEBUG Already up to date.
2024-05-30 00:46:13,231 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-05-30 00:46:13,692 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-05-30 00:46:13,692 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-05-30 00:46:13,697 [ scc.git] DEBUG Calling 'git fetch origin pull/70/head'
2024-05-30 00:46:14,119 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-05-30 00:46:14,119 [ scc.git] DEBUG * branch refs/pull/70/head -> FETCH_HEAD
2024-05-30 00:46:14,124 [ scc.git] DEBUG ## Unique users: []
2024-05-30 00:46:14,125 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:14,125 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:14,131 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-05-30 00:46:14,138 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:14,145 [ 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-30 00:46:14,196 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-30 00:46:14,199 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-05-30 00:46:14,199 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-05-30 00:46:14,199 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-05-30 00:46:14,199 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-05-30 00:46:14,199 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-05-30 00:46:14,199 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-05-30 00:46:14,199 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-05-30 00:46:14,199 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-05-30 00:46:14,199 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-05-30 00:46:14,199 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-05-30 00:46:14,201 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-05-30 00:46:14,201 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-05-30 00:46:14,202 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-05-30 00:46:14,202 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-05-30 00:46:14,202 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-05-30 00:46:14,202 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-05-30 00:46:14,202 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-05-30 00:46:14,202 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-05-30 00:46:14,202 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-05-30 00:46:14,202 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-05-30 00:46:14,202 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-05-30 00:46:14,202 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-05-30 00:46:14,202 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-05-30 00:46:14,202 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-05-30 00:46:14,202 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-05-30 00:46:14,202 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-05-30 00:46:14,202 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-05-30 00:46:14,202 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-05-30 00:46:14,202 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-05-30 00:46:14,202 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-05-30 00:46:14,202 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-05-30 00:46:14,202 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-05-30 00:46:14,202 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-05-30 00:46:14,202 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-05-30 00:46:14,202 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-05-30 00:46:14,202 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-05-30 00:46:14,202 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-05-30 00:46:14,202 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-05-30 00:46:14,202 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-05-30 00:46:14,202 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-05-30 00:46:14,202 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-05-30 00:46:14,203 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-05-30 00:46:14,203 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-05-30 00:46:14,203 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-05-30 00:46:14,203 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-05-30 00:46:14,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:46:14,369 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7a15634965188ef2714e60d4e60db61e6b1efc0f'
2024-05-30 00:46:14,377 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:14,382 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 70 (Toml support) 7a15634965188ef2714e60d4e60db61e6b1efc0f'
2024-05-30 00:46:14,424 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-30 00:46:14,427 [ scc.git] DEBUG py-setup | 3 +--
2024-05-30 00:46:14,427 [ scc.git] DEBUG utils | 18 ++++++++++++------
2024-05-30 00:46:14,427 [ scc.git] DEBUG 2 files changed, 13 insertions(+), 8 deletions(-)
2024-05-30 00:46:14,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:46:14,781 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-30 00:46:14,824 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:14,824 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:14,830 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-30 00:46:14,881 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-30 00:46:14,888 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7effe45d67f0> has no local changes
2024-05-30 00:46:14,889 [ 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'
- PR 70 jburel 'Toml support'
Generated by OMERO-plugins-push#81 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/)'
2024-05-30 00:46:14,901 [ scc.git] DEBUG [detached HEAD c9a2b2c] merge master -Dorg -Ssuccess-only
2024-05-30 00:46:14,901 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:14,902 [ scc.repo] DEBUG ## PRs found:
2024-05-30 00:46:15,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-05-30 00:46:15,224 [ scc.repo] DEBUG ## Branches found:
2024-05-30 00:46:15,224 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-30 00:46:15,225 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:15,225 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:15,231 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-30 00:46:15,237 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-30 00:46:15,237 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-30 00:46:15,242 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-30 00:46:15,247 [ scc.git] DEBUG Already up to date.
2024-05-30 00:46:15,248 [ scc.git] DEBUG ## Unique users: []
2024-05-30 00:46:15,248 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:15,248 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:15,253 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-30 00:46:15,291 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:15,292 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:15,297 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-30 00:46:15,341 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-30 00:46:15,348 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7effe45e7b80> has no local changes
2024-05-30 00:46:15,348 [ 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#81 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/)'
2024-05-30 00:46:15,358 [ scc.git] DEBUG [detached HEAD b9f23c7] merge master -Dorg -Ssuccess-only
2024-05-30 00:46:15,358 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:15,358 [ scc.repo] DEBUG ## PRs found:
2024-05-30 00:46:15,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-05-30 00:46:15,655 [ scc.repo] DEBUG ## Branches found:
2024-05-30 00:46:15,655 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-30 00:46:15,655 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:15,655 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:15,668 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-30 00:46:15,674 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-30 00:46:15,675 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-30 00:46:15,680 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-30 00:46:15,686 [ scc.git] DEBUG Already up to date.
2024-05-30 00:46:15,686 [ scc.git] DEBUG ## Unique users: []
2024-05-30 00:46:15,686 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:15,686 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:15,691 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-30 00:46:15,743 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:15,743 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:15,749 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-30 00:46:15,790 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-30 00:46:15,798 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7effe4643df0> has no local changes
2024-05-30 00:46:15,798 [ 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#81 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/)'
2024-05-30 00:46:15,810 [ scc.git] DEBUG [detached HEAD 8365fd1] merge master -Dorg -Ssuccess-only
2024-05-30 00:46:15,810 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:15,811 [ scc.git] INFO Overriding base-branch from master to main
2024-05-30 00:46:15,811 [ scc.repo] DEBUG ## PRs found:
2024-05-30 00:46:16,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-05-30 00:46:16,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-05-30 00:46:17,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-05-30 00:46:17,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-05-30 00:46:18,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-30 00:46:18,767 [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-30 00:46:19,231 [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-30 00:46:19,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-30 00:46:20,200 [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-30 00:46:20,201 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-30 00:46:20,201 [ scc.repo] DEBUG ## Branches found:
2024-05-30 00:46:20,201 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-30 00:46:20,201 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:20,201 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:20,208 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-05-30 00:46:20,213 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-30 00:46:20,213 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-05-30 00:46:20,219 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-05-30 00:46:20,225 [ scc.git] DEBUG Already up to date.
2024-05-30 00:46:20,225 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-05-30 00:46:20,665 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-05-30 00:46:20,665 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-05-30 00:46:20,672 [ scc.git] DEBUG ## Unique users: []
2024-05-30 00:46:20,672 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:20,672 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:20,678 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-30 00:46:20,685 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:20,691 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-30 00:46:20,720 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-05-30 00:46:20,720 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-05-30 00:46:20,720 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-30 00:46:20,720 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-30 00:46:20,728 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-30 00:46:20,736 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-05-30 00:46:20,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:46:20,970 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-30 00:46:20,976 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-30 00:46:20,984 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#81](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-05-30 00:46:20,990 [ scc.config] DEBUG Found github.token
2024-05-30 00:46:20,990 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-05-30 00:46:20,990 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-30 00:46:21,030 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:21,031 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:21,036 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-30 00:46:21,087 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-30 00:46:21,096 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7effe4639f40> has no local changes
2024-05-30 00:46:21,096 [ 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#81 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/)'
2024-05-30 00:46:21,106 [ scc.git] DEBUG [detached HEAD 83d5890] merge master -Dorg -Ssuccess-only
2024-05-30 00:46:21,106 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:21,106 [ scc.repo] DEBUG ## PRs found:
2024-05-30 00:46:21,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-05-30 00:46:21,406 [ scc.repo] DEBUG ## Branches found:
2024-05-30 00:46:21,406 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-30 00:46:21,406 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:21,406 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:21,412 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-30 00:46:21,417 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-30 00:46:21,418 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-30 00:46:21,423 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-30 00:46:21,429 [ scc.git] DEBUG Already up to date.
2024-05-30 00:46:21,429 [ scc.git] DEBUG ## Unique users: []
2024-05-30 00:46:21,429 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:21,429 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:21,434 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-30 00:46:21,475 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:21,475 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:21,484 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-30 00:46:21,524 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-30 00:46:21,531 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7effe45cfee0> has no local changes
2024-05-30 00:46:21,531 [ 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#81 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/)'
2024-05-30 00:46:21,542 [ scc.git] DEBUG [detached HEAD 2ece407] merge master -Dorg -Ssuccess-only
2024-05-30 00:46:21,542 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:21,543 [ scc.repo] DEBUG ## PRs found:
2024-05-30 00:46:21,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-05-30 00:46:21,851 [ scc.repo] DEBUG ## Branches found:
2024-05-30 00:46:21,851 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-30 00:46:21,851 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:21,851 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:21,858 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-30 00:46:21,863 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-30 00:46:21,864 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-30 00:46:21,869 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-30 00:46:21,874 [ scc.git] DEBUG Already up to date.
2024-05-30 00:46:21,874 [ scc.git] DEBUG ## Unique users: []
2024-05-30 00:46:21,874 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:21,874 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:21,879 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-30 00:46:21,917 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:21,917 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:21,922 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-30 00:46:21,960 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-30 00:46:21,967 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7effe45535b0> has no local changes
2024-05-30 00:46:21,968 [ 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#81 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/)'
2024-05-30 00:46:21,977 [ scc.git] DEBUG [detached HEAD 33a3b3b] merge master -Dorg -Ssuccess-only
2024-05-30 00:46:21,977 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:21,977 [ scc.repo] DEBUG ## PRs found:
2024-05-30 00:46:22,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-05-30 00:46:22,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-05-30 00:46:23,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-05-30 00:46:23,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-30 00:46:24,366 [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-30 00:46:24,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-30 00:46:25,239 [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-30 00:46:25,239 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-05-30 00:46:25,239 [ scc.repo] DEBUG ## Branches found:
2024-05-30 00:46:25,239 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-30 00:46:25,240 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:25,240 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:25,246 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-30 00:46:25,252 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-30 00:46:25,252 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-30 00:46:25,259 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-30 00:46:25,267 [ scc.git] DEBUG Already up to date.
2024-05-30 00:46:25,268 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-05-30 00:46:25,699 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-05-30 00:46:25,699 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-05-30 00:46:25,704 [ scc.git] DEBUG ## Unique users: []
2024-05-30 00:46:25,705 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:25,705 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:25,712 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-30 00:46:25,718 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:25,724 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-30 00:46:25,766 [ scc.git] DEBUG Auto-merging Dockerfile
2024-05-30 00:46:25,767 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-05-30 00:46:25,767 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-30 00:46:25,767 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-30 00:46:25,774 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-30 00:46:25,782 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-05-30 00:46:25,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:46:25,949 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-30 00:46:25,955 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-30 00:46:25,961 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#81](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-05-30 00:46:25,966 [ scc.config] DEBUG Found github.token
2024-05-30 00:46:25,967 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-05-30 00:46:25,967 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-30 00:46:26,007 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:26,007 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:26,013 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-30 00:46:26,053 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-30 00:46:26,061 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7effe4597bb0> has no local changes
2024-05-30 00:46:26,061 [ 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#81 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/)'
2024-05-30 00:46:26,072 [ scc.git] DEBUG [detached HEAD ea3b4d4] merge master -Dorg -Ssuccess-only
2024-05-30 00:46:26,073 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:26,073 [ scc.git] INFO Overriding base-branch from master to develop
2024-05-30 00:46:26,073 [ scc.repo] DEBUG ## PRs found:
2024-05-30 00:46:26,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-05-30 00:46:27,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-05-30 00:46:27,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-05-30 00:46:27,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-05-30 00:46:28,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-05-30 00:46:28,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-05-30 00:46:29,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-05-30 00:46:29,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-30 00:46:30,278 [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-30 00:46:30,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-30 00:46:31,171 [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-30 00:46:31,172 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-30 00:46:31,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-05-30 00:46:32,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-05-30 00:46:32,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-05-30 00:46:33,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-05-30 00:46:33,110 [ scc.repo] DEBUG ## Branches found:
2024-05-30 00:46:33,110 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-30 00:46:33,110 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:33,110 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:33,118 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-05-30 00:46:33,125 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-30 00:46:33,126 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-05-30 00:46:33,135 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-05-30 00:46:33,145 [ scc.git] DEBUG Already up to date.
2024-05-30 00:46:33,145 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-05-30 00:46:33,649 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-05-30 00:46:33,649 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-05-30 00:46:33,655 [ scc.git] DEBUG ## Unique users: []
2024-05-30 00:46:33,655 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:33,655 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:33,663 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-30 00:46:33,672 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:33,678 [ 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-30 00:46:33,760 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-05-30 00:46:33,760 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-05-30 00:46:33,760 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-30 00:46:33,760 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-30 00:46:33,766 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-30 00:46:33,773 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-30 00:46:33,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:46:33,945 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-30 00:46:33,955 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-30 00:46:33,961 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#81](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-05-30 00:46:33,966 [ scc.config] DEBUG Found github.token
2024-05-30 00:46:33,967 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-05-30 00:46:33,967 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-30 00:46:34,007 [ scc.git] DEBUG Get sha1 of %s
2024-05-30 00:46:34,008 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-30 00:46:34,014 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-30 00:46:34,052 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-30 00:46:34,059 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7effe4553280> has no local changes
2024-05-30 00:46:34,060 [ 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#81 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/)'
2024-05-30 00:46:34,068 [ scc.git] DEBUG [detached HEAD c593e5f] merge master -Dorg -Ssuccess-only
2024-05-30 00:46:34,069 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:34,069 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-30 00:46:34,145 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-05-30 00:46:34,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:46:34,376 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-05-30 00:46:34,383 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-05-30 00:46:34,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:46:34,794 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-05-30 00:46:34,801 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-05-30 00:46:35,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:46:35,210 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-05-30 00:46:35,217 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-05-30 00:46:35,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:46:35,633 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-05-30 00:46:36,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:46:36,050 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-05-30 00:46:36,055 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-05-30 00:46:36,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:46:36,459 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-05-30 00:46:36,465 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-05-30 00:46:36,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:46:36,874 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-05-30 00:46:36,879 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-05-30 00:46:37,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:46:37,283 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-05-30 00:46:37,288 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-05-30 00:46:37,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:46:37,694 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-05-30 00:46:37,699 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-05-30 00:46:38,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:46:38,094 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-05-30 00:46:38,100 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-05-30 00:46:38,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:46:38,495 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-05-30 00:46:38,500 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-05-30 00:46:38,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:46:38,959 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-05-30 00:46:38,965 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-05-30 00:46:39,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:46:39,420 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-05-30 00:46:39,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:46:39,838 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-05-30 00:46:40,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:46:40,243 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-05-30 00:46:40,249 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-05-30 00:46:40,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:46:40,658 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-05-30 00:46:41,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:46:41,071 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-05-30 00:46:41,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:46:41,484 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-05-30 00:46:41,489 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-05-30 00:46:41,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:46:41,902 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-05-30 00:46:41,908 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-05-30 00:46:42,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:46:42,314 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-05-30 00:46:42,319 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-05-30 00:46:42,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:46:42,732 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-05-30 00:46:42,739 [ scc.config] DEBUG Found submodule.scripts.url
2024-05-30 00:46:43,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-30 00:46:43,147 [ scc.config] DEBUG Found submodule.scripts.branch
2024-05-30 00:46:43,147 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-30 00:46:43,234 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7effe7fbbd90> has local changes
2024-05-30 00:46:43,234 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 63 sbesson 'Remove python-future dependency'
- PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 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)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 562 will-moore 'Add changelog 7.0.0'
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 471 will-moore 'Z projection disabled tooltip'
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'
- PR 70 jburel 'Toml support'
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#81 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/81/)'
2024-05-30 00:46:43,250 [ scc.git] DEBUG [detached HEAD dd0a7f1] merge master -Dorg -Ssuccess-only
2024-05-30 00:46:43,250 [ scc.merge] INFO Repository: ome/omero-plugins
2024-05-30 00:46:43,250 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-05-30 00:46:43,250 [ scc.merge] INFO Already up to date.
2024-05-30 00:46:43,251 [ scc.merge] INFO
2024-05-30 00:46:43,251 [ scc.merge] INFO
2024-05-30 00:46:43,251 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-05-30 00:46:43,251 [ scc.merge] INFO Already up to date.
2024-05-30 00:46:43,251 [ scc.merge] INFO
2024-05-30 00:46:43,251 [ scc.merge] INFO
2024-05-30 00:46:43,251 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-05-30 00:46:43,251 [ scc.merge] INFO Excluded PRs:
2024-05-30 00:46:43,251 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-05-30 00:46:43,251 [ scc.merge] INFO Already up to date.
2024-05-30 00:46:43,251 [ scc.merge] INFO
2024-05-30 00:46:43,251 [ scc.merge] INFO Merged PRs:
2024-05-30 00:46:43,251 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-05-30 00:46:43,251 [ scc.merge] INFO
2024-05-30 00:46:43,251 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-05-30 00:46:43,251 [ scc.merge] INFO Excluded PRs:
2024-05-30 00:46:43,251 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-05-30 00:46:43,251 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-05-30 00:46:43,251 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-05-30 00:46:43,251 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-05-30 00:46:43,251 [ scc.merge] INFO Already up to date.
2024-05-30 00:46:43,251 [ scc.merge] INFO
2024-05-30 00:46:43,251 [ scc.merge] INFO Merged PRs:
2024-05-30 00:46:43,251 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-05-30 00:46:43,251 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-05-30 00:46:43,251 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-05-30 00:46:43,251 [ scc.merge] INFO
2024-05-30 00:46:43,251 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-05-30 00:46:43,251 [ scc.merge] INFO Excluded PRs:
2024-05-30 00:46:43,251 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-30 00:46:43,251 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-05-30 00:46:43,251 [ scc.merge] INFO Already up to date.
2024-05-30 00:46:43,251 [ scc.merge] INFO
2024-05-30 00:46:43,252 [ scc.merge] INFO Merged PRs:
2024-05-30 00:46:43,252 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-05-30 00:46:43,252 [ scc.merge] INFO
2024-05-30 00:46:43,252 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-30 00:46:43,252 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-05-30 00:46:43,252 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-05-30 00:46:43,252 [ scc.merge] INFO
2024-05-30 00:46:43,252 [ scc.merge] INFO Repository: ome/omero-figure
2024-05-30 00:46:43,252 [ scc.merge] INFO Excluded PRs:
2024-05-30 00:46:43,252 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-05-30 00:46:43,252 [ scc.merge] INFO Already up to date.
2024-05-30 00:46:43,252 [ scc.merge] INFO
2024-05-30 00:46:43,252 [ scc.merge] INFO Merged PRs:
2024-05-30 00:46:43,252 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-05-30 00:46:43,252 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-05-30 00:46:43,252 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-05-30 00:46:43,252 [ scc.merge] INFO - PR 562 will-moore 'Add changelog 7.0.0'
2024-05-30 00:46:43,252 [ scc.merge] INFO
2024-05-30 00:46:43,252 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-05-30 00:46:43,252 [ scc.merge] INFO Already up to date.
2024-05-30 00:46:43,252 [ scc.merge] INFO
2024-05-30 00:46:43,252 [ scc.merge] INFO Merged PRs:
2024-05-30 00:46:43,252 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-05-30 00:46:43,252 [ scc.merge] INFO
2024-05-30 00:46:43,252 [ scc.merge] INFO Repository: ome/omero-gallery
2024-05-30 00:46:43,252 [ scc.merge] INFO Already up to date.
2024-05-30 00:46:43,252 [ scc.merge] INFO
2024-05-30 00:46:43,252 [ scc.merge] INFO Merged PRs:
2024-05-30 00:46:43,252 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-30 00:46:43,252 [ scc.merge] INFO
2024-05-30 00:46:43,252 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-05-30 00:46:43,252 [ scc.merge] INFO Excluded PRs:
2024-05-30 00:46:43,252 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-05-30 00:46:43,252 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-05-30 00:46:43,253 [ scc.merge] INFO Already up to date.
2024-05-30 00:46:43,253 [ scc.merge] INFO
2024-05-30 00:46:43,253 [ scc.merge] INFO Merged PRs:
2024-05-30 00:46:43,253 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-05-30 00:46:43,253 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-05-30 00:46:43,253 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-30 00:46:43,253 [ scc.merge] INFO
2024-05-30 00:46:43,253 [ scc.merge] INFO Repository: ome/omero-mapr
2024-05-30 00:46:43,253 [ scc.merge] INFO Excluded PRs:
2024-05-30 00:46:43,253 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-05-30 00:46:43,253 [ scc.merge] INFO Already up to date.
2024-05-30 00:46:43,253 [ scc.merge] INFO
2024-05-30 00:46:43,253 [ scc.merge] INFO Merged PRs:
2024-05-30 00:46:43,253 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-05-30 00:46:43,253 [ scc.merge] INFO
2024-05-30 00:46:43,253 [ scc.merge] INFO Repository: ome/omero-metadata
2024-05-30 00:46:43,253 [ scc.merge] INFO Already up to date.
2024-05-30 00:46:43,253 [ scc.merge] INFO
2024-05-30 00:46:43,253 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-30 00:46:43,253 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-30 00:46:43,253 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-30 00:46:43,253 [ scc.merge] INFO
2024-05-30 00:46:43,253 [ scc.merge] INFO Repository: ome/omero-parade
2024-05-30 00:46:43,253 [ scc.merge] INFO Excluded PRs:
2024-05-30 00:46:43,253 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-05-30 00:46:43,253 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-05-30 00:46:43,253 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-05-30 00:46:43,253 [ scc.merge] INFO Already up to date.
2024-05-30 00:46:43,253 [ scc.merge] INFO
2024-05-30 00:46:43,253 [ scc.merge] INFO Merged PRs:
2024-05-30 00:46:43,253 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-30 00:46:43,253 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-30 00:46:43,253 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-30 00:46:43,254 [ scc.merge] INFO
2024-05-30 00:46:43,254 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-05-30 00:46:43,254 [ scc.merge] INFO Already up to date.
2024-05-30 00:46:43,254 [ scc.merge] INFO
2024-05-30 00:46:43,254 [ scc.merge] INFO Merged PRs:
2024-05-30 00:46:43,254 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-05-30 00:46:43,254 [ scc.merge] INFO
2024-05-30 00:46:43,254 [ scc.merge] INFO Repository: ome/omero-rois
2024-05-30 00:46:43,254 [ scc.merge] INFO Excluded PRs:
2024-05-30 00:46:43,254 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-30 00:46:43,254 [ scc.merge] INFO Already up to date.
2024-05-30 00:46:43,254 [ scc.merge] INFO
2024-05-30 00:46:43,254 [ scc.merge] INFO Merged PRs:
2024-05-30 00:46:43,254 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-30 00:46:43,254 [ scc.merge] INFO
2024-05-30 00:46:43,254 [ scc.merge] INFO Repository: ome/omero-signup
2024-05-30 00:46:43,254 [ scc.merge] INFO Already up to date.
2024-05-30 00:46:43,254 [ scc.merge] INFO
2024-05-30 00:46:43,254 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-30 00:46:43,254 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-30 00:46:43,254 [ scc.merge] INFO
2024-05-30 00:46:43,254 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-05-30 00:46:43,254 [ scc.merge] INFO Already up to date.
2024-05-30 00:46:43,254 [ scc.merge] INFO
2024-05-30 00:46:43,254 [ scc.merge] INFO Merged PRs:
2024-05-30 00:46:43,254 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-30 00:46:43,254 [ scc.merge] INFO - PR 70 jburel 'Toml support'
2024-05-30 00:46:43,254 [ scc.merge] INFO
2024-05-30 00:46:43,254 [ scc.merge] INFO Repository: ome/omero-upload
2024-05-30 00:46:43,254 [ scc.merge] INFO Already up to date.
2024-05-30 00:46:43,254 [ scc.merge] INFO
2024-05-30 00:46:43,254 [ scc.merge] INFO
2024-05-30 00:46:43,254 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-05-30 00:46:43,254 [ scc.merge] INFO Already up to date.
2024-05-30 00:46:43,254 [ scc.merge] INFO
2024-05-30 00:46:43,255 [ scc.merge] INFO
2024-05-30 00:46:43,255 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-05-30 00:46:43,255 [ scc.merge] INFO Excluded PRs:
2024-05-30 00:46:43,255 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-05-30 00:46:43,255 [ scc.merge] INFO Already up to date.
2024-05-30 00:46:43,255 [ scc.merge] INFO
2024-05-30 00:46:43,255 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-30 00:46:43,255 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-30 00:46:43,255 [ scc.merge] INFO
2024-05-30 00:46:43,255 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-05-30 00:46:43,255 [ scc.merge] INFO Already up to date.
2024-05-30 00:46:43,255 [ scc.merge] INFO
2024-05-30 00:46:43,255 [ scc.merge] INFO
2024-05-30 00:46:43,255 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-05-30 00:46:43,255 [ scc.merge] INFO Already up to date.
2024-05-30 00:46:43,255 [ scc.merge] INFO
2024-05-30 00:46:43,255 [ scc.merge] INFO
2024-05-30 00:46:43,255 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-05-30 00:46:43,255 [ scc.merge] INFO Already up to date.
2024-05-30 00:46:43,255 [ scc.merge] INFO
2024-05-30 00:46:43,255 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-30 00:46:43,255 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-05-30 00:46:43,255 [ scc.merge] INFO
2024-05-30 00:46:43,255 [ scc.merge] INFO Repository: ome/scripts
2024-05-30 00:46:43,255 [ scc.merge] INFO Excluded PRs:
2024-05-30 00:46:43,255 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-05-30 00:46:43,255 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-05-30 00:46:43,255 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-05-30 00:46:43,255 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-05-30 00:46:43,255 [ scc.merge] INFO Already up to date.
2024-05-30 00:46:43,255 [ scc.merge] INFO
2024-05-30 00:46:43,255 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-30 00:46:43,255 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-30 00:46:43,255 [ scc.merge] INFO
2024-05-30 00:46:43,256 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-30 00:46:43,256 [ scc.git] DEBUG Calling 'git remote'
2024-05-30 00:46:43,262 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-05-30 00:46:43,262 [ scc.git] DEBUG Calling 'git remote'
2024-05-30 00:46:43,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:43,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-05-30 00:46:43,267 [ scc.git] DEBUG Calling 'git remote'
2024-05-30 00:46:43,272 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:43,273 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-05-30 00:46:43,273 [ scc.git] DEBUG Calling 'git remote'
2024-05-30 00:46:43,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:43,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-05-30 00:46:43,278 [ scc.git] DEBUG Calling 'git remote'
2024-05-30 00:46:43,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:43,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-30 00:46:43,284 [ scc.git] DEBUG Calling 'git remote'
2024-05-30 00:46:43,289 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:43,290 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-30 00:46:43,290 [ scc.git] DEBUG Calling 'git remote'
2024-05-30 00:46:43,295 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:43,295 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-30 00:46:43,295 [ scc.git] DEBUG Calling 'git remote'
2024-05-30 00:46:43,302 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:43,302 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-30 00:46:43,302 [ scc.git] DEBUG Calling 'git remote'
2024-05-30 00:46:43,309 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:43,309 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-30 00:46:43,310 [ scc.git] DEBUG Calling 'git remote'
2024-05-30 00:46:43,316 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:43,317 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-30 00:46:43,317 [ scc.git] DEBUG Calling 'git remote'
2024-05-30 00:46:43,322 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:43,322 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-30 00:46:43,322 [ scc.git] DEBUG Calling 'git remote'
2024-05-30 00:46:43,328 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:43,328 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-30 00:46:43,328 [ scc.git] DEBUG Calling 'git remote'
2024-05-30 00:46:43,334 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:43,334 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-30 00:46:43,334 [ scc.git] DEBUG Calling 'git remote'
2024-05-30 00:46:43,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:43,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-30 00:46:43,341 [ scc.git] DEBUG Calling 'git remote'
2024-05-30 00:46:43,346 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:43,346 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-30 00:46:43,346 [ scc.git] DEBUG Calling 'git remote'
2024-05-30 00:46:43,352 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:43,352 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-30 00:46:43,352 [ scc.git] DEBUG Calling 'git remote'
2024-05-30 00:46:43,357 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:43,358 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-30 00:46:43,358 [ scc.git] DEBUG Calling 'git remote'
2024-05-30 00:46:43,363 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:43,363 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-30 00:46:43,363 [ scc.git] DEBUG Calling 'git remote'
2024-05-30 00:46:43,368 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:43,368 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-30 00:46:43,368 [ scc.git] DEBUG Calling 'git remote'
2024-05-30 00:46:43,374 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:43,374 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-30 00:46:43,374 [ scc.git] DEBUG Calling 'git remote'
2024-05-30 00:46:43,380 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:43,381 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-30 00:46:43,381 [ scc.git] DEBUG Calling 'git remote'
2024-05-30 00:46:43,387 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-30 00:46:43,387 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-30 00:46:43,388 [ scc.git] DEBUG Calling 'git remote'
2024-05-30 00:46:43,394 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.9.1 to 5.9.2-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD b7664ef] 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 3d9e3b87
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 7b7a637
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 7688c54
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 e285f14] 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-30 00:47:31,545 [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-30 00:47:40,733 [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-30 00:47:43,130 [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-30 00:47:47,722 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-05-30 00:48:35,235 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/f6f303f9/images/svgs/logo.svg){kind=logo}
