Skipping 103 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-06-16 00:44:57,326 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-16 00:44:57,326 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-16 00:44:57,332 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-16 00:44:57,339 [ scc.git] DEBUG Already up to date.
2024-06-16 00:44:57,340 [ scc.git] DEBUG Calling 'git fetch origin pull/102/head'
2024-06-16 00:44:57,751 [ scc.git] DEBUG From https://github.com/ome/omero-cli-zarr
2024-06-16 00:44:57,752 [ scc.git] DEBUG * branch refs/pull/102/head -> FETCH_HEAD
2024-06-16 00:44:57,757 [ scc.git] DEBUG Calling 'git fetch origin pull/123/head'
2024-06-16 00:44:58,119 [ scc.git] DEBUG From https://github.com/ome/omero-cli-zarr
2024-06-16 00:44:58,120 [ scc.git] DEBUG * branch refs/pull/123/head -> FETCH_HEAD
2024-06-16 00:44:58,125 [ scc.git] DEBUG Calling 'git fetch origin pull/147/head'
2024-06-16 00:44:58,570 [ scc.git] DEBUG From https://github.com/ome/omero-cli-zarr
2024-06-16 00:44:58,570 [ scc.git] DEBUG * branch refs/pull/147/head -> FETCH_HEAD
2024-06-16 00:44:58,575 [ scc.git] DEBUG ## Unique users: []
2024-06-16 00:44:58,575 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:44:58,575 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:44:58,583 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f22d4074b7c458ad24320cf5a6f8adb9e686aa44'
2024-06-16 00:44:58,593 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:44:58,599 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 102 (Zarr export tests) f22d4074b7c458ad24320cf5a6f8adb9e686aa44'
2024-06-16 00:44:58,694 [ scc.git] DEBUG Auto-merging src/omero_zarr/cli.py
2024-06-16 00:44:58,694 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-06-16 00:44:58,694 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_zarr/raw_pixels.py
2024-06-16 00:44:58,694 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-16 00:44:58,694 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-16 00:44:58,703 [ scc.git] DEBUG Calling 'git reset --hard 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-16 00:44:58,710 [ scc.git] DEBUG HEAD is now at 2ca566b Merge pull request #160 from ome/pre-commit-ci-update-config
2024-06-16 00:44:58,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:44:58,875 [ scc.git] DEBUG Calling 'git merge-base 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473 f22d4074b7c458ad24320cf5a6f8adb9e686aa44'
2024-06-16 00:44:58,883 [ scc.git] DEBUG Calling 'git diff --name-only 782a1cd0077bcc2871f21e9f0acdc25ae7745243..2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-16 00:44:58,890 [ scc.git] INFO - PR 102 will-moore 'Zarr export tests'
Conflicting PR. Removed from build [OMERO-plugins-push#97](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_zarr/raw_pixels.py
--conflicts
2024-06-16 00:44:58,896 [ scc.config] DEBUG Found github.token
2024-06-16 00:44:58,896 [ scc.git] DEBUG Not adding comment to issue #102, already --conflicts.
2024-06-16 00:44:58,896 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-06-16 00:44:58,902 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:44:58,907 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 123 (Support export of Fileset:ID) 553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-06-16 00:44:58,945 [ scc.git] DEBUG Auto-merging .isort.cfg
2024-06-16 00:44:58,945 [ scc.git] DEBUG CONFLICT (content): Merge conflict in .isort.cfg
2024-06-16 00:44:58,945 [ scc.git] DEBUG Auto-merging setup.py
2024-06-16 00:44:58,945 [ scc.git] DEBUG Auto-merging src/omero_zarr/cli.py
2024-06-16 00:44:58,945 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-06-16 00:44:58,945 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_zarr/raw_pixels.py
2024-06-16 00:44:58,945 [ scc.git] DEBUG Auto-merging src/omero_zarr/util.py
2024-06-16 00:44:58,945 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-16 00:44:58,945 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-16 00:44:58,951 [ scc.git] DEBUG Calling 'git reset --hard 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-16 00:44:58,958 [ scc.git] DEBUG HEAD is now at 2ca566b Merge pull request #160 from ome/pre-commit-ci-update-config
2024-06-16 00:44:59,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:44:59,297 [ scc.git] DEBUG Calling 'git merge-base 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473 553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-06-16 00:44:59,304 [ scc.git] DEBUG Calling 'git diff --name-only eff38d0408f9d50de13b28dfe09e4382965e203f..2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-16 00:44:59,311 [ scc.git] INFO - PR 123 will-moore 'Support export of Fileset:ID'
Conflicting PR. Removed from build [OMERO-plugins-push#97](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/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-06-16 00:44:59,316 [ scc.config] DEBUG Found github.token
2024-06-16 00:44:59,316 [ scc.git] DEBUG Not adding comment to issue #123, already --conflicts.
2024-06-16 00:44:59,317 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a14f62a940f4974a305b3f5858049ee493b898ef'
2024-06-16 00:44:59,322 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:44:59,326 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 147 (Name option) a14f62a940f4974a305b3f5858049ee493b898ef'
2024-06-16 00:44:59,338 [ scc.git] DEBUG Auto-merging src/omero_zarr/masks.py
2024-06-16 00:44:59,338 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-06-16 00:44:59,338 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-16 00:44:59,341 [ scc.git] DEBUG README.rst | 30 ++++++++++++++++++------------
2024-06-16 00:44:59,341 [ scc.git] DEBUG src/omero_zarr/cli.py | 9 +++++++++
2024-06-16 00:44:59,341 [ scc.git] DEBUG src/omero_zarr/masks.py | 4 ++--
2024-06-16 00:44:59,341 [ scc.git] DEBUG src/omero_zarr/raw_pixels.py | 28 +++++++++++++++++++++++-----
2024-06-16 00:44:59,341 [ scc.git] DEBUG src/omero_zarr/util.py | 2 +-
2024-06-16 00:44:59,342 [ scc.git] DEBUG 5 files changed, 53 insertions(+), 20 deletions(-)
2024-06-16 00:44:59,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:44:59,707 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-16 00:44:59,748 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:44:59,749 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:44:59,755 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-16 00:44:59,796 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-16 00:44:59,803 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcb287d2970> has no local changes
2024-06-16 00:44:59,803 [ 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#97 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/)'
2024-06-16 00:44:59,811 [ scc.git] DEBUG [detached HEAD 9fa200d] merge master -Dorg -Ssuccess-only
2024-06-16 00:44:59,812 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:44:59,812 [ scc.repo] DEBUG ## PRs found:
2024-06-16 00:45:00,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-06-16 00:45:00,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-06-16 00:45:01,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-06-16 00:45:01,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-16 00:45:02,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-16 00:45:02,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-16 00:45:03,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-16 00:45:03,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/3179811fd0a1d65e2dc5f56013cf92e086da24ab?per_page=1 HTTP/1.1" 200 2
2024-06-16 00:45:03,564 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-06-16 00:45:04,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-06-16 00:45:04,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-16 00:45:05,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-16 00:45:05,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-16 00:45:06,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-16 00:45:06,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24?per_page=1 HTTP/1.1" 200 2
2024-06-16 00:45:06,575 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-06-16 00:45:06,576 [ scc.repo] DEBUG ## Branches found:
2024-06-16 00:45:06,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-16 00:45:06,576 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:45:06,576 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:06,584 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-16 00:45:06,592 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-16 00:45:06,592 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-16 00:45:06,600 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-16 00:45:06,608 [ scc.git] DEBUG Already up to date.
2024-06-16 00:45:06,608 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-06-16 00:45:06,995 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-16 00:45:06,995 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-06-16 00:45:07,001 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-06-16 00:45:07,342 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-16 00:45:07,342 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-06-16 00:45:07,348 [ scc.git] DEBUG ## Unique users: []
2024-06-16 00:45:07,348 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:45:07,348 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:07,355 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-16 00:45:07,363 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:07,368 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-16 00:45:07,565 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-16 00:45:07,573 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-06-16 00:45:07,573 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-06-16 00:45:07,573 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-06-16 00:45:07,573 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-06-16 00:45:07,573 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-06-16 00:45:07,573 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-06-16 00:45:07,573 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-06-16 00:45:07,573 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-06-16 00:45:07,573 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-06-16 00:45:07,573 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-06-16 00:45:07,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:45:07,737 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-16 00:45:07,746 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:07,753 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-16 00:45:07,879 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-06-16 00:45:07,879 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-06-16 00:45:07,879 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-06-16 00:45:07,880 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-16 00:45:07,886 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-06-16 00:45:07,886 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-06-16 00:45:07,886 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-06-16 00:45:07,886 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-06-16 00:45:07,886 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-06-16 00:45:07,886 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-06-16 00:45:07,887 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-06-16 00:45:07,887 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-06-16 00:45:07,887 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-06-16 00:45:07,887 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-06-16 00:45:07,887 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-06-16 00:45:07,887 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-06-16 00:45:08,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:45:08,152 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-16 00:45:08,195 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:45:08,195 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:08,201 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-16 00:45:08,243 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-16 00:45:08,253 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcb2878dbb0> has no local changes
2024-06-16 00:45:08,253 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 560 will-moore 'Max projection bytes' (exclude comment)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
Generated by OMERO-plugins-push#97 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/)'
2024-06-16 00:45:08,263 [ scc.git] DEBUG [detached HEAD 67cc66ac] merge master -Dorg -Ssuccess-only
2024-06-16 00:45:08,264 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:45:08,264 [ scc.repo] DEBUG ## PRs found:
2024-06-16 00:45:08,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-06-16 00:45:09,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-06-16 00:45:09,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-06-16 00:45:10,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-16 00:45:10,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-16 00:45:11,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-16 00:45:11,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-06-16 00:45:11,509 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-06-16 00:45:11,510 [ scc.repo] DEBUG ## Branches found:
2024-06-16 00:45:11,510 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-16 00:45:11,510 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:45:11,510 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:11,526 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-16 00:45:11,535 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-16 00:45:11,535 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-16 00:45:11,542 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-16 00:45:11,549 [ scc.git] DEBUG Already up to date.
2024-06-16 00:45:11,549 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-06-16 00:45:11,920 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-06-16 00:45:11,921 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-06-16 00:45:11,925 [ scc.git] DEBUG ## Unique users: []
2024-06-16 00:45:11,925 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:45:11,925 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:11,931 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-16 00:45:11,937 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:11,943 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-16 00:45:11,952 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-06-16 00:45:11,953 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-16 00:45:11,955 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-06-16 00:45:11,955 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-06-16 00:45:12,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:45:12,119 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-16 00:45:12,162 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:45:12,163 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:12,170 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-16 00:45:12,213 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-16 00:45:12,221 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcb287f8df0> has no local changes
2024-06-16 00:45:12,221 [ 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#97 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/)'
2024-06-16 00:45:12,230 [ scc.git] DEBUG [detached HEAD f8fdc6d] merge master -Dorg -Ssuccess-only
2024-06-16 00:45:12,231 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:45:12,231 [ scc.repo] DEBUG ## PRs found:
2024-06-16 00:45:12,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-06-16 00:45:13,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-06-16 00:45:13,085 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-16 00:45:13,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-16 00:45:14,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-16 00:45:14,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-16 00:45:15,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-16 00:45:15,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-06-16 00:45:15,499 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-16 00:45:15,499 [ scc.repo] DEBUG ## Branches found:
2024-06-16 00:45:15,500 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-16 00:45:15,500 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:45:15,500 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:15,511 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-16 00:45:15,522 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-16 00:45:15,522 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-16 00:45:15,534 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-16 00:45:15,546 [ scc.git] DEBUG Already up to date.
2024-06-16 00:45:15,547 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-06-16 00:45:15,915 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-06-16 00:45:15,915 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-06-16 00:45:15,922 [ scc.git] DEBUG ## Unique users: []
2024-06-16 00:45:15,923 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:45:15,923 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:15,931 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-06-16 00:45:15,938 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:15,944 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-06-16 00:45:15,956 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-16 00:45:15,961 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-06-16 00:45:15,961 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-06-16 00:45:16,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:45:16,122 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-16 00:45:16,166 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:45:16,166 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:16,173 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-16 00:45:16,218 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-16 00:45:16,227 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcb287f8340> has no local changes
2024-06-16 00:45:16,228 [ 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#97 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/)'
2024-06-16 00:45:16,238 [ scc.git] DEBUG [detached HEAD 2768a3f] merge master -Dorg -Ssuccess-only
2024-06-16 00:45:16,239 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:45:16,239 [ scc.repo] DEBUG ## PRs found:
2024-06-16 00:45:16,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-06-16 00:45:17,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-06-16 00:45:17,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-06-16 00:45:18,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-16 00:45:18,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-16 00:45:19,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-16 00:45:19,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-16 00:45:20,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-06-16 00:45:20,041 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-16 00:45:20,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-06-16 00:45:20,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-06-16 00:45:21,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-16 00:45:22,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-16 00:45:22,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-16 00:45:22,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-16 00:45:23,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-06-16 00:45:23,401 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-06-16 00:45:23,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-06-16 00:45:24,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-06-16 00:45:24,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-16 00:45:25,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-16 00:45:25,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-16 00:45:26,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-06-16 00:45:26,216 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-06-16 00:45:26,217 [ scc.repo] DEBUG ## Branches found:
2024-06-16 00:45:26,217 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-16 00:45:26,217 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:45:26,217 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:26,222 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-16 00:45:26,227 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-16 00:45:26,227 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-16 00:45:26,232 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-16 00:45:26,237 [ scc.git] DEBUG Already up to date.
2024-06-16 00:45:26,237 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-06-16 00:45:26,757 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-16 00:45:26,758 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-06-16 00:45:26,762 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-06-16 00:45:27,834 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-16 00:45:27,834 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-06-16 00:45:27,839 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-06-16 00:45:28,536 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-16 00:45:28,536 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-06-16 00:45:28,541 [ scc.git] DEBUG ## Unique users: []
2024-06-16 00:45:28,541 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:45:28,541 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:28,546 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-16 00:45:28,553 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:28,557 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-16 00:45:28,923 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-06-16 00:45:28,924 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-16 00:45:28,927 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-06-16 00:45:28,928 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-06-16 00:45:28,928 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-06-16 00:45:29,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:45:29,092 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-16 00:45:29,100 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:29,105 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-16 00:45:29,326 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-06-16 00:45:29,326 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-06-16 00:45:29,326 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-06-16 00:45:29,326 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-06-16 00:45:29,326 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-16 00:45:29,331 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-06-16 00:45:29,331 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-06-16 00:45:29,331 [ scc.git] DEBUG src/app/header.html | 5 +
2024-06-16 00:45:29,331 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-06-16 00:45:29,331 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-06-16 00:45:29,331 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-06-16 00:45:29,331 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-06-16 00:45:29,331 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-06-16 00:45:29,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:45:29,492 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-16 00:45:29,500 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:29,506 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-16 00:45:29,629 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-06-16 00:45:29,629 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-16 00:45:29,632 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-06-16 00:45:29,632 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-06-16 00:45:29,632 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-06-16 00:45:29,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:45:29,907 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-16 00:45:29,947 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:45:29,947 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:29,953 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-16 00:45:29,995 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-16 00:45:30,003 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcb287b58e0> has no local changes
2024-06-16 00:45:30,004 [ 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#97 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/)'
2024-06-16 00:45:30,018 [ scc.git] DEBUG [detached HEAD 9f2d12e] merge master -Dorg -Ssuccess-only
2024-06-16 00:45:30,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:45:30,019 [ scc.repo] DEBUG ## PRs found:
2024-06-16 00:45:30,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-06-16 00:45:30,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-06-16 00:45:31,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-06-16 00:45:31,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-16 00:45:32,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-16 00:45:32,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-16 00:45:33,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-16 00:45:33,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-06-16 00:45:33,658 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-06-16 00:45:33,658 [ scc.repo] DEBUG ## Branches found:
2024-06-16 00:45:33,658 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-16 00:45:33,658 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:45:33,658 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:33,665 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-16 00:45:33,671 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-16 00:45:33,671 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-16 00:45:33,677 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-16 00:45:33,684 [ scc.git] DEBUG Already up to date.
2024-06-16 00:45:33,684 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-06-16 00:45:34,057 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-06-16 00:45:34,058 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-06-16 00:45:34,063 [ scc.git] DEBUG ## Unique users: []
2024-06-16 00:45:34,064 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:45:34,064 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:34,072 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-16 00:45:34,081 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:34,087 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-16 00:45:34,099 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-16 00:45:34,101 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-06-16 00:45:34,101 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-06-16 00:45:34,101 [ scc.git] DEBUG requirements.txt | 2 +-
2024-06-16 00:45:34,101 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-06-16 00:45:34,101 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-06-16 00:45:34,101 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-06-16 00:45:34,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:45:34,262 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-16 00:45:34,301 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:45:34,302 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:34,308 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-16 00:45:34,350 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-16 00:45:34,358 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcb2875abb0> has no local changes
2024-06-16 00:45:34,358 [ 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#97 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/)'
2024-06-16 00:45:34,368 [ scc.git] DEBUG [detached HEAD affa888] merge master -Dorg -Ssuccess-only
2024-06-16 00:45:34,368 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:45:34,368 [ scc.repo] DEBUG ## PRs found:
2024-06-16 00:45:34,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-06-16 00:45:35,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-06-16 00:45:35,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-06-16 00:45:36,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-16 00:45:36,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-16 00:45:37,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-16 00:45:37,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-06-16 00:45:37,739 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-16 00:45:38,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-06-16 00:45:38,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-06-16 00:45:39,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-16 00:45:39,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-16 00:45:40,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-16 00:45:40,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-06-16 00:45:40,577 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-16 00:45:40,577 [ scc.repo] DEBUG ## Branches found:
2024-06-16 00:45:40,577 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-16 00:45:40,577 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:45:40,577 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:40,587 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-16 00:45:40,594 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-16 00:45:40,595 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-16 00:45:40,603 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-16 00:45:40,611 [ scc.git] DEBUG Already up to date.
2024-06-16 00:45:40,611 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-06-16 00:45:41,099 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-16 00:45:41,099 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-06-16 00:45:41,104 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-06-16 00:45:41,632 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-16 00:45:41,632 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-06-16 00:45:41,637 [ scc.git] DEBUG ## Unique users: []
2024-06-16 00:45:41,637 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:45:41,637 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:41,643 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-16 00:45:41,651 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:41,657 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-16 00:45:41,711 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-06-16 00:45:41,712 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-06-16 00:45:41,712 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-16 00:45:41,712 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-16 00:45:41,712 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-16 00:45:41,713 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-16 00:45:41,720 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-16 00:45:41,728 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-16 00:45:41,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:45:41,895 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-16 00:45:41,904 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-16 00:45:41,911 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#97](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-06-16 00:45:41,916 [ scc.config] DEBUG Found github.token
2024-06-16 00:45:41,917 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-06-16 00:45:41,917 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-16 00:45:41,925 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:41,932 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-16 00:45:41,953 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-16 00:45:41,953 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-16 00:45:41,953 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-06-16 00:45:41,953 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-16 00:45:41,954 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-16 00:45:41,961 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-16 00:45:41,970 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-16 00:45:42,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:45:42,341 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-16 00:45:42,348 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-16 00:45:42,355 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#97](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-06-16 00:45:42,361 [ scc.config] DEBUG Found github.token
2024-06-16 00:45:42,361 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-06-16 00:45:42,362 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-16 00:45:42,403 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:45:42,403 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:42,409 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-16 00:45:42,452 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-16 00:45:42,460 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcb2879bf40> has no local changes
2024-06-16 00:45:42,460 [ 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#97 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/)'
2024-06-16 00:45:42,469 [ scc.git] DEBUG [detached HEAD b3764a9] merge master -Dorg -Ssuccess-only
2024-06-16 00:45:42,470 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:45:42,470 [ scc.repo] DEBUG ## PRs found:
2024-06-16 00:45:42,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-06-16 00:45:43,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-06-16 00:45:43,361 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-16 00:45:43,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-16 00:45:44,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-16 00:45:44,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-16 00:45:45,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-16 00:45:45,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-06-16 00:45:45,889 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-16 00:45:46,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-06-16 00:45:46,342 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-16 00:45:46,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-16 00:45:47,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-16 00:45:47,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-16 00:45:48,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-16 00:45:48,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-06-16 00:45:48,889 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-16 00:45:49,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-06-16 00:45:49,354 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-16 00:45:49,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-16 00:45:50,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-16 00:45:50,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-16 00:45:51,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-16 00:45:51,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-06-16 00:45:51,930 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-16 00:45:52,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-06-16 00:45:52,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-06-16 00:45:53,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-06-16 00:45:53,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-06-16 00:45:54,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-06-16 00:45:54,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-06-16 00:45:54,819 [ scc.repo] DEBUG ## Branches found:
2024-06-16 00:45:54,820 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-16 00:45:54,820 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:45:54,820 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:54,827 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-16 00:45:54,835 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-16 00:45:54,835 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-16 00:45:54,845 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-16 00:45:54,853 [ scc.git] DEBUG Already up to date.
2024-06-16 00:45:54,853 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-06-16 00:45:55,247 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-16 00:45:55,247 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-06-16 00:45:55,255 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-06-16 00:45:55,632 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-16 00:45:55,632 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-06-16 00:45:55,637 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-06-16 00:45:56,012 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-16 00:45:56,013 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-06-16 00:45:56,018 [ scc.git] DEBUG ## Unique users: []
2024-06-16 00:45:56,018 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:45:56,018 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:56,025 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-06-16 00:45:56,033 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:56,041 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-06-16 00:45:56,052 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-16 00:45:56,056 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-06-16 00:45:56,056 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-06-16 00:45:56,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:45:56,215 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-06-16 00:45:56,222 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:56,229 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 129 (Bump @babel/traverse from 7.21.4 to 7.23.2) 733f52703019d4b6d7e375c121a25c107b64dbec'
2024-06-16 00:45:56,288 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-16 00:45:56,288 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-16 00:45:56,292 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-06-16 00:45:56,293 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-06-16 00:45:56,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:45:56,633 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-06-16 00:45:56,643 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:56,652 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (Bump axios from 1.3.5 to 1.6.0) a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-06-16 00:45:56,685 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-16 00:45:56,685 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-16 00:45:56,690 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-06-16 00:45:56,690 [ scc.git] DEBUG package.json | 2 +-
2024-06-16 00:45:56,690 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-06-16 00:45:57,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:45:57,041 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-16 00:45:57,095 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:45:57,095 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:57,104 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-16 00:45:57,159 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-16 00:45:57,170 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcb28713640> has no local changes
2024-06-16 00:45:57,170 [ 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#97 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/)'
2024-06-16 00:45:57,182 [ scc.git] DEBUG [detached HEAD 4f7d2a3] merge master -Dorg -Ssuccess-only
2024-06-16 00:45:57,183 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:45:57,183 [ scc.repo] DEBUG ## PRs found:
2024-06-16 00:45:57,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-06-16 00:45:58,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-06-16 00:45:58,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-16 00:45:58,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-16 00:45:59,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-16 00:45:59,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-06-16 00:45:59,909 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-06-16 00:45:59,909 [ scc.repo] DEBUG ## Branches found:
2024-06-16 00:45:59,909 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-16 00:45:59,910 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:45:59,910 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:45:59,915 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-16 00:45:59,920 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-16 00:45:59,920 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-16 00:45:59,925 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-16 00:45:59,930 [ scc.git] DEBUG Already up to date.
2024-06-16 00:45:59,930 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-16 00:46:00,314 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-06-16 00:46:00,314 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-16 00:46:00,318 [ scc.git] DEBUG ## Unique users: []
2024-06-16 00:46:00,319 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:00,319 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:00,324 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-16 00:46:00,330 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:00,334 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-16 00:46:00,343 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-16 00:46:00,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:46:00,495 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-16 00:46:00,548 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:00,549 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:00,564 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-16 00:46:00,609 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-16 00:46:00,619 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcb287b9be0> has no local changes
2024-06-16 00:46:00,620 [ 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#97 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/)'
2024-06-16 00:46:00,631 [ scc.git] DEBUG [detached HEAD 14f44aa] merge master -Dorg -Ssuccess-only
2024-06-16 00:46:00,632 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:00,632 [ scc.repo] DEBUG ## PRs found:
2024-06-16 00:46:01,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-06-16 00:46:01,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-06-16 00:46:01,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-06-16 00:46:02,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-06-16 00:46:02,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-16 00:46:03,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-16 00:46:03,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-16 00:46:04,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-06-16 00:46:04,250 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-16 00:46:04,250 [ scc.repo] DEBUG ## Branches found:
2024-06-16 00:46:04,250 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-16 00:46:04,250 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:04,250 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:04,257 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-16 00:46:04,263 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-16 00:46:04,264 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-16 00:46:04,270 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-16 00:46:04,278 [ scc.git] DEBUG Already up to date.
2024-06-16 00:46:04,279 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-06-16 00:46:04,689 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-06-16 00:46:04,690 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-06-16 00:46:04,696 [ scc.git] DEBUG ## Unique users: []
2024-06-16 00:46:04,696 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:04,696 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:04,704 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-06-16 00:46:04,710 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:04,716 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-06-16 00:46:04,727 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-06-16 00:46:04,728 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-16 00:46:04,730 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-06-16 00:46:04,730 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-06-16 00:46:04,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:46:04,884 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-16 00:46:04,926 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:04,926 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:04,932 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-16 00:46:04,975 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-16 00:46:04,983 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcb286ca550> has no local changes
2024-06-16 00:46:04,983 [ 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#97 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/)'
2024-06-16 00:46:04,992 [ scc.git] DEBUG [detached HEAD 70b0802] merge master -Dorg -Ssuccess-only
2024-06-16 00:46:04,993 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:04,993 [ scc.repo] DEBUG ## PRs found:
2024-06-16 00:46:05,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-06-16 00:46:05,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-06-16 00:46:06,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-06-16 00:46:06,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-16 00:46:07,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-16 00:46:07,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-16 00:46:08,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-06-16 00:46:08,275 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-16 00:46:08,275 [ scc.repo] DEBUG ## Branches found:
2024-06-16 00:46:08,275 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-16 00:46:08,275 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:08,275 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:08,281 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-16 00:46:08,287 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-16 00:46:08,287 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-16 00:46:08,293 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-16 00:46:08,299 [ scc.git] DEBUG Already up to date.
2024-06-16 00:46:08,299 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-16 00:46:08,888 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-06-16 00:46:08,888 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-16 00:46:08,894 [ scc.git] DEBUG ## Unique users: []
2024-06-16 00:46:08,894 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:08,894 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:08,900 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-16 00:46:08,906 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:08,911 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-16 00:46:08,931 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-06-16 00:46:08,932 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-06-16 00:46:08,932 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-06-16 00:46:08,932 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-06-16 00:46:08,932 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-06-16 00:46:08,932 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-06-16 00:46:08,932 [ scc.git] DEBUG Auto-merging setup.py
2024-06-16 00:46:08,932 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-06-16 00:46:08,932 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-16 00:46:08,932 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-16 00:46:08,939 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-16 00:46:08,946 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-06-16 00:46:09,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:46:09,111 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-16 00:46:09,119 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-16 00:46:09,127 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#97](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/signup_settings.py
- omero_signup/views.py
- omero_signup/urls.py
--conflicts
2024-06-16 00:46:09,134 [ scc.config] DEBUG Found github.token
2024-06-16 00:46:09,135 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-06-16 00:46:09,135 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-16 00:46:09,181 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:09,182 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:09,190 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-16 00:46:09,239 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-16 00:46:09,247 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcb2876bf40> has no local changes
2024-06-16 00:46:09,247 [ 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#97 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/)'
2024-06-16 00:46:09,258 [ scc.git] DEBUG [detached HEAD f89a280] merge master -Dorg -Ssuccess-only
2024-06-16 00:46:09,258 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:09,259 [ scc.repo] DEBUG ## PRs found:
2024-06-16 00:46:09,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-06-16 00:46:10,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-06-16 00:46:10,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-06-16 00:46:11,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-16 00:46:11,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-16 00:46:12,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-16 00:46:12,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-06-16 00:46:12,541 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-16 00:46:12,541 [ scc.repo] DEBUG ## Branches found:
2024-06-16 00:46:12,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-16 00:46:12,541 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:12,541 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:12,547 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-16 00:46:12,553 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-16 00:46:12,553 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-16 00:46:12,559 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-16 00:46:12,565 [ scc.git] DEBUG Already up to date.
2024-06-16 00:46:12,566 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-06-16 00:46:12,991 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-06-16 00:46:12,991 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-06-16 00:46:12,996 [ scc.git] DEBUG ## Unique users: []
2024-06-16 00:46:12,997 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:12,997 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:13,003 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-06-16 00:46:13,010 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:13,015 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-06-16 00:46:13,033 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-16 00:46:13,036 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-06-16 00:46:13,036 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-06-16 00:46:13,036 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-06-16 00:46:13,036 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-06-16 00:46:13,036 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-06-16 00:46:13,036 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-06-16 00:46:13,036 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-06-16 00:46:13,036 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-06-16 00:46:13,038 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-06-16 00:46:13,038 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-06-16 00:46:13,039 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-06-16 00:46:13,039 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-06-16 00:46:13,039 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-06-16 00:46:13,039 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-06-16 00:46:13,039 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-06-16 00:46:13,039 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-06-16 00:46:13,039 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-06-16 00:46:13,039 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-06-16 00:46:13,039 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-06-16 00:46:13,039 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-06-16 00:46:13,039 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-06-16 00:46:13,039 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-06-16 00:46:13,039 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-06-16 00:46:13,039 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-06-16 00:46:13,039 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-06-16 00:46:13,039 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-06-16 00:46:13,039 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-06-16 00:46:13,039 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-06-16 00:46:13,039 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-06-16 00:46:13,039 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-06-16 00:46:13,039 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-06-16 00:46:13,039 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-06-16 00:46:13,039 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-06-16 00:46:13,039 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-06-16 00:46:13,039 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-06-16 00:46:13,039 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-06-16 00:46:13,039 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-06-16 00:46:13,039 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-06-16 00:46:13,039 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-06-16 00:46:13,039 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-06-16 00:46:13,039 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-06-16 00:46:13,039 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-06-16 00:46:13,040 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-06-16 00:46:13,040 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-06-16 00:46:13,040 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-06-16 00:46:13,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:46:13,198 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-16 00:46:13,242 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:13,242 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:13,249 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-16 00:46:13,290 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-16 00:46:13,298 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcb286ca730> has no local changes
2024-06-16 00:46:13,298 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Generated by OMERO-plugins-push#97 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/)'
2024-06-16 00:46:13,309 [ scc.git] DEBUG [detached HEAD a26f424] merge master -Dorg -Ssuccess-only
2024-06-16 00:46:13,310 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:13,310 [ scc.repo] DEBUG ## PRs found:
2024-06-16 00:46:13,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-06-16 00:46:13,616 [ scc.repo] DEBUG ## Branches found:
2024-06-16 00:46:13,616 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-16 00:46:13,617 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:13,617 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:13,624 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-16 00:46:13,629 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-16 00:46:13,629 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-16 00:46:13,635 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-16 00:46:13,641 [ scc.git] DEBUG Already up to date.
2024-06-16 00:46:13,641 [ scc.git] DEBUG ## Unique users: []
2024-06-16 00:46:13,642 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:13,642 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:13,647 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-16 00:46:13,690 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:13,690 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:13,696 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-16 00:46:13,735 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-16 00:46:13,742 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcb286dcb80> has no local changes
2024-06-16 00:46:13,742 [ 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#97 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/)'
2024-06-16 00:46:13,751 [ scc.git] DEBUG [detached HEAD fe8a226] merge master -Dorg -Ssuccess-only
2024-06-16 00:46:13,751 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:13,752 [ scc.repo] DEBUG ## PRs found:
2024-06-16 00:46:14,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-06-16 00:46:14,048 [ scc.repo] DEBUG ## Branches found:
2024-06-16 00:46:14,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-16 00:46:14,048 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:14,048 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:14,055 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-16 00:46:14,061 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-16 00:46:14,061 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-16 00:46:14,067 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-16 00:46:14,074 [ scc.git] DEBUG Already up to date.
2024-06-16 00:46:14,074 [ scc.git] DEBUG ## Unique users: []
2024-06-16 00:46:14,074 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:14,074 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:14,081 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-16 00:46:14,122 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:14,122 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:14,129 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-16 00:46:14,173 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-16 00:46:14,179 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcb286fcd90> has no local changes
2024-06-16 00:46:14,180 [ 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#97 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/)'
2024-06-16 00:46:14,188 [ scc.git] DEBUG [detached HEAD a0b9381] merge master -Dorg -Ssuccess-only
2024-06-16 00:46:14,189 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:14,189 [ scc.git] INFO Overriding base-branch from master to main
2024-06-16 00:46:14,189 [ scc.repo] DEBUG ## PRs found:
2024-06-16 00:46:14,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-06-16 00:46:15,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-06-16 00:46:15,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-06-16 00:46:15,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-06-16 00:46:16,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-16 00:46:16,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-16 00:46:17,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-16 00:46:17,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-16 00:46:18,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-06-16 00:46:18,290 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-16 00:46:18,290 [ scc.repo] DEBUG ## Branches found:
2024-06-16 00:46:18,290 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-16 00:46:18,291 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:18,291 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:18,298 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-06-16 00:46:18,303 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-16 00:46:18,304 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-06-16 00:46:18,311 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-06-16 00:46:18,317 [ scc.git] DEBUG Already up to date.
2024-06-16 00:46:18,318 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-06-16 00:46:18,777 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-06-16 00:46:18,778 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-06-16 00:46:18,783 [ scc.git] DEBUG ## Unique users: []
2024-06-16 00:46:18,783 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:18,783 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:18,790 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-16 00:46:18,797 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:18,803 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-16 00:46:18,897 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-06-16 00:46:18,897 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-06-16 00:46:18,897 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-16 00:46:18,898 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-16 00:46:18,905 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-16 00:46:18,911 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-06-16 00:46:19,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:46:19,088 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-16 00:46:19,094 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-16 00:46:19,099 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#97](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-06-16 00:46:19,105 [ scc.config] DEBUG Found github.token
2024-06-16 00:46:19,106 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-06-16 00:46:19,106 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-16 00:46:19,147 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:19,147 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:19,154 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-16 00:46:19,199 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-16 00:46:19,206 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcb28727be0> has no local changes
2024-06-16 00:46:19,206 [ 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#97 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/)'
2024-06-16 00:46:19,214 [ scc.git] DEBUG [detached HEAD a410eae] merge master -Dorg -Ssuccess-only
2024-06-16 00:46:19,215 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:19,215 [ scc.repo] DEBUG ## PRs found:
2024-06-16 00:46:19,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-06-16 00:46:19,540 [ scc.repo] DEBUG ## Branches found:
2024-06-16 00:46:19,540 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-16 00:46:19,540 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:19,540 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:19,545 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-16 00:46:19,551 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-16 00:46:19,551 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-16 00:46:19,557 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-16 00:46:19,563 [ scc.git] DEBUG Already up to date.
2024-06-16 00:46:19,563 [ scc.git] DEBUG ## Unique users: []
2024-06-16 00:46:19,563 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:19,564 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:19,570 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-16 00:46:19,610 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:19,610 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:19,616 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-16 00:46:19,654 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-16 00:46:19,661 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcb286e2e80> has no local changes
2024-06-16 00:46:19,661 [ 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#97 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/)'
2024-06-16 00:46:19,671 [ scc.git] DEBUG [detached HEAD 0832b89] merge master -Dorg -Ssuccess-only
2024-06-16 00:46:19,671 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:19,671 [ scc.repo] DEBUG ## PRs found:
2024-06-16 00:46:19,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-06-16 00:46:19,960 [ scc.repo] DEBUG ## Branches found:
2024-06-16 00:46:19,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-16 00:46:19,960 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:19,960 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:19,966 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-16 00:46:19,972 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-16 00:46:19,972 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-16 00:46:19,978 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-16 00:46:19,985 [ scc.git] DEBUG Already up to date.
2024-06-16 00:46:19,985 [ scc.git] DEBUG ## Unique users: []
2024-06-16 00:46:19,985 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:19,985 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:19,990 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-16 00:46:20,029 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:20,029 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:20,035 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-16 00:46:20,073 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-16 00:46:20,080 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcb28645400> has no local changes
2024-06-16 00:46:20,080 [ 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#97 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/)'
2024-06-16 00:46:20,088 [ scc.git] DEBUG [detached HEAD f67bee0] merge master -Dorg -Ssuccess-only
2024-06-16 00:46:20,088 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:20,089 [ scc.repo] DEBUG ## PRs found:
2024-06-16 00:46:20,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-06-16 00:46:20,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-06-16 00:46:21,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-06-16 00:46:21,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-16 00:46:22,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-16 00:46:22,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-16 00:46:23,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-06-16 00:46:23,267 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-06-16 00:46:23,267 [ scc.repo] DEBUG ## Branches found:
2024-06-16 00:46:23,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-16 00:46:23,267 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:23,268 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:23,274 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-16 00:46:23,281 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-16 00:46:23,281 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-16 00:46:23,288 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-16 00:46:23,295 [ scc.git] DEBUG Already up to date.
2024-06-16 00:46:23,295 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-06-16 00:46:23,771 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-06-16 00:46:23,772 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-06-16 00:46:23,776 [ scc.git] DEBUG ## Unique users: []
2024-06-16 00:46:23,776 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:23,776 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:23,782 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-16 00:46:23,788 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:23,794 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-16 00:46:23,906 [ scc.git] DEBUG Auto-merging Dockerfile
2024-06-16 00:46:23,906 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-06-16 00:46:23,906 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-16 00:46:23,907 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-16 00:46:23,913 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-16 00:46:23,922 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-06-16 00:46:24,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:46:24,078 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-16 00:46:24,088 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-16 00:46:24,095 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#97](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-06-16 00:46:24,101 [ scc.config] DEBUG Found github.token
2024-06-16 00:46:24,101 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-06-16 00:46:24,101 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-16 00:46:24,145 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:24,145 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:24,151 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-16 00:46:24,195 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-16 00:46:24,203 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcb2868bb80> has no local changes
2024-06-16 00:46:24,204 [ 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#97 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/)'
2024-06-16 00:46:24,215 [ scc.git] DEBUG [detached HEAD c13f9b8] merge master -Dorg -Ssuccess-only
2024-06-16 00:46:24,215 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:24,215 [ scc.git] INFO Overriding base-branch from master to develop
2024-06-16 00:46:24,215 [ scc.repo] DEBUG ## PRs found:
2024-06-16 00:46:24,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-06-16 00:46:25,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-06-16 00:46:25,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-06-16 00:46:26,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-06-16 00:46:26,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-06-16 00:46:27,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-06-16 00:46:27,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-06-16 00:46:27,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-16 00:46:28,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-16 00:46:28,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-16 00:46:29,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-06-16 00:46:29,274 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-16 00:46:29,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-06-16 00:46:30,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-06-16 00:46:30,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-06-16 00:46:31,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-06-16 00:46:31,295 [ scc.repo] DEBUG ## Branches found:
2024-06-16 00:46:31,295 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-16 00:46:31,295 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:31,295 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:31,301 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-06-16 00:46:31,307 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-16 00:46:31,307 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-06-16 00:46:31,314 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-06-16 00:46:31,321 [ scc.git] DEBUG Already up to date.
2024-06-16 00:46:31,321 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-06-16 00:46:31,760 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-06-16 00:46:31,760 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-06-16 00:46:31,765 [ scc.git] DEBUG ## Unique users: []
2024-06-16 00:46:31,765 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:31,766 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:31,773 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-16 00:46:31,782 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:31,789 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-16 00:46:31,823 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-06-16 00:46:31,823 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-06-16 00:46:31,824 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-16 00:46:31,824 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-16 00:46:31,831 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-16 00:46:31,838 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-06-16 00:46:32,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:46:32,003 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-16 00:46:32,011 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-16 00:46:32,018 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#97](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-06-16 00:46:32,023 [ scc.config] DEBUG Found github.token
2024-06-16 00:46:32,023 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-06-16 00:46:32,023 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-16 00:46:32,063 [ scc.git] DEBUG Get sha1 of %s
2024-06-16 00:46:32,064 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-16 00:46:32,069 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-16 00:46:32,110 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-16 00:46:32,117 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcb286a3ee0> has no local changes
2024-06-16 00:46:32,118 [ 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#97 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/)'
2024-06-16 00:46:32,128 [ scc.git] DEBUG [detached HEAD 3989287] merge master -Dorg -Ssuccess-only
2024-06-16 00:46:32,128 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:32,128 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-16 00:46:32,211 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-06-16 00:46:32,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:46:32,411 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-06-16 00:46:32,418 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-06-16 00:46:32,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:46:32,809 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-06-16 00:46:32,814 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-06-16 00:46:33,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:46:33,218 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-06-16 00:46:33,224 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-06-16 00:46:33,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:46:33,639 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-06-16 00:46:34,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:46:34,047 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-06-16 00:46:34,053 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-06-16 00:46:34,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:46:34,448 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-06-16 00:46:34,452 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-06-16 00:46:34,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:46:34,858 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-06-16 00:46:34,863 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-06-16 00:46:35,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:46:35,298 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-06-16 00:46:35,303 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-06-16 00:46:35,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:46:35,704 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-06-16 00:46:35,710 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-06-16 00:46:36,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:46:36,106 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-06-16 00:46:36,115 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-06-16 00:46:36,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:46:36,512 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-06-16 00:46:36,517 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-06-16 00:46:36,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:46:36,909 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-06-16 00:46:36,915 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-06-16 00:46:37,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:46:37,313 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-06-16 00:46:37,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:46:37,755 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-06-16 00:46:38,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:46:38,141 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-06-16 00:46:38,146 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-06-16 00:46:38,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:46:38,548 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-06-16 00:46:38,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:46:38,961 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-06-16 00:46:39,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:46:39,350 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-06-16 00:46:39,357 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-06-16 00:46:39,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:46:39,759 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-06-16 00:46:39,764 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-06-16 00:46:40,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:46:40,160 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-06-16 00:46:40,165 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-06-16 00:46:40,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:46:40,565 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-06-16 00:46:40,570 [ scc.config] DEBUG Found submodule.scripts.url
2024-06-16 00:46:40,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-16 00:46:40,971 [ scc.config] DEBUG Found submodule.scripts.branch
2024-06-16 00:46:40,971 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-16 00:46:41,050 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcb298e32e0> has local changes
2024-06-16 00:46:41,051 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 373 dependabot[bot] 'Bump omero-test-infra from `7688c54` to `cda3ec6`'
- PR 375 dependabot[bot] 'Bump omero-figure from `3d9e3b8` to `ffc7e07`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 63 sbesson 'Remove python-future dependency'
- PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
- PR 65 will-moore 'gateway_required() uses omero_user_token if no username and password'
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 560 will-moore 'Max projection bytes' (exclude comment)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#97 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/97/)'
2024-06-16 00:46:41,067 [ scc.git] DEBUG [detached HEAD 115cc8d] merge master -Dorg -Ssuccess-only
2024-06-16 00:46:41,068 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-06-16 00:46:41,068 [ scc.merge] INFO Repository: ome/omero-plugins
2024-06-16 00:46:41,068 [ scc.merge] INFO Already up to date.
2024-06-16 00:46:41,068 [ scc.merge] INFO
2024-06-16 00:46:41,068 [ scc.merge] INFO Merged PRs:
2024-06-16 00:46:41,068 [ scc.merge] INFO - PR 373 dependabot[bot] 'Bump omero-test-infra from `7688c54` to `cda3ec6`'
2024-06-16 00:46:41,068 [ scc.merge] INFO - PR 375 dependabot[bot] 'Bump omero-figure from `3d9e3b8` to `ffc7e07`'
2024-06-16 00:46:41,068 [ scc.merge] INFO
2024-06-16 00:46:41,068 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-06-16 00:46:41,068 [ scc.merge] INFO Already up to date.
2024-06-16 00:46:41,069 [ scc.merge] INFO
2024-06-16 00:46:41,069 [ scc.merge] INFO
2024-06-16 00:46:41,069 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-06-16 00:46:41,069 [ scc.merge] INFO Excluded PRs:
2024-06-16 00:46:41,069 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-06-16 00:46:41,069 [ scc.merge] INFO Already up to date.
2024-06-16 00:46:41,069 [ scc.merge] INFO
2024-06-16 00:46:41,069 [ scc.merge] INFO Merged PRs:
2024-06-16 00:46:41,069 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-06-16 00:46:41,069 [ scc.merge] INFO
2024-06-16 00:46:41,069 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-06-16 00:46:41,069 [ scc.merge] INFO Excluded PRs:
2024-06-16 00:46:41,069 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-06-16 00:46:41,069 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-06-16 00:46:41,069 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-06-16 00:46:41,069 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-06-16 00:46:41,069 [ scc.merge] INFO Already up to date.
2024-06-16 00:46:41,069 [ scc.merge] INFO
2024-06-16 00:46:41,069 [ scc.merge] INFO Merged PRs:
2024-06-16 00:46:41,069 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-06-16 00:46:41,069 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-06-16 00:46:41,070 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-06-16 00:46:41,070 [ scc.merge] INFO - PR 65 will-moore 'gateway_required() uses omero_user_token if no username and password'
2024-06-16 00:46:41,070 [ scc.merge] INFO
2024-06-16 00:46:41,070 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-06-16 00:46:41,070 [ scc.merge] INFO Excluded PRs:
2024-06-16 00:46:41,070 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-16 00:46:41,070 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-06-16 00:46:41,070 [ scc.merge] INFO Already up to date.
2024-06-16 00:46:41,070 [ scc.merge] INFO
2024-06-16 00:46:41,070 [ scc.merge] INFO Merged PRs:
2024-06-16 00:46:41,070 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-06-16 00:46:41,070 [ scc.merge] INFO
2024-06-16 00:46:41,070 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-16 00:46:41,070 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-06-16 00:46:41,070 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-06-16 00:46:41,070 [ scc.merge] INFO
2024-06-16 00:46:41,070 [ scc.merge] INFO Repository: ome/omero-figure
2024-06-16 00:46:41,070 [ scc.merge] INFO Excluded PRs:
2024-06-16 00:46:41,070 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes' (exclude comment)
2024-06-16 00:46:41,070 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-06-16 00:46:41,070 [ scc.merge] INFO Already up to date.
2024-06-16 00:46:41,070 [ scc.merge] INFO
2024-06-16 00:46:41,071 [ scc.merge] INFO Merged PRs:
2024-06-16 00:46:41,071 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-06-16 00:46:41,071 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-06-16 00:46:41,071 [ scc.merge] INFO
2024-06-16 00:46:41,071 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-06-16 00:46:41,071 [ scc.merge] INFO Already up to date.
2024-06-16 00:46:41,071 [ scc.merge] INFO
2024-06-16 00:46:41,071 [ scc.merge] INFO Merged PRs:
2024-06-16 00:46:41,071 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-06-16 00:46:41,071 [ scc.merge] INFO
2024-06-16 00:46:41,071 [ scc.merge] INFO Repository: ome/omero-gallery
2024-06-16 00:46:41,071 [ scc.merge] INFO Already up to date.
2024-06-16 00:46:41,071 [ scc.merge] INFO
2024-06-16 00:46:41,071 [ scc.merge] INFO Merged PRs:
2024-06-16 00:46:41,071 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-16 00:46:41,071 [ scc.merge] INFO
2024-06-16 00:46:41,071 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-06-16 00:46:41,071 [ scc.merge] INFO Excluded PRs:
2024-06-16 00:46:41,071 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-06-16 00:46:41,071 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-06-16 00:46:41,071 [ scc.merge] INFO Already up to date.
2024-06-16 00:46:41,071 [ scc.merge] INFO
2024-06-16 00:46:41,071 [ scc.merge] INFO Merged PRs:
2024-06-16 00:46:41,071 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-06-16 00:46:41,072 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-06-16 00:46:41,072 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-16 00:46:41,072 [ scc.merge] INFO
2024-06-16 00:46:41,072 [ scc.merge] INFO Repository: ome/omero-mapr
2024-06-16 00:46:41,072 [ scc.merge] INFO Excluded PRs:
2024-06-16 00:46:41,072 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-06-16 00:46:41,072 [ scc.merge] INFO Already up to date.
2024-06-16 00:46:41,072 [ scc.merge] INFO
2024-06-16 00:46:41,072 [ scc.merge] INFO Merged PRs:
2024-06-16 00:46:41,072 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-06-16 00:46:41,072 [ scc.merge] INFO
2024-06-16 00:46:41,072 [ scc.merge] INFO Repository: ome/omero-metadata
2024-06-16 00:46:41,072 [ scc.merge] INFO Already up to date.
2024-06-16 00:46:41,072 [ scc.merge] INFO
2024-06-16 00:46:41,072 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-16 00:46:41,072 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-16 00:46:41,072 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-16 00:46:41,072 [ scc.merge] INFO
2024-06-16 00:46:41,072 [ scc.merge] INFO Repository: ome/omero-parade
2024-06-16 00:46:41,072 [ scc.merge] INFO Excluded PRs:
2024-06-16 00:46:41,072 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-06-16 00:46:41,072 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-06-16 00:46:41,073 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-06-16 00:46:41,073 [ scc.merge] INFO Already up to date.
2024-06-16 00:46:41,073 [ scc.merge] INFO
2024-06-16 00:46:41,073 [ scc.merge] INFO Merged PRs:
2024-06-16 00:46:41,073 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-16 00:46:41,073 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-16 00:46:41,073 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-16 00:46:41,073 [ scc.merge] INFO
2024-06-16 00:46:41,073 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-06-16 00:46:41,073 [ scc.merge] INFO Already up to date.
2024-06-16 00:46:41,073 [ scc.merge] INFO
2024-06-16 00:46:41,073 [ scc.merge] INFO Merged PRs:
2024-06-16 00:46:41,073 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-06-16 00:46:41,073 [ scc.merge] INFO
2024-06-16 00:46:41,073 [ scc.merge] INFO Repository: ome/omero-rois
2024-06-16 00:46:41,073 [ scc.merge] INFO Excluded PRs:
2024-06-16 00:46:41,073 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-16 00:46:41,073 [ scc.merge] INFO Already up to date.
2024-06-16 00:46:41,073 [ scc.merge] INFO
2024-06-16 00:46:41,073 [ scc.merge] INFO Merged PRs:
2024-06-16 00:46:41,074 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-16 00:46:41,074 [ scc.merge] INFO
2024-06-16 00:46:41,074 [ scc.merge] INFO Repository: ome/omero-signup
2024-06-16 00:46:41,074 [ scc.merge] INFO Already up to date.
2024-06-16 00:46:41,074 [ scc.merge] INFO
2024-06-16 00:46:41,074 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-16 00:46:41,074 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-16 00:46:41,074 [ scc.merge] INFO
2024-06-16 00:46:41,074 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-06-16 00:46:41,074 [ scc.merge] INFO Already up to date.
2024-06-16 00:46:41,074 [ scc.merge] INFO
2024-06-16 00:46:41,074 [ scc.merge] INFO Merged PRs:
2024-06-16 00:46:41,074 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-16 00:46:41,074 [ scc.merge] INFO
2024-06-16 00:46:41,074 [ scc.merge] INFO Repository: ome/omero-upload
2024-06-16 00:46:41,074 [ scc.merge] INFO Already up to date.
2024-06-16 00:46:41,074 [ scc.merge] INFO
2024-06-16 00:46:41,074 [ scc.merge] INFO
2024-06-16 00:46:41,074 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-06-16 00:46:41,074 [ scc.merge] INFO Already up to date.
2024-06-16 00:46:41,074 [ scc.merge] INFO
2024-06-16 00:46:41,074 [ scc.merge] INFO
2024-06-16 00:46:41,074 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-06-16 00:46:41,074 [ scc.merge] INFO Excluded PRs:
2024-06-16 00:46:41,074 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-06-16 00:46:41,075 [ scc.merge] INFO Already up to date.
2024-06-16 00:46:41,075 [ scc.merge] INFO
2024-06-16 00:46:41,075 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-16 00:46:41,075 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-16 00:46:41,075 [ scc.merge] INFO
2024-06-16 00:46:41,075 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-06-16 00:46:41,075 [ scc.merge] INFO Already up to date.
2024-06-16 00:46:41,075 [ scc.merge] INFO
2024-06-16 00:46:41,075 [ scc.merge] INFO
2024-06-16 00:46:41,075 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-06-16 00:46:41,075 [ scc.merge] INFO Already up to date.
2024-06-16 00:46:41,075 [ scc.merge] INFO
2024-06-16 00:46:41,075 [ scc.merge] INFO
2024-06-16 00:46:41,075 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-06-16 00:46:41,075 [ scc.merge] INFO Already up to date.
2024-06-16 00:46:41,075 [ scc.merge] INFO
2024-06-16 00:46:41,075 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-16 00:46:41,075 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-06-16 00:46:41,075 [ scc.merge] INFO
2024-06-16 00:46:41,075 [ scc.merge] INFO Repository: ome/scripts
2024-06-16 00:46:41,075 [ scc.merge] INFO Excluded PRs:
2024-06-16 00:46:41,075 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-06-16 00:46:41,075 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-06-16 00:46:41,076 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-06-16 00:46:41,076 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-06-16 00:46:41,076 [ scc.merge] INFO Already up to date.
2024-06-16 00:46:41,076 [ scc.merge] INFO
2024-06-16 00:46:41,076 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-16 00:46:41,076 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-16 00:46:41,076 [ scc.merge] INFO
2024-06-16 00:46:41,076 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-06-16 00:46:41,076 [ scc.git] DEBUG Calling 'git remote'
2024-06-16 00:46:41,085 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-06-16 00:46:41,086 [ scc.git] DEBUG Calling 'git remote'
2024-06-16 00:46:41,096 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:41,096 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-06-16 00:46:41,096 [ scc.git] DEBUG Calling 'git remote'
2024-06-16 00:46:41,101 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:41,101 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-06-16 00:46:41,101 [ scc.git] DEBUG Calling 'git remote'
2024-06-16 00:46:41,105 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:41,106 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-06-16 00:46:41,106 [ scc.git] DEBUG Calling 'git remote'
2024-06-16 00:46:41,110 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:41,110 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-16 00:46:41,110 [ scc.git] DEBUG Calling 'git remote'
2024-06-16 00:46:41,115 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:41,115 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-16 00:46:41,115 [ scc.git] DEBUG Calling 'git remote'
2024-06-16 00:46:41,119 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:41,120 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-16 00:46:41,120 [ scc.git] DEBUG Calling 'git remote'
2024-06-16 00:46:41,124 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:41,124 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-16 00:46:41,124 [ scc.git] DEBUG Calling 'git remote'
2024-06-16 00:46:41,129 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:41,129 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-16 00:46:41,129 [ scc.git] DEBUG Calling 'git remote'
2024-06-16 00:46:41,133 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:41,134 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-16 00:46:41,134 [ scc.git] DEBUG Calling 'git remote'
2024-06-16 00:46:41,138 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:41,138 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-16 00:46:41,138 [ scc.git] DEBUG Calling 'git remote'
2024-06-16 00:46:41,143 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:41,143 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-16 00:46:41,143 [ scc.git] DEBUG Calling 'git remote'
2024-06-16 00:46:41,148 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:41,148 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-16 00:46:41,148 [ scc.git] DEBUG Calling 'git remote'
2024-06-16 00:46:41,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:41,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-16 00:46:41,152 [ scc.git] DEBUG Calling 'git remote'
2024-06-16 00:46:41,157 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:41,157 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-16 00:46:41,158 [ scc.git] DEBUG Calling 'git remote'
2024-06-16 00:46:41,162 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:41,162 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-16 00:46:41,162 [ scc.git] DEBUG Calling 'git remote'
2024-06-16 00:46:41,167 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:41,167 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-16 00:46:41,167 [ scc.git] DEBUG Calling 'git remote'
2024-06-16 00:46:41,172 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:41,172 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-16 00:46:41,172 [ scc.git] DEBUG Calling 'git remote'
2024-06-16 00:46:41,177 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:41,177 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-16 00:46:41,177 [ scc.git] DEBUG Calling 'git remote'
2024-06-16 00:46:41,182 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:41,182 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-16 00:46:41,182 [ scc.git] DEBUG Calling 'git remote'
2024-06-16 00:46:41,187 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:41,187 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-16 00:46:41,187 [ scc.git] DEBUG Calling 'git remote'
2024-06-16 00:46:41,192 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-16 00:46:41,192 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-16 00:46:41,192 [ scc.git] DEBUG Calling 'git remote'
2024-06-16 00:46:41,197 [ 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 7f06d13] 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 ffc7e075
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from 7b7a637
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 5a90893
nothing to commit, working tree clean
[detached HEAD 7c23fc2] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-06-16 00:47:29,045 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-06-16 00:47:38,040 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-06-16 00:47:40,455 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-06-16 00:47:45,094 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-06-16 00:48:32,679 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/f6f303f9/images/svgs/logo.svg){kind=logo}
