Console Output
Skipping 84 KB..
Full Log3 553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-06-04 00:41:01,541 [ scc.git] DEBUG Calling 'git diff --name-only eff38d0408f9d50de13b28dfe09e4382965e203f..2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-04 00:41:01,548 [ scc.git] INFO - PR 123 will-moore 'Support export of Fileset:ID'
Conflicting PR. Removed from build [OMERO-plugins-push#84](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/consoleText) for more details.
Possible conflicts:
- PR #102 will-moore 'Zarr export tests'
- src/omero_zarr/raw_pixels.py
- Upstream changes
- src/omero_zarr/raw_pixels.py
- .isort.cfg
--conflicts
2024-06-04 00:41:01,557 [ scc.config] DEBUG Found github.token
2024-06-04 00:41:01,557 [ scc.git] DEBUG Not adding comment to issue #123, already --conflicts.
2024-06-04 00:41:01,557 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a14f62a940f4974a305b3f5858049ee493b898ef'
2024-06-04 00:41:01,566 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:01,573 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 147 (Name option) a14f62a940f4974a305b3f5858049ee493b898ef'
2024-06-04 00:41:01,592 [ scc.git] DEBUG Auto-merging src/omero_zarr/masks.py
2024-06-04 00:41:01,592 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-06-04 00:41:01,592 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-04 00:41:01,596 [ scc.git] DEBUG README.rst | 30 ++++++++++++++++++------------
2024-06-04 00:41:01,596 [ scc.git] DEBUG src/omero_zarr/cli.py | 9 +++++++++
2024-06-04 00:41:01,596 [ scc.git] DEBUG src/omero_zarr/masks.py | 4 ++--
2024-06-04 00:41:01,597 [ scc.git] DEBUG src/omero_zarr/raw_pixels.py | 28 +++++++++++++++++++++++-----
2024-06-04 00:41:01,597 [ scc.git] DEBUG src/omero_zarr/util.py | 2 +-
2024-06-04 00:41:01,597 [ scc.git] DEBUG 5 files changed, 53 insertions(+), 20 deletions(-)
2024-06-04 00:41:01,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:41:01,950 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-04 00:41:02,016 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:41:02,016 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:02,027 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-04 00:41:02,086 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-04 00:41:02,098 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5a9f0adee0> has no local changes
2024-06-04 00:41:02,098 [ 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#84 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/)'
2024-06-04 00:41:02,110 [ scc.git] DEBUG [detached HEAD e9058f8] merge master -Dorg -Ssuccess-only
2024-06-04 00:41:02,110 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:41:02,111 [ scc.repo] DEBUG ## PRs found:
2024-06-04 00:41:02,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-06-04 00:41:02,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562 HTTP/1.1" 200 None
2024-06-04 00:41:03,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562/comments HTTP/1.1" 200 None
2024-06-04 00:41:03,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23 HTTP/1.1" 200 None
2024-06-04 00:41:04,292 [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-06-04 00:41:05,237 [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-06-04 00:41:05,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23 HTTP/1.1" 200 None
2024-06-04 00:41:06,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/0c814d66251860ddb01c00ade8469e45f7a1be23?per_page=1 HTTP/1.1" 200 2
2024-06-04 00:41:06,101 [ scc.repo] DEBUG - PR 562 will-moore 'Add changelog 7.0.0'
2024-06-04 00:41:06,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560 HTTP/1.1" 200 None
2024-06-04 00:41:07,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560/comments HTTP/1.1" 200 None
2024-06-04 00:41:07,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569 HTTP/1.1" 200 None
2024-06-04 00:41:07,951 [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-06-04 00:41:08,420 [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-06-04 00:41:08,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569 HTTP/1.1" 200 None
2024-06-04 00:41:09,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/b7cad07be139b0ba61a8d0fc2bf3033f90909569?per_page=1 HTTP/1.1" 200 2
2024-06-04 00:41:09,305 [ scc.repo] DEBUG - PR 560 will-moore 'Max projection bytes'
2024-06-04 00:41:09,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-06-04 00:41:10,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-06-04 00:41:10,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-04 00:41:11,110 [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-06-04 00:41:11,629 [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-06-04 00:41:12,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-04 00:41:12,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/3179811fd0a1d65e2dc5f56013cf92e086da24ab?per_page=1 HTTP/1.1" 200 2
2024-06-04 00:41:12,472 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-06-04 00:41:12,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-06-04 00:41:13,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-04 00:41:13,868 [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-06-04 00:41:14,328 [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-06-04 00:41:14,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-04 00:41:15,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24?per_page=1 HTTP/1.1" 200 2
2024-06-04 00:41:15,255 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-06-04 00:41:15,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543 HTTP/1.1" 200 None
2024-06-04 00:41:16,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543/comments HTTP/1.1" 200 None
2024-06-04 00:41:16,226 [ scc.repo] DEBUG ## Branches found:
2024-06-04 00:41:16,226 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-04 00:41:16,227 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:41:16,227 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:16,233 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-04 00:41:16,240 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-04 00:41:16,240 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-04 00:41:16,248 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-04 00:41:16,256 [ scc.git] DEBUG Already up to date.
2024-06-04 00:41:16,256 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-06-04 00:41:17,043 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-04 00:41:17,044 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-06-04 00:41:17,049 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-06-04 00:41:17,772 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-04 00:41:17,772 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-06-04 00:41:17,778 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-06-04 00:41:18,984 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-04 00:41:18,985 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-06-04 00:41:18,992 [ scc.git] DEBUG Calling 'git fetch origin pull/562/head'
2024-06-04 00:41:19,384 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-04 00:41:19,384 [ scc.git] DEBUG * branch refs/pull/562/head -> FETCH_HEAD
2024-06-04 00:41:19,389 [ scc.git] DEBUG ## Unique users: []
2024-06-04 00:41:19,389 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:41:19,389 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:19,395 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-04 00:41:19,403 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:19,409 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-04 00:41:19,523 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-04 00:41:19,529 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-06-04 00:41:19,529 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-06-04 00:41:19,529 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-06-04 00:41:19,529 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-06-04 00:41:19,529 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-06-04 00:41:19,529 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-06-04 00:41:19,529 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-06-04 00:41:19,529 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-06-04 00:41:19,529 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-06-04 00:41:19,529 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-06-04 00:41:19,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:41:19,690 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-04 00:41:19,701 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:19,707 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-04 00:41:19,963 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-06-04 00:41:19,963 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-06-04 00:41:19,963 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-06-04 00:41:19,963 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-04 00:41:19,971 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-06-04 00:41:19,971 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-06-04 00:41:19,971 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-06-04 00:41:19,971 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-06-04 00:41:19,971 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-06-04 00:41:19,971 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-06-04 00:41:19,971 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-06-04 00:41:19,971 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-06-04 00:41:19,971 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-06-04 00:41:19,974 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-06-04 00:41:19,974 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-06-04 00:41:19,974 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-06-04 00:41:20,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:41:20,137 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b7cad07be139b0ba61a8d0fc2bf3033f90909569'
2024-06-04 00:41:20,145 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:20,150 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) b7cad07be139b0ba61a8d0fc2bf3033f90909569'
2024-06-04 00:41:20,447 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-06-04 00:41:20,447 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-06-04 00:41:20,447 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-06-04 00:41:20,447 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-06-04 00:41:20,447 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-06-04 00:41:20,448 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-04 00:41:20,456 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-06-04 00:41:20,456 [ scc.git] DEBUG omero_figure/urls.py | 8 +++
2024-06-04 00:41:20,456 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-06-04 00:41:20,456 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-06-04 00:41:20,456 [ scc.git] DEBUG src/index.html | 1 +
2024-06-04 00:41:20,456 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-06-04 00:41:20,456 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-06-04 00:41:20,456 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-06-04 00:41:20,456 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-06-04 00:41:20,456 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-06-04 00:41:20,456 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-06-04 00:41:20,456 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-06-04 00:41:20,458 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-06-04 00:41:20,458 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-06-04 00:41:20,458 [ scc.git] DEBUG 14 files changed, 161 insertions(+), 14 deletions(-)
2024-06-04 00:41:20,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:41:20,615 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0c814d66251860ddb01c00ade8469e45f7a1be23'
2024-06-04 00:41:20,623 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:20,629 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 562 (Add changelog 7.0.0) 0c814d66251860ddb01c00ade8469e45f7a1be23'
2024-06-04 00:41:20,655 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-04 00:41:20,658 [ scc.git] DEBUG CHANGELOG.md | 10 ++++++++++
2024-06-04 00:41:20,658 [ scc.git] DEBUG 1 file changed, 10 insertions(+)
2024-06-04 00:41:21,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:41:21,029 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-04 00:41:21,074 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:41:21,075 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:21,081 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-04 00:41:21,120 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-04 00:41:21,130 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5a9e000bb0> has no local changes
2024-06-04 00:41:21,130 [ 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#84 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/)'
2024-06-04 00:41:21,310 [ scc.git] DEBUG [detached HEAD 7699d3d5] merge master -Dorg -Ssuccess-only
2024-06-04 00:41:21,311 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:41:21,311 [ scc.repo] DEBUG ## PRs found:
2024-06-04 00:41:21,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-06-04 00:41:22,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-06-04 00:41:22,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-06-04 00:41:22,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-04 00:41:23,395 [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-06-04 00:41:23,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-04 00:41:24,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-06-04 00:41:24,273 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-06-04 00:41:24,273 [ scc.repo] DEBUG ## Branches found:
2024-06-04 00:41:24,273 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-04 00:41:24,273 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:41:24,273 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:24,279 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-04 00:41:24,284 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-04 00:41:24,285 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-04 00:41:24,290 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-04 00:41:24,296 [ scc.git] DEBUG Already up to date.
2024-06-04 00:41:24,296 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-06-04 00:41:24,718 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-06-04 00:41:24,719 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-06-04 00:41:24,723 [ scc.git] DEBUG ## Unique users: []
2024-06-04 00:41:24,723 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:41:24,723 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:24,728 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-04 00:41:24,734 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:24,740 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-04 00:41:24,774 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-06-04 00:41:24,774 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-04 00:41:24,777 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-06-04 00:41:24,777 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-06-04 00:41:24,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:41:24,953 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-04 00:41:24,997 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:41:24,997 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:25,003 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-04 00:41:25,046 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-04 00:41:25,052 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5a9c7b06d0> has no local changes
2024-06-04 00:41:25,053 [ 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#84 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/)'
2024-06-04 00:41:25,061 [ scc.git] DEBUG [detached HEAD 0c0cadb] merge master -Dorg -Ssuccess-only
2024-06-04 00:41:25,062 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:41:25,062 [ scc.repo] DEBUG ## PRs found:
2024-06-04 00:41:25,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-06-04 00:41:25,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-06-04 00:41:25,897 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-04 00:41:26,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-04 00:41:26,890 [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-06-04 00:41:27,376 [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-06-04 00:41:27,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-04 00:41:28,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-06-04 00:41:28,243 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-04 00:41:28,243 [ scc.repo] DEBUG ## Branches found:
2024-06-04 00:41:28,243 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-04 00:41:28,243 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:41:28,243 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:28,249 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-04 00:41:28,255 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-04 00:41:28,256 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-04 00:41:28,262 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-04 00:41:28,268 [ scc.git] DEBUG Already up to date.
2024-06-04 00:41:28,268 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-06-04 00:41:28,646 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-06-04 00:41:28,646 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-06-04 00:41:28,651 [ scc.git] DEBUG ## Unique users: []
2024-06-04 00:41:28,651 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:41:28,651 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:28,657 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-06-04 00:41:28,663 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:28,667 [ 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-06-04 00:41:28,678 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-04 00:41:28,682 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-06-04 00:41:28,682 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-06-04 00:41:28,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:41:28,843 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-04 00:41:28,885 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:41:28,885 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:28,890 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-04 00:41:28,930 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-04 00:41:28,938 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5a9e041fd0> has no local changes
2024-06-04 00:41:28,938 [ 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#84 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/)'
2024-06-04 00:41:28,949 [ scc.git] DEBUG [detached HEAD 77899de] merge master -Dorg -Ssuccess-only
2024-06-04 00:41:28,949 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:41:28,949 [ scc.repo] DEBUG ## PRs found:
2024-06-04 00:41:29,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-06-04 00:41:29,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-06-04 00:41:30,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-06-04 00:41:30,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-04 00:41:31,259 [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-06-04 00:41:31,736 [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-06-04 00:41:32,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-04 00:41:32,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-06-04 00:41:32,662 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-04 00:41:33,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-06-04 00:41:33,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-06-04 00:41:34,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-04 00:41:34,526 [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-06-04 00:41:34,981 [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-06-04 00:41:35,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-04 00:41:35,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-06-04 00:41:35,896 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-06-04 00:41:36,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-06-04 00:41:36,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-06-04 00:41:37,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-04 00:41:37,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-04 00:41:38,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-04 00:41:38,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-06-04 00:41:38,566 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-06-04 00:41:38,567 [ scc.repo] DEBUG ## Branches found:
2024-06-04 00:41:38,567 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-04 00:41:38,567 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:41:38,567 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:38,579 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-04 00:41:38,589 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-04 00:41:38,590 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-04 00:41:38,602 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-04 00:41:38,613 [ scc.git] DEBUG Already up to date.
2024-06-04 00:41:38,614 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-06-04 00:41:39,137 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-04 00:41:39,137 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-06-04 00:41:39,142 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-06-04 00:41:39,543 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-04 00:41:39,543 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-06-04 00:41:39,551 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-06-04 00:41:40,055 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-04 00:41:40,056 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-06-04 00:41:40,062 [ scc.git] DEBUG ## Unique users: []
2024-06-04 00:41:40,062 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:41:40,062 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:40,068 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-04 00:41:40,076 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:40,082 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-04 00:41:40,149 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-06-04 00:41:40,150 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-04 00:41:40,153 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-06-04 00:41:40,153 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-06-04 00:41:40,153 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-06-04 00:41:40,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:41:40,307 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-04 00:41:40,316 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:40,322 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-04 00:41:40,473 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-06-04 00:41:40,474 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-06-04 00:41:40,474 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-06-04 00:41:40,474 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-06-04 00:41:40,474 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-04 00:41:40,479 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-06-04 00:41:40,479 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-06-04 00:41:40,479 [ scc.git] DEBUG src/app/header.html | 5 +
2024-06-04 00:41:40,479 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-06-04 00:41:40,479 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-06-04 00:41:40,479 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-06-04 00:41:40,479 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-06-04 00:41:40,479 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-06-04 00:41:40,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:41:40,722 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-04 00:41:40,733 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:40,740 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-04 00:41:40,757 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-06-04 00:41:40,758 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-04 00:41:40,762 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-06-04 00:41:40,762 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-06-04 00:41:40,762 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-06-04 00:41:41,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:41:41,143 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-04 00:41:41,200 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:41:41,201 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:41,209 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-04 00:41:41,259 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-04 00:41:41,271 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5a9c7b8280> has no local changes
2024-06-04 00:41:41,272 [ 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#84 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/)'
2024-06-04 00:41:41,286 [ scc.git] DEBUG [detached HEAD cd05d74] merge master -Dorg -Ssuccess-only
2024-06-04 00:41:41,286 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:41:41,287 [ scc.repo] DEBUG ## PRs found:
2024-06-04 00:41:41,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-06-04 00:41:42,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-06-04 00:41:42,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-06-04 00:41:43,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-04 00:41:43,633 [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-06-04 00:41:44,104 [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-06-04 00:41:44,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-04 00:41:45,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-06-04 00:41:45,032 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-06-04 00:41:45,033 [ scc.repo] DEBUG ## Branches found:
2024-06-04 00:41:45,033 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-04 00:41:45,033 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:41:45,033 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:45,041 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-04 00:41:45,049 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-04 00:41:45,049 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-04 00:41:45,059 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-04 00:41:45,067 [ scc.git] DEBUG Already up to date.
2024-06-04 00:41:45,067 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-06-04 00:41:45,472 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-06-04 00:41:45,472 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-06-04 00:41:45,478 [ scc.git] DEBUG ## Unique users: []
2024-06-04 00:41:45,478 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:41:45,478 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:45,485 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-04 00:41:45,493 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:45,501 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-04 00:41:45,513 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-04 00:41:45,516 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-06-04 00:41:45,517 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-06-04 00:41:45,519 [ scc.git] DEBUG requirements.txt | 2 +-
2024-06-04 00:41:45,519 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-06-04 00:41:45,519 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-06-04 00:41:45,520 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-06-04 00:41:45,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:41:45,699 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-04 00:41:45,751 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:41:45,751 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:45,758 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-04 00:41:45,798 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-04 00:41:45,805 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5a9c7ca460> has no local changes
2024-06-04 00:41:45,806 [ 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#84 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/)'
2024-06-04 00:41:45,816 [ scc.git] DEBUG [detached HEAD 7a6fc2f] merge master -Dorg -Ssuccess-only
2024-06-04 00:41:45,817 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:41:45,817 [ scc.repo] DEBUG ## PRs found:
2024-06-04 00:41:46,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-06-04 00:41:46,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-06-04 00:41:47,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-06-04 00:41:47,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-04 00:41:48,228 [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-06-04 00:41:48,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-04 00:41:49,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-06-04 00:41:49,090 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-04 00:41:49,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-06-04 00:41:50,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-06-04 00:41:50,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-04 00:41:50,974 [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-06-04 00:41:51,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-04 00:41:51,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-06-04 00:41:51,837 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-04 00:41:51,837 [ scc.repo] DEBUG ## Branches found:
2024-06-04 00:41:51,837 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-04 00:41:51,837 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:41:51,838 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:51,845 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-04 00:41:51,851 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-04 00:41:51,852 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-04 00:41:51,859 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-04 00:41:51,865 [ scc.git] DEBUG Already up to date.
2024-06-04 00:41:51,866 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-06-04 00:41:52,409 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-04 00:41:52,409 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-06-04 00:41:52,415 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-06-04 00:41:52,997 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-04 00:41:52,997 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-06-04 00:41:53,004 [ scc.git] DEBUG ## Unique users: []
2024-06-04 00:41:53,004 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:41:53,004 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:53,012 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-04 00:41:53,026 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:53,036 [ 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-06-04 00:41:53,085 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-06-04 00:41:53,086 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-06-04 00:41:53,086 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-04 00:41:53,086 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-04 00:41:53,087 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-04 00:41:53,088 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-04 00:41:53,095 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-04 00:41:53,104 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-04 00:41:53,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:41:53,266 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-04 00:41:53,274 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-04 00:41:53,282 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#84](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-06-04 00:41:53,289 [ scc.config] DEBUG Found github.token
2024-06-04 00:41:53,289 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-06-04 00:41:53,289 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-04 00:41:53,297 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:53,304 [ 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-06-04 00:41:53,347 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-04 00:41:53,348 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-04 00:41:53,348 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-06-04 00:41:53,348 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-04 00:41:53,348 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-04 00:41:53,357 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-04 00:41:53,365 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-04 00:41:53,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:41:53,680 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-04 00:41:53,688 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-04 00:41:53,693 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#84](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/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-06-04 00:41:53,697 [ scc.config] DEBUG Found github.token
2024-06-04 00:41:53,698 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-06-04 00:41:53,698 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-04 00:41:53,736 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:41:53,737 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:41:53,744 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-04 00:41:53,782 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-04 00:41:53,790 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5a9c771640> has no local changes
2024-06-04 00:41:53,791 [ 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#84 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/)'
2024-06-04 00:41:53,800 [ scc.git] DEBUG [detached HEAD 5e86524] merge master -Dorg -Ssuccess-only
2024-06-04 00:41:53,801 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:41:53,801 [ scc.repo] DEBUG ## PRs found:
2024-06-04 00:41:54,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-06-04 00:41:54,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-06-04 00:41:54,659 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-04 00:41:55,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-04 00:41:55,685 [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-06-04 00:41:56,151 [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-06-04 00:41:56,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-04 00:41:57,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-06-04 00:41:57,035 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-04 00:41:57,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-06-04 00:41:57,490 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-04 00:41:57,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-04 00:41:58,476 [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-06-04 00:41:58,969 [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-06-04 00:41:59,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-04 00:41:59,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-06-04 00:41:59,853 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-04 00:42:00,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-06-04 00:42:00,317 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-04 00:42:00,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-04 00:42:01,363 [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-06-04 00:42:01,883 [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-06-04 00:42:02,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-04 00:42:02,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-06-04 00:42:02,760 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-04 00:42:03,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-06-04 00:42:03,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-06-04 00:42:04,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-06-04 00:42:04,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-06-04 00:42:05,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-06-04 00:42:05,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-06-04 00:42:05,752 [ scc.repo] DEBUG ## Branches found:
2024-06-04 00:42:05,752 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-04 00:42:05,752 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:05,752 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:05,760 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-04 00:42:05,766 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-04 00:42:05,767 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-04 00:42:05,774 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-04 00:42:05,781 [ scc.git] DEBUG Already up to date.
2024-06-04 00:42:05,782 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-06-04 00:42:06,174 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-04 00:42:06,174 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-06-04 00:42:06,178 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-06-04 00:42:06,562 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-04 00:42:06,562 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-06-04 00:42:06,567 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-06-04 00:42:06,941 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-04 00:42:06,941 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-06-04 00:42:06,945 [ scc.git] DEBUG ## Unique users: []
2024-06-04 00:42:06,946 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:06,946 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:06,952 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-06-04 00:42:06,959 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:06,965 [ 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-06-04 00:42:06,976 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-04 00:42:06,980 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-06-04 00:42:06,980 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-06-04 00:42:07,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:07,145 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-06-04 00:42:07,151 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:07,156 [ 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-06-04 00:42:07,206 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-04 00:42:07,206 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-04 00:42:07,210 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-06-04 00:42:07,210 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-06-04 00:42:07,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:07,569 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-06-04 00:42:07,575 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:07,580 [ 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-06-04 00:42:07,659 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-04 00:42:07,660 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-04 00:42:07,663 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-06-04 00:42:07,664 [ scc.git] DEBUG package.json | 2 +-
2024-06-04 00:42:07,664 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-06-04 00:42:07,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:07,984 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-04 00:42:08,029 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:08,029 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:08,035 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-04 00:42:08,076 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-04 00:42:08,084 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5a9c771580> has no local changes
2024-06-04 00:42:08,084 [ 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#84 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/)'
2024-06-04 00:42:08,094 [ scc.git] DEBUG [detached HEAD 9769327] merge master -Dorg -Ssuccess-only
2024-06-04 00:42:08,094 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:08,094 [ scc.repo] DEBUG ## PRs found:
2024-06-04 00:42:08,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-06-04 00:42:08,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-06-04 00:42:09,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-04 00:42:09,943 [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-06-04 00:42:10,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-04 00:42:10,807 [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-06-04 00:42:10,808 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-06-04 00:42:10,808 [ scc.repo] DEBUG ## Branches found:
2024-06-04 00:42:10,808 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-04 00:42:10,809 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:10,809 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:10,815 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-04 00:42:10,821 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-04 00:42:10,822 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-04 00:42:10,828 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-04 00:42:10,835 [ scc.git] DEBUG Already up to date.
2024-06-04 00:42:10,836 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-04 00:42:11,220 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-06-04 00:42:11,221 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-04 00:42:11,226 [ scc.git] DEBUG ## Unique users: []
2024-06-04 00:42:11,226 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:11,226 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:11,233 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-04 00:42:11,239 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:11,245 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-04 00:42:11,254 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-04 00:42:11,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:11,426 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-04 00:42:11,469 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:11,469 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:11,476 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-04 00:42:11,520 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-04 00:42:11,527 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5a9c782c10> has no local changes
2024-06-04 00:42:11,527 [ 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#84 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/)'
2024-06-04 00:42:11,536 [ scc.git] DEBUG [detached HEAD 140a2ea] merge master -Dorg -Ssuccess-only
2024-06-04 00:42:11,537 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:11,537 [ scc.repo] DEBUG ## PRs found:
2024-06-04 00:42:11,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-06-04 00:42:12,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-06-04 00:42:12,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-06-04 00:42:13,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-06-04 00:42:13,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-04 00:42:14,355 [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-06-04 00:42:14,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-04 00:42:15,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-06-04 00:42:15,221 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-04 00:42:15,221 [ scc.repo] DEBUG ## Branches found:
2024-06-04 00:42:15,221 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-04 00:42:15,221 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:15,221 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:15,227 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-04 00:42:15,232 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-04 00:42:15,232 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-04 00:42:15,237 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-04 00:42:15,242 [ scc.git] DEBUG Already up to date.
2024-06-04 00:42:15,243 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-06-04 00:42:15,732 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-06-04 00:42:15,732 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-06-04 00:42:15,738 [ scc.git] DEBUG ## Unique users: []
2024-06-04 00:42:15,738 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:15,738 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:15,744 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-06-04 00:42:15,753 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:15,761 [ 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-06-04 00:42:15,773 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-06-04 00:42:15,773 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-04 00:42:15,776 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-06-04 00:42:15,777 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-06-04 00:42:15,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:15,937 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-04 00:42:15,983 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:15,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:15,990 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-04 00:42:16,034 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-04 00:42:16,042 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5a9c73a5b0> has no local changes
2024-06-04 00:42:16,043 [ 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#84 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/)'
2024-06-04 00:42:16,055 [ scc.git] DEBUG [detached HEAD bf76a21] merge master -Dorg -Ssuccess-only
2024-06-04 00:42:16,055 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:16,056 [ scc.repo] DEBUG ## PRs found:
2024-06-04 00:42:16,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-06-04 00:42:16,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-06-04 00:42:17,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-06-04 00:42:17,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-04 00:42:18,256 [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-06-04 00:42:18,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-04 00:42:19,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-06-04 00:42:19,134 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-04 00:42:19,135 [ scc.repo] DEBUG ## Branches found:
2024-06-04 00:42:19,135 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-04 00:42:19,135 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:19,135 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:19,143 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-04 00:42:19,150 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-04 00:42:19,151 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-04 00:42:19,158 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-04 00:42:19,165 [ scc.git] DEBUG Already up to date.
2024-06-04 00:42:19,165 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-04 00:42:19,587 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-06-04 00:42:19,587 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-04 00:42:19,592 [ scc.git] DEBUG ## Unique users: []
2024-06-04 00:42:19,592 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:19,593 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:19,598 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-04 00:42:19,604 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:19,612 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-04 00:42:19,667 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-06-04 00:42:19,667 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-06-04 00:42:19,667 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-06-04 00:42:19,667 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-06-04 00:42:19,667 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-06-04 00:42:19,667 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-06-04 00:42:19,667 [ scc.git] DEBUG Auto-merging setup.py
2024-06-04 00:42:19,667 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-06-04 00:42:19,667 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-04 00:42:19,667 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-04 00:42:19,674 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-04 00:42:19,681 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-06-04 00:42:19,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:19,862 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-04 00:42:19,869 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-04 00:42:19,875 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#84](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- setup.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
--conflicts
2024-06-04 00:42:19,880 [ scc.config] DEBUG Found github.token
2024-06-04 00:42:19,881 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-06-04 00:42:19,881 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-04 00:42:19,923 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:19,923 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:19,929 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-04 00:42:19,971 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-04 00:42:19,978 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5a9c7d6eb0> has no local changes
2024-06-04 00:42:19,978 [ 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#84 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/)'
2024-06-04 00:42:19,988 [ scc.git] DEBUG [detached HEAD e121def] merge master -Dorg -Ssuccess-only
2024-06-04 00:42:19,988 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:19,989 [ scc.repo] DEBUG ## PRs found:
2024-06-04 00:42:20,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-06-04 00:42:20,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-06-04 00:42:21,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-06-04 00:42:21,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-04 00:42:22,230 [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-06-04 00:42:22,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-04 00:42:23,080 [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-06-04 00:42:23,081 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-04 00:42:23,081 [ scc.repo] DEBUG ## Branches found:
2024-06-04 00:42:23,081 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-04 00:42:23,082 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:23,082 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:23,088 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-04 00:42:23,094 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-04 00:42:23,094 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-04 00:42:23,101 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-04 00:42:23,107 [ scc.git] DEBUG Already up to date.
2024-06-04 00:42:23,107 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-06-04 00:42:23,590 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-06-04 00:42:23,590 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-06-04 00:42:23,595 [ scc.git] DEBUG ## Unique users: []
2024-06-04 00:42:23,595 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:23,596 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:23,604 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-06-04 00:42:23,613 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:23,619 [ 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-06-04 00:42:23,660 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-04 00:42:23,663 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-06-04 00:42:23,664 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-06-04 00:42:23,664 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-06-04 00:42:23,664 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-06-04 00:42:23,664 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-06-04 00:42:23,667 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-06-04 00:42:23,667 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-06-04 00:42:23,667 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-06-04 00:42:23,667 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-06-04 00:42:23,667 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-06-04 00:42:23,667 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-06-04 00:42:23,667 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-06-04 00:42:23,667 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-06-04 00:42:23,668 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-06-04 00:42:23,668 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-06-04 00:42:23,668 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-06-04 00:42:23,668 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-06-04 00:42:23,668 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-06-04 00:42:23,668 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-06-04 00:42:23,668 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-06-04 00:42:23,668 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-06-04 00:42:23,668 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-06-04 00:42:23,668 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-06-04 00:42:23,668 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-06-04 00:42:23,668 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-06-04 00:42:23,668 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-06-04 00:42:23,668 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-06-04 00:42:23,668 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-06-04 00:42:23,668 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-06-04 00:42:23,668 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-06-04 00:42:23,668 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-06-04 00:42:23,668 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-06-04 00:42:23,668 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-06-04 00:42:23,668 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-06-04 00:42:23,668 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-06-04 00:42:23,668 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-06-04 00:42:23,668 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-06-04 00:42:23,668 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-06-04 00:42:23,668 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-06-04 00:42:23,668 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-06-04 00:42:23,668 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-06-04 00:42:23,668 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-06-04 00:42:23,668 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-06-04 00:42:23,668 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-06-04 00:42:23,668 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-06-04 00:42:23,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:23,835 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-04 00:42:23,878 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:23,879 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:23,886 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-04 00:42:23,928 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-04 00:42:23,935 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5a9c73a7f0> has no local changes
2024-06-04 00:42:23,935 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Generated by OMERO-plugins-push#84 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/)'
2024-06-04 00:42:23,945 [ scc.git] DEBUG [detached HEAD b9940e5] merge master -Dorg -Ssuccess-only
2024-06-04 00:42:23,945 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:23,946 [ scc.repo] DEBUG ## PRs found:
2024-06-04 00:42:24,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-06-04 00:42:24,279 [ scc.repo] DEBUG ## Branches found:
2024-06-04 00:42:24,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-04 00:42:24,280 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:24,280 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:24,288 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-04 00:42:24,296 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-04 00:42:24,296 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-04 00:42:24,305 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-04 00:42:24,313 [ scc.git] DEBUG Already up to date.
2024-06-04 00:42:24,313 [ scc.git] DEBUG ## Unique users: []
2024-06-04 00:42:24,313 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:24,314 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:24,319 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-04 00:42:24,360 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:24,360 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:24,366 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-04 00:42:24,419 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-04 00:42:24,427 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5a9c74bb80> has no local changes
2024-06-04 00:42:24,428 [ 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#84 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/)'
2024-06-04 00:42:24,438 [ scc.git] DEBUG [detached HEAD bc0f2e6] merge master -Dorg -Ssuccess-only
2024-06-04 00:42:24,438 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:24,439 [ scc.repo] DEBUG ## PRs found:
2024-06-04 00:42:24,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-06-04 00:42:24,712 [ scc.repo] DEBUG ## Branches found:
2024-06-04 00:42:24,712 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-04 00:42:24,712 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:24,712 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:24,720 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-04 00:42:24,728 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-04 00:42:24,728 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-04 00:42:24,736 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-04 00:42:24,744 [ scc.git] DEBUG Already up to date.
2024-06-04 00:42:24,744 [ scc.git] DEBUG ## Unique users: []
2024-06-04 00:42:24,744 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:24,744 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:24,752 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-04 00:42:24,795 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:24,795 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:24,802 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-04 00:42:24,848 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-04 00:42:24,857 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5a9c77ddf0> has no local changes
2024-06-04 00:42:24,858 [ 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#84 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/)'
2024-06-04 00:42:24,869 [ scc.git] DEBUG [detached HEAD 658de7f] merge master -Dorg -Ssuccess-only
2024-06-04 00:42:24,869 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:24,870 [ scc.git] INFO Overriding base-branch from master to main
2024-06-04 00:42:24,870 [ scc.repo] DEBUG ## PRs found:
2024-06-04 00:42:25,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-06-04 00:42:25,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-06-04 00:42:26,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-06-04 00:42:26,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-06-04 00:42:27,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-04 00:42:27,592 [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-06-04 00:42:28,060 [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-06-04 00:42:28,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-04 00:42:28,946 [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-06-04 00:42:28,947 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-04 00:42:28,948 [ scc.repo] DEBUG ## Branches found:
2024-06-04 00:42:28,948 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-04 00:42:28,948 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:28,948 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:28,955 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-06-04 00:42:28,961 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-04 00:42:28,962 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-06-04 00:42:28,968 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-06-04 00:42:28,974 [ scc.git] DEBUG Already up to date.
2024-06-04 00:42:28,975 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-06-04 00:42:29,413 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-06-04 00:42:29,414 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-06-04 00:42:29,419 [ scc.git] DEBUG ## Unique users: []
2024-06-04 00:42:29,419 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:29,419 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:29,426 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-04 00:42:29,431 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:29,436 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-04 00:42:29,483 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-06-04 00:42:29,483 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-06-04 00:42:29,483 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-04 00:42:29,483 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-04 00:42:29,490 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-04 00:42:29,504 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-06-04 00:42:29,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:29,672 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-04 00:42:29,679 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-04 00:42:29,686 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#84](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-06-04 00:42:29,691 [ scc.config] DEBUG Found github.token
2024-06-04 00:42:29,691 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-06-04 00:42:29,691 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-04 00:42:29,738 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:29,739 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:29,745 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-04 00:42:29,788 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-04 00:42:29,795 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5a9c76cf40> has no local changes
2024-06-04 00:42:29,796 [ 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#84 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/)'
2024-06-04 00:42:29,811 [ scc.git] DEBUG [detached HEAD ad86038] merge master -Dorg -Ssuccess-only
2024-06-04 00:42:29,812 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:29,812 [ scc.repo] DEBUG ## PRs found:
2024-06-04 00:42:30,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-06-04 00:42:30,100 [ scc.repo] DEBUG ## Branches found:
2024-06-04 00:42:30,100 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-04 00:42:30,100 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:30,100 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:30,110 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-04 00:42:30,118 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-04 00:42:30,119 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-04 00:42:30,127 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-04 00:42:30,135 [ scc.git] DEBUG Already up to date.
2024-06-04 00:42:30,135 [ scc.git] DEBUG ## Unique users: []
2024-06-04 00:42:30,135 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:30,135 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:30,142 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-04 00:42:30,189 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:30,190 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:30,196 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-04 00:42:30,241 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-04 00:42:30,248 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5a9c74eee0> has no local changes
2024-06-04 00:42:30,248 [ 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#84 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/)'
2024-06-04 00:42:30,260 [ scc.git] DEBUG [detached HEAD 0809428] merge master -Dorg -Ssuccess-only
2024-06-04 00:42:30,261 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:30,261 [ scc.repo] DEBUG ## PRs found:
2024-06-04 00:42:30,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-06-04 00:42:30,539 [ scc.repo] DEBUG ## Branches found:
2024-06-04 00:42:30,539 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-04 00:42:30,539 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:30,539 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:30,549 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-04 00:42:30,559 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-04 00:42:30,560 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-04 00:42:30,570 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-04 00:42:30,580 [ scc.git] DEBUG Already up to date.
2024-06-04 00:42:30,581 [ scc.git] DEBUG ## Unique users: []
2024-06-04 00:42:30,581 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:30,581 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:30,588 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-04 00:42:30,644 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:30,645 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:30,659 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-04 00:42:30,709 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-04 00:42:30,718 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5a9c6b65b0> has no local changes
2024-06-04 00:42:30,718 [ 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#84 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/)'
2024-06-04 00:42:30,730 [ scc.git] DEBUG [detached HEAD b43f04f] merge master -Dorg -Ssuccess-only
2024-06-04 00:42:30,731 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:30,731 [ scc.repo] DEBUG ## PRs found:
2024-06-04 00:42:31,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-06-04 00:42:31,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-06-04 00:42:31,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-06-04 00:42:32,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-04 00:42:32,835 [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-06-04 00:42:33,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-04 00:42:33,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-06-04 00:42:33,705 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-06-04 00:42:33,705 [ scc.repo] DEBUG ## Branches found:
2024-06-04 00:42:33,705 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-04 00:42:33,705 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:33,705 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:33,711 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-04 00:42:33,718 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-04 00:42:33,718 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-04 00:42:33,725 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-04 00:42:33,731 [ scc.git] DEBUG Already up to date.
2024-06-04 00:42:33,731 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-06-04 00:42:34,161 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-06-04 00:42:34,161 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-06-04 00:42:34,167 [ scc.git] DEBUG ## Unique users: []
2024-06-04 00:42:34,168 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:34,168 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:34,174 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-04 00:42:34,180 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:34,186 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-04 00:42:34,198 [ scc.git] DEBUG Auto-merging Dockerfile
2024-06-04 00:42:34,198 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-06-04 00:42:34,198 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-04 00:42:34,198 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-04 00:42:34,205 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-04 00:42:34,213 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-06-04 00:42:34,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:34,388 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-04 00:42:34,395 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-04 00:42:34,403 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#84](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-06-04 00:42:34,408 [ scc.config] DEBUG Found github.token
2024-06-04 00:42:34,409 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-06-04 00:42:34,409 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-04 00:42:34,448 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:34,448 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:34,454 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-04 00:42:34,492 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-04 00:42:34,500 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5a9c6fabb0> has no local changes
2024-06-04 00:42:34,500 [ 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#84 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/)'
2024-06-04 00:42:34,510 [ scc.git] DEBUG [detached HEAD 2107292] merge master -Dorg -Ssuccess-only
2024-06-04 00:42:34,510 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:34,510 [ scc.git] INFO Overriding base-branch from master to develop
2024-06-04 00:42:34,510 [ scc.repo] DEBUG ## PRs found:
2024-06-04 00:42:34,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-06-04 00:42:35,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-06-04 00:42:35,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-06-04 00:42:36,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-06-04 00:42:36,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-06-04 00:42:37,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-06-04 00:42:37,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-06-04 00:42:38,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-04 00:42:38,570 [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-06-04 00:42:39,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-04 00:42:39,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-06-04 00:42:39,410 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-04 00:42:39,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-06-04 00:42:40,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-06-04 00:42:40,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-06-04 00:42:41,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-06-04 00:42:41,328 [ scc.repo] DEBUG ## Branches found:
2024-06-04 00:42:41,328 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-04 00:42:41,328 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:41,328 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:41,335 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-06-04 00:42:41,342 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-04 00:42:41,343 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-06-04 00:42:41,350 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-06-04 00:42:41,357 [ scc.git] DEBUG Already up to date.
2024-06-04 00:42:41,358 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-06-04 00:42:41,815 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-06-04 00:42:41,815 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-06-04 00:42:41,821 [ scc.git] DEBUG ## Unique users: []
2024-06-04 00:42:41,821 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:41,821 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:41,829 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-04 00:42:41,836 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:41,842 [ 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-06-04 00:42:41,946 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-06-04 00:42:41,946 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-06-04 00:42:41,946 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-04 00:42:41,946 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-04 00:42:41,952 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-04 00:42:41,959 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-06-04 00:42:42,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:42,120 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-04 00:42:42,128 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-04 00:42:42,134 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#84](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-06-04 00:42:42,139 [ scc.config] DEBUG Found github.token
2024-06-04 00:42:42,139 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-06-04 00:42:42,139 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-04 00:42:42,177 [ scc.git] DEBUG Get sha1 of %s
2024-06-04 00:42:42,177 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-04 00:42:42,182 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-04 00:42:42,222 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-04 00:42:42,229 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5a9c6b6280> has no local changes
2024-06-04 00:42:42,229 [ 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#84 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/)'
2024-06-04 00:42:42,238 [ scc.git] DEBUG [detached HEAD 938524d] merge master -Dorg -Ssuccess-only
2024-06-04 00:42:42,238 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:42,239 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-04 00:42:42,315 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-06-04 00:42:42,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:42,530 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-06-04 00:42:42,535 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-06-04 00:42:42,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:42,954 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-06-04 00:42:42,963 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-06-04 00:42:43,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:43,370 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-06-04 00:42:43,375 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-06-04 00:42:43,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:43,789 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-06-04 00:42:44,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:44,205 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-06-04 00:42:44,212 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-06-04 00:42:44,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:44,625 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-06-04 00:42:44,632 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-06-04 00:42:45,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:45,037 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-06-04 00:42:45,046 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-06-04 00:42:45,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:45,445 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-06-04 00:42:45,452 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-06-04 00:42:45,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:45,846 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-06-04 00:42:45,852 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-06-04 00:42:46,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:46,258 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-06-04 00:42:46,266 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-06-04 00:42:46,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:46,674 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-06-04 00:42:46,681 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-06-04 00:42:47,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:47,117 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-06-04 00:42:47,126 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-06-04 00:42:47,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:47,523 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-06-04 00:42:47,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:47,927 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-06-04 00:42:48,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:48,330 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-06-04 00:42:48,335 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-06-04 00:42:48,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:48,753 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-06-04 00:42:49,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:49,173 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-06-04 00:42:49,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:49,594 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-06-04 00:42:49,600 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-06-04 00:42:49,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:50,015 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-06-04 00:42:50,021 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-06-04 00:42:50,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:50,428 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-06-04 00:42:50,434 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-06-04 00:42:50,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:50,849 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-06-04 00:42:50,854 [ scc.config] DEBUG Found submodule.scripts.url
2024-06-04 00:42:51,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-04 00:42:51,260 [ scc.config] DEBUG Found submodule.scripts.branch
2024-06-04 00:42:51,260 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-04 00:42:51,339 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5a9f11cd90> has local changes
2024-06-04 00:42:51,340 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 373 dependabot[bot] 'Bump omero-test-infra from `7688c54` to `cda3ec6`'
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'
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#84 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/84/)'
2024-06-04 00:42:51,359 [ scc.git] DEBUG [detached HEAD 22d9191] merge master -Dorg -Ssuccess-only
2024-06-04 00:42:51,360 [ scc.merge] INFO Repository: ome/omero-plugins
2024-06-04 00:42:51,360 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-06-04 00:42:51,360 [ scc.merge] INFO Already up to date.
2024-06-04 00:42:51,360 [ scc.merge] INFO
2024-06-04 00:42:51,360 [ scc.merge] INFO Merged PRs:
2024-06-04 00:42:51,360 [ scc.merge] INFO - PR 373 dependabot[bot] 'Bump omero-test-infra from `7688c54` to `cda3ec6`'
2024-06-04 00:42:51,360 [ scc.merge] INFO
2024-06-04 00:42:51,360 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-06-04 00:42:51,360 [ scc.merge] INFO Already up to date.
2024-06-04 00:42:51,361 [ scc.merge] INFO
2024-06-04 00:42:51,361 [ scc.merge] INFO
2024-06-04 00:42:51,361 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-06-04 00:42:51,361 [ scc.merge] INFO Excluded PRs:
2024-06-04 00:42:51,361 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-06-04 00:42:51,361 [ scc.merge] INFO Already up to date.
2024-06-04 00:42:51,361 [ scc.merge] INFO
2024-06-04 00:42:51,361 [ scc.merge] INFO Merged PRs:
2024-06-04 00:42:51,361 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-06-04 00:42:51,361 [ scc.merge] INFO
2024-06-04 00:42:51,361 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-06-04 00:42:51,361 [ scc.merge] INFO Excluded PRs:
2024-06-04 00:42:51,361 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-06-04 00:42:51,361 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-06-04 00:42:51,361 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-06-04 00:42:51,361 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-06-04 00:42:51,361 [ scc.merge] INFO Already up to date.
2024-06-04 00:42:51,361 [ scc.merge] INFO
2024-06-04 00:42:51,362 [ scc.merge] INFO Merged PRs:
2024-06-04 00:42:51,362 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-06-04 00:42:51,362 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-06-04 00:42:51,362 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-06-04 00:42:51,362 [ scc.merge] INFO
2024-06-04 00:42:51,362 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-06-04 00:42:51,362 [ scc.merge] INFO Excluded PRs:
2024-06-04 00:42:51,362 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-04 00:42:51,362 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-06-04 00:42:51,362 [ scc.merge] INFO Already up to date.
2024-06-04 00:42:51,362 [ scc.merge] INFO
2024-06-04 00:42:51,362 [ scc.merge] INFO Merged PRs:
2024-06-04 00:42:51,362 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-06-04 00:42:51,362 [ scc.merge] INFO
2024-06-04 00:42:51,362 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-04 00:42:51,362 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-06-04 00:42:51,362 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-06-04 00:42:51,362 [ scc.merge] INFO
2024-06-04 00:42:51,363 [ scc.merge] INFO Repository: ome/omero-figure
2024-06-04 00:42:51,363 [ scc.merge] INFO Excluded PRs:
2024-06-04 00:42:51,363 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-06-04 00:42:51,363 [ scc.merge] INFO Already up to date.
2024-06-04 00:42:51,363 [ scc.merge] INFO
2024-06-04 00:42:51,363 [ scc.merge] INFO Merged PRs:
2024-06-04 00:42:51,363 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-06-04 00:42:51,363 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-06-04 00:42:51,363 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-06-04 00:42:51,363 [ scc.merge] INFO - PR 562 will-moore 'Add changelog 7.0.0'
2024-06-04 00:42:51,363 [ scc.merge] INFO
2024-06-04 00:42:51,363 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-06-04 00:42:51,363 [ scc.merge] INFO Already up to date.
2024-06-04 00:42:51,363 [ scc.merge] INFO
2024-06-04 00:42:51,363 [ scc.merge] INFO Merged PRs:
2024-06-04 00:42:51,363 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-06-04 00:42:51,363 [ scc.merge] INFO
2024-06-04 00:42:51,363 [ scc.merge] INFO Repository: ome/omero-gallery
2024-06-04 00:42:51,363 [ scc.merge] INFO Already up to date.
2024-06-04 00:42:51,364 [ scc.merge] INFO
2024-06-04 00:42:51,364 [ scc.merge] INFO Merged PRs:
2024-06-04 00:42:51,364 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-04 00:42:51,364 [ scc.merge] INFO
2024-06-04 00:42:51,364 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-06-04 00:42:51,364 [ scc.merge] INFO Excluded PRs:
2024-06-04 00:42:51,364 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-06-04 00:42:51,364 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-06-04 00:42:51,364 [ scc.merge] INFO Already up to date.
2024-06-04 00:42:51,364 [ scc.merge] INFO
2024-06-04 00:42:51,364 [ scc.merge] INFO Merged PRs:
2024-06-04 00:42:51,364 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-06-04 00:42:51,364 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-06-04 00:42:51,364 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-04 00:42:51,364 [ scc.merge] INFO
2024-06-04 00:42:51,364 [ scc.merge] INFO Repository: ome/omero-mapr
2024-06-04 00:42:51,364 [ scc.merge] INFO Excluded PRs:
2024-06-04 00:42:51,364 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-06-04 00:42:51,365 [ scc.merge] INFO Already up to date.
2024-06-04 00:42:51,365 [ scc.merge] INFO
2024-06-04 00:42:51,365 [ scc.merge] INFO Merged PRs:
2024-06-04 00:42:51,365 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-06-04 00:42:51,365 [ scc.merge] INFO
2024-06-04 00:42:51,365 [ scc.merge] INFO Repository: ome/omero-metadata
2024-06-04 00:42:51,365 [ scc.merge] INFO Already up to date.
2024-06-04 00:42:51,365 [ scc.merge] INFO
2024-06-04 00:42:51,365 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-04 00:42:51,365 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-04 00:42:51,365 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-04 00:42:51,365 [ scc.merge] INFO
2024-06-04 00:42:51,365 [ scc.merge] INFO Repository: ome/omero-parade
2024-06-04 00:42:51,365 [ scc.merge] INFO Excluded PRs:
2024-06-04 00:42:51,365 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-06-04 00:42:51,365 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-06-04 00:42:51,365 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-06-04 00:42:51,365 [ scc.merge] INFO Already up to date.
2024-06-04 00:42:51,365 [ scc.merge] INFO
2024-06-04 00:42:51,366 [ scc.merge] INFO Merged PRs:
2024-06-04 00:42:51,366 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-04 00:42:51,366 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-04 00:42:51,366 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-04 00:42:51,366 [ scc.merge] INFO
2024-06-04 00:42:51,366 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-06-04 00:42:51,366 [ scc.merge] INFO Already up to date.
2024-06-04 00:42:51,366 [ scc.merge] INFO
2024-06-04 00:42:51,366 [ scc.merge] INFO Merged PRs:
2024-06-04 00:42:51,366 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-06-04 00:42:51,366 [ scc.merge] INFO
2024-06-04 00:42:51,366 [ scc.merge] INFO Repository: ome/omero-rois
2024-06-04 00:42:51,366 [ scc.merge] INFO Excluded PRs:
2024-06-04 00:42:51,366 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-04 00:42:51,366 [ scc.merge] INFO Already up to date.
2024-06-04 00:42:51,366 [ scc.merge] INFO
2024-06-04 00:42:51,366 [ scc.merge] INFO Merged PRs:
2024-06-04 00:42:51,366 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-04 00:42:51,366 [ scc.merge] INFO
2024-06-04 00:42:51,367 [ scc.merge] INFO Repository: ome/omero-signup
2024-06-04 00:42:51,367 [ scc.merge] INFO Already up to date.
2024-06-04 00:42:51,367 [ scc.merge] INFO
2024-06-04 00:42:51,367 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-04 00:42:51,367 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-04 00:42:51,367 [ scc.merge] INFO
2024-06-04 00:42:51,367 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-06-04 00:42:51,367 [ scc.merge] INFO Already up to date.
2024-06-04 00:42:51,367 [ scc.merge] INFO
2024-06-04 00:42:51,367 [ scc.merge] INFO Merged PRs:
2024-06-04 00:42:51,367 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-04 00:42:51,367 [ scc.merge] INFO
2024-06-04 00:42:51,367 [ scc.merge] INFO Repository: ome/omero-upload
2024-06-04 00:42:51,367 [ scc.merge] INFO Already up to date.
2024-06-04 00:42:51,367 [ scc.merge] INFO
2024-06-04 00:42:51,367 [ scc.merge] INFO
2024-06-04 00:42:51,367 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-06-04 00:42:51,367 [ scc.merge] INFO Already up to date.
2024-06-04 00:42:51,367 [ scc.merge] INFO
2024-06-04 00:42:51,368 [ scc.merge] INFO
2024-06-04 00:42:51,368 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-06-04 00:42:51,368 [ scc.merge] INFO Excluded PRs:
2024-06-04 00:42:51,368 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-06-04 00:42:51,368 [ scc.merge] INFO Already up to date.
2024-06-04 00:42:51,368 [ scc.merge] INFO
2024-06-04 00:42:51,368 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-04 00:42:51,368 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-04 00:42:51,368 [ scc.merge] INFO
2024-06-04 00:42:51,368 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-06-04 00:42:51,368 [ scc.merge] INFO Already up to date.
2024-06-04 00:42:51,368 [ scc.merge] INFO
2024-06-04 00:42:51,368 [ scc.merge] INFO
2024-06-04 00:42:51,368 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-06-04 00:42:51,368 [ scc.merge] INFO Already up to date.
2024-06-04 00:42:51,368 [ scc.merge] INFO
2024-06-04 00:42:51,368 [ scc.merge] INFO
2024-06-04 00:42:51,368 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-06-04 00:42:51,368 [ scc.merge] INFO Already up to date.
2024-06-04 00:42:51,368 [ scc.merge] INFO
2024-06-04 00:42:51,368 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-04 00:42:51,369 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-06-04 00:42:51,369 [ scc.merge] INFO
2024-06-04 00:42:51,369 [ scc.merge] INFO Repository: ome/scripts
2024-06-04 00:42:51,369 [ scc.merge] INFO Excluded PRs:
2024-06-04 00:42:51,369 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-06-04 00:42:51,369 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-06-04 00:42:51,369 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-06-04 00:42:51,369 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-06-04 00:42:51,369 [ scc.merge] INFO Already up to date.
2024-06-04 00:42:51,369 [ scc.merge] INFO
2024-06-04 00:42:51,369 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-04 00:42:51,369 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-04 00:42:51,369 [ scc.merge] INFO
2024-06-04 00:42:51,369 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-06-04 00:42:51,369 [ scc.git] DEBUG Calling 'git remote'
2024-06-04 00:42:51,381 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-06-04 00:42:51,381 [ scc.git] DEBUG Calling 'git remote'
2024-06-04 00:42:51,391 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:51,391 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-06-04 00:42:51,392 [ scc.git] DEBUG Calling 'git remote'
2024-06-04 00:42:51,399 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:51,399 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-06-04 00:42:51,399 [ scc.git] DEBUG Calling 'git remote'
2024-06-04 00:42:51,405 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:51,405 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-06-04 00:42:51,405 [ scc.git] DEBUG Calling 'git remote'
2024-06-04 00:42:51,413 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:51,413 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-04 00:42:51,413 [ scc.git] DEBUG Calling 'git remote'
2024-06-04 00:42:51,419 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:51,419 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-04 00:42:51,419 [ scc.git] DEBUG Calling 'git remote'
2024-06-04 00:42:51,425 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:51,425 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-04 00:42:51,425 [ scc.git] DEBUG Calling 'git remote'
2024-06-04 00:42:51,431 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:51,431 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-04 00:42:51,431 [ scc.git] DEBUG Calling 'git remote'
2024-06-04 00:42:51,437 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:51,437 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-04 00:42:51,437 [ scc.git] DEBUG Calling 'git remote'
2024-06-04 00:42:51,443 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:51,443 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-04 00:42:51,443 [ scc.git] DEBUG Calling 'git remote'
2024-06-04 00:42:51,449 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:51,449 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-04 00:42:51,449 [ scc.git] DEBUG Calling 'git remote'
2024-06-04 00:42:51,455 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:51,456 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-04 00:42:51,456 [ scc.git] DEBUG Calling 'git remote'
2024-06-04 00:42:51,462 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:51,462 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-04 00:42:51,462 [ scc.git] DEBUG Calling 'git remote'
2024-06-04 00:42:51,469 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:51,469 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-04 00:42:51,469 [ scc.git] DEBUG Calling 'git remote'
2024-06-04 00:42:51,475 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:51,475 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-04 00:42:51,475 [ scc.git] DEBUG Calling 'git remote'
2024-06-04 00:42:51,481 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:51,481 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-04 00:42:51,481 [ scc.git] DEBUG Calling 'git remote'
2024-06-04 00:42:51,487 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:51,487 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-04 00:42:51,487 [ scc.git] DEBUG Calling 'git remote'
2024-06-04 00:42:51,493 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:51,493 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-04 00:42:51,493 [ scc.git] DEBUG Calling 'git remote'
2024-06-04 00:42:51,498 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:51,499 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-04 00:42:51,499 [ scc.git] DEBUG Calling 'git remote'
2024-06-04 00:42:51,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:51,506 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-04 00:42:51,506 [ scc.git] DEBUG Calling 'git remote'
2024-06-04 00:42:51,512 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:51,513 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-04 00:42:51,513 [ scc.git] DEBUG Calling 'git remote'
2024-06-04 00:42:51,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-04 00:42:51,519 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-04 00:42:51,519 [ scc.git] DEBUG Calling 'git remote'
2024-06-04 00:42:51,524 [ 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 985863a] 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 cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 5a90893
nothing to commit, working tree clean
[detached HEAD 308ea40] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-06-04 00:43:42,525 [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-06-04 00:43:51,555 [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-06-04 00:43:53,949 [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-06-04 00:43:58,515 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-06-04 00:44:44,911 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/9ed1fe1f/images/svgs/logo.svg){kind=logo}
