Console Output
Skipping 76 KB..
Full Logommit-ci-update-config
2024-05-26 00:42:43,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:42:43,191 [ scc.git] DEBUG Calling 'git merge-base 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473 553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-05-26 00:42:43,200 [ scc.git] DEBUG Calling 'git diff --name-only eff38d0408f9d50de13b28dfe09e4382965e203f..2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-05-26 00:42:43,206 [ scc.git] INFO - PR 123 will-moore 'Support export of Fileset:ID'
Conflicting PR. Removed from build [OMERO-plugins-push#77](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/consoleText) for more details.
Possible conflicts:
- PR #102 will-moore 'Zarr export tests'
- src/omero_zarr/raw_pixels.py
- Upstream changes
- .isort.cfg
- src/omero_zarr/raw_pixels.py
--conflicts
2024-05-26 00:42:43,210 [ scc.config] DEBUG Found github.token
2024-05-26 00:42:43,211 [ scc.git] DEBUG Not adding comment to issue #123, already --conflicts.
2024-05-26 00:42:43,211 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a14f62a940f4974a305b3f5858049ee493b898ef'
2024-05-26 00:42:43,221 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:42:43,230 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 147 (Name option) a14f62a940f4974a305b3f5858049ee493b898ef'
2024-05-26 00:42:43,242 [ scc.git] DEBUG Auto-merging src/omero_zarr/masks.py
2024-05-26 00:42:43,242 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-05-26 00:42:43,242 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-26 00:42:43,245 [ scc.git] DEBUG README.rst | 30 ++++++++++++++++++------------
2024-05-26 00:42:43,245 [ scc.git] DEBUG src/omero_zarr/cli.py | 9 +++++++++
2024-05-26 00:42:43,245 [ scc.git] DEBUG src/omero_zarr/masks.py | 4 ++--
2024-05-26 00:42:43,245 [ scc.git] DEBUG src/omero_zarr/raw_pixels.py | 28 +++++++++++++++++++++++-----
2024-05-26 00:42:43,245 [ scc.git] DEBUG src/omero_zarr/util.py | 2 +-
2024-05-26 00:42:43,245 [ scc.git] DEBUG 5 files changed, 53 insertions(+), 20 deletions(-)
2024-05-26 00:42:43,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:42:43,597 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-26 00:42:43,638 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:42:43,638 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:42:43,646 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-26 00:42:43,688 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-26 00:42:43,695 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f216462fb50> has no local changes
2024-05-26 00:42:43,695 [ 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#77 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/)'
2024-05-26 00:42:43,704 [ scc.git] DEBUG [detached HEAD fa4e04d] merge master -Dorg -Ssuccess-only
2024-05-26 00:42:43,705 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:42:43,705 [ scc.repo] DEBUG ## PRs found:
2024-05-26 00:42:44,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-05-26 00:42:44,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562 HTTP/1.1" 200 None
2024-05-26 00:42:45,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562/comments HTTP/1.1" 200 None
2024-05-26 00:42:45,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23 HTTP/1.1" 200 None
2024-05-26 00:42:46,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-26 00:42:46,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-26 00:42:46,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23 HTTP/1.1" 200 None
2024-05-26 00:42:47,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/0c814d66251860ddb01c00ade8469e45f7a1be23?per_page=1 HTTP/1.1" 200 2
2024-05-26 00:42:47,383 [ scc.repo] DEBUG - PR 562 will-moore 'Add changelog 7.0.0'
2024-05-26 00:42:47,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560 HTTP/1.1" 200 None
2024-05-26 00:42:48,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560/comments HTTP/1.1" 200 None
2024-05-26 00:42:48,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569 HTTP/1.1" 200 None
2024-05-26 00:42:49,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-26 00:42:49,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-26 00:42:50,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569 HTTP/1.1" 200 None
2024-05-26 00:42:50,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/b7cad07be139b0ba61a8d0fc2bf3033f90909569?per_page=1 HTTP/1.1" 200 2
2024-05-26 00:42:50,781 [ scc.repo] DEBUG - PR 560 will-moore 'Max projection bytes'
2024-05-26 00:42:51,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-05-26 00:42:51,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-05-26 00:42:52,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-26 00:42:52,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-26 00:42:53,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-26 00:42:53,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-26 00:42:54,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/3179811fd0a1d65e2dc5f56013cf92e086da24ab?per_page=1 HTTP/1.1" 200 2
2024-05-26 00:42:54,060 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-05-26 00:42:54,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-05-26 00:42:55,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-26 00:42:55,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-26 00:42:55,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-26 00:42:56,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-26 00:42:56,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24?per_page=1 HTTP/1.1" 200 2
2024-05-26 00:42:56,898 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-05-26 00:42:57,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543 HTTP/1.1" 200 None
2024-05-26 00:42:57,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543/comments HTTP/1.1" 200 None
2024-05-26 00:42:57,800 [ scc.repo] DEBUG ## Branches found:
2024-05-26 00:42:57,800 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-26 00:42:57,800 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:42:57,800 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:42:57,807 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-26 00:42:57,813 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-26 00:42:57,813 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-26 00:42:57,821 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-26 00:42:57,829 [ scc.git] DEBUG Already up to date.
2024-05-26 00:42:57,830 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-05-26 00:42:58,222 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-26 00:42:58,222 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-05-26 00:42:58,228 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-05-26 00:42:58,854 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-26 00:42:58,854 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-05-26 00:42:58,860 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-05-26 00:42:59,243 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-26 00:42:59,243 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-05-26 00:42:59,251 [ scc.git] DEBUG Calling 'git fetch origin pull/562/head'
2024-05-26 00:42:59,675 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-26 00:42:59,675 [ scc.git] DEBUG * branch refs/pull/562/head -> FETCH_HEAD
2024-05-26 00:42:59,680 [ scc.git] DEBUG ## Unique users: []
2024-05-26 00:42:59,680 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:42:59,680 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:42:59,686 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-26 00:42:59,693 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:42:59,700 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-26 00:42:59,721 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-26 00:42:59,727 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-05-26 00:42:59,727 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-05-26 00:42:59,727 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-05-26 00:42:59,727 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-05-26 00:42:59,727 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-05-26 00:42:59,727 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-05-26 00:42:59,727 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-05-26 00:42:59,728 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-05-26 00:42:59,730 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-05-26 00:42:59,730 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-05-26 00:42:59,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:42:59,893 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-26 00:42:59,903 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:42:59,909 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-26 00:43:00,104 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-26 00:43:00,105 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-05-26 00:43:00,105 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-05-26 00:43:00,105 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-26 00:43:00,112 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-05-26 00:43:00,112 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-05-26 00:43:00,112 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-05-26 00:43:00,112 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-05-26 00:43:00,112 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-05-26 00:43:00,112 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-05-26 00:43:00,112 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-05-26 00:43:00,112 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-05-26 00:43:00,112 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-05-26 00:43:00,112 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-05-26 00:43:00,112 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-05-26 00:43:00,112 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-05-26 00:43:00,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:43:00,295 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b7cad07be139b0ba61a8d0fc2bf3033f90909569'
2024-05-26 00:43:00,305 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:00,310 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) b7cad07be139b0ba61a8d0fc2bf3033f90909569'
2024-05-26 00:43:00,421 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-05-26 00:43:00,421 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-05-26 00:43:00,421 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-05-26 00:43:00,421 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-26 00:43:00,421 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-05-26 00:43:00,422 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-26 00:43:00,430 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-05-26 00:43:00,430 [ scc.git] DEBUG omero_figure/urls.py | 8 +++
2024-05-26 00:43:00,430 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-05-26 00:43:00,430 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-05-26 00:43:00,430 [ scc.git] DEBUG src/index.html | 1 +
2024-05-26 00:43:00,430 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-05-26 00:43:00,430 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-05-26 00:43:00,430 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-05-26 00:43:00,430 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-05-26 00:43:00,430 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-05-26 00:43:00,430 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-05-26 00:43:00,430 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-05-26 00:43:00,430 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-05-26 00:43:00,430 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-05-26 00:43:00,430 [ scc.git] DEBUG 14 files changed, 161 insertions(+), 14 deletions(-)
2024-05-26 00:43:00,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:43:00,711 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0c814d66251860ddb01c00ade8469e45f7a1be23'
2024-05-26 00:43:00,719 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:00,725 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 562 (Add changelog 7.0.0) 0c814d66251860ddb01c00ade8469e45f7a1be23'
2024-05-26 00:43:00,753 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-26 00:43:00,756 [ scc.git] DEBUG CHANGELOG.md | 10 ++++++++++
2024-05-26 00:43:00,756 [ scc.git] DEBUG 1 file changed, 10 insertions(+)
2024-05-26 00:43:01,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:43:01,132 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-26 00:43:01,179 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:43:01,179 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:01,185 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-26 00:43:01,224 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-26 00:43:01,236 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2164679f70> has no local changes
2024-05-26 00:43:01,237 [ 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#77 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/)'
2024-05-26 00:43:01,248 [ scc.git] DEBUG [detached HEAD 2ef3255f] merge master -Dorg -Ssuccess-only
2024-05-26 00:43:01,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:43:01,249 [ scc.repo] DEBUG ## PRs found:
2024-05-26 00:43:01,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-05-26 00:43:02,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-05-26 00:43:02,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-05-26 00:43:03,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-26 00:43:03,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-26 00:43:04,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-26 00:43:04,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-05-26 00:43:04,453 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-05-26 00:43:04,453 [ scc.repo] DEBUG ## Branches found:
2024-05-26 00:43:04,453 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-26 00:43:04,453 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:43:04,453 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:04,461 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-26 00:43:04,467 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-26 00:43:04,468 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-26 00:43:04,474 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-26 00:43:04,481 [ scc.git] DEBUG Already up to date.
2024-05-26 00:43:04,482 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-05-26 00:43:04,853 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-05-26 00:43:04,853 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-05-26 00:43:04,858 [ scc.git] DEBUG ## Unique users: []
2024-05-26 00:43:04,858 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:43:04,859 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:04,865 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-26 00:43:04,870 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:04,875 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-26 00:43:04,883 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-05-26 00:43:04,884 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-26 00:43:04,887 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-05-26 00:43:04,887 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-05-26 00:43:05,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:43:05,046 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-26 00:43:05,094 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:43:05,094 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:05,100 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-26 00:43:05,142 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-26 00:43:05,150 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2164679e20> has no local changes
2024-05-26 00:43:05,151 [ 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#77 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/)'
2024-05-26 00:43:05,160 [ scc.git] DEBUG [detached HEAD 6033f5e] merge master -Dorg -Ssuccess-only
2024-05-26 00:43:05,161 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:43:05,161 [ scc.repo] DEBUG ## PRs found:
2024-05-26 00:43:05,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-05-26 00:43:05,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-05-26 00:43:05,981 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-26 00:43:06,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-26 00:43:07,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-26 00:43:07,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-26 00:43:08,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-26 00:43:08,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-05-26 00:43:08,522 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-26 00:43:08,522 [ scc.repo] DEBUG ## Branches found:
2024-05-26 00:43:08,522 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-26 00:43:08,522 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:43:08,522 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:08,529 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-26 00:43:08,535 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-26 00:43:08,535 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-26 00:43:08,541 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-26 00:43:08,547 [ scc.git] DEBUG Already up to date.
2024-05-26 00:43:08,547 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-05-26 00:43:08,915 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-05-26 00:43:08,915 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-05-26 00:43:08,920 [ scc.git] DEBUG ## Unique users: []
2024-05-26 00:43:08,920 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:43:08,920 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:08,925 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-05-26 00:43:08,930 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:08,934 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-05-26 00:43:08,945 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-26 00:43:08,949 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-05-26 00:43:08,949 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-05-26 00:43:09,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:43:09,113 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-26 00:43:09,162 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:43:09,163 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:09,171 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-26 00:43:09,217 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-26 00:43:09,227 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2164624d30> has no local changes
2024-05-26 00:43:09,227 [ 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#77 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/)'
2024-05-26 00:43:09,236 [ scc.git] DEBUG [detached HEAD 534b641] merge master -Dorg -Ssuccess-only
2024-05-26 00:43:09,236 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:43:09,237 [ scc.repo] DEBUG ## PRs found:
2024-05-26 00:43:09,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-05-26 00:43:10,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-05-26 00:43:10,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-05-26 00:43:11,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-26 00:43:11,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-26 00:43:12,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-26 00:43:12,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-26 00:43:12,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-05-26 00:43:12,962 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-26 00:43:13,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-05-26 00:43:13,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-05-26 00:43:14,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-05-26 00:43:14,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-26 00:43:15,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-26 00:43:15,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-05-26 00:43:16,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-05-26 00:43:16,314 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-05-26 00:43:16,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-05-26 00:43:17,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-05-26 00:43:17,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-26 00:43:18,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-26 00:43:18,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-26 00:43:19,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-05-26 00:43:19,040 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-05-26 00:43:19,041 [ scc.repo] DEBUG ## Branches found:
2024-05-26 00:43:19,041 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-26 00:43:19,041 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:43:19,041 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:19,047 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-26 00:43:19,054 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-26 00:43:19,054 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-26 00:43:19,061 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-26 00:43:19,069 [ scc.git] DEBUG Already up to date.
2024-05-26 00:43:19,069 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-05-26 00:43:19,535 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-26 00:43:19,535 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-05-26 00:43:19,544 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-05-26 00:43:20,505 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-26 00:43:20,505 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-05-26 00:43:20,511 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-05-26 00:43:20,941 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-26 00:43:20,941 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-05-26 00:43:20,946 [ scc.git] DEBUG ## Unique users: []
2024-05-26 00:43:20,946 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:43:20,946 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:20,953 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-26 00:43:20,959 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:20,965 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-26 00:43:20,977 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-05-26 00:43:20,978 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-26 00:43:20,981 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-05-26 00:43:20,981 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-05-26 00:43:20,981 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-05-26 00:43:21,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:43:21,147 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-05-26 00:43:21,154 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:21,159 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-05-26 00:43:21,255 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-05-26 00:43:21,255 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-05-26 00:43:21,255 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-05-26 00:43:21,255 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-05-26 00:43:21,255 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-26 00:43:21,259 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-05-26 00:43:21,259 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-05-26 00:43:21,260 [ scc.git] DEBUG src/app/header.html | 5 +
2024-05-26 00:43:21,260 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-05-26 00:43:21,260 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-05-26 00:43:21,260 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-05-26 00:43:21,260 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-05-26 00:43:21,260 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-05-26 00:43:21,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:43:21,558 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-26 00:43:21,567 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:21,573 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-26 00:43:21,587 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-05-26 00:43:21,597 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-26 00:43:21,600 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-05-26 00:43:21,600 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-05-26 00:43:21,600 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-05-26 00:43:21,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:43:21,982 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-26 00:43:22,022 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:43:22,023 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:22,029 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-26 00:43:22,073 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-26 00:43:22,081 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f216463c3a0> has no local changes
2024-05-26 00:43:22,081 [ 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#77 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/)'
2024-05-26 00:43:22,090 [ scc.git] DEBUG [detached HEAD 94de67f] merge master -Dorg -Ssuccess-only
2024-05-26 00:43:22,091 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:43:22,091 [ scc.repo] DEBUG ## PRs found:
2024-05-26 00:43:22,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-05-26 00:43:22,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-05-26 00:43:23,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-05-26 00:43:23,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-26 00:43:24,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-26 00:43:24,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-26 00:43:25,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-26 00:43:25,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-05-26 00:43:25,852 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-05-26 00:43:25,853 [ scc.repo] DEBUG ## Branches found:
2024-05-26 00:43:25,853 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-26 00:43:25,853 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:43:25,853 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:25,859 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-26 00:43:25,864 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-26 00:43:25,865 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-26 00:43:25,870 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-26 00:43:25,876 [ scc.git] DEBUG Already up to date.
2024-05-26 00:43:25,876 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-05-26 00:43:26,252 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-05-26 00:43:26,252 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-05-26 00:43:26,258 [ scc.git] DEBUG ## Unique users: []
2024-05-26 00:43:26,258 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:43:26,258 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:26,265 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-26 00:43:26,272 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:26,279 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-26 00:43:26,296 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-26 00:43:26,299 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-05-26 00:43:26,299 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-05-26 00:43:26,299 [ scc.git] DEBUG requirements.txt | 2 +-
2024-05-26 00:43:26,299 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-05-26 00:43:26,299 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-05-26 00:43:26,299 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-05-26 00:43:26,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:43:26,470 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-26 00:43:26,514 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:43:26,514 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:26,522 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-26 00:43:26,567 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-26 00:43:26,575 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f21645fcb50> has no local changes
2024-05-26 00:43:26,576 [ 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#77 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/)'
2024-05-26 00:43:26,587 [ scc.git] DEBUG [detached HEAD 87482be] merge master -Dorg -Ssuccess-only
2024-05-26 00:43:26,587 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:43:26,588 [ scc.repo] DEBUG ## PRs found:
2024-05-26 00:43:27,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-05-26 00:43:27,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-05-26 00:43:28,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-05-26 00:43:28,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-26 00:43:28,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-26 00:43:29,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-26 00:43:29,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-05-26 00:43:29,876 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-26 00:43:30,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-05-26 00:43:30,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-05-26 00:43:31,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-26 00:43:31,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-26 00:43:32,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-26 00:43:32,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-05-26 00:43:32,672 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-26 00:43:32,672 [ scc.repo] DEBUG ## Branches found:
2024-05-26 00:43:32,672 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-26 00:43:32,673 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:43:32,673 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:32,679 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-26 00:43:32,683 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-26 00:43:32,683 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-26 00:43:32,688 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-26 00:43:32,694 [ scc.git] DEBUG Already up to date.
2024-05-26 00:43:32,694 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-05-26 00:43:33,256 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-26 00:43:33,256 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-05-26 00:43:33,261 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-05-26 00:43:33,883 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-26 00:43:33,884 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-05-26 00:43:33,890 [ scc.git] DEBUG ## Unique users: []
2024-05-26 00:43:33,890 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:43:33,890 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:33,897 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-26 00:43:33,905 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:33,910 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-26 00:43:33,991 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-05-26 00:43:33,991 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-05-26 00:43:33,991 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-26 00:43:33,991 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-26 00:43:33,992 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-26 00:43:33,993 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-26 00:43:33,999 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-26 00:43:34,006 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-26 00:43:34,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:43:34,172 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-26 00:43:34,180 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-26 00:43:34,186 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#77](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-05-26 00:43:34,191 [ scc.config] DEBUG Found github.token
2024-05-26 00:43:34,192 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-05-26 00:43:34,192 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-26 00:43:34,199 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:34,204 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-26 00:43:34,222 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-26 00:43:34,222 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-26 00:43:34,222 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-05-26 00:43:34,222 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-26 00:43:34,222 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-26 00:43:34,229 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-26 00:43:34,237 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-26 00:43:34,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:43:34,579 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-26 00:43:34,586 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-26 00:43:34,592 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#77](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-05-26 00:43:34,598 [ scc.config] DEBUG Found github.token
2024-05-26 00:43:34,598 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-05-26 00:43:34,599 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-26 00:43:34,638 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:43:34,638 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:34,644 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-26 00:43:34,682 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-26 00:43:34,690 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f216463df10> has no local changes
2024-05-26 00:43:34,690 [ 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#77 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/)'
2024-05-26 00:43:34,700 [ scc.git] DEBUG [detached HEAD 09febb5] merge master -Dorg -Ssuccess-only
2024-05-26 00:43:34,700 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:43:34,701 [ scc.repo] DEBUG ## PRs found:
2024-05-26 00:43:35,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-05-26 00:43:35,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-05-26 00:43:35,612 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-26 00:43:36,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-26 00:43:36,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-26 00:43:37,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-26 00:43:37,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-26 00:43:38,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-05-26 00:43:38,111 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-26 00:43:38,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-05-26 00:43:38,581 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-26 00:43:39,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-26 00:43:39,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-26 00:43:40,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-26 00:43:40,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-26 00:43:41,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-05-26 00:43:41,028 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-26 00:43:41,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-05-26 00:43:41,484 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-26 00:43:42,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-26 00:43:42,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-26 00:43:43,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-26 00:43:43,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-26 00:43:43,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-05-26 00:43:43,986 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-26 00:43:44,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-05-26 00:43:44,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-05-26 00:43:45,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-05-26 00:43:45,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-05-26 00:43:46,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-05-26 00:43:46,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-05-26 00:43:46,870 [ scc.repo] DEBUG ## Branches found:
2024-05-26 00:43:46,870 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-26 00:43:46,871 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:43:46,871 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:46,877 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-26 00:43:46,882 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-26 00:43:46,883 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-26 00:43:46,888 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-26 00:43:46,896 [ scc.git] DEBUG Already up to date.
2024-05-26 00:43:46,896 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-05-26 00:43:47,297 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-26 00:43:47,297 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-05-26 00:43:47,302 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-05-26 00:43:47,682 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-26 00:43:47,682 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-05-26 00:43:47,688 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-05-26 00:43:48,057 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-26 00:43:48,058 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-05-26 00:43:48,062 [ scc.git] DEBUG ## Unique users: []
2024-05-26 00:43:48,062 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:43:48,062 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:48,069 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-05-26 00:43:48,074 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:48,078 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-05-26 00:43:48,087 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-26 00:43:48,090 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-05-26 00:43:48,090 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-05-26 00:43:48,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:43:48,247 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-05-26 00:43:48,253 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:48,258 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 129 (Bump @babel/traverse from 7.21.4 to 7.23.2) 733f52703019d4b6d7e375c121a25c107b64dbec'
2024-05-26 00:43:48,329 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-26 00:43:48,329 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-26 00:43:48,333 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-05-26 00:43:48,333 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-05-26 00:43:48,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:43:48,659 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-05-26 00:43:48,666 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:48,673 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (Bump axios from 1.3.5 to 1.6.0) a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-05-26 00:43:48,686 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-26 00:43:48,687 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-26 00:43:48,690 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-05-26 00:43:48,690 [ scc.git] DEBUG package.json | 2 +-
2024-05-26 00:43:48,690 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-05-26 00:43:49,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:43:49,070 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-26 00:43:49,108 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:43:49,108 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:49,113 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-26 00:43:49,153 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-26 00:43:49,160 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f21645b4640> has no local changes
2024-05-26 00:43:49,160 [ 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#77 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/)'
2024-05-26 00:43:49,171 [ scc.git] DEBUG [detached HEAD d2e1d36] merge master -Dorg -Ssuccess-only
2024-05-26 00:43:49,171 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:43:49,171 [ scc.repo] DEBUG ## PRs found:
2024-05-26 00:43:49,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-05-26 00:43:50,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-05-26 00:43:50,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-26 00:43:50,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-26 00:43:51,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-26 00:43:51,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-05-26 00:43:51,897 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-05-26 00:43:51,898 [ scc.repo] DEBUG ## Branches found:
2024-05-26 00:43:51,898 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-26 00:43:51,898 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:43:51,898 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:51,905 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-26 00:43:51,912 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-26 00:43:51,912 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-26 00:43:51,920 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-26 00:43:51,927 [ scc.git] DEBUG Already up to date.
2024-05-26 00:43:51,927 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-26 00:43:52,309 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-05-26 00:43:52,309 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-26 00:43:52,317 [ scc.git] DEBUG ## Unique users: []
2024-05-26 00:43:52,317 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:43:52,317 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:52,326 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-26 00:43:52,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:52,345 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-26 00:43:52,357 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-26 00:43:52,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:43:52,522 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-26 00:43:52,574 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:43:52,574 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:52,583 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-26 00:43:52,630 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-26 00:43:52,638 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2164653df0> has no local changes
2024-05-26 00:43:52,638 [ 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#77 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/)'
2024-05-26 00:43:52,649 [ scc.git] DEBUG [detached HEAD 163d254] merge master -Dorg -Ssuccess-only
2024-05-26 00:43:52,650 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:43:52,650 [ scc.repo] DEBUG ## PRs found:
2024-05-26 00:43:53,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-05-26 00:43:53,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-05-26 00:43:53,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-05-26 00:43:54,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-05-26 00:43:54,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-26 00:43:55,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-26 00:43:55,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-26 00:43:56,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-05-26 00:43:56,384 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-26 00:43:56,385 [ scc.repo] DEBUG ## Branches found:
2024-05-26 00:43:56,385 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-26 00:43:56,385 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:43:56,385 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:56,391 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-26 00:43:56,396 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-26 00:43:56,397 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-26 00:43:56,402 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-26 00:43:56,407 [ scc.git] DEBUG Already up to date.
2024-05-26 00:43:56,408 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-05-26 00:43:56,840 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-05-26 00:43:56,840 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-05-26 00:43:56,845 [ scc.git] DEBUG ## Unique users: []
2024-05-26 00:43:56,845 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:43:56,845 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:56,851 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-05-26 00:43:56,858 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:56,863 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-05-26 00:43:56,873 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-05-26 00:43:56,874 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-26 00:43:56,877 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-05-26 00:43:56,877 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-05-26 00:43:57,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:43:57,035 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-26 00:43:57,078 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:43:57,078 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:43:57,084 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-26 00:43:57,124 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-26 00:43:57,131 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f216456c520> has no local changes
2024-05-26 00:43:57,131 [ 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#77 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/)'
2024-05-26 00:43:57,140 [ scc.git] DEBUG [detached HEAD 96678f9] merge master -Dorg -Ssuccess-only
2024-05-26 00:43:57,141 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:43:57,141 [ scc.repo] DEBUG ## PRs found:
2024-05-26 00:43:57,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-05-26 00:43:58,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-05-26 00:43:58,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-05-26 00:43:58,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-26 00:43:59,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-26 00:43:59,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-26 00:44:00,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-05-26 00:44:00,384 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-26 00:44:00,384 [ scc.repo] DEBUG ## Branches found:
2024-05-26 00:44:00,384 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-26 00:44:00,384 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:44:00,384 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:00,390 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-26 00:44:00,394 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-26 00:44:00,395 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-26 00:44:00,399 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-26 00:44:00,404 [ scc.git] DEBUG Already up to date.
2024-05-26 00:44:00,405 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-26 00:44:00,800 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-05-26 00:44:00,800 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-26 00:44:00,806 [ scc.git] DEBUG ## Unique users: []
2024-05-26 00:44:00,806 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:44:00,806 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:00,812 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-26 00:44:00,819 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:00,824 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-26 00:44:00,834 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-05-26 00:44:00,834 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-05-26 00:44:00,834 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-05-26 00:44:00,834 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-05-26 00:44:00,834 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-05-26 00:44:00,834 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-05-26 00:44:00,834 [ scc.git] DEBUG Auto-merging setup.py
2024-05-26 00:44:00,835 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-05-26 00:44:00,835 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-26 00:44:00,835 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-26 00:44:00,841 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-26 00:44:00,848 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-05-26 00:44:01,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:44:01,021 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-26 00:44:01,028 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-26 00:44:01,035 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#77](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- setup.py
- omero_signup/urls.py
- omero_signup/signup_settings.py
--conflicts
2024-05-26 00:44:01,040 [ scc.config] DEBUG Found github.token
2024-05-26 00:44:01,040 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-05-26 00:44:01,040 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-26 00:44:01,079 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:44:01,080 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:01,086 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-26 00:44:01,127 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-26 00:44:01,135 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f216456c670> has no local changes
2024-05-26 00:44:01,136 [ 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#77 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/)'
2024-05-26 00:44:01,145 [ scc.git] DEBUG [detached HEAD 3d7f455] merge master -Dorg -Ssuccess-only
2024-05-26 00:44:01,145 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:01,145 [ scc.repo] DEBUG ## PRs found:
2024-05-26 00:44:01,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-05-26 00:44:01,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-05-26 00:44:02,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-05-26 00:44:02,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-26 00:44:03,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-26 00:44:03,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-26 00:44:04,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-05-26 00:44:04,284 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-26 00:44:04,284 [ scc.repo] DEBUG ## Branches found:
2024-05-26 00:44:04,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-26 00:44:04,284 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:44:04,284 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:04,290 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-26 00:44:04,296 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-26 00:44:04,296 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-26 00:44:04,303 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-26 00:44:04,313 [ scc.git] DEBUG Updating a0148a6..7688c54
2024-05-26 00:44:04,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls/69 HTTP/1.1" 200 None
2024-05-26 00:44:04,902 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-05-26 00:44:05,376 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-05-26 00:44:05,376 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-05-26 00:44:05,380 [ scc.git] DEBUG ## Unique users: []
2024-05-26 00:44:05,381 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:44:05,381 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:05,387 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-05-26 00:44:05,394 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:05,398 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-05-26 00:44:05,411 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-26 00:44:05,414 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-05-26 00:44:05,414 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-05-26 00:44:05,414 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-05-26 00:44:05,414 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-05-26 00:44:05,414 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-05-26 00:44:05,414 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-05-26 00:44:05,414 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-05-26 00:44:05,414 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-05-26 00:44:05,414 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-05-26 00:44:05,414 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-05-26 00:44:05,414 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-05-26 00:44:05,416 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-05-26 00:44:05,417 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-05-26 00:44:05,417 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-05-26 00:44:05,417 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-05-26 00:44:05,417 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-05-26 00:44:05,417 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-05-26 00:44:05,417 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-05-26 00:44:05,417 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-05-26 00:44:05,417 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-05-26 00:44:05,417 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-05-26 00:44:05,417 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-05-26 00:44:05,417 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-05-26 00:44:05,417 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-05-26 00:44:05,417 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-05-26 00:44:05,417 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-05-26 00:44:05,417 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-05-26 00:44:05,417 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-05-26 00:44:05,417 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-05-26 00:44:05,417 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-05-26 00:44:05,417 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-05-26 00:44:05,417 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-05-26 00:44:05,417 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-05-26 00:44:05,417 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-05-26 00:44:05,417 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-05-26 00:44:05,417 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-05-26 00:44:05,417 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-05-26 00:44:05,417 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-05-26 00:44:05,417 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-05-26 00:44:05,417 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-05-26 00:44:05,417 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-05-26 00:44:05,417 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-05-26 00:44:05,417 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-05-26 00:44:05,418 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-05-26 00:44:05,418 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-05-26 00:44:05,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:44:05,578 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-26 00:44:05,621 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:44:05,621 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:05,627 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-26 00:44:05,666 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-26 00:44:05,672 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f216456c580> has no local changes
2024-05-26 00:44:05,673 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Updating a0148a6..7688c54
Previously merged:
- PR 69 jburel 'use build'
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Generated by OMERO-plugins-push#77 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/)'
2024-05-26 00:44:05,681 [ scc.git] DEBUG [detached HEAD 204c4bb] merge master -Dorg -Ssuccess-only
2024-05-26 00:44:05,682 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:05,682 [ scc.repo] DEBUG ## PRs found:
2024-05-26 00:44:06,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-05-26 00:44:06,120 [ scc.repo] DEBUG ## Branches found:
2024-05-26 00:44:06,121 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-26 00:44:06,121 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:44:06,121 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:06,127 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-26 00:44:06,131 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-26 00:44:06,131 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-26 00:44:06,136 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-26 00:44:06,141 [ scc.git] DEBUG Already up to date.
2024-05-26 00:44:06,141 [ scc.git] DEBUG ## Unique users: []
2024-05-26 00:44:06,141 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:44:06,141 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:06,147 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-26 00:44:06,189 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:44:06,189 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:06,195 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-26 00:44:06,236 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-26 00:44:06,243 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f21645a6d60> has no local changes
2024-05-26 00:44:06,244 [ 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#77 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/)'
2024-05-26 00:44:06,253 [ scc.git] DEBUG [detached HEAD c3b2036] merge master -Dorg -Ssuccess-only
2024-05-26 00:44:06,254 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:06,254 [ scc.repo] DEBUG ## PRs found:
2024-05-26 00:44:06,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-05-26 00:44:06,542 [ scc.repo] DEBUG ## Branches found:
2024-05-26 00:44:06,542 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-26 00:44:06,542 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:44:06,542 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:06,549 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-26 00:44:06,555 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-26 00:44:06,555 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-26 00:44:06,561 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-26 00:44:06,567 [ scc.git] DEBUG Already up to date.
2024-05-26 00:44:06,568 [ scc.git] DEBUG ## Unique users: []
2024-05-26 00:44:06,568 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:44:06,568 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:06,574 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-26 00:44:06,616 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:44:06,616 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:06,622 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-26 00:44:06,660 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-26 00:44:06,667 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f216457cbb0> has no local changes
2024-05-26 00:44:06,667 [ 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#77 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/)'
2024-05-26 00:44:06,675 [ scc.git] DEBUG [detached HEAD 379dad9] merge master -Dorg -Ssuccess-only
2024-05-26 00:44:06,675 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:06,676 [ scc.git] INFO Overriding base-branch from master to main
2024-05-26 00:44:06,676 [ scc.repo] DEBUG ## PRs found:
2024-05-26 00:44:07,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-05-26 00:44:07,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-05-26 00:44:07,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-05-26 00:44:08,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-05-26 00:44:09,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-26 00:44:09,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-26 00:44:09,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-26 00:44:10,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-26 00:44:10,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-05-26 00:44:10,870 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-26 00:44:10,870 [ scc.repo] DEBUG ## Branches found:
2024-05-26 00:44:10,870 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-26 00:44:10,871 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:44:10,871 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:10,878 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-05-26 00:44:10,883 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-26 00:44:10,883 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-05-26 00:44:10,889 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-05-26 00:44:10,894 [ scc.git] DEBUG Already up to date.
2024-05-26 00:44:10,894 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-05-26 00:44:11,262 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-05-26 00:44:11,263 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-05-26 00:44:11,268 [ scc.git] DEBUG ## Unique users: []
2024-05-26 00:44:11,268 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:44:11,268 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:11,273 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-26 00:44:11,278 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:11,284 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-26 00:44:11,319 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-05-26 00:44:11,319 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-05-26 00:44:11,319 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-26 00:44:11,319 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-26 00:44:11,326 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-26 00:44:11,333 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-05-26 00:44:11,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:44:11,495 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-26 00:44:11,502 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-26 00:44:11,509 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#77](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-05-26 00:44:11,514 [ scc.config] DEBUG Found github.token
2024-05-26 00:44:11,514 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-05-26 00:44:11,514 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-26 00:44:11,554 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:44:11,555 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:11,561 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-26 00:44:11,600 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-26 00:44:11,607 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2164624b80> has no local changes
2024-05-26 00:44:11,607 [ 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#77 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/)'
2024-05-26 00:44:11,616 [ scc.git] DEBUG [detached HEAD 50df41f] merge master -Dorg -Ssuccess-only
2024-05-26 00:44:11,616 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:11,616 [ scc.repo] DEBUG ## PRs found:
2024-05-26 00:44:11,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-05-26 00:44:11,927 [ scc.repo] DEBUG ## Branches found:
2024-05-26 00:44:11,927 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-26 00:44:11,927 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:44:11,927 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:11,933 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-26 00:44:11,938 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-26 00:44:11,938 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-26 00:44:11,944 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-26 00:44:11,950 [ scc.git] DEBUG Already up to date.
2024-05-26 00:44:11,951 [ scc.git] DEBUG ## Unique users: []
2024-05-26 00:44:11,951 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:44:11,951 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:11,956 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-26 00:44:11,993 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:44:11,993 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:11,999 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-26 00:44:12,037 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-26 00:44:12,044 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2164574e50> has no local changes
2024-05-26 00:44:12,044 [ 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#77 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/)'
2024-05-26 00:44:12,052 [ scc.git] DEBUG [detached HEAD a339120] merge master -Dorg -Ssuccess-only
2024-05-26 00:44:12,052 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:12,052 [ scc.repo] DEBUG ## PRs found:
2024-05-26 00:44:12,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-05-26 00:44:12,362 [ scc.repo] DEBUG ## Branches found:
2024-05-26 00:44:12,362 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-26 00:44:12,362 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:44:12,362 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:12,369 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-26 00:44:12,374 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-26 00:44:12,375 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-26 00:44:12,380 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-26 00:44:12,386 [ scc.git] DEBUG Already up to date.
2024-05-26 00:44:12,386 [ scc.git] DEBUG ## Unique users: []
2024-05-26 00:44:12,386 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:44:12,386 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:12,392 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-26 00:44:12,430 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:44:12,431 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:12,436 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-26 00:44:12,477 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-26 00:44:12,484 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f21644e7490> has no local changes
2024-05-26 00:44:12,484 [ 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#77 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/)'
2024-05-26 00:44:12,493 [ scc.git] DEBUG [detached HEAD 2b7e02a] merge master -Dorg -Ssuccess-only
2024-05-26 00:44:12,494 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:12,494 [ scc.repo] DEBUG ## PRs found:
2024-05-26 00:44:12,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-05-26 00:44:13,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-05-26 00:44:13,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-05-26 00:44:14,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-26 00:44:14,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-26 00:44:15,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-26 00:44:15,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-05-26 00:44:15,621 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-05-26 00:44:15,621 [ scc.repo] DEBUG ## Branches found:
2024-05-26 00:44:15,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-26 00:44:15,621 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:44:15,621 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:15,627 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-26 00:44:15,632 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-26 00:44:15,632 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-26 00:44:15,637 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-26 00:44:15,642 [ scc.git] DEBUG Already up to date.
2024-05-26 00:44:15,642 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-05-26 00:44:16,058 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-05-26 00:44:16,058 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-05-26 00:44:16,062 [ scc.git] DEBUG ## Unique users: []
2024-05-26 00:44:16,062 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:44:16,063 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:16,068 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-26 00:44:16,073 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:16,078 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-26 00:44:16,088 [ scc.git] DEBUG Auto-merging Dockerfile
2024-05-26 00:44:16,088 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-05-26 00:44:16,088 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-26 00:44:16,089 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-26 00:44:16,094 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-26 00:44:16,101 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-05-26 00:44:16,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:44:16,258 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-26 00:44:16,264 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-26 00:44:16,270 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#77](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-05-26 00:44:16,275 [ scc.config] DEBUG Found github.token
2024-05-26 00:44:16,275 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-05-26 00:44:16,275 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-26 00:44:16,317 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:44:16,317 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:16,322 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-26 00:44:16,359 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-26 00:44:16,367 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f216452cbe0> has no local changes
2024-05-26 00:44:16,368 [ 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#77 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/)'
2024-05-26 00:44:16,377 [ scc.git] DEBUG [detached HEAD 4b992ec] merge master -Dorg -Ssuccess-only
2024-05-26 00:44:16,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:16,378 [ scc.git] INFO Overriding base-branch from master to develop
2024-05-26 00:44:16,378 [ scc.repo] DEBUG ## PRs found:
2024-05-26 00:44:16,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-05-26 00:44:17,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-05-26 00:44:17,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-05-26 00:44:18,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-05-26 00:44:18,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-05-26 00:44:19,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-05-26 00:44:19,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-05-26 00:44:20,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-26 00:44:20,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-26 00:44:21,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-26 00:44:21,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-05-26 00:44:21,507 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-26 00:44:21,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-05-26 00:44:22,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-05-26 00:44:22,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-05-26 00:44:23,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-05-26 00:44:23,453 [ scc.repo] DEBUG ## Branches found:
2024-05-26 00:44:23,454 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-26 00:44:23,454 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:44:23,454 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:23,461 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-05-26 00:44:23,466 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-26 00:44:23,466 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-05-26 00:44:23,472 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-05-26 00:44:23,478 [ scc.git] DEBUG Already up to date.
2024-05-26 00:44:23,478 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-05-26 00:44:23,873 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-05-26 00:44:23,873 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-05-26 00:44:23,877 [ scc.git] DEBUG ## Unique users: []
2024-05-26 00:44:23,878 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:44:23,878 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:23,883 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-26 00:44:23,890 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:23,895 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-26 00:44:23,947 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-05-26 00:44:23,947 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-05-26 00:44:23,947 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-26 00:44:23,948 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-26 00:44:23,955 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-26 00:44:23,962 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-26 00:44:24,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:44:24,120 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-26 00:44:24,128 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-26 00:44:24,133 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#77](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-05-26 00:44:24,138 [ scc.config] DEBUG Found github.token
2024-05-26 00:44:24,138 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-05-26 00:44:24,138 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-26 00:44:24,177 [ scc.git] DEBUG Get sha1 of %s
2024-05-26 00:44:24,178 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-26 00:44:24,184 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-26 00:44:24,225 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-26 00:44:24,233 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f216455bd30> has no local changes
2024-05-26 00:44:24,233 [ 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#77 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/)'
2024-05-26 00:44:24,242 [ scc.git] DEBUG [detached HEAD b00c909] merge master -Dorg -Ssuccess-only
2024-05-26 00:44:24,242 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:24,242 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-26 00:44:24,319 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-05-26 00:44:24,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:44:24,546 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-05-26 00:44:24,551 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-05-26 00:44:24,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:44:24,973 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-05-26 00:44:24,979 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-05-26 00:44:25,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:44:25,385 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-05-26 00:44:25,391 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-05-26 00:44:25,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:44:25,802 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-05-26 00:44:26,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:44:26,190 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-05-26 00:44:26,195 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-05-26 00:44:26,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:44:26,609 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-05-26 00:44:26,617 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-05-26 00:44:27,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:44:27,028 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-05-26 00:44:27,034 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-05-26 00:44:27,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:44:27,443 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-05-26 00:44:27,450 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-05-26 00:44:27,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:44:27,849 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-05-26 00:44:27,855 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-05-26 00:44:28,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:44:28,279 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-05-26 00:44:28,286 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-05-26 00:44:28,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:44:28,718 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-05-26 00:44:28,723 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-05-26 00:44:29,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:44:29,122 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-05-26 00:44:29,127 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-05-26 00:44:29,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:44:29,566 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-05-26 00:44:29,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:44:29,976 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-05-26 00:44:30,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:44:30,384 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-05-26 00:44:30,392 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-05-26 00:44:30,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:44:30,803 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-05-26 00:44:31,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:44:31,208 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-05-26 00:44:31,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:44:31,656 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-05-26 00:44:31,664 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-05-26 00:44:32,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:44:32,068 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-05-26 00:44:32,076 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-05-26 00:44:32,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:44:32,478 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-05-26 00:44:32,490 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-05-26 00:44:32,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:44:32,889 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-05-26 00:44:32,896 [ scc.config] DEBUG Found submodule.scripts.url
2024-05-26 00:44:33,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-26 00:44:33,304 [ scc.config] DEBUG Found submodule.scripts.branch
2024-05-26 00:44:33,304 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-26 00:44:33,398 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2164f842e0> has local changes
2024-05-26 00:44:33,398 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
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
Updating a0148a6..7688c54
Previously merged:
- PR 69 jburel 'use build'
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#77 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/77/)'
2024-05-26 00:44:33,414 [ scc.git] DEBUG [detached HEAD 82aee45] merge master -Dorg -Ssuccess-only
2024-05-26 00:44:33,415 [ scc.merge] INFO Repository: ome/omero-plugins
2024-05-26 00:44:33,415 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-05-26 00:44:33,415 [ scc.merge] INFO Already up to date.
2024-05-26 00:44:33,415 [ scc.merge] INFO
2024-05-26 00:44:33,415 [ scc.merge] INFO
2024-05-26 00:44:33,415 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-05-26 00:44:33,415 [ scc.merge] INFO Already up to date.
2024-05-26 00:44:33,415 [ scc.merge] INFO
2024-05-26 00:44:33,415 [ scc.merge] INFO
2024-05-26 00:44:33,415 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-05-26 00:44:33,415 [ scc.merge] INFO Excluded PRs:
2024-05-26 00:44:33,415 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-05-26 00:44:33,415 [ scc.merge] INFO Already up to date.
2024-05-26 00:44:33,415 [ scc.merge] INFO
2024-05-26 00:44:33,415 [ scc.merge] INFO Merged PRs:
2024-05-26 00:44:33,415 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-05-26 00:44:33,415 [ scc.merge] INFO
2024-05-26 00:44:33,415 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-05-26 00:44:33,415 [ scc.merge] INFO Excluded PRs:
2024-05-26 00:44:33,415 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-05-26 00:44:33,415 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-05-26 00:44:33,415 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-05-26 00:44:33,416 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-05-26 00:44:33,416 [ scc.merge] INFO Already up to date.
2024-05-26 00:44:33,416 [ scc.merge] INFO
2024-05-26 00:44:33,416 [ scc.merge] INFO Merged PRs:
2024-05-26 00:44:33,416 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-05-26 00:44:33,416 [ scc.merge] INFO
2024-05-26 00:44:33,416 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-05-26 00:44:33,416 [ scc.merge] INFO Excluded PRs:
2024-05-26 00:44:33,416 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-26 00:44:33,416 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-05-26 00:44:33,416 [ scc.merge] INFO Already up to date.
2024-05-26 00:44:33,416 [ scc.merge] INFO
2024-05-26 00:44:33,416 [ scc.merge] INFO Merged PRs:
2024-05-26 00:44:33,416 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-05-26 00:44:33,416 [ scc.merge] INFO
2024-05-26 00:44:33,416 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-26 00:44:33,416 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-05-26 00:44:33,416 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-05-26 00:44:33,416 [ scc.merge] INFO
2024-05-26 00:44:33,416 [ scc.merge] INFO Repository: ome/omero-figure
2024-05-26 00:44:33,416 [ scc.merge] INFO Excluded PRs:
2024-05-26 00:44:33,416 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-05-26 00:44:33,416 [ scc.merge] INFO Already up to date.
2024-05-26 00:44:33,416 [ scc.merge] INFO
2024-05-26 00:44:33,416 [ scc.merge] INFO Merged PRs:
2024-05-26 00:44:33,416 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-05-26 00:44:33,416 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-05-26 00:44:33,416 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-05-26 00:44:33,416 [ scc.merge] INFO - PR 562 will-moore 'Add changelog 7.0.0'
2024-05-26 00:44:33,416 [ scc.merge] INFO
2024-05-26 00:44:33,416 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-05-26 00:44:33,416 [ scc.merge] INFO Already up to date.
2024-05-26 00:44:33,416 [ scc.merge] INFO
2024-05-26 00:44:33,416 [ scc.merge] INFO Merged PRs:
2024-05-26 00:44:33,416 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-05-26 00:44:33,416 [ scc.merge] INFO
2024-05-26 00:44:33,416 [ scc.merge] INFO Repository: ome/omero-gallery
2024-05-26 00:44:33,416 [ scc.merge] INFO Already up to date.
2024-05-26 00:44:33,416 [ scc.merge] INFO
2024-05-26 00:44:33,416 [ scc.merge] INFO Merged PRs:
2024-05-26 00:44:33,417 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-26 00:44:33,417 [ scc.merge] INFO
2024-05-26 00:44:33,417 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-05-26 00:44:33,417 [ scc.merge] INFO Excluded PRs:
2024-05-26 00:44:33,417 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-05-26 00:44:33,417 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-05-26 00:44:33,417 [ scc.merge] INFO Already up to date.
2024-05-26 00:44:33,417 [ scc.merge] INFO
2024-05-26 00:44:33,417 [ scc.merge] INFO Merged PRs:
2024-05-26 00:44:33,417 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-05-26 00:44:33,417 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-05-26 00:44:33,417 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-26 00:44:33,417 [ scc.merge] INFO
2024-05-26 00:44:33,417 [ scc.merge] INFO Repository: ome/omero-mapr
2024-05-26 00:44:33,417 [ scc.merge] INFO Excluded PRs:
2024-05-26 00:44:33,417 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-05-26 00:44:33,417 [ scc.merge] INFO Already up to date.
2024-05-26 00:44:33,417 [ scc.merge] INFO
2024-05-26 00:44:33,417 [ scc.merge] INFO Merged PRs:
2024-05-26 00:44:33,417 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-05-26 00:44:33,417 [ scc.merge] INFO
2024-05-26 00:44:33,417 [ scc.merge] INFO Repository: ome/omero-metadata
2024-05-26 00:44:33,417 [ scc.merge] INFO Already up to date.
2024-05-26 00:44:33,417 [ scc.merge] INFO
2024-05-26 00:44:33,417 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-26 00:44:33,417 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-26 00:44:33,417 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-26 00:44:33,417 [ scc.merge] INFO
2024-05-26 00:44:33,417 [ scc.merge] INFO Repository: ome/omero-parade
2024-05-26 00:44:33,417 [ scc.merge] INFO Excluded PRs:
2024-05-26 00:44:33,417 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-05-26 00:44:33,417 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-05-26 00:44:33,417 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-05-26 00:44:33,417 [ scc.merge] INFO Already up to date.
2024-05-26 00:44:33,417 [ scc.merge] INFO
2024-05-26 00:44:33,417 [ scc.merge] INFO Merged PRs:
2024-05-26 00:44:33,417 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-26 00:44:33,417 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-26 00:44:33,417 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-26 00:44:33,417 [ scc.merge] INFO
2024-05-26 00:44:33,418 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-05-26 00:44:33,418 [ scc.merge] INFO Already up to date.
2024-05-26 00:44:33,418 [ scc.merge] INFO
2024-05-26 00:44:33,418 [ scc.merge] INFO Merged PRs:
2024-05-26 00:44:33,418 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-05-26 00:44:33,418 [ scc.merge] INFO
2024-05-26 00:44:33,418 [ scc.merge] INFO Repository: ome/omero-rois
2024-05-26 00:44:33,418 [ scc.merge] INFO Excluded PRs:
2024-05-26 00:44:33,418 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-26 00:44:33,418 [ scc.merge] INFO Already up to date.
2024-05-26 00:44:33,418 [ scc.merge] INFO
2024-05-26 00:44:33,418 [ scc.merge] INFO Merged PRs:
2024-05-26 00:44:33,418 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-26 00:44:33,418 [ scc.merge] INFO
2024-05-26 00:44:33,418 [ scc.merge] INFO Repository: ome/omero-signup
2024-05-26 00:44:33,418 [ scc.merge] INFO Already up to date.
2024-05-26 00:44:33,418 [ scc.merge] INFO
2024-05-26 00:44:33,418 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-26 00:44:33,418 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-26 00:44:33,418 [ scc.merge] INFO
2024-05-26 00:44:33,418 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-05-26 00:44:33,418 [ scc.merge] INFO Updating a0148a6..7688c54
2024-05-26 00:44:33,418 [ scc.merge] INFO Previously merged:
2024-05-26 00:44:33,418 [ scc.merge] INFO - PR 69 jburel 'use build'
2024-05-26 00:44:33,418 [ scc.merge] INFO
2024-05-26 00:44:33,418 [ scc.merge] INFO Merged PRs:
2024-05-26 00:44:33,418 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-26 00:44:33,418 [ scc.merge] INFO
2024-05-26 00:44:33,418 [ scc.merge] INFO Repository: ome/omero-upload
2024-05-26 00:44:33,418 [ scc.merge] INFO Already up to date.
2024-05-26 00:44:33,418 [ scc.merge] INFO
2024-05-26 00:44:33,418 [ scc.merge] INFO
2024-05-26 00:44:33,418 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-05-26 00:44:33,418 [ scc.merge] INFO Already up to date.
2024-05-26 00:44:33,418 [ scc.merge] INFO
2024-05-26 00:44:33,418 [ scc.merge] INFO
2024-05-26 00:44:33,418 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-05-26 00:44:33,418 [ scc.merge] INFO Excluded PRs:
2024-05-26 00:44:33,418 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-05-26 00:44:33,419 [ scc.merge] INFO Already up to date.
2024-05-26 00:44:33,419 [ scc.merge] INFO
2024-05-26 00:44:33,419 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-26 00:44:33,419 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-26 00:44:33,419 [ scc.merge] INFO
2024-05-26 00:44:33,419 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-05-26 00:44:33,419 [ scc.merge] INFO Already up to date.
2024-05-26 00:44:33,419 [ scc.merge] INFO
2024-05-26 00:44:33,419 [ scc.merge] INFO
2024-05-26 00:44:33,419 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-05-26 00:44:33,419 [ scc.merge] INFO Already up to date.
2024-05-26 00:44:33,419 [ scc.merge] INFO
2024-05-26 00:44:33,419 [ scc.merge] INFO
2024-05-26 00:44:33,419 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-05-26 00:44:33,419 [ scc.merge] INFO Already up to date.
2024-05-26 00:44:33,419 [ scc.merge] INFO
2024-05-26 00:44:33,419 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-26 00:44:33,419 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-05-26 00:44:33,419 [ scc.merge] INFO
2024-05-26 00:44:33,419 [ scc.merge] INFO Repository: ome/scripts
2024-05-26 00:44:33,419 [ scc.merge] INFO Excluded PRs:
2024-05-26 00:44:33,419 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-05-26 00:44:33,419 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-05-26 00:44:33,419 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-05-26 00:44:33,419 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-05-26 00:44:33,419 [ scc.merge] INFO Already up to date.
2024-05-26 00:44:33,419 [ scc.merge] INFO
2024-05-26 00:44:33,419 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-26 00:44:33,419 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-26 00:44:33,419 [ scc.merge] INFO
2024-05-26 00:44:33,419 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-26 00:44:33,419 [ scc.git] DEBUG Calling 'git remote'
2024-05-26 00:44:33,426 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-05-26 00:44:33,426 [ scc.git] DEBUG Calling 'git remote'
2024-05-26 00:44:33,433 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:33,433 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-05-26 00:44:33,433 [ scc.git] DEBUG Calling 'git remote'
2024-05-26 00:44:33,442 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:33,442 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-05-26 00:44:33,442 [ scc.git] DEBUG Calling 'git remote'
2024-05-26 00:44:33,452 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:33,453 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-05-26 00:44:33,453 [ scc.git] DEBUG Calling 'git remote'
2024-05-26 00:44:33,463 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:33,464 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-26 00:44:33,464 [ scc.git] DEBUG Calling 'git remote'
2024-05-26 00:44:33,472 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:33,472 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-26 00:44:33,472 [ scc.git] DEBUG Calling 'git remote'
2024-05-26 00:44:33,482 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:33,482 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-26 00:44:33,482 [ scc.git] DEBUG Calling 'git remote'
2024-05-26 00:44:33,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:33,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-26 00:44:33,491 [ scc.git] DEBUG Calling 'git remote'
2024-05-26 00:44:33,498 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:33,498 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-26 00:44:33,498 [ scc.git] DEBUG Calling 'git remote'
2024-05-26 00:44:33,506 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:33,506 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-26 00:44:33,506 [ scc.git] DEBUG Calling 'git remote'
2024-05-26 00:44:33,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:33,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-26 00:44:33,514 [ scc.git] DEBUG Calling 'git remote'
2024-05-26 00:44:33,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:33,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-26 00:44:33,523 [ scc.git] DEBUG Calling 'git remote'
2024-05-26 00:44:33,531 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:33,531 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-26 00:44:33,531 [ scc.git] DEBUG Calling 'git remote'
2024-05-26 00:44:33,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:33,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-26 00:44:33,542 [ scc.git] DEBUG Calling 'git remote'
2024-05-26 00:44:33,550 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:33,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-26 00:44:33,551 [ scc.git] DEBUG Calling 'git remote'
2024-05-26 00:44:33,559 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:33,559 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-26 00:44:33,559 [ scc.git] DEBUG Calling 'git remote'
2024-05-26 00:44:33,565 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:33,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-26 00:44:33,566 [ scc.git] DEBUG Calling 'git remote'
2024-05-26 00:44:33,572 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:33,572 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-26 00:44:33,572 [ scc.git] DEBUG Calling 'git remote'
2024-05-26 00:44:33,579 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:33,579 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-26 00:44:33,579 [ scc.git] DEBUG Calling 'git remote'
2024-05-26 00:44:33,585 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:33,586 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-26 00:44:33,586 [ scc.git] DEBUG Calling 'git remote'
2024-05-26 00:44:33,592 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:33,592 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-26 00:44:33,592 [ scc.git] DEBUG Calling 'git remote'
2024-05-26 00:44:33,598 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-26 00:44:33,599 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-26 00:44:33,599 [ scc.git] DEBUG Calling 'git remote'
2024-05-26 00:44:33,605 [ 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 470ec7b] 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 a0148a6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 5a90893
nothing to commit, working tree clean
[detached HEAD 3148f6f] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-05-26 00:45:19,064 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-05-26 00:45:28,074 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-05-26 00:45:30,428 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-05-26 00:45:35,036 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-05-26 00:46:21,863 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/f6f303f9/images/svgs/logo.svg){kind=logo}
