Skipping 101 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
Possible conflicts:
- Upstream changes
- src/omero_zarr/raw_pixels.py
--conflicts
2024-06-11 00:44:11,582 [ scc.config] DEBUG Found github.token
2024-06-11 00:44:11,583 [ scc.git] DEBUG Not adding comment to issue #102, already --conflicts.
2024-06-11 00:44:11,583 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-06-11 00:44:11,594 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:11,602 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 123 (Support export of Fileset:ID) 553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-06-11 00:44:11,620 [ scc.git] DEBUG Auto-merging .isort.cfg
2024-06-11 00:44:11,620 [ scc.git] DEBUG CONFLICT (content): Merge conflict in .isort.cfg
2024-06-11 00:44:11,620 [ scc.git] DEBUG Auto-merging setup.py
2024-06-11 00:44:11,620 [ scc.git] DEBUG Auto-merging src/omero_zarr/cli.py
2024-06-11 00:44:11,620 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-06-11 00:44:11,620 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_zarr/raw_pixels.py
2024-06-11 00:44:11,620 [ scc.git] DEBUG Auto-merging src/omero_zarr/util.py
2024-06-11 00:44:11,620 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-11 00:44:11,621 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-11 00:44:11,630 [ scc.git] DEBUG Calling 'git reset --hard 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-11 00:44:11,640 [ scc.git] DEBUG HEAD is now at 2ca566b Merge pull request #160 from ome/pre-commit-ci-update-config
2024-06-11 00:44:11,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:44:11,956 [ scc.git] DEBUG Calling 'git merge-base 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473 553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-06-11 00:44:11,963 [ scc.git] DEBUG Calling 'git diff --name-only eff38d0408f9d50de13b28dfe09e4382965e203f..2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-11 00:44:11,972 [ scc.git] INFO - PR 123 will-moore 'Support export of Fileset:ID'
Conflicting PR. Removed from build [OMERO-plugins-push#92](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/consoleText) for more details.
Possible conflicts:
- PR #102 will-moore 'Zarr export tests'
- src/omero_zarr/raw_pixels.py
- Upstream changes
- src/omero_zarr/raw_pixels.py
- .isort.cfg
--conflicts
2024-06-11 00:44:11,980 [ scc.config] DEBUG Found github.token
2024-06-11 00:44:11,980 [ scc.git] DEBUG Not adding comment to issue #123, already --conflicts.
2024-06-11 00:44:11,980 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a14f62a940f4974a305b3f5858049ee493b898ef'
2024-06-11 00:44:11,989 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:11,997 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 147 (Name option) a14f62a940f4974a305b3f5858049ee493b898ef'
2024-06-11 00:44:12,012 [ scc.git] DEBUG Auto-merging src/omero_zarr/masks.py
2024-06-11 00:44:12,013 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-06-11 00:44:12,013 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-11 00:44:12,016 [ scc.git] DEBUG README.rst | 30 ++++++++++++++++++------------
2024-06-11 00:44:12,017 [ scc.git] DEBUG src/omero_zarr/cli.py | 9 +++++++++
2024-06-11 00:44:12,017 [ scc.git] DEBUG src/omero_zarr/masks.py | 4 ++--
2024-06-11 00:44:12,017 [ scc.git] DEBUG src/omero_zarr/raw_pixels.py | 28 +++++++++++++++++++++++-----
2024-06-11 00:44:12,017 [ scc.git] DEBUG src/omero_zarr/util.py | 2 +-
2024-06-11 00:44:12,017 [ scc.git] DEBUG 5 files changed, 53 insertions(+), 20 deletions(-)
2024-06-11 00:44:12,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:44:12,361 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-11 00:44:12,406 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:44:12,406 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:12,414 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-11 00:44:12,459 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-11 00:44:12,469 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4cd06e4970> has no local changes
2024-06-11 00:44:12,470 [ 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#92 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/)'
2024-06-11 00:44:12,483 [ scc.git] DEBUG [detached HEAD ac065ac] merge master -Dorg -Ssuccess-only
2024-06-11 00:44:12,484 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:44:12,484 [ scc.repo] DEBUG ## PRs found:
2024-06-11 00:44:12,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-06-11 00:44:13,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/566 HTTP/1.1" 200 None
2024-06-11 00:44:13,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/566/comments HTTP/1.1" 200 None
2024-06-11 00:44:14,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562 HTTP/1.1" 200 None
2024-06-11 00:44:14,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562/comments HTTP/1.1" 200 None
2024-06-11 00:44:15,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/5750e2b744e687c5064df1b3ee304bfe7b5e6573 HTTP/1.1" 200 None
2024-06-11 00:44:15,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/5750e2b744e687c5064df1b3ee304bfe7b5e6573/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-11 00:44:16,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/5750e2b744e687c5064df1b3ee304bfe7b5e6573/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-11 00:44:16,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/5750e2b744e687c5064df1b3ee304bfe7b5e6573 HTTP/1.1" 200 None
2024-06-11 00:44:17,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/5750e2b744e687c5064df1b3ee304bfe7b5e6573?per_page=1 HTTP/1.1" 200 2
2024-06-11 00:44:17,087 [ scc.repo] DEBUG - PR 562 will-moore 'Add changelog 7.0.0'
2024-06-11 00:44:17,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-06-11 00:44:18,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-06-11 00:44:18,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-11 00:44:18,965 [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-11 00:44:19,393 [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-11 00:44:19,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-11 00:44:20,338 [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-11 00:44:20,338 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-06-11 00:44:20,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-06-11 00:44:21,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-11 00:44:21,806 [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-11 00:44:22,268 [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-11 00:44:22,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-11 00:44:23,167 [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-11 00:44:23,169 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-06-11 00:44:23,169 [ scc.repo] DEBUG ## Branches found:
2024-06-11 00:44:23,169 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-11 00:44:23,170 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:44:23,170 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:23,179 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-11 00:44:23,186 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-11 00:44:23,186 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-11 00:44:23,197 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-11 00:44:23,216 [ scc.git] DEBUG Updating 3d9e3b87..b2515791
2024-06-11 00:44:23,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls/563 HTTP/1.1" 200 None
2024-06-11 00:44:23,866 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-06-11 00:44:24,404 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-11 00:44:24,405 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-06-11 00:44:24,411 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-06-11 00:44:24,865 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-11 00:44:24,865 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-06-11 00:44:24,872 [ scc.git] DEBUG Calling 'git fetch origin pull/562/head'
2024-06-11 00:44:25,267 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-11 00:44:25,268 [ scc.git] DEBUG * branch refs/pull/562/head -> FETCH_HEAD
2024-06-11 00:44:25,276 [ scc.git] DEBUG ## Unique users: []
2024-06-11 00:44:25,277 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:44:25,277 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:25,286 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-11 00:44:25,296 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:25,304 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-11 00:44:25,323 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-11 00:44:25,329 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-06-11 00:44:25,329 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-06-11 00:44:25,329 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-06-11 00:44:25,329 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-06-11 00:44:25,329 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-06-11 00:44:25,329 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-06-11 00:44:25,329 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-06-11 00:44:25,329 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-06-11 00:44:25,329 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-06-11 00:44:25,329 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-06-11 00:44:25,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:44:25,501 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-11 00:44:25,511 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:25,518 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-11 00:44:25,542 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-06-11 00:44:25,542 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-06-11 00:44:25,543 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-06-11 00:44:25,543 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-11 00:44:25,551 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-06-11 00:44:25,551 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-06-11 00:44:25,551 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-06-11 00:44:25,551 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-06-11 00:44:25,551 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-06-11 00:44:25,551 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-06-11 00:44:25,551 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-06-11 00:44:25,551 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-06-11 00:44:25,551 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-06-11 00:44:25,551 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-06-11 00:44:25,552 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-06-11 00:44:25,552 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-06-11 00:44:25,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:44:25,901 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5750e2b744e687c5064df1b3ee304bfe7b5e6573'
2024-06-11 00:44:25,910 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:25,917 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 562 (Add changelog 7.0.0) 5750e2b744e687c5064df1b3ee304bfe7b5e6573'
2024-06-11 00:44:25,962 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-11 00:44:25,965 [ scc.git] DEBUG CHANGELOG.md | 10 ++++++++++
2024-06-11 00:44:25,965 [ scc.git] DEBUG README.rst | 2 +-
2024-06-11 00:44:25,965 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 1 deletion(-)
2024-06-11 00:44:26,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:44:26,310 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-11 00:44:26,360 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:44:26,361 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:26,369 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-11 00:44:26,415 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-11 00:44:26,427 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4cd069fbb0> has no local changes
2024-06-11 00:44:26,427 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 566 jo-mueller 'added info on figure scripts upload' (user: jo-mueller)
- PR 560 will-moore 'Max projection bytes' (exclude comment)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 3d9e3b87..b2515791
Previously merged:
- PR 563 will-moore 'Use path instead of re_path for all URLs'
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 562 will-moore 'Add changelog 7.0.0'
Generated by OMERO-plugins-push#92 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/)'
2024-06-11 00:44:26,439 [ scc.git] DEBUG [detached HEAD 61bc8e55] merge master -Dorg -Ssuccess-only
2024-06-11 00:44:26,440 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:44:26,440 [ scc.repo] DEBUG ## PRs found:
2024-06-11 00:44:26,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-06-11 00:44:27,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-06-11 00:44:27,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-06-11 00:44:28,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-11 00:44:28,735 [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-11 00:44:29,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-11 00:44:29,626 [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-11 00:44:29,626 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-06-11 00:44:29,626 [ scc.repo] DEBUG ## Branches found:
2024-06-11 00:44:29,626 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-11 00:44:29,626 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:44:29,627 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:29,636 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-11 00:44:29,644 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-11 00:44:29,644 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-11 00:44:29,654 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-11 00:44:29,663 [ scc.git] DEBUG Already up to date.
2024-06-11 00:44:29,663 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-06-11 00:44:30,043 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-06-11 00:44:30,043 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-06-11 00:44:30,054 [ scc.git] DEBUG ## Unique users: []
2024-06-11 00:44:30,054 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:44:30,054 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:30,065 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-11 00:44:30,079 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:30,089 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-11 00:44:30,139 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-06-11 00:44:30,139 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-11 00:44:30,143 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-06-11 00:44:30,143 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-06-11 00:44:30,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:44:30,300 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-11 00:44:30,359 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:44:30,360 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:30,370 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-11 00:44:30,459 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-11 00:44:30,471 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4cd06dcdf0> has no local changes
2024-06-11 00:44:30,472 [ 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#92 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/)'
2024-06-11 00:44:30,489 [ scc.git] DEBUG [detached HEAD 41d4878] merge master -Dorg -Ssuccess-only
2024-06-11 00:44:30,489 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:44:30,490 [ scc.repo] DEBUG ## PRs found:
2024-06-11 00:44:30,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-06-11 00:44:31,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-06-11 00:44:31,275 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-11 00:44:31,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-11 00:44:32,332 [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-11 00:44:32,816 [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-11 00:44:33,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-11 00:44:33,678 [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-11 00:44:33,679 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-11 00:44:33,679 [ scc.repo] DEBUG ## Branches found:
2024-06-11 00:44:33,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-11 00:44:33,679 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:44:33,679 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:33,686 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-11 00:44:33,699 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-11 00:44:33,700 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-11 00:44:33,708 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-11 00:44:33,716 [ scc.git] DEBUG Already up to date.
2024-06-11 00:44:33,716 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-06-11 00:44:34,129 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-06-11 00:44:34,129 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-06-11 00:44:34,135 [ scc.git] DEBUG ## Unique users: []
2024-06-11 00:44:34,135 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:44:34,135 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:34,142 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-06-11 00:44:34,150 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:34,157 [ 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-11 00:44:34,170 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-11 00:44:34,175 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-06-11 00:44:34,175 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-06-11 00:44:34,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:44:34,341 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-11 00:44:34,385 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:44:34,386 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:34,394 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-11 00:44:34,444 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-11 00:44:34,454 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4cd06dc340> has no local changes
2024-06-11 00:44:34,455 [ 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#92 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/)'
2024-06-11 00:44:34,468 [ scc.git] DEBUG [detached HEAD 68c2a1a] merge master -Dorg -Ssuccess-only
2024-06-11 00:44:34,468 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:44:34,469 [ scc.repo] DEBUG ## PRs found:
2024-06-11 00:44:34,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-06-11 00:44:35,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-06-11 00:44:35,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-06-11 00:44:36,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-11 00:44:36,870 [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-11 00:44:37,329 [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-11 00:44:37,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-11 00:44:38,246 [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-11 00:44:38,247 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-11 00:44:38,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-06-11 00:44:39,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-06-11 00:44:39,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-11 00:44:40,174 [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-11 00:44:40,680 [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-11 00:44:41,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-11 00:44:41,552 [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-11 00:44:41,553 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-06-11 00:44:42,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-06-11 00:44:42,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-06-11 00:44:42,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-11 00:44:43,415 [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-11 00:44:43,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-11 00:44:44,303 [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-11 00:44:44,304 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-06-11 00:44:44,304 [ scc.repo] DEBUG ## Branches found:
2024-06-11 00:44:44,304 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-11 00:44:44,305 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:44:44,305 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:44,314 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-11 00:44:44,325 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-11 00:44:44,325 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-11 00:44:44,381 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-11 00:44:44,393 [ scc.git] DEBUG Already up to date.
2024-06-11 00:44:44,393 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-06-11 00:44:44,880 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-11 00:44:44,880 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-06-11 00:44:44,889 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-06-11 00:44:45,483 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-11 00:44:45,483 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-06-11 00:44:45,489 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-06-11 00:44:45,960 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-11 00:44:45,960 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-06-11 00:44:45,966 [ scc.git] DEBUG ## Unique users: []
2024-06-11 00:44:45,966 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:44:45,966 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:45,973 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-11 00:44:45,980 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:45,986 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-11 00:44:46,064 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-06-11 00:44:46,064 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-11 00:44:46,068 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-06-11 00:44:46,068 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-06-11 00:44:46,068 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-06-11 00:44:46,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:44:46,221 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-11 00:44:46,233 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:46,242 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-11 00:44:46,284 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-06-11 00:44:46,285 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-06-11 00:44:46,285 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-06-11 00:44:46,285 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-06-11 00:44:46,285 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-11 00:44:46,290 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-06-11 00:44:46,290 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-06-11 00:44:46,290 [ scc.git] DEBUG src/app/header.html | 5 +
2024-06-11 00:44:46,290 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-06-11 00:44:46,290 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-06-11 00:44:46,290 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-06-11 00:44:46,290 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-06-11 00:44:46,291 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-06-11 00:44:46,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:44:46,632 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-11 00:44:46,641 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:46,648 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-11 00:44:46,743 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-06-11 00:44:46,744 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-11 00:44:46,747 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-06-11 00:44:46,747 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-06-11 00:44:46,747 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-06-11 00:44:47,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:44:47,028 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-11 00:44:47,071 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:44:47,071 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:47,078 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-11 00:44:47,120 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-11 00:44:47,129 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4cd06b78e0> has no local changes
2024-06-11 00:44:47,129 [ 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#92 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/)'
2024-06-11 00:44:47,140 [ scc.git] DEBUG [detached HEAD 1663e73] merge master -Dorg -Ssuccess-only
2024-06-11 00:44:47,140 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:44:47,141 [ scc.repo] DEBUG ## PRs found:
2024-06-11 00:44:47,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-06-11 00:44:47,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-06-11 00:44:48,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-06-11 00:44:49,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-11 00:44:49,528 [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-11 00:44:50,340 [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-11 00:44:50,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-11 00:44:51,252 [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-11 00:44:51,254 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-06-11 00:44:51,254 [ scc.repo] DEBUG ## Branches found:
2024-06-11 00:44:51,254 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-11 00:44:51,254 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:44:51,254 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:51,263 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-11 00:44:51,272 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-11 00:44:51,272 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-11 00:44:51,280 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-11 00:44:51,287 [ scc.git] DEBUG Already up to date.
2024-06-11 00:44:51,287 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-06-11 00:44:51,652 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-06-11 00:44:51,652 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-06-11 00:44:51,659 [ scc.git] DEBUG ## Unique users: []
2024-06-11 00:44:51,659 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:44:51,659 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:51,667 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-11 00:44:51,677 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:51,685 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-11 00:44:51,700 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-11 00:44:51,703 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-06-11 00:44:51,703 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-06-11 00:44:51,703 [ scc.git] DEBUG requirements.txt | 2 +-
2024-06-11 00:44:51,703 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-06-11 00:44:51,703 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-06-11 00:44:51,703 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-06-11 00:44:51,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:44:51,856 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-11 00:44:51,897 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:44:51,898 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:51,905 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-11 00:44:51,946 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-11 00:44:51,954 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4cd066cbb0> has no local changes
2024-06-11 00:44:51,954 [ 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#92 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/)'
2024-06-11 00:44:51,966 [ scc.git] DEBUG [detached HEAD 796efa3] merge master -Dorg -Ssuccess-only
2024-06-11 00:44:51,966 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:44:51,966 [ scc.repo] DEBUG ## PRs found:
2024-06-11 00:44:52,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-06-11 00:44:52,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-06-11 00:44:53,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-06-11 00:44:53,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-11 00:44:54,317 [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-11 00:44:54,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-11 00:44:55,243 [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-11 00:44:55,244 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-11 00:44:55,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-06-11 00:44:56,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-06-11 00:44:56,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-11 00:44:57,127 [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-11 00:44:57,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-11 00:44:57,995 [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-11 00:44:57,996 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-11 00:44:57,996 [ scc.repo] DEBUG ## Branches found:
2024-06-11 00:44:57,996 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-11 00:44:57,996 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:44:57,996 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:58,003 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-11 00:44:58,009 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-11 00:44:58,010 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-11 00:44:58,017 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-11 00:44:58,026 [ scc.git] DEBUG Already up to date.
2024-06-11 00:44:58,027 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-06-11 00:44:58,416 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-11 00:44:58,416 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-06-11 00:44:58,423 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-06-11 00:44:59,111 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-11 00:44:59,112 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-06-11 00:44:59,119 [ scc.git] DEBUG ## Unique users: []
2024-06-11 00:44:59,119 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:44:59,119 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:59,128 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-11 00:44:59,139 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:59,147 [ 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-11 00:44:59,249 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-06-11 00:44:59,250 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-06-11 00:44:59,250 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-11 00:44:59,250 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-11 00:44:59,250 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-11 00:44:59,251 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-11 00:44:59,260 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-11 00:44:59,271 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-11 00:44:59,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:44:59,419 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-11 00:44:59,429 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-11 00:44:59,437 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#92](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-06-11 00:44:59,446 [ scc.config] DEBUG Found github.token
2024-06-11 00:44:59,446 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-06-11 00:44:59,446 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-11 00:44:59,457 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:59,466 [ 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-11 00:44:59,610 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-11 00:44:59,610 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-11 00:44:59,610 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-06-11 00:44:59,610 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-11 00:44:59,610 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-11 00:44:59,618 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-11 00:44:59,626 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-11 00:44:59,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:44:59,825 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-11 00:44:59,838 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-11 00:44:59,848 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#92](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/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-11 00:44:59,857 [ scc.config] DEBUG Found github.token
2024-06-11 00:44:59,858 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-06-11 00:44:59,858 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-11 00:44:59,903 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:44:59,903 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:44:59,912 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-11 00:44:59,958 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-11 00:44:59,969 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4cd068ff40> has no local changes
2024-06-11 00:44:59,970 [ 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#92 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/)'
2024-06-11 00:44:59,983 [ scc.git] DEBUG [detached HEAD 890edc3] merge master -Dorg -Ssuccess-only
2024-06-11 00:44:59,984 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:44:59,984 [ scc.repo] DEBUG ## PRs found:
2024-06-11 00:45:00,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-06-11 00:45:00,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-06-11 00:45:00,816 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-11 00:45:01,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-11 00:45:01,891 [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-11 00:45:02,345 [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-11 00:45:02,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-11 00:45:03,229 [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-11 00:45:03,230 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-11 00:45:03,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-06-11 00:45:03,698 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-11 00:45:04,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-11 00:45:04,731 [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-11 00:45:05,300 [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-11 00:45:05,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-11 00:45:06,273 [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-11 00:45:06,274 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-11 00:45:06,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-06-11 00:45:06,737 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-11 00:45:07,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-11 00:45:07,815 [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-11 00:45:08,298 [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-11 00:45:08,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-11 00:45:09,254 [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-11 00:45:09,255 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-11 00:45:09,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-06-11 00:45:10,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-06-11 00:45:10,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-06-11 00:45:11,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-06-11 00:45:11,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-06-11 00:45:12,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-06-11 00:45:12,026 [ scc.repo] DEBUG ## Branches found:
2024-06-11 00:45:12,026 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-11 00:45:12,026 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:12,027 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:12,034 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-11 00:45:12,040 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-11 00:45:12,040 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-11 00:45:12,049 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-11 00:45:12,056 [ scc.git] DEBUG Already up to date.
2024-06-11 00:45:12,057 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-06-11 00:45:12,439 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-11 00:45:12,440 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-06-11 00:45:12,445 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-06-11 00:45:12,856 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-11 00:45:12,856 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-06-11 00:45:12,862 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-06-11 00:45:13,239 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-11 00:45:13,240 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-06-11 00:45:13,248 [ scc.git] DEBUG ## Unique users: []
2024-06-11 00:45:13,248 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:13,248 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:13,256 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-06-11 00:45:13,263 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:13,269 [ 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-11 00:45:13,279 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-11 00:45:13,282 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-06-11 00:45:13,282 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-06-11 00:45:13,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:13,427 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-06-11 00:45:13,433 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:13,439 [ 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-11 00:45:13,451 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-11 00:45:13,452 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-11 00:45:13,455 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-06-11 00:45:13,455 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-06-11 00:45:13,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:13,841 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-06-11 00:45:13,850 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:13,856 [ 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-11 00:45:13,870 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-11 00:45:13,870 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-11 00:45:13,874 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-06-11 00:45:13,875 [ scc.git] DEBUG package.json | 2 +-
2024-06-11 00:45:13,875 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-06-11 00:45:14,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:14,250 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-11 00:45:14,303 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:14,304 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:14,313 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-11 00:45:14,362 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-11 00:45:14,370 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4cd0624640> has no local changes
2024-06-11 00:45:14,371 [ 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#92 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/)'
2024-06-11 00:45:14,383 [ scc.git] DEBUG [detached HEAD 7ba2147] merge master -Dorg -Ssuccess-only
2024-06-11 00:45:14,383 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:14,383 [ scc.repo] DEBUG ## PRs found:
2024-06-11 00:45:14,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-06-11 00:45:15,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-06-11 00:45:15,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-11 00:45:16,204 [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-11 00:45:16,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-11 00:45:17,128 [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-11 00:45:17,129 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-06-11 00:45:17,129 [ scc.repo] DEBUG ## Branches found:
2024-06-11 00:45:17,129 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-11 00:45:17,129 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:17,129 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:17,138 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-11 00:45:17,144 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-11 00:45:17,144 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-11 00:45:17,151 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-11 00:45:17,159 [ scc.git] DEBUG Already up to date.
2024-06-11 00:45:17,160 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-11 00:45:17,555 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-06-11 00:45:17,555 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-11 00:45:17,560 [ scc.git] DEBUG ## Unique users: []
2024-06-11 00:45:17,561 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:17,561 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:17,567 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-11 00:45:17,574 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:17,580 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-11 00:45:17,591 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-11 00:45:17,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:17,752 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-11 00:45:17,793 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:17,793 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:17,799 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-11 00:45:17,837 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-11 00:45:17,845 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4cd0696be0> has no local changes
2024-06-11 00:45:17,845 [ 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#92 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/)'
2024-06-11 00:45:17,854 [ scc.git] DEBUG [detached HEAD db6f5de] merge master -Dorg -Ssuccess-only
2024-06-11 00:45:17,854 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:17,855 [ scc.repo] DEBUG ## PRs found:
2024-06-11 00:45:18,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-06-11 00:45:18,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-06-11 00:45:19,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-06-11 00:45:19,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-06-11 00:45:20,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-11 00:45:20,648 [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-11 00:45:21,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-11 00:45:21,581 [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-11 00:45:21,582 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-11 00:45:21,582 [ scc.repo] DEBUG ## Branches found:
2024-06-11 00:45:21,582 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-11 00:45:21,582 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:21,582 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:21,589 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-11 00:45:21,596 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-11 00:45:21,596 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-11 00:45:21,606 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-11 00:45:21,615 [ scc.git] DEBUG Already up to date.
2024-06-11 00:45:21,616 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-06-11 00:45:22,021 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-06-11 00:45:22,021 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-06-11 00:45:22,026 [ scc.git] DEBUG ## Unique users: []
2024-06-11 00:45:22,026 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:22,026 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:22,032 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-06-11 00:45:22,039 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:22,045 [ 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-11 00:45:22,056 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-06-11 00:45:22,057 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-11 00:45:22,059 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-06-11 00:45:22,059 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-06-11 00:45:22,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:22,215 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-11 00:45:22,260 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:22,261 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:22,267 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-11 00:45:22,308 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-11 00:45:22,316 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4cd05db550> has no local changes
2024-06-11 00:45:22,316 [ 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#92 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/)'
2024-06-11 00:45:22,336 [ scc.git] DEBUG [detached HEAD 9330477] merge master -Dorg -Ssuccess-only
2024-06-11 00:45:22,336 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:22,336 [ scc.repo] DEBUG ## PRs found:
2024-06-11 00:45:22,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-06-11 00:45:23,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-06-11 00:45:23,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-06-11 00:45:24,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-11 00:45:24,661 [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-11 00:45:25,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-11 00:45:25,601 [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-11 00:45:25,602 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-11 00:45:25,602 [ scc.repo] DEBUG ## Branches found:
2024-06-11 00:45:25,602 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-11 00:45:25,602 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:25,602 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:25,609 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-11 00:45:25,617 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-11 00:45:25,617 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-11 00:45:25,624 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-11 00:45:25,631 [ scc.git] DEBUG Already up to date.
2024-06-11 00:45:25,632 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-11 00:45:26,022 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-06-11 00:45:26,022 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-11 00:45:26,028 [ scc.git] DEBUG ## Unique users: []
2024-06-11 00:45:26,028 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:26,028 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:26,034 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-11 00:45:26,042 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:26,048 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-11 00:45:26,061 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-06-11 00:45:26,062 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-06-11 00:45:26,062 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-06-11 00:45:26,062 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-06-11 00:45:26,062 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-06-11 00:45:26,062 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-06-11 00:45:26,062 [ scc.git] DEBUG Auto-merging setup.py
2024-06-11 00:45:26,062 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-06-11 00:45:26,062 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-11 00:45:26,062 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-11 00:45:26,070 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-11 00:45:26,079 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-06-11 00:45:26,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:26,236 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-11 00:45:26,244 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-11 00:45:26,253 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#92](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- setup.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
--conflicts
2024-06-11 00:45:26,260 [ scc.config] DEBUG Found github.token
2024-06-11 00:45:26,260 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-06-11 00:45:26,260 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-11 00:45:26,304 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:26,304 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:26,312 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-11 00:45:26,363 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-11 00:45:26,372 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4cd068af40> has no local changes
2024-06-11 00:45:26,372 [ 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#92 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/)'
2024-06-11 00:45:26,383 [ scc.git] DEBUG [detached HEAD 08f6bd1] merge master -Dorg -Ssuccess-only
2024-06-11 00:45:26,384 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:26,384 [ scc.repo] DEBUG ## PRs found:
2024-06-11 00:45:26,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-06-11 00:45:27,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-06-11 00:45:27,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-06-11 00:45:28,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-11 00:45:28,686 [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-11 00:45:29,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-11 00:45:29,615 [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-11 00:45:29,616 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-11 00:45:29,616 [ scc.repo] DEBUG ## Branches found:
2024-06-11 00:45:29,616 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-11 00:45:29,616 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:29,616 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:29,625 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-11 00:45:29,632 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-11 00:45:29,632 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-11 00:45:29,639 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-11 00:45:29,646 [ scc.git] DEBUG Already up to date.
2024-06-11 00:45:29,646 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-06-11 00:45:30,047 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-06-11 00:45:30,048 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-06-11 00:45:30,054 [ scc.git] DEBUG ## Unique users: []
2024-06-11 00:45:30,054 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:30,054 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:30,060 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-06-11 00:45:30,068 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:30,075 [ 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-11 00:45:30,097 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-11 00:45:30,102 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-06-11 00:45:30,102 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-06-11 00:45:30,102 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-06-11 00:45:30,102 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-06-11 00:45:30,103 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-06-11 00:45:30,105 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-06-11 00:45:30,106 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-06-11 00:45:30,106 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-06-11 00:45:30,106 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-06-11 00:45:30,106 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-06-11 00:45:30,106 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-06-11 00:45:30,106 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-06-11 00:45:30,106 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-06-11 00:45:30,106 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-06-11 00:45:30,106 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-06-11 00:45:30,106 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-06-11 00:45:30,106 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-06-11 00:45:30,106 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-06-11 00:45:30,106 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-06-11 00:45:30,106 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-06-11 00:45:30,106 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-06-11 00:45:30,106 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-06-11 00:45:30,106 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-06-11 00:45:30,106 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-06-11 00:45:30,106 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-06-11 00:45:30,106 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-06-11 00:45:30,106 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-06-11 00:45:30,106 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-06-11 00:45:30,106 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-06-11 00:45:30,107 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-06-11 00:45:30,107 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-06-11 00:45:30,107 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-06-11 00:45:30,107 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-06-11 00:45:30,107 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-06-11 00:45:30,107 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-06-11 00:45:30,107 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-06-11 00:45:30,107 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-06-11 00:45:30,107 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-06-11 00:45:30,107 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-06-11 00:45:30,107 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-06-11 00:45:30,107 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-06-11 00:45:30,107 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-06-11 00:45:30,107 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-06-11 00:45:30,107 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-06-11 00:45:30,107 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-06-11 00:45:30,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:30,249 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-11 00:45:30,290 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:30,290 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:30,298 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-11 00:45:30,342 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-11 00:45:30,352 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4cd05db730> has no local changes
2024-06-11 00:45:30,352 [ 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#92 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/)'
2024-06-11 00:45:30,364 [ scc.git] DEBUG [detached HEAD 85ff04d] merge master -Dorg -Ssuccess-only
2024-06-11 00:45:30,364 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:30,365 [ scc.repo] DEBUG ## PRs found:
2024-06-11 00:45:30,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-06-11 00:45:30,695 [ scc.repo] DEBUG ## Branches found:
2024-06-11 00:45:30,695 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-11 00:45:30,695 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:30,695 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:30,702 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-11 00:45:30,709 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-11 00:45:30,710 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-11 00:45:30,717 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-11 00:45:30,724 [ scc.git] DEBUG Already up to date.
2024-06-11 00:45:30,725 [ scc.git] DEBUG ## Unique users: []
2024-06-11 00:45:30,725 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:30,725 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:30,732 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-11 00:45:30,775 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:30,775 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:30,782 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-11 00:45:30,826 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-11 00:45:30,836 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4cd05edb80> has no local changes
2024-06-11 00:45:30,837 [ 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#92 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/)'
2024-06-11 00:45:30,850 [ scc.git] DEBUG [detached HEAD 3feb61e] merge master -Dorg -Ssuccess-only
2024-06-11 00:45:30,850 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:30,850 [ scc.repo] DEBUG ## PRs found:
2024-06-11 00:45:31,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-06-11 00:45:31,120 [ scc.repo] DEBUG ## Branches found:
2024-06-11 00:45:31,120 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-11 00:45:31,121 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:31,121 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:31,129 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-11 00:45:31,136 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-11 00:45:31,137 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-11 00:45:31,146 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-11 00:45:31,157 [ scc.git] DEBUG Already up to date.
2024-06-11 00:45:31,157 [ scc.git] DEBUG ## Unique users: []
2024-06-11 00:45:31,157 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:31,157 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:31,166 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-11 00:45:31,207 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:31,208 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:31,216 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-11 00:45:31,262 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-11 00:45:31,269 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4cd0639d90> has no local changes
2024-06-11 00:45:31,269 [ 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#92 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/)'
2024-06-11 00:45:31,280 [ scc.git] DEBUG [detached HEAD 6bf9bd9] merge master -Dorg -Ssuccess-only
2024-06-11 00:45:31,281 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:31,281 [ scc.git] INFO Overriding base-branch from master to main
2024-06-11 00:45:31,281 [ scc.repo] DEBUG ## PRs found:
2024-06-11 00:45:31,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-06-11 00:45:32,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-06-11 00:45:32,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-06-11 00:45:33,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-06-11 00:45:33,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-11 00:45:34,006 [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-11 00:45:34,455 [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-11 00:45:35,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-11 00:45:35,438 [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-11 00:45:35,439 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-11 00:45:35,439 [ scc.repo] DEBUG ## Branches found:
2024-06-11 00:45:35,439 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-11 00:45:35,439 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:35,439 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:35,445 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-06-11 00:45:35,450 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-11 00:45:35,451 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-06-11 00:45:35,457 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-06-11 00:45:35,466 [ scc.git] DEBUG Already up to date.
2024-06-11 00:45:35,467 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-06-11 00:45:35,852 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-06-11 00:45:35,852 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-06-11 00:45:35,857 [ scc.git] DEBUG ## Unique users: []
2024-06-11 00:45:35,857 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:35,857 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:35,864 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-11 00:45:35,871 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:35,877 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-11 00:45:35,888 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-06-11 00:45:35,888 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-06-11 00:45:35,888 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-11 00:45:35,888 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-11 00:45:35,894 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-11 00:45:35,901 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-06-11 00:45:36,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:36,043 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-11 00:45:36,049 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-11 00:45:36,056 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#92](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-06-11 00:45:36,061 [ scc.config] DEBUG Found github.token
2024-06-11 00:45:36,061 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-06-11 00:45:36,062 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-11 00:45:36,107 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:36,108 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:36,114 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-11 00:45:36,155 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-11 00:45:36,163 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4cd060fd90> has no local changes
2024-06-11 00:45:36,163 [ 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#92 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/)'
2024-06-11 00:45:36,174 [ scc.git] DEBUG [detached HEAD 0e73681] merge master -Dorg -Ssuccess-only
2024-06-11 00:45:36,174 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:36,175 [ scc.repo] DEBUG ## PRs found:
2024-06-11 00:45:36,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-06-11 00:45:36,513 [ scc.repo] DEBUG ## Branches found:
2024-06-11 00:45:36,513 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-11 00:45:36,514 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:36,514 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:36,522 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-11 00:45:36,530 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-11 00:45:36,530 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-11 00:45:36,538 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-11 00:45:36,547 [ scc.git] DEBUG Already up to date.
2024-06-11 00:45:36,547 [ scc.git] DEBUG ## Unique users: []
2024-06-11 00:45:36,547 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:36,547 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:36,555 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-11 00:45:36,623 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:36,623 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:36,633 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-11 00:45:36,688 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-11 00:45:36,697 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4cd05f4e80> has no local changes
2024-06-11 00:45:36,697 [ 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#92 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/)'
2024-06-11 00:45:36,709 [ scc.git] DEBUG [detached HEAD 50b0709] merge master -Dorg -Ssuccess-only
2024-06-11 00:45:36,709 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:36,710 [ scc.repo] DEBUG ## PRs found:
2024-06-11 00:45:36,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-06-11 00:45:36,924 [ scc.repo] DEBUG ## Branches found:
2024-06-11 00:45:36,924 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-11 00:45:36,924 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:36,925 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:36,934 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-11 00:45:36,941 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-11 00:45:36,941 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-11 00:45:36,950 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-11 00:45:36,958 [ scc.git] DEBUG Already up to date.
2024-06-11 00:45:36,958 [ scc.git] DEBUG ## Unique users: []
2024-06-11 00:45:36,958 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:36,958 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:36,967 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-11 00:45:37,026 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:37,027 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:37,035 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-11 00:45:37,080 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-11 00:45:37,088 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4cd0557400> has no local changes
2024-06-11 00:45:37,088 [ 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#92 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/)'
2024-06-11 00:45:37,098 [ scc.git] DEBUG [detached HEAD 45e8ff0] merge master -Dorg -Ssuccess-only
2024-06-11 00:45:37,098 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:37,099 [ scc.repo] DEBUG ## PRs found:
2024-06-11 00:45:37,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-06-11 00:45:37,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-06-11 00:45:38,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-06-11 00:45:38,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-11 00:45:39,381 [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-11 00:45:39,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-11 00:45:40,303 [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-11 00:45:40,304 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-06-11 00:45:40,304 [ scc.repo] DEBUG ## Branches found:
2024-06-11 00:45:40,305 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-11 00:45:40,305 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:40,305 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:40,314 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-11 00:45:40,321 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-11 00:45:40,322 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-11 00:45:40,329 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-11 00:45:40,336 [ scc.git] DEBUG Already up to date.
2024-06-11 00:45:40,337 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-06-11 00:45:40,743 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-06-11 00:45:40,743 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-06-11 00:45:40,749 [ scc.git] DEBUG ## Unique users: []
2024-06-11 00:45:40,750 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:40,750 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:40,758 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-11 00:45:40,768 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:40,778 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-11 00:45:40,795 [ scc.git] DEBUG Auto-merging Dockerfile
2024-06-11 00:45:40,795 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-06-11 00:45:40,795 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-11 00:45:40,796 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-11 00:45:40,804 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-11 00:45:40,812 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-06-11 00:45:40,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:40,981 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-11 00:45:40,992 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-11 00:45:41,000 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#92](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-06-11 00:45:41,011 [ scc.config] DEBUG Found github.token
2024-06-11 00:45:41,011 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-06-11 00:45:41,011 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-11 00:45:41,062 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:41,063 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:41,070 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-11 00:45:41,119 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-11 00:45:41,128 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4cd059db80> has no local changes
2024-06-11 00:45:41,128 [ 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#92 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/)'
2024-06-11 00:45:41,139 [ scc.git] DEBUG [detached HEAD 1643306] merge master -Dorg -Ssuccess-only
2024-06-11 00:45:41,139 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:41,139 [ scc.git] INFO Overriding base-branch from master to develop
2024-06-11 00:45:41,140 [ scc.repo] DEBUG ## PRs found:
2024-06-11 00:45:41,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-06-11 00:45:42,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-06-11 00:45:42,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-06-11 00:45:43,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-06-11 00:45:43,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-06-11 00:45:43,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-06-11 00:45:44,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-06-11 00:45:44,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-11 00:45:45,289 [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-11 00:45:45,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-11 00:45:46,136 [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-11 00:45:46,137 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-11 00:45:46,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-06-11 00:45:47,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-06-11 00:45:47,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-06-11 00:45:48,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-06-11 00:45:48,103 [ scc.repo] DEBUG ## Branches found:
2024-06-11 00:45:48,103 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-11 00:45:48,104 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:48,104 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:48,112 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-06-11 00:45:48,117 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-11 00:45:48,118 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-06-11 00:45:48,124 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-06-11 00:45:48,130 [ scc.git] DEBUG Already up to date.
2024-06-11 00:45:48,131 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-06-11 00:45:48,538 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-06-11 00:45:48,539 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-06-11 00:45:48,543 [ scc.git] DEBUG ## Unique users: []
2024-06-11 00:45:48,544 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:48,544 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:48,550 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-11 00:45:48,559 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:48,564 [ 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-11 00:45:48,590 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-06-11 00:45:48,590 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-06-11 00:45:48,590 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-11 00:45:48,591 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-11 00:45:48,598 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-11 00:45:48,605 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-06-11 00:45:48,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:48,758 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-11 00:45:48,765 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-11 00:45:48,771 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#92](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-06-11 00:45:48,777 [ scc.config] DEBUG Found github.token
2024-06-11 00:45:48,777 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-06-11 00:45:48,778 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-11 00:45:48,818 [ scc.git] DEBUG Get sha1 of %s
2024-06-11 00:45:48,818 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-11 00:45:48,823 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-11 00:45:48,863 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-11 00:45:48,870 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4cd05c8d60> has no local changes
2024-06-11 00:45:48,870 [ 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#92 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/)'
2024-06-11 00:45:48,879 [ scc.git] DEBUG [detached HEAD 07657af] merge master -Dorg -Ssuccess-only
2024-06-11 00:45:48,879 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:48,880 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-11 00:45:48,957 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-06-11 00:45:49,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:49,183 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-06-11 00:45:49,189 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-06-11 00:45:49,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:49,596 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-06-11 00:45:49,603 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-06-11 00:45:49,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:50,013 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-06-11 00:45:50,024 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-06-11 00:45:50,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:50,421 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-06-11 00:45:50,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:50,827 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-06-11 00:45:50,833 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-06-11 00:45:51,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:51,233 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-06-11 00:45:51,239 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-06-11 00:45:51,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:51,644 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-06-11 00:45:51,650 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-06-11 00:45:52,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:52,048 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-06-11 00:45:52,054 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-06-11 00:45:52,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:52,457 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-06-11 00:45:52,462 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-06-11 00:45:52,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:52,870 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-06-11 00:45:52,876 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-06-11 00:45:53,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:53,276 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-06-11 00:45:53,281 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-06-11 00:45:53,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:53,681 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-06-11 00:45:53,686 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-06-11 00:45:54,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:54,092 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-06-11 00:45:54,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:54,504 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-06-11 00:45:54,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:54,904 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-06-11 00:45:54,910 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-06-11 00:45:55,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:55,317 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-06-11 00:45:55,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:55,704 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-06-11 00:45:56,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:56,111 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-06-11 00:45:56,116 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-06-11 00:45:56,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:56,515 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-06-11 00:45:56,521 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-06-11 00:45:56,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:56,919 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-06-11 00:45:56,924 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-06-11 00:45:57,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:57,318 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-06-11 00:45:57,323 [ scc.config] DEBUG Found submodule.scripts.url
2024-06-11 00:45:57,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-11 00:45:57,727 [ scc.config] DEBUG Found submodule.scripts.branch
2024-06-11 00:45:57,727 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-11 00:45:57,806 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4cd17f52e0> has local changes
2024-06-11 00:45:57,806 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 373 dependabot[bot] 'Bump omero-test-infra from `7688c54` to `cda3ec6`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 63 sbesson 'Remove python-future dependency'
- PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 566 jo-mueller 'added info on figure scripts upload' (user: jo-mueller)
- PR 560 will-moore 'Max projection bytes' (exclude comment)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 3d9e3b87..b2515791
Previously merged:
- PR 563 will-moore 'Use path instead of re_path for all URLs'
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 562 will-moore 'Add changelog 7.0.0'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#92 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/92/)'
2024-06-11 00:45:57,905 [ scc.git] DEBUG [detached HEAD 1835d6e] merge master -Dorg -Ssuccess-only
2024-06-11 00:45:57,905 [ scc.merge] INFO Repository: ome/omero-plugins
2024-06-11 00:45:57,905 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-06-11 00:45:57,905 [ scc.merge] INFO Already up to date.
2024-06-11 00:45:57,905 [ scc.merge] INFO
2024-06-11 00:45:57,906 [ scc.merge] INFO Merged PRs:
2024-06-11 00:45:57,906 [ scc.merge] INFO - PR 373 dependabot[bot] 'Bump omero-test-infra from `7688c54` to `cda3ec6`'
2024-06-11 00:45:57,906 [ scc.merge] INFO
2024-06-11 00:45:57,906 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-06-11 00:45:57,906 [ scc.merge] INFO Already up to date.
2024-06-11 00:45:57,906 [ scc.merge] INFO
2024-06-11 00:45:57,906 [ scc.merge] INFO
2024-06-11 00:45:57,906 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-06-11 00:45:57,906 [ scc.merge] INFO Excluded PRs:
2024-06-11 00:45:57,906 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-06-11 00:45:57,906 [ scc.merge] INFO Already up to date.
2024-06-11 00:45:57,906 [ scc.merge] INFO
2024-06-11 00:45:57,906 [ scc.merge] INFO Merged PRs:
2024-06-11 00:45:57,906 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-06-11 00:45:57,906 [ scc.merge] INFO
2024-06-11 00:45:57,906 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-06-11 00:45:57,906 [ scc.merge] INFO Excluded PRs:
2024-06-11 00:45:57,906 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-06-11 00:45:57,906 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-06-11 00:45:57,906 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-06-11 00:45:57,906 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-06-11 00:45:57,906 [ scc.merge] INFO Already up to date.
2024-06-11 00:45:57,906 [ scc.merge] INFO
2024-06-11 00:45:57,906 [ scc.merge] INFO Merged PRs:
2024-06-11 00:45:57,906 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-06-11 00:45:57,906 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-06-11 00:45:57,906 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-06-11 00:45:57,906 [ scc.merge] INFO
2024-06-11 00:45:57,906 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-06-11 00:45:57,906 [ scc.merge] INFO Excluded PRs:
2024-06-11 00:45:57,906 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-11 00:45:57,906 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-06-11 00:45:57,906 [ scc.merge] INFO Already up to date.
2024-06-11 00:45:57,906 [ scc.merge] INFO
2024-06-11 00:45:57,906 [ scc.merge] INFO Merged PRs:
2024-06-11 00:45:57,906 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-06-11 00:45:57,906 [ scc.merge] INFO
2024-06-11 00:45:57,906 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-11 00:45:57,906 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-06-11 00:45:57,907 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-06-11 00:45:57,907 [ scc.merge] INFO
2024-06-11 00:45:57,907 [ scc.merge] INFO Repository: ome/omero-figure
2024-06-11 00:45:57,907 [ scc.merge] INFO Excluded PRs:
2024-06-11 00:45:57,907 [ scc.merge] INFO - PR 566 jo-mueller 'added info on figure scripts upload' (user: jo-mueller)
2024-06-11 00:45:57,907 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes' (exclude comment)
2024-06-11 00:45:57,907 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-06-11 00:45:57,907 [ scc.merge] INFO Updating 3d9e3b87..b2515791
2024-06-11 00:45:57,907 [ scc.merge] INFO Previously merged:
2024-06-11 00:45:57,907 [ scc.merge] INFO - PR 563 will-moore 'Use path instead of re_path for all URLs'
2024-06-11 00:45:57,907 [ scc.merge] INFO
2024-06-11 00:45:57,907 [ scc.merge] INFO Merged PRs:
2024-06-11 00:45:57,907 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-06-11 00:45:57,907 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-06-11 00:45:57,907 [ scc.merge] INFO - PR 562 will-moore 'Add changelog 7.0.0'
2024-06-11 00:45:57,907 [ scc.merge] INFO
2024-06-11 00:45:57,907 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-06-11 00:45:57,907 [ scc.merge] INFO Already up to date.
2024-06-11 00:45:57,907 [ scc.merge] INFO
2024-06-11 00:45:57,907 [ scc.merge] INFO Merged PRs:
2024-06-11 00:45:57,907 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-06-11 00:45:57,907 [ scc.merge] INFO
2024-06-11 00:45:57,907 [ scc.merge] INFO Repository: ome/omero-gallery
2024-06-11 00:45:57,907 [ scc.merge] INFO Already up to date.
2024-06-11 00:45:57,907 [ scc.merge] INFO
2024-06-11 00:45:57,907 [ scc.merge] INFO Merged PRs:
2024-06-11 00:45:57,907 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-11 00:45:57,907 [ scc.merge] INFO
2024-06-11 00:45:57,907 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-06-11 00:45:57,907 [ scc.merge] INFO Excluded PRs:
2024-06-11 00:45:57,907 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-06-11 00:45:57,907 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-06-11 00:45:57,907 [ scc.merge] INFO Already up to date.
2024-06-11 00:45:57,907 [ scc.merge] INFO
2024-06-11 00:45:57,907 [ scc.merge] INFO Merged PRs:
2024-06-11 00:45:57,907 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-06-11 00:45:57,907 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-06-11 00:45:57,907 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-11 00:45:57,908 [ scc.merge] INFO
2024-06-11 00:45:57,908 [ scc.merge] INFO Repository: ome/omero-mapr
2024-06-11 00:45:57,908 [ scc.merge] INFO Excluded PRs:
2024-06-11 00:45:57,908 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-06-11 00:45:57,908 [ scc.merge] INFO Already up to date.
2024-06-11 00:45:57,908 [ scc.merge] INFO
2024-06-11 00:45:57,908 [ scc.merge] INFO Merged PRs:
2024-06-11 00:45:57,908 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-06-11 00:45:57,908 [ scc.merge] INFO
2024-06-11 00:45:57,908 [ scc.merge] INFO Repository: ome/omero-metadata
2024-06-11 00:45:57,908 [ scc.merge] INFO Already up to date.
2024-06-11 00:45:57,908 [ scc.merge] INFO
2024-06-11 00:45:57,908 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-11 00:45:57,908 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-11 00:45:57,908 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-11 00:45:57,908 [ scc.merge] INFO
2024-06-11 00:45:57,908 [ scc.merge] INFO Repository: ome/omero-parade
2024-06-11 00:45:57,908 [ scc.merge] INFO Excluded PRs:
2024-06-11 00:45:57,908 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-06-11 00:45:57,908 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-06-11 00:45:57,908 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-06-11 00:45:57,908 [ scc.merge] INFO Already up to date.
2024-06-11 00:45:57,908 [ scc.merge] INFO
2024-06-11 00:45:57,908 [ scc.merge] INFO Merged PRs:
2024-06-11 00:45:57,908 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-11 00:45:57,908 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-11 00:45:57,908 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-11 00:45:57,908 [ scc.merge] INFO
2024-06-11 00:45:57,908 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-06-11 00:45:57,908 [ scc.merge] INFO Already up to date.
2024-06-11 00:45:57,908 [ scc.merge] INFO
2024-06-11 00:45:57,908 [ scc.merge] INFO Merged PRs:
2024-06-11 00:45:57,908 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-06-11 00:45:57,908 [ scc.merge] INFO
2024-06-11 00:45:57,908 [ scc.merge] INFO Repository: ome/omero-rois
2024-06-11 00:45:57,908 [ scc.merge] INFO Excluded PRs:
2024-06-11 00:45:57,908 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-11 00:45:57,908 [ scc.merge] INFO Already up to date.
2024-06-11 00:45:57,908 [ scc.merge] INFO
2024-06-11 00:45:57,909 [ scc.merge] INFO Merged PRs:
2024-06-11 00:45:57,909 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-11 00:45:57,909 [ scc.merge] INFO
2024-06-11 00:45:57,909 [ scc.merge] INFO Repository: ome/omero-signup
2024-06-11 00:45:57,909 [ scc.merge] INFO Already up to date.
2024-06-11 00:45:57,909 [ scc.merge] INFO
2024-06-11 00:45:57,909 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-11 00:45:57,909 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-11 00:45:57,909 [ scc.merge] INFO
2024-06-11 00:45:57,909 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-06-11 00:45:57,909 [ scc.merge] INFO Already up to date.
2024-06-11 00:45:57,909 [ scc.merge] INFO
2024-06-11 00:45:57,909 [ scc.merge] INFO Merged PRs:
2024-06-11 00:45:57,909 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-11 00:45:57,909 [ scc.merge] INFO
2024-06-11 00:45:57,909 [ scc.merge] INFO Repository: ome/omero-upload
2024-06-11 00:45:57,909 [ scc.merge] INFO Already up to date.
2024-06-11 00:45:57,909 [ scc.merge] INFO
2024-06-11 00:45:57,909 [ scc.merge] INFO
2024-06-11 00:45:57,909 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-06-11 00:45:57,909 [ scc.merge] INFO Already up to date.
2024-06-11 00:45:57,909 [ scc.merge] INFO
2024-06-11 00:45:57,909 [ scc.merge] INFO
2024-06-11 00:45:57,909 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-06-11 00:45:57,909 [ scc.merge] INFO Excluded PRs:
2024-06-11 00:45:57,909 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-06-11 00:45:57,909 [ scc.merge] INFO Already up to date.
2024-06-11 00:45:57,909 [ scc.merge] INFO
2024-06-11 00:45:57,909 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-11 00:45:57,909 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-11 00:45:57,909 [ scc.merge] INFO
2024-06-11 00:45:57,909 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-06-11 00:45:57,909 [ scc.merge] INFO Already up to date.
2024-06-11 00:45:57,909 [ scc.merge] INFO
2024-06-11 00:45:57,909 [ scc.merge] INFO
2024-06-11 00:45:57,909 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-06-11 00:45:57,909 [ scc.merge] INFO Already up to date.
2024-06-11 00:45:57,909 [ scc.merge] INFO
2024-06-11 00:45:57,909 [ scc.merge] INFO
2024-06-11 00:45:57,910 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-06-11 00:45:57,910 [ scc.merge] INFO Already up to date.
2024-06-11 00:45:57,910 [ scc.merge] INFO
2024-06-11 00:45:57,910 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-11 00:45:57,910 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-06-11 00:45:57,910 [ scc.merge] INFO
2024-06-11 00:45:57,910 [ scc.merge] INFO Repository: ome/scripts
2024-06-11 00:45:57,910 [ scc.merge] INFO Excluded PRs:
2024-06-11 00:45:57,910 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-06-11 00:45:57,910 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-06-11 00:45:57,910 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-06-11 00:45:57,910 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-06-11 00:45:57,910 [ scc.merge] INFO Already up to date.
2024-06-11 00:45:57,910 [ scc.merge] INFO
2024-06-11 00:45:57,910 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-11 00:45:57,910 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-11 00:45:57,910 [ scc.merge] INFO
2024-06-11 00:45:57,910 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-06-11 00:45:57,910 [ scc.git] DEBUG Calling 'git remote'
2024-06-11 00:45:57,917 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-06-11 00:45:57,917 [ scc.git] DEBUG Calling 'git remote'
2024-06-11 00:45:57,923 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:57,923 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-06-11 00:45:57,923 [ scc.git] DEBUG Calling 'git remote'
2024-06-11 00:45:57,930 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:57,930 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-06-11 00:45:57,930 [ scc.git] DEBUG Calling 'git remote'
2024-06-11 00:45:57,936 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:57,937 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-06-11 00:45:57,937 [ scc.git] DEBUG Calling 'git remote'
2024-06-11 00:45:57,943 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:57,943 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-11 00:45:57,943 [ scc.git] DEBUG Calling 'git remote'
2024-06-11 00:45:57,950 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:57,950 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-11 00:45:57,950 [ scc.git] DEBUG Calling 'git remote'
2024-06-11 00:45:57,956 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:57,956 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-11 00:45:57,956 [ scc.git] DEBUG Calling 'git remote'
2024-06-11 00:45:57,963 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:57,964 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-11 00:45:57,964 [ scc.git] DEBUG Calling 'git remote'
2024-06-11 00:45:57,970 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:57,970 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-11 00:45:57,971 [ scc.git] DEBUG Calling 'git remote'
2024-06-11 00:45:57,977 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:57,977 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-11 00:45:57,977 [ scc.git] DEBUG Calling 'git remote'
2024-06-11 00:45:57,983 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:57,983 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-11 00:45:57,983 [ scc.git] DEBUG Calling 'git remote'
2024-06-11 00:45:57,989 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:57,989 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-11 00:45:57,989 [ scc.git] DEBUG Calling 'git remote'
2024-06-11 00:45:57,994 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:57,995 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-11 00:45:57,995 [ scc.git] DEBUG Calling 'git remote'
2024-06-11 00:45:58,000 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:58,000 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-11 00:45:58,001 [ scc.git] DEBUG Calling 'git remote'
2024-06-11 00:45:58,006 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:58,006 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-11 00:45:58,007 [ scc.git] DEBUG Calling 'git remote'
2024-06-11 00:45:58,012 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:58,012 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-11 00:45:58,012 [ scc.git] DEBUG Calling 'git remote'
2024-06-11 00:45:58,017 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:58,017 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-11 00:45:58,017 [ scc.git] DEBUG Calling 'git remote'
2024-06-11 00:45:58,023 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:58,023 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-11 00:45:58,023 [ scc.git] DEBUG Calling 'git remote'
2024-06-11 00:45:58,029 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:58,029 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-11 00:45:58,029 [ scc.git] DEBUG Calling 'git remote'
2024-06-11 00:45:58,035 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:58,035 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-11 00:45:58,035 [ scc.git] DEBUG Calling 'git remote'
2024-06-11 00:45:58,041 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:58,042 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-11 00:45:58,042 [ scc.git] DEBUG Calling 'git remote'
2024-06-11 00:45:58,047 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-11 00:45:58,047 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-11 00:45:58,047 [ scc.git] DEBUG Calling 'git remote'
2024-06-11 00:45:58,053 [ 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 f900949] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 2ca566b
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from 3d9e3b87
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from 7b7a637
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 5a90893
nothing to commit, working tree clean
[detached HEAD e7c6af4] 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-11 00:46:44,505 [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-11 00:46:53,602 [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-11 00:46:56,007 [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-11 00:47:00,575 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-06-11 00:47:47,059 [ 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/0ce0ee70/images/svgs/logo.svg){kind=logo}
