Console Output
Skipping 84 KB..
Full Log-parse HEAD'
2024-06-12 00:44:51,509 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 102 (Zarr export tests) f22d4074b7c458ad24320cf5a6f8adb9e686aa44'
2024-06-12 00:44:51,588 [ scc.git] DEBUG Auto-merging src/omero_zarr/cli.py
2024-06-12 00:44:51,588 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-06-12 00:44:51,588 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_zarr/raw_pixels.py
2024-06-12 00:44:51,588 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-12 00:44:51,589 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-12 00:44:51,595 [ scc.git] DEBUG Calling 'git reset --hard 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-12 00:44:51,602 [ scc.git] DEBUG HEAD is now at 2ca566b Merge pull request #160 from ome/pre-commit-ci-update-config
2024-06-12 00:44:51,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:44:51,778 [ scc.git] DEBUG Calling 'git merge-base 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473 f22d4074b7c458ad24320cf5a6f8adb9e686aa44'
2024-06-12 00:44:51,786 [ scc.git] DEBUG Calling 'git diff --name-only 782a1cd0077bcc2871f21e9f0acdc25ae7745243..2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-12 00:44:51,791 [ scc.git] INFO - PR 102 will-moore 'Zarr export tests'
Conflicting PR. Removed from build [OMERO-plugins-push#93](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_zarr/raw_pixels.py
--conflicts
2024-06-12 00:44:51,796 [ scc.config] DEBUG Found github.token
2024-06-12 00:44:51,797 [ scc.git] DEBUG Not adding comment to issue #102, already --conflicts.
2024-06-12 00:44:51,797 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-06-12 00:44:51,803 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:44:51,808 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 123 (Support export of Fileset:ID) 553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-06-12 00:44:51,851 [ scc.git] DEBUG Auto-merging .isort.cfg
2024-06-12 00:44:51,851 [ scc.git] DEBUG CONFLICT (content): Merge conflict in .isort.cfg
2024-06-12 00:44:51,851 [ scc.git] DEBUG Auto-merging setup.py
2024-06-12 00:44:51,851 [ scc.git] DEBUG Auto-merging src/omero_zarr/cli.py
2024-06-12 00:44:51,851 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-06-12 00:44:51,851 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_zarr/raw_pixels.py
2024-06-12 00:44:51,852 [ scc.git] DEBUG Auto-merging src/omero_zarr/util.py
2024-06-12 00:44:51,852 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-12 00:44:51,853 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-12 00:44:51,859 [ scc.git] DEBUG Calling 'git reset --hard 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-12 00:44:51,867 [ scc.git] DEBUG HEAD is now at 2ca566b Merge pull request #160 from ome/pre-commit-ci-update-config
2024-06-12 00:44:52,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:44:52,190 [ scc.git] DEBUG Calling 'git merge-base 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473 553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-06-12 00:44:52,197 [ scc.git] DEBUG Calling 'git diff --name-only eff38d0408f9d50de13b28dfe09e4382965e203f..2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-12 00:44:52,204 [ scc.git] INFO - PR 123 will-moore 'Support export of Fileset:ID'
Conflicting PR. Removed from build [OMERO-plugins-push#93](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/consoleText) for more details.
Possible conflicts:
- PR #102 will-moore 'Zarr export tests'
- src/omero_zarr/raw_pixels.py
- Upstream changes
- .isort.cfg
- src/omero_zarr/raw_pixels.py
--conflicts
2024-06-12 00:44:52,210 [ scc.config] DEBUG Found github.token
2024-06-12 00:44:52,210 [ scc.git] DEBUG Not adding comment to issue #123, already --conflicts.
2024-06-12 00:44:52,210 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a14f62a940f4974a305b3f5858049ee493b898ef'
2024-06-12 00:44:52,217 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:44:52,223 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 147 (Name option) a14f62a940f4974a305b3f5858049ee493b898ef'
2024-06-12 00:44:52,243 [ scc.git] DEBUG Auto-merging src/omero_zarr/masks.py
2024-06-12 00:44:52,243 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-06-12 00:44:52,244 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-12 00:44:52,248 [ scc.git] DEBUG README.rst | 30 ++++++++++++++++++------------
2024-06-12 00:44:52,249 [ scc.git] DEBUG src/omero_zarr/cli.py | 9 +++++++++
2024-06-12 00:44:52,249 [ scc.git] DEBUG src/omero_zarr/masks.py | 4 ++--
2024-06-12 00:44:52,249 [ scc.git] DEBUG src/omero_zarr/raw_pixels.py | 28 +++++++++++++++++++++++-----
2024-06-12 00:44:52,249 [ scc.git] DEBUG src/omero_zarr/util.py | 2 +-
2024-06-12 00:44:52,249 [ scc.git] DEBUG 5 files changed, 53 insertions(+), 20 deletions(-)
2024-06-12 00:44:52,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:44:52,600 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-12 00:44:52,641 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:44:52,641 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:44:52,648 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-12 00:44:52,694 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-12 00:44:52,700 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff44190c970> has no local changes
2024-06-12 00:44:52,701 [ 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#93 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/)'
2024-06-12 00:44:52,711 [ scc.git] DEBUG [detached HEAD 82aeb95] merge master -Dorg -Ssuccess-only
2024-06-12 00:44:52,711 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:44:52,712 [ scc.repo] DEBUG ## PRs found:
2024-06-12 00:44:53,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-06-12 00:44:53,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/566 HTTP/1.1" 200 None
2024-06-12 00:44:54,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/566/comments HTTP/1.1" 200 None
2024-06-12 00:44:54,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562 HTTP/1.1" 200 None
2024-06-12 00:44:55,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562/comments HTTP/1.1" 200 None
2024-06-12 00:44:55,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/5750e2b744e687c5064df1b3ee304bfe7b5e6573 HTTP/1.1" 200 None
2024-06-12 00:44:55,953 [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-12 00:44:56,430 [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-12 00:44:56,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/5750e2b744e687c5064df1b3ee304bfe7b5e6573 HTTP/1.1" 200 None
2024-06-12 00:44:57,341 [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-12 00:44:57,342 [ scc.repo] DEBUG - PR 562 will-moore 'Add changelog 7.0.0'
2024-06-12 00:44:57,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-06-12 00:44:58,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-06-12 00:44:58,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-12 00:44:59,284 [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-12 00:44:59,744 [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-12 00:45:00,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-12 00:45:00,660 [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-12 00:45:00,660 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-06-12 00:45:01,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-06-12 00:45:01,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-12 00:45:02,140 [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-12 00:45:02,614 [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-12 00:45:03,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-12 00:45:03,559 [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-12 00:45:03,560 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-06-12 00:45:03,561 [ scc.repo] DEBUG ## Branches found:
2024-06-12 00:45:03,561 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-12 00:45:03,561 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:45:03,561 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:03,567 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-12 00:45:03,573 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-12 00:45:03,573 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-12 00:45:03,578 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-12 00:45:03,589 [ scc.git] DEBUG Already up to date.
2024-06-12 00:45:03,589 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-06-12 00:45:05,082 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-12 00:45:05,083 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-06-12 00:45:05,090 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-06-12 00:45:05,665 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-12 00:45:05,665 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-06-12 00:45:05,670 [ scc.git] DEBUG Calling 'git fetch origin pull/562/head'
2024-06-12 00:45:06,095 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-12 00:45:06,095 [ scc.git] DEBUG * branch refs/pull/562/head -> FETCH_HEAD
2024-06-12 00:45:06,100 [ scc.git] DEBUG ## Unique users: []
2024-06-12 00:45:06,100 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:45:06,100 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:06,106 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-12 00:45:06,112 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:06,118 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-12 00:45:06,270 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-12 00:45:06,278 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-06-12 00:45:06,278 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-06-12 00:45:06,278 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-06-12 00:45:06,278 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-06-12 00:45:06,278 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-06-12 00:45:06,278 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-06-12 00:45:06,278 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-06-12 00:45:06,278 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-06-12 00:45:06,278 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-06-12 00:45:06,278 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-06-12 00:45:06,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:45:06,431 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-12 00:45:06,439 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:06,444 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-12 00:45:06,479 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-06-12 00:45:06,479 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-06-12 00:45:06,480 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-06-12 00:45:06,480 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-12 00:45:06,487 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-06-12 00:45:06,487 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-06-12 00:45:06,487 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-06-12 00:45:06,487 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-06-12 00:45:06,487 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-06-12 00:45:06,487 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-06-12 00:45:06,487 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-06-12 00:45:06,487 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-06-12 00:45:06,487 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-06-12 00:45:06,488 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-06-12 00:45:06,488 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-06-12 00:45:06,488 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-06-12 00:45:06,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:45:06,875 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5750e2b744e687c5064df1b3ee304bfe7b5e6573'
2024-06-12 00:45:06,886 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:06,894 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 562 (Add changelog 7.0.0) 5750e2b744e687c5064df1b3ee304bfe7b5e6573'
2024-06-12 00:45:06,910 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-12 00:45:06,913 [ scc.git] DEBUG CHANGELOG.md | 10 ++++++++++
2024-06-12 00:45:06,913 [ scc.git] DEBUG README.rst | 2 +-
2024-06-12 00:45:06,913 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 1 deletion(-)
2024-06-12 00:45:07,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:45:07,274 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-12 00:45:07,320 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:45:07,320 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:07,326 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-12 00:45:07,364 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-12 00:45:07,374 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff4418c7bb0> has no local changes
2024-06-12 00:45:07,374 [ 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)
Already up to date.
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#93 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/)'
2024-06-12 00:45:07,384 [ scc.git] DEBUG [detached HEAD 5ce1a979] merge master -Dorg -Ssuccess-only
2024-06-12 00:45:07,385 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:45:07,385 [ scc.repo] DEBUG ## PRs found:
2024-06-12 00:45:07,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-06-12 00:45:08,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-06-12 00:45:08,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-06-12 00:45:09,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-12 00:45:09,749 [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-12 00:45:10,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-12 00:45:10,748 [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-12 00:45:10,749 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-06-12 00:45:10,749 [ scc.repo] DEBUG ## Branches found:
2024-06-12 00:45:10,750 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-12 00:45:10,750 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:45:10,750 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:10,756 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-12 00:45:10,762 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-12 00:45:10,762 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-12 00:45:10,769 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-12 00:45:10,776 [ scc.git] DEBUG Already up to date.
2024-06-12 00:45:10,776 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-06-12 00:45:11,184 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-06-12 00:45:11,184 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-06-12 00:45:11,189 [ scc.git] DEBUG ## Unique users: []
2024-06-12 00:45:11,189 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:45:11,189 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:11,194 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-12 00:45:11,200 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:11,205 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-12 00:45:11,227 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-06-12 00:45:11,227 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-12 00:45:11,230 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-06-12 00:45:11,230 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-06-12 00:45:11,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:45:11,416 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-12 00:45:11,455 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:45:11,455 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:11,461 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-12 00:45:11,501 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-12 00:45:11,507 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff44191cdf0> has no local changes
2024-06-12 00:45:11,507 [ 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#93 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/)'
2024-06-12 00:45:11,515 [ scc.git] DEBUG [detached HEAD 822e1a4] merge master -Dorg -Ssuccess-only
2024-06-12 00:45:11,516 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:45:11,516 [ scc.repo] DEBUG ## PRs found:
2024-06-12 00:45:11,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-06-12 00:45:12,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-06-12 00:45:12,371 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-12 00:45:12,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-12 00:45:13,406 [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-12 00:45:13,935 [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-12 00:45:14,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-12 00:45:14,907 [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-12 00:45:14,908 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-12 00:45:14,908 [ scc.repo] DEBUG ## Branches found:
2024-06-12 00:45:14,908 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-12 00:45:14,908 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:45:14,908 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:14,913 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-12 00:45:14,919 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-12 00:45:14,919 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-12 00:45:14,925 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-12 00:45:14,932 [ scc.git] DEBUG Already up to date.
2024-06-12 00:45:14,932 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-06-12 00:45:15,322 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-06-12 00:45:15,322 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-06-12 00:45:15,328 [ scc.git] DEBUG ## Unique users: []
2024-06-12 00:45:15,328 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:45:15,329 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:15,334 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-06-12 00:45:15,341 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:15,349 [ 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-12 00:45:15,375 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-12 00:45:15,380 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-06-12 00:45:15,380 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-06-12 00:45:15,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:45:15,535 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-12 00:45:15,593 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:45:15,594 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:15,603 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-12 00:45:15,658 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-12 00:45:15,667 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff44191c340> has no local changes
2024-06-12 00:45:15,667 [ 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#93 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/)'
2024-06-12 00:45:15,679 [ scc.git] DEBUG [detached HEAD d087d3a] merge master -Dorg -Ssuccess-only
2024-06-12 00:45:15,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:45:15,679 [ scc.repo] DEBUG ## PRs found:
2024-06-12 00:45:16,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-06-12 00:45:16,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-06-12 00:45:17,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-06-12 00:45:17,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-12 00:45:18,101 [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-12 00:45:18,589 [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-12 00:45:19,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-12 00:45:19,448 [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-12 00:45:19,449 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-12 00:45:19,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-06-12 00:45:20,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-06-12 00:45:20,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-12 00:45:21,486 [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-12 00:45:21,970 [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-12 00:45:22,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-12 00:45:22,899 [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-12 00:45:22,899 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-06-12 00:45:23,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-06-12 00:45:23,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-06-12 00:45:24,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-12 00:45:24,825 [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-12 00:45:25,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-12 00:45:25,783 [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-12 00:45:25,784 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-06-12 00:45:25,784 [ scc.repo] DEBUG ## Branches found:
2024-06-12 00:45:25,784 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-12 00:45:25,784 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:45:25,784 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:25,790 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-12 00:45:25,795 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-12 00:45:25,795 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-12 00:45:25,801 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-12 00:45:25,807 [ scc.git] DEBUG Already up to date.
2024-06-12 00:45:25,807 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-06-12 00:45:26,313 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-12 00:45:26,313 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-06-12 00:45:26,318 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-06-12 00:45:27,307 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-12 00:45:27,307 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-06-12 00:45:27,312 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-06-12 00:45:27,753 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-12 00:45:27,753 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-06-12 00:45:27,758 [ scc.git] DEBUG ## Unique users: []
2024-06-12 00:45:27,758 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:45:27,759 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:27,765 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-12 00:45:27,772 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:27,777 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-12 00:45:27,809 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-06-12 00:45:27,809 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-12 00:45:27,813 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-06-12 00:45:27,813 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-06-12 00:45:27,813 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-06-12 00:45:27,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:45:27,975 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-12 00:45:27,982 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:27,987 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-12 00:45:28,061 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-06-12 00:45:28,061 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-06-12 00:45:28,061 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-06-12 00:45:28,061 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-06-12 00:45:28,062 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-12 00:45:28,066 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-06-12 00:45:28,066 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-06-12 00:45:28,066 [ scc.git] DEBUG src/app/header.html | 5 +
2024-06-12 00:45:28,066 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-06-12 00:45:28,066 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-06-12 00:45:28,066 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-06-12 00:45:28,066 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-06-12 00:45:28,066 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-06-12 00:45:28,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:45:28,388 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-12 00:45:28,397 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:28,402 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-12 00:45:28,437 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-06-12 00:45:28,437 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-12 00:45:28,440 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-06-12 00:45:28,441 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-06-12 00:45:28,441 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-06-12 00:45:28,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:45:28,795 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-12 00:45:28,833 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:45:28,833 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:28,838 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-12 00:45:28,878 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-12 00:45:28,888 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff4418e38e0> has no local changes
2024-06-12 00:45:28,888 [ 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#93 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/)'
2024-06-12 00:45:28,900 [ scc.git] DEBUG [detached HEAD 901dda7] merge master -Dorg -Ssuccess-only
2024-06-12 00:45:28,900 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:45:28,900 [ scc.repo] DEBUG ## PRs found:
2024-06-12 00:45:29,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-06-12 00:45:29,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-06-12 00:45:30,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-06-12 00:45:30,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-12 00:45:31,348 [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-12 00:45:31,816 [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-12 00:45:32,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-12 00:45:32,746 [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-12 00:45:32,747 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-06-12 00:45:32,747 [ scc.repo] DEBUG ## Branches found:
2024-06-12 00:45:32,747 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-12 00:45:32,747 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:45:32,747 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:32,753 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-12 00:45:32,759 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-12 00:45:32,759 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-12 00:45:32,765 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-12 00:45:32,771 [ scc.git] DEBUG Already up to date.
2024-06-12 00:45:32,771 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-06-12 00:45:33,141 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-06-12 00:45:33,141 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-06-12 00:45:33,147 [ scc.git] DEBUG ## Unique users: []
2024-06-12 00:45:33,147 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:45:33,147 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:33,152 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-12 00:45:33,158 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:33,163 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-12 00:45:33,172 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-12 00:45:33,175 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-06-12 00:45:33,175 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-06-12 00:45:33,175 [ scc.git] DEBUG requirements.txt | 2 +-
2024-06-12 00:45:33,175 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-06-12 00:45:33,175 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-06-12 00:45:33,175 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-06-12 00:45:33,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:45:33,369 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-12 00:45:33,406 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:45:33,407 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:33,412 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-12 00:45:33,452 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-12 00:45:33,458 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff440091bb0> has no local changes
2024-06-12 00:45:33,458 [ 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#93 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/)'
2024-06-12 00:45:33,466 [ scc.git] DEBUG [detached HEAD 1eba842] merge master -Dorg -Ssuccess-only
2024-06-12 00:45:33,467 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:45:33,467 [ scc.repo] DEBUG ## PRs found:
2024-06-12 00:45:33,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-06-12 00:45:34,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-06-12 00:45:34,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-06-12 00:45:35,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-12 00:45:35,908 [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-12 00:45:36,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-12 00:45:36,843 [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-12 00:45:36,844 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-12 00:45:37,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-06-12 00:45:37,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-06-12 00:45:38,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-12 00:45:38,747 [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-12 00:45:39,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-12 00:45:39,606 [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-12 00:45:39,606 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-12 00:45:39,606 [ scc.repo] DEBUG ## Branches found:
2024-06-12 00:45:39,606 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-12 00:45:39,607 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:45:39,607 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:39,613 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-12 00:45:39,618 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-12 00:45:39,618 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-12 00:45:39,623 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-12 00:45:39,628 [ scc.git] DEBUG Already up to date.
2024-06-12 00:45:39,629 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-06-12 00:45:40,154 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-12 00:45:40,154 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-06-12 00:45:40,159 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-06-12 00:45:40,867 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-12 00:45:40,867 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-06-12 00:45:40,872 [ scc.git] DEBUG ## Unique users: []
2024-06-12 00:45:40,872 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:45:40,872 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:40,878 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-12 00:45:40,884 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:40,889 [ 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-12 00:45:40,965 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-06-12 00:45:40,965 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-06-12 00:45:40,965 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-12 00:45:40,965 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-12 00:45:40,965 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-12 00:45:40,966 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-12 00:45:40,971 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-12 00:45:40,978 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-12 00:45:41,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:45:41,136 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-12 00:45:41,143 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-12 00:45:41,149 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#93](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-06-12 00:45:41,154 [ scc.config] DEBUG Found github.token
2024-06-12 00:45:41,154 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-06-12 00:45:41,155 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-12 00:45:41,162 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:41,167 [ 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-12 00:45:41,185 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-12 00:45:41,185 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-12 00:45:41,185 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-06-12 00:45:41,185 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-12 00:45:41,186 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-12 00:45:41,192 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-12 00:45:41,200 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-12 00:45:41,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:45:41,556 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-12 00:45:41,565 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-12 00:45:41,571 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#93](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/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-12 00:45:41,576 [ scc.config] DEBUG Found github.token
2024-06-12 00:45:41,577 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-06-12 00:45:41,577 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-12 00:45:41,620 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:45:41,620 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:41,625 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-12 00:45:41,665 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-12 00:45:41,672 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff4418b8f40> has no local changes
2024-06-12 00:45:41,672 [ 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#93 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/)'
2024-06-12 00:45:41,683 [ scc.git] DEBUG [detached HEAD 13fe40d] merge master -Dorg -Ssuccess-only
2024-06-12 00:45:41,683 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:45:41,684 [ scc.repo] DEBUG ## PRs found:
2024-06-12 00:45:42,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-06-12 00:45:42,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-06-12 00:45:42,602 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-12 00:45:43,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-12 00:45:43,664 [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-12 00:45:44,130 [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-12 00:45:44,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-12 00:45:44,999 [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-12 00:45:45,001 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-12 00:45:45,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-06-12 00:45:45,477 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-12 00:45:46,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-12 00:45:46,546 [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-12 00:45:47,043 [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-12 00:45:47,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-12 00:45:48,016 [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-12 00:45:48,018 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-12 00:45:48,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-06-12 00:45:48,499 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-12 00:45:49,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-12 00:45:49,713 [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-12 00:45:50,217 [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-12 00:45:50,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-12 00:45:51,189 [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-12 00:45:51,193 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-12 00:45:51,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-06-12 00:45:52,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-06-12 00:45:52,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-06-12 00:45:53,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-06-12 00:45:53,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-06-12 00:45:54,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-06-12 00:45:54,202 [ scc.repo] DEBUG ## Branches found:
2024-06-12 00:45:54,203 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-12 00:45:54,203 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:45:54,203 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:54,211 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-12 00:45:54,219 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-12 00:45:54,219 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-12 00:45:54,228 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-12 00:45:54,235 [ scc.git] DEBUG Already up to date.
2024-06-12 00:45:54,235 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-06-12 00:45:54,639 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-12 00:45:54,640 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-06-12 00:45:54,646 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-06-12 00:45:55,014 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-12 00:45:55,014 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-06-12 00:45:55,019 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-06-12 00:45:55,389 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-12 00:45:55,390 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-06-12 00:45:55,396 [ scc.git] DEBUG ## Unique users: []
2024-06-12 00:45:55,396 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:45:55,396 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:55,404 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-06-12 00:45:55,413 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:55,423 [ 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-12 00:45:55,438 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-12 00:45:55,442 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-06-12 00:45:55,443 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-06-12 00:45:55,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:45:55,607 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-06-12 00:45:55,617 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:55,626 [ 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-12 00:45:55,665 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-12 00:45:55,665 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-12 00:45:55,669 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-06-12 00:45:55,669 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-06-12 00:45:56,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:45:56,019 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-06-12 00:45:56,027 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:56,033 [ 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-12 00:45:56,046 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-12 00:45:56,047 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-12 00:45:56,052 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-06-12 00:45:56,052 [ scc.git] DEBUG package.json | 2 +-
2024-06-12 00:45:56,052 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-06-12 00:45:56,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:45:56,424 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-12 00:45:56,469 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:45:56,469 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:56,476 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-12 00:45:56,514 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-12 00:45:56,521 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff440049640> has no local changes
2024-06-12 00:45:56,521 [ 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#93 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/)'
2024-06-12 00:45:56,531 [ scc.git] DEBUG [detached HEAD 7228adf] merge master -Dorg -Ssuccess-only
2024-06-12 00:45:56,531 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:45:56,531 [ scc.repo] DEBUG ## PRs found:
2024-06-12 00:45:56,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-06-12 00:45:57,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-06-12 00:45:57,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-12 00:45:58,400 [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-12 00:45:58,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-12 00:45:59,258 [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-12 00:45:59,259 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-06-12 00:45:59,260 [ scc.repo] DEBUG ## Branches found:
2024-06-12 00:45:59,260 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-12 00:45:59,260 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:45:59,260 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:59,266 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-12 00:45:59,272 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-12 00:45:59,272 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-12 00:45:59,278 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-12 00:45:59,285 [ scc.git] DEBUG Already up to date.
2024-06-12 00:45:59,285 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-12 00:45:59,665 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-06-12 00:45:59,665 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-12 00:45:59,670 [ scc.git] DEBUG ## Unique users: []
2024-06-12 00:45:59,671 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:45:59,671 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:59,676 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-12 00:45:59,682 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:59,691 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-12 00:45:59,700 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-12 00:45:59,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:45:59,860 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-12 00:45:59,898 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:45:59,898 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:45:59,904 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-12 00:45:59,947 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-12 00:45:59,954 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff4418d0be0> has no local changes
2024-06-12 00:45:59,954 [ 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#93 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/)'
2024-06-12 00:45:59,963 [ scc.git] DEBUG [detached HEAD 488d7da] merge master -Dorg -Ssuccess-only
2024-06-12 00:45:59,963 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:45:59,963 [ scc.repo] DEBUG ## PRs found:
2024-06-12 00:46:00,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-06-12 00:46:00,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-06-12 00:46:01,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-06-12 00:46:01,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-06-12 00:46:02,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-12 00:46:02,824 [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-12 00:46:03,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-12 00:46:03,689 [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-12 00:46:03,690 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-12 00:46:03,690 [ scc.repo] DEBUG ## Branches found:
2024-06-12 00:46:03,690 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-12 00:46:03,690 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:03,690 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:03,696 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-12 00:46:03,702 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-12 00:46:03,703 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-12 00:46:03,712 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-12 00:46:03,719 [ scc.git] DEBUG Already up to date.
2024-06-12 00:46:03,720 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-06-12 00:46:04,181 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-06-12 00:46:04,181 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-06-12 00:46:04,187 [ scc.git] DEBUG ## Unique users: []
2024-06-12 00:46:04,187 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:04,187 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:04,192 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-06-12 00:46:04,199 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:04,205 [ 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-12 00:46:04,215 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-06-12 00:46:04,216 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-12 00:46:04,219 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-06-12 00:46:04,219 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-06-12 00:46:04,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:46:04,389 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-12 00:46:04,428 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:04,428 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:04,434 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-12 00:46:04,472 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-12 00:46:04,479 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff4287c7550> has no local changes
2024-06-12 00:46:04,479 [ 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#93 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/)'
2024-06-12 00:46:04,488 [ scc.git] DEBUG [detached HEAD 0c2ee6c] merge master -Dorg -Ssuccess-only
2024-06-12 00:46:04,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:04,488 [ scc.repo] DEBUG ## PRs found:
2024-06-12 00:46:04,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-06-12 00:46:05,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-06-12 00:46:05,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-06-12 00:46:06,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-12 00:46:06,929 [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-12 00:46:07,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-12 00:46:07,865 [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-12 00:46:07,866 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-12 00:46:07,866 [ scc.repo] DEBUG ## Branches found:
2024-06-12 00:46:07,866 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-12 00:46:07,866 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:07,866 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:07,873 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-12 00:46:07,878 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-12 00:46:07,879 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-12 00:46:07,884 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-12 00:46:07,890 [ scc.git] DEBUG Already up to date.
2024-06-12 00:46:07,891 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-12 00:46:08,313 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-06-12 00:46:08,313 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-12 00:46:08,319 [ scc.git] DEBUG ## Unique users: []
2024-06-12 00:46:08,319 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:08,319 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:08,325 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-12 00:46:08,330 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:08,335 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-12 00:46:08,381 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-06-12 00:46:08,381 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-06-12 00:46:08,381 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-06-12 00:46:08,381 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-06-12 00:46:08,381 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-06-12 00:46:08,381 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-06-12 00:46:08,381 [ scc.git] DEBUG Auto-merging setup.py
2024-06-12 00:46:08,381 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-06-12 00:46:08,381 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-12 00:46:08,381 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-12 00:46:08,389 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-12 00:46:08,396 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-06-12 00:46:08,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:46:08,570 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-12 00:46:08,577 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-12 00:46:08,583 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#93](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/views.py
- omero_signup/urls.py
- omero_signup/signup_settings.py
--conflicts
2024-06-12 00:46:08,589 [ scc.config] DEBUG Found github.token
2024-06-12 00:46:08,589 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-06-12 00:46:08,589 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-12 00:46:08,633 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:08,633 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:08,640 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-12 00:46:08,683 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-12 00:46:08,690 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff4400b1f40> has no local changes
2024-06-12 00:46:08,690 [ 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#93 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/)'
2024-06-12 00:46:08,699 [ scc.git] DEBUG [detached HEAD 719735c] merge master -Dorg -Ssuccess-only
2024-06-12 00:46:08,700 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:08,700 [ scc.repo] DEBUG ## PRs found:
2024-06-12 00:46:09,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-06-12 00:46:09,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-06-12 00:46:10,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-06-12 00:46:10,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-12 00:46:11,037 [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-12 00:46:11,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-12 00:46:11,992 [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-12 00:46:11,993 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-12 00:46:11,993 [ scc.repo] DEBUG ## Branches found:
2024-06-12 00:46:11,993 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-12 00:46:11,993 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:11,993 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:11,999 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-12 00:46:12,004 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-12 00:46:12,005 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-12 00:46:12,011 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-12 00:46:12,017 [ scc.git] DEBUG Already up to date.
2024-06-12 00:46:12,017 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-06-12 00:46:12,489 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-06-12 00:46:12,490 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-06-12 00:46:12,496 [ scc.git] DEBUG ## Unique users: []
2024-06-12 00:46:12,496 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:12,496 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:12,501 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-06-12 00:46:12,508 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:12,513 [ 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-12 00:46:12,526 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-12 00:46:12,530 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-06-12 00:46:12,530 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-06-12 00:46:12,530 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-06-12 00:46:12,530 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-06-12 00:46:12,530 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-06-12 00:46:12,530 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-06-12 00:46:12,530 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-06-12 00:46:12,530 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-06-12 00:46:12,530 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-06-12 00:46:12,530 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-06-12 00:46:12,530 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-06-12 00:46:12,532 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-06-12 00:46:12,532 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-06-12 00:46:12,532 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-06-12 00:46:12,532 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-06-12 00:46:12,532 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-06-12 00:46:12,532 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-06-12 00:46:12,532 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-06-12 00:46:12,532 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-06-12 00:46:12,532 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-06-12 00:46:12,533 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-06-12 00:46:12,533 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-06-12 00:46:12,533 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-06-12 00:46:12,533 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-06-12 00:46:12,533 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-06-12 00:46:12,533 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-06-12 00:46:12,533 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-06-12 00:46:12,533 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-06-12 00:46:12,533 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-06-12 00:46:12,533 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-06-12 00:46:12,533 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-06-12 00:46:12,533 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-06-12 00:46:12,533 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-06-12 00:46:12,533 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-06-12 00:46:12,533 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-06-12 00:46:12,533 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-06-12 00:46:12,533 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-06-12 00:46:12,533 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-06-12 00:46:12,533 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-06-12 00:46:12,533 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-06-12 00:46:12,533 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-06-12 00:46:12,533 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-06-12 00:46:12,533 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-06-12 00:46:12,533 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-06-12 00:46:12,533 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-06-12 00:46:12,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:46:12,909 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-12 00:46:12,953 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:12,953 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:12,959 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-12 00:46:13,003 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-12 00:46:13,010 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff4287c7730> has no local changes
2024-06-12 00:46:13,011 [ 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#93 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/)'
2024-06-12 00:46:13,020 [ scc.git] DEBUG [detached HEAD 9ce8781] merge master -Dorg -Ssuccess-only
2024-06-12 00:46:13,020 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:13,021 [ scc.repo] DEBUG ## PRs found:
2024-06-12 00:46:13,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-06-12 00:46:13,390 [ scc.repo] DEBUG ## Branches found:
2024-06-12 00:46:13,391 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-12 00:46:13,391 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:13,391 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:13,396 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-12 00:46:13,401 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-12 00:46:13,402 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-12 00:46:13,407 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-12 00:46:13,412 [ scc.git] DEBUG Already up to date.
2024-06-12 00:46:13,412 [ scc.git] DEBUG ## Unique users: []
2024-06-12 00:46:13,412 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:13,412 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:13,417 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-12 00:46:13,458 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:13,458 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:13,464 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-12 00:46:13,502 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-12 00:46:13,508 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff4287d9b80> has no local changes
2024-06-12 00:46:13,508 [ 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#93 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/)'
2024-06-12 00:46:13,516 [ scc.git] DEBUG [detached HEAD c7d5c17] merge master -Dorg -Ssuccess-only
2024-06-12 00:46:13,517 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:13,517 [ scc.repo] DEBUG ## PRs found:
2024-06-12 00:46:13,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-06-12 00:46:13,938 [ scc.repo] DEBUG ## Branches found:
2024-06-12 00:46:13,938 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-12 00:46:13,938 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:13,938 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:13,944 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-12 00:46:13,949 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-12 00:46:13,949 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-12 00:46:13,954 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-12 00:46:13,959 [ scc.git] DEBUG Already up to date.
2024-06-12 00:46:13,960 [ scc.git] DEBUG ## Unique users: []
2024-06-12 00:46:13,960 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:13,960 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:13,965 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-12 00:46:14,013 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:14,014 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:14,018 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-12 00:46:14,055 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-12 00:46:14,061 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff440033d90> has no local changes
2024-06-12 00:46:14,061 [ 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#93 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/)'
2024-06-12 00:46:14,069 [ scc.git] DEBUG [detached HEAD 0cf167f] merge master -Dorg -Ssuccess-only
2024-06-12 00:46:14,069 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:14,069 [ scc.git] INFO Overriding base-branch from master to main
2024-06-12 00:46:14,070 [ scc.repo] DEBUG ## PRs found:
2024-06-12 00:46:14,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-06-12 00:46:14,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-06-12 00:46:15,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-06-12 00:46:15,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-06-12 00:46:16,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-12 00:46:16,965 [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-12 00:46:17,431 [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-12 00:46:17,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-12 00:46:18,380 [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-12 00:46:18,382 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-12 00:46:18,382 [ scc.repo] DEBUG ## Branches found:
2024-06-12 00:46:18,382 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-12 00:46:18,382 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:18,382 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:18,389 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-06-12 00:46:18,394 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-12 00:46:18,394 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-06-12 00:46:18,401 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-06-12 00:46:18,407 [ scc.git] DEBUG Already up to date.
2024-06-12 00:46:18,408 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-06-12 00:46:18,858 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-06-12 00:46:18,859 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-06-12 00:46:18,865 [ scc.git] DEBUG ## Unique users: []
2024-06-12 00:46:18,866 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:18,866 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:18,873 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-12 00:46:18,879 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:18,885 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-12 00:46:18,903 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-06-12 00:46:18,904 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-06-12 00:46:18,904 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-12 00:46:18,904 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-12 00:46:18,910 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-12 00:46:18,917 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-06-12 00:46:19,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:46:19,080 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-12 00:46:19,086 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-12 00:46:19,092 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#93](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-06-12 00:46:19,098 [ scc.config] DEBUG Found github.token
2024-06-12 00:46:19,098 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-06-12 00:46:19,099 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-12 00:46:19,147 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:19,148 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:19,155 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-12 00:46:19,193 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-12 00:46:19,200 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff44004cb50> has no local changes
2024-06-12 00:46:19,200 [ 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#93 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/)'
2024-06-12 00:46:19,208 [ scc.git] DEBUG [detached HEAD 33b98f4] merge master -Dorg -Ssuccess-only
2024-06-12 00:46:19,208 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:19,209 [ scc.repo] DEBUG ## PRs found:
2024-06-12 00:46:19,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-06-12 00:46:19,517 [ scc.repo] DEBUG ## Branches found:
2024-06-12 00:46:19,517 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-12 00:46:19,517 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:19,518 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:19,523 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-12 00:46:19,528 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-12 00:46:19,529 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-12 00:46:19,534 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-12 00:46:19,540 [ scc.git] DEBUG Already up to date.
2024-06-12 00:46:19,541 [ scc.git] DEBUG ## Unique users: []
2024-06-12 00:46:19,541 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:19,541 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:19,548 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-12 00:46:19,587 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:19,587 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:19,592 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-12 00:46:19,631 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-12 00:46:19,637 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff4287f5e80> has no local changes
2024-06-12 00:46:19,637 [ 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#93 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/)'
2024-06-12 00:46:19,645 [ scc.git] DEBUG [detached HEAD da360a9] merge master -Dorg -Ssuccess-only
2024-06-12 00:46:19,646 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:19,646 [ scc.repo] DEBUG ## PRs found:
2024-06-12 00:46:19,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-06-12 00:46:19,982 [ scc.repo] DEBUG ## Branches found:
2024-06-12 00:46:19,982 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-12 00:46:19,982 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:19,982 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:19,988 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-12 00:46:19,993 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-12 00:46:19,993 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-12 00:46:19,999 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-12 00:46:20,005 [ scc.git] DEBUG Already up to date.
2024-06-12 00:46:20,005 [ scc.git] DEBUG ## Unique users: []
2024-06-12 00:46:20,005 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:20,005 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:20,010 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-12 00:46:20,048 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:20,048 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:20,054 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-12 00:46:20,092 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-12 00:46:20,099 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff428744400> has no local changes
2024-06-12 00:46:20,099 [ 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#93 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/)'
2024-06-12 00:46:20,108 [ scc.git] DEBUG [detached HEAD bb29f4b] merge master -Dorg -Ssuccess-only
2024-06-12 00:46:20,108 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:20,109 [ scc.repo] DEBUG ## PRs found:
2024-06-12 00:46:20,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-06-12 00:46:20,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-06-12 00:46:21,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-06-12 00:46:21,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-12 00:46:22,396 [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-12 00:46:22,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-12 00:46:23,328 [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-12 00:46:23,329 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-06-12 00:46:23,329 [ scc.repo] DEBUG ## Branches found:
2024-06-12 00:46:23,329 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-12 00:46:23,329 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:23,329 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:23,336 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-12 00:46:23,342 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-12 00:46:23,342 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-12 00:46:23,349 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-12 00:46:23,356 [ scc.git] DEBUG Already up to date.
2024-06-12 00:46:23,356 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-06-12 00:46:23,816 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-06-12 00:46:23,816 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-06-12 00:46:23,821 [ scc.git] DEBUG ## Unique users: []
2024-06-12 00:46:23,822 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:23,822 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:23,828 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-12 00:46:23,835 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:23,840 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-12 00:46:23,881 [ scc.git] DEBUG Auto-merging Dockerfile
2024-06-12 00:46:23,881 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-06-12 00:46:23,881 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-12 00:46:23,881 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-12 00:46:23,887 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-12 00:46:23,895 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-06-12 00:46:24,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:46:24,060 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-12 00:46:24,066 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-12 00:46:24,071 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#93](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-06-12 00:46:24,076 [ scc.config] DEBUG Found github.token
2024-06-12 00:46:24,077 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-06-12 00:46:24,077 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-12 00:46:24,117 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:24,117 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:24,122 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-12 00:46:24,159 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-12 00:46:24,165 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff428789b80> has no local changes
2024-06-12 00:46:24,166 [ 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#93 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/)'
2024-06-12 00:46:24,174 [ scc.git] DEBUG [detached HEAD 97e6040] merge master -Dorg -Ssuccess-only
2024-06-12 00:46:24,174 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:24,175 [ scc.git] INFO Overriding base-branch from master to develop
2024-06-12 00:46:24,175 [ scc.repo] DEBUG ## PRs found:
2024-06-12 00:46:24,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-06-12 00:46:25,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-06-12 00:46:25,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-06-12 00:46:26,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-06-12 00:46:26,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-06-12 00:46:27,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-06-12 00:46:27,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-06-12 00:46:28,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-12 00:46:28,491 [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-12 00:46:28,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-12 00:46:29,410 [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-12 00:46:29,412 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-12 00:46:29,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-06-12 00:46:30,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-06-12 00:46:30,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-06-12 00:46:31,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-06-12 00:46:31,398 [ scc.repo] DEBUG ## Branches found:
2024-06-12 00:46:31,399 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-12 00:46:31,399 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:31,399 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:31,407 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-06-12 00:46:31,414 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-12 00:46:31,414 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-06-12 00:46:31,420 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-06-12 00:46:31,426 [ scc.git] DEBUG Already up to date.
2024-06-12 00:46:31,427 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-06-12 00:46:31,886 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-06-12 00:46:31,887 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-06-12 00:46:31,892 [ scc.git] DEBUG ## Unique users: []
2024-06-12 00:46:31,892 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:31,893 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:31,899 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-12 00:46:31,909 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:31,916 [ 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-12 00:46:31,939 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-06-12 00:46:31,940 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-06-12 00:46:31,940 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-12 00:46:31,940 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-12 00:46:31,947 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-12 00:46:31,954 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-06-12 00:46:32,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:46:32,147 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-12 00:46:32,154 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-12 00:46:32,161 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#93](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-06-12 00:46:32,166 [ scc.config] DEBUG Found github.token
2024-06-12 00:46:32,166 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-06-12 00:46:32,166 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-12 00:46:32,209 [ scc.git] DEBUG Get sha1 of %s
2024-06-12 00:46:32,209 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-12 00:46:32,215 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-12 00:46:32,260 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-12 00:46:32,269 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff4287b5d60> has no local changes
2024-06-12 00:46:32,269 [ 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#93 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/)'
2024-06-12 00:46:32,279 [ scc.git] DEBUG [detached HEAD ed60260] merge master -Dorg -Ssuccess-only
2024-06-12 00:46:32,279 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:32,279 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-12 00:46:32,366 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-06-12 00:46:32,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:46:32,600 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-06-12 00:46:32,607 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-06-12 00:46:33,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:46:33,019 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-06-12 00:46:33,025 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-06-12 00:46:33,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:46:33,419 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-06-12 00:46:33,424 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-06-12 00:46:33,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:46:33,839 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-06-12 00:46:34,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:46:34,249 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-06-12 00:46:34,254 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-06-12 00:46:34,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:46:34,657 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-06-12 00:46:34,664 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-06-12 00:46:35,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:46:35,065 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-06-12 00:46:35,070 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-06-12 00:46:35,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:46:35,475 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-06-12 00:46:35,480 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-06-12 00:46:35,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:46:35,887 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-06-12 00:46:35,892 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-06-12 00:46:36,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:46:36,286 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-06-12 00:46:36,291 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-06-12 00:46:36,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:46:36,703 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-06-12 00:46:36,710 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-06-12 00:46:37,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:46:37,112 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-06-12 00:46:37,118 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-06-12 00:46:37,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:46:37,533 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-06-12 00:46:37,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:46:37,976 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-06-12 00:46:38,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:46:38,368 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-06-12 00:46:38,373 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-06-12 00:46:38,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:46:38,789 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-06-12 00:46:39,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:46:39,194 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-06-12 00:46:39,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:46:39,621 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-06-12 00:46:39,626 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-06-12 00:46:40,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:46:40,049 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-06-12 00:46:40,053 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-06-12 00:46:40,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:46:40,449 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-06-12 00:46:40,455 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-06-12 00:46:40,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:46:40,891 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-06-12 00:46:40,897 [ scc.config] DEBUG Found submodule.scripts.url
2024-06-12 00:46:41,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-12 00:46:41,308 [ scc.config] DEBUG Found submodule.scripts.branch
2024-06-12 00:46:41,309 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-12 00:46:41,403 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff442a1d2e0> has local changes
2024-06-12 00:46:41,403 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 373 dependabot[bot] 'Bump omero-test-infra from `7688c54` to `cda3ec6`'
- PR 374 dependabot[bot] 'Bump omero-figure from `3d9e3b8` to `b251579`'
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)
Already up to date.
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#93 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/93/)'
2024-06-12 00:46:41,418 [ scc.git] DEBUG [detached HEAD 39964dc] merge master -Dorg -Ssuccess-only
2024-06-12 00:46:41,419 [ scc.merge] INFO Repository: ome/omero-plugins
2024-06-12 00:46:41,419 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-06-12 00:46:41,419 [ scc.merge] INFO Already up to date.
2024-06-12 00:46:41,419 [ scc.merge] INFO
2024-06-12 00:46:41,419 [ scc.merge] INFO Merged PRs:
2024-06-12 00:46:41,419 [ scc.merge] INFO - PR 373 dependabot[bot] 'Bump omero-test-infra from `7688c54` to `cda3ec6`'
2024-06-12 00:46:41,420 [ scc.merge] INFO - PR 374 dependabot[bot] 'Bump omero-figure from `3d9e3b8` to `b251579`'
2024-06-12 00:46:41,420 [ scc.merge] INFO
2024-06-12 00:46:41,420 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-06-12 00:46:41,420 [ scc.merge] INFO Already up to date.
2024-06-12 00:46:41,420 [ scc.merge] INFO
2024-06-12 00:46:41,420 [ scc.merge] INFO
2024-06-12 00:46:41,420 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-06-12 00:46:41,420 [ scc.merge] INFO Excluded PRs:
2024-06-12 00:46:41,420 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-06-12 00:46:41,420 [ scc.merge] INFO Already up to date.
2024-06-12 00:46:41,420 [ scc.merge] INFO
2024-06-12 00:46:41,420 [ scc.merge] INFO Merged PRs:
2024-06-12 00:46:41,420 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-06-12 00:46:41,420 [ scc.merge] INFO
2024-06-12 00:46:41,420 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-06-12 00:46:41,420 [ scc.merge] INFO Excluded PRs:
2024-06-12 00:46:41,420 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-06-12 00:46:41,420 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-06-12 00:46:41,420 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-06-12 00:46:41,420 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-06-12 00:46:41,421 [ scc.merge] INFO Already up to date.
2024-06-12 00:46:41,421 [ scc.merge] INFO
2024-06-12 00:46:41,421 [ scc.merge] INFO Merged PRs:
2024-06-12 00:46:41,421 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-06-12 00:46:41,421 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-06-12 00:46:41,421 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-06-12 00:46:41,421 [ scc.merge] INFO
2024-06-12 00:46:41,421 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-06-12 00:46:41,421 [ scc.merge] INFO Excluded PRs:
2024-06-12 00:46:41,421 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-12 00:46:41,421 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-06-12 00:46:41,421 [ scc.merge] INFO Already up to date.
2024-06-12 00:46:41,421 [ scc.merge] INFO
2024-06-12 00:46:41,421 [ scc.merge] INFO Merged PRs:
2024-06-12 00:46:41,421 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-06-12 00:46:41,421 [ scc.merge] INFO
2024-06-12 00:46:41,421 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-12 00:46:41,421 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-06-12 00:46:41,422 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-06-12 00:46:41,422 [ scc.merge] INFO
2024-06-12 00:46:41,422 [ scc.merge] INFO Repository: ome/omero-figure
2024-06-12 00:46:41,422 [ scc.merge] INFO Excluded PRs:
2024-06-12 00:46:41,422 [ scc.merge] INFO - PR 566 jo-mueller 'added info on figure scripts upload' (user: jo-mueller)
2024-06-12 00:46:41,422 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes' (exclude comment)
2024-06-12 00:46:41,422 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-06-12 00:46:41,422 [ scc.merge] INFO Already up to date.
2024-06-12 00:46:41,422 [ scc.merge] INFO
2024-06-12 00:46:41,422 [ scc.merge] INFO Merged PRs:
2024-06-12 00:46:41,422 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-06-12 00:46:41,422 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-06-12 00:46:41,422 [ scc.merge] INFO - PR 562 will-moore 'Add changelog 7.0.0'
2024-06-12 00:46:41,422 [ scc.merge] INFO
2024-06-12 00:46:41,422 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-06-12 00:46:41,422 [ scc.merge] INFO Already up to date.
2024-06-12 00:46:41,422 [ scc.merge] INFO
2024-06-12 00:46:41,422 [ scc.merge] INFO Merged PRs:
2024-06-12 00:46:41,423 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-06-12 00:46:41,423 [ scc.merge] INFO
2024-06-12 00:46:41,423 [ scc.merge] INFO Repository: ome/omero-gallery
2024-06-12 00:46:41,423 [ scc.merge] INFO Already up to date.
2024-06-12 00:46:41,423 [ scc.merge] INFO
2024-06-12 00:46:41,423 [ scc.merge] INFO Merged PRs:
2024-06-12 00:46:41,423 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-12 00:46:41,423 [ scc.merge] INFO
2024-06-12 00:46:41,423 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-06-12 00:46:41,423 [ scc.merge] INFO Excluded PRs:
2024-06-12 00:46:41,423 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-06-12 00:46:41,423 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-06-12 00:46:41,423 [ scc.merge] INFO Already up to date.
2024-06-12 00:46:41,423 [ scc.merge] INFO
2024-06-12 00:46:41,423 [ scc.merge] INFO Merged PRs:
2024-06-12 00:46:41,423 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-06-12 00:46:41,423 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-06-12 00:46:41,423 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-12 00:46:41,423 [ scc.merge] INFO
2024-06-12 00:46:41,423 [ scc.merge] INFO Repository: ome/omero-mapr
2024-06-12 00:46:41,424 [ scc.merge] INFO Excluded PRs:
2024-06-12 00:46:41,424 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-06-12 00:46:41,424 [ scc.merge] INFO Already up to date.
2024-06-12 00:46:41,424 [ scc.merge] INFO
2024-06-12 00:46:41,424 [ scc.merge] INFO Merged PRs:
2024-06-12 00:46:41,424 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-06-12 00:46:41,424 [ scc.merge] INFO
2024-06-12 00:46:41,424 [ scc.merge] INFO Repository: ome/omero-metadata
2024-06-12 00:46:41,424 [ scc.merge] INFO Already up to date.
2024-06-12 00:46:41,424 [ scc.merge] INFO
2024-06-12 00:46:41,424 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-12 00:46:41,424 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-12 00:46:41,424 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-12 00:46:41,424 [ scc.merge] INFO
2024-06-12 00:46:41,424 [ scc.merge] INFO Repository: ome/omero-parade
2024-06-12 00:46:41,424 [ scc.merge] INFO Excluded PRs:
2024-06-12 00:46:41,424 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-06-12 00:46:41,424 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-06-12 00:46:41,425 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-06-12 00:46:41,425 [ scc.merge] INFO Already up to date.
2024-06-12 00:46:41,425 [ scc.merge] INFO
2024-06-12 00:46:41,425 [ scc.merge] INFO Merged PRs:
2024-06-12 00:46:41,425 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-12 00:46:41,425 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-12 00:46:41,425 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-12 00:46:41,425 [ scc.merge] INFO
2024-06-12 00:46:41,425 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-06-12 00:46:41,425 [ scc.merge] INFO Already up to date.
2024-06-12 00:46:41,425 [ scc.merge] INFO
2024-06-12 00:46:41,425 [ scc.merge] INFO Merged PRs:
2024-06-12 00:46:41,425 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-06-12 00:46:41,425 [ scc.merge] INFO
2024-06-12 00:46:41,425 [ scc.merge] INFO Repository: ome/omero-rois
2024-06-12 00:46:41,425 [ scc.merge] INFO Excluded PRs:
2024-06-12 00:46:41,425 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-12 00:46:41,425 [ scc.merge] INFO Already up to date.
2024-06-12 00:46:41,425 [ scc.merge] INFO
2024-06-12 00:46:41,426 [ scc.merge] INFO Merged PRs:
2024-06-12 00:46:41,426 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-12 00:46:41,426 [ scc.merge] INFO
2024-06-12 00:46:41,426 [ scc.merge] INFO Repository: ome/omero-signup
2024-06-12 00:46:41,426 [ scc.merge] INFO Already up to date.
2024-06-12 00:46:41,426 [ scc.merge] INFO
2024-06-12 00:46:41,426 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-12 00:46:41,426 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-12 00:46:41,426 [ scc.merge] INFO
2024-06-12 00:46:41,426 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-06-12 00:46:41,426 [ scc.merge] INFO Already up to date.
2024-06-12 00:46:41,426 [ scc.merge] INFO
2024-06-12 00:46:41,426 [ scc.merge] INFO Merged PRs:
2024-06-12 00:46:41,426 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-12 00:46:41,426 [ scc.merge] INFO
2024-06-12 00:46:41,426 [ scc.merge] INFO Repository: ome/omero-upload
2024-06-12 00:46:41,426 [ scc.merge] INFO Already up to date.
2024-06-12 00:46:41,426 [ scc.merge] INFO
2024-06-12 00:46:41,426 [ scc.merge] INFO
2024-06-12 00:46:41,426 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-06-12 00:46:41,427 [ scc.merge] INFO Already up to date.
2024-06-12 00:46:41,427 [ scc.merge] INFO
2024-06-12 00:46:41,427 [ scc.merge] INFO
2024-06-12 00:46:41,427 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-06-12 00:46:41,427 [ scc.merge] INFO Excluded PRs:
2024-06-12 00:46:41,427 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-06-12 00:46:41,427 [ scc.merge] INFO Already up to date.
2024-06-12 00:46:41,427 [ scc.merge] INFO
2024-06-12 00:46:41,427 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-12 00:46:41,427 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-12 00:46:41,427 [ scc.merge] INFO
2024-06-12 00:46:41,427 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-06-12 00:46:41,427 [ scc.merge] INFO Already up to date.
2024-06-12 00:46:41,427 [ scc.merge] INFO
2024-06-12 00:46:41,427 [ scc.merge] INFO
2024-06-12 00:46:41,427 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-06-12 00:46:41,427 [ scc.merge] INFO Already up to date.
2024-06-12 00:46:41,428 [ scc.merge] INFO
2024-06-12 00:46:41,428 [ scc.merge] INFO
2024-06-12 00:46:41,428 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-06-12 00:46:41,428 [ scc.merge] INFO Already up to date.
2024-06-12 00:46:41,428 [ scc.merge] INFO
2024-06-12 00:46:41,428 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-12 00:46:41,428 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-06-12 00:46:41,428 [ scc.merge] INFO
2024-06-12 00:46:41,428 [ scc.merge] INFO Repository: ome/scripts
2024-06-12 00:46:41,428 [ scc.merge] INFO Excluded PRs:
2024-06-12 00:46:41,428 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-06-12 00:46:41,428 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-06-12 00:46:41,428 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-06-12 00:46:41,428 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-06-12 00:46:41,428 [ scc.merge] INFO Already up to date.
2024-06-12 00:46:41,428 [ scc.merge] INFO
2024-06-12 00:46:41,428 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-12 00:46:41,428 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-12 00:46:41,428 [ scc.merge] INFO
2024-06-12 00:46:41,429 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-06-12 00:46:41,429 [ scc.git] DEBUG Calling 'git remote'
2024-06-12 00:46:41,436 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-06-12 00:46:41,436 [ scc.git] DEBUG Calling 'git remote'
2024-06-12 00:46:41,442 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:41,442 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-06-12 00:46:41,442 [ scc.git] DEBUG Calling 'git remote'
2024-06-12 00:46:41,448 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:41,448 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-06-12 00:46:41,448 [ scc.git] DEBUG Calling 'git remote'
2024-06-12 00:46:41,454 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:41,454 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-06-12 00:46:41,454 [ scc.git] DEBUG Calling 'git remote'
2024-06-12 00:46:41,460 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:41,461 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-12 00:46:41,461 [ scc.git] DEBUG Calling 'git remote'
2024-06-12 00:46:41,467 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:41,467 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-12 00:46:41,467 [ scc.git] DEBUG Calling 'git remote'
2024-06-12 00:46:41,474 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:41,475 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-12 00:46:41,475 [ scc.git] DEBUG Calling 'git remote'
2024-06-12 00:46:41,483 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:41,483 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-12 00:46:41,483 [ scc.git] DEBUG Calling 'git remote'
2024-06-12 00:46:41,489 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:41,490 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-12 00:46:41,490 [ scc.git] DEBUG Calling 'git remote'
2024-06-12 00:46:41,496 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:41,496 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-12 00:46:41,496 [ scc.git] DEBUG Calling 'git remote'
2024-06-12 00:46:41,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:41,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-12 00:46:41,502 [ scc.git] DEBUG Calling 'git remote'
2024-06-12 00:46:41,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:41,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-12 00:46:41,509 [ scc.git] DEBUG Calling 'git remote'
2024-06-12 00:46:41,515 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:41,515 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-12 00:46:41,515 [ scc.git] DEBUG Calling 'git remote'
2024-06-12 00:46:41,522 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:41,522 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-12 00:46:41,522 [ scc.git] DEBUG Calling 'git remote'
2024-06-12 00:46:41,528 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:41,528 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-12 00:46:41,528 [ scc.git] DEBUG Calling 'git remote'
2024-06-12 00:46:41,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:41,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-12 00:46:41,534 [ scc.git] DEBUG Calling 'git remote'
2024-06-12 00:46:41,540 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:41,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-12 00:46:41,541 [ scc.git] DEBUG Calling 'git remote'
2024-06-12 00:46:41,546 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:41,546 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-12 00:46:41,546 [ scc.git] DEBUG Calling 'git remote'
2024-06-12 00:46:41,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:41,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-12 00:46:41,551 [ scc.git] DEBUG Calling 'git remote'
2024-06-12 00:46:41,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:41,557 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-12 00:46:41,557 [ scc.git] DEBUG Calling 'git remote'
2024-06-12 00:46:41,562 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:41,562 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-12 00:46:41,562 [ scc.git] DEBUG Calling 'git remote'
2024-06-12 00:46:41,568 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-12 00:46:41,568 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-12 00:46:41,568 [ scc.git] DEBUG Calling 'git remote'
2024-06-12 00:46:41,573 [ 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 63f0d74] 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 b2515791
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 02cc0f2] 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-12 00:47:28,823 [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-12 00:47:37,948 [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-12 00:47:40,375 [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-12 00:47:45,115 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-06-12 00:48:32,635 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/28c89a1b/images/svgs/logo.svg){kind=logo}
