Console Output
Skipping 89 KB..
Full Log498764274f8dc882fb54c7e0a30fb6737'
2024-06-19 00:44:09,394 [ scc.git] DEBUG Auto-merging .isort.cfg
2024-06-19 00:44:09,394 [ scc.git] DEBUG CONFLICT (content): Merge conflict in .isort.cfg
2024-06-19 00:44:09,395 [ scc.git] DEBUG Auto-merging setup.py
2024-06-19 00:44:09,395 [ scc.git] DEBUG Auto-merging src/omero_zarr/cli.py
2024-06-19 00:44:09,395 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-06-19 00:44:09,395 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_zarr/raw_pixels.py
2024-06-19 00:44:09,395 [ scc.git] DEBUG Auto-merging src/omero_zarr/util.py
2024-06-19 00:44:09,395 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-19 00:44:09,395 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-19 00:44:09,401 [ scc.git] DEBUG Calling 'git reset --hard 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-19 00:44:09,408 [ scc.git] DEBUG HEAD is now at 2ca566b Merge pull request #160 from ome/pre-commit-ci-update-config
2024-06-19 00:44:09,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:44:09,762 [ scc.git] DEBUG Calling 'git merge-base 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473 553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-06-19 00:44:09,769 [ scc.git] DEBUG Calling 'git diff --name-only eff38d0408f9d50de13b28dfe09e4382965e203f..2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-19 00:44:09,775 [ scc.git] INFO - PR 123 will-moore 'Support export of Fileset:ID'
Conflicting PR. Removed from build [OMERO-plugins-push#101](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/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-19 00:44:09,779 [ scc.config] DEBUG Found github.token
2024-06-19 00:44:09,780 [ scc.git] DEBUG Not adding comment to issue #123, already --conflicts.
2024-06-19 00:44:09,780 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a14f62a940f4974a305b3f5858049ee493b898ef'
2024-06-19 00:44:09,786 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:09,790 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 147 (Name option) a14f62a940f4974a305b3f5858049ee493b898ef'
2024-06-19 00:44:09,802 [ scc.git] DEBUG Auto-merging src/omero_zarr/masks.py
2024-06-19 00:44:09,802 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-06-19 00:44:09,803 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-19 00:44:09,806 [ scc.git] DEBUG README.rst | 30 ++++++++++++++++++------------
2024-06-19 00:44:09,806 [ scc.git] DEBUG src/omero_zarr/cli.py | 9 +++++++++
2024-06-19 00:44:09,806 [ scc.git] DEBUG src/omero_zarr/masks.py | 4 ++--
2024-06-19 00:44:09,806 [ scc.git] DEBUG src/omero_zarr/raw_pixels.py | 28 +++++++++++++++++++++++-----
2024-06-19 00:44:09,806 [ scc.git] DEBUG src/omero_zarr/util.py | 2 +-
2024-06-19 00:44:09,806 [ scc.git] DEBUG 5 files changed, 53 insertions(+), 20 deletions(-)
2024-06-19 00:44:10,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:44:10,209 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-19 00:44:10,248 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:44:10,249 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:10,254 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-19 00:44:10,292 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-19 00:44:10,299 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2926d24970> has no local changes
2024-06-19 00:44:10,299 [ 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#101 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/)'
2024-06-19 00:44:10,307 [ scc.git] DEBUG [detached HEAD 2be6ac4] merge master -Dorg -Ssuccess-only
2024-06-19 00:44:10,307 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:44:10,308 [ scc.repo] DEBUG ## PRs found:
2024-06-19 00:44:10,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-06-19 00:44:11,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/568 HTTP/1.1" 200 None
2024-06-19 00:44:11,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/568/comments HTTP/1.1" 200 None
2024-06-19 00:44:12,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6 HTTP/1.1" 200 None
2024-06-19 00:44:12,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-19 00:44:13,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-19 00:44:13,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6 HTTP/1.1" 200 None
2024-06-19 00:44:14,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6?per_page=1 HTTP/1.1" 200 2
2024-06-19 00:44:14,023 [ scc.repo] DEBUG - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-06-19 00:44:14,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-06-19 00:44:14,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-06-19 00:44:15,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-19 00:44:15,916 [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-19 00:44:16,383 [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-19 00:44:16,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-19 00:44:17,219 [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-19 00:44:17,220 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-06-19 00:44:17,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-06-19 00:44:18,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-19 00:44:18,725 [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-19 00:44:19,217 [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-19 00:44:19,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-19 00:44:20,149 [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-19 00:44:20,150 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-06-19 00:44:20,150 [ scc.repo] DEBUG ## Branches found:
2024-06-19 00:44:20,150 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-19 00:44:20,150 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:44:20,150 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:20,157 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-19 00:44:20,162 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-19 00:44:20,162 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-19 00:44:20,168 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-19 00:44:20,174 [ scc.git] DEBUG Already up to date.
2024-06-19 00:44:20,174 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-06-19 00:44:20,562 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-19 00:44:20,562 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-06-19 00:44:20,567 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-06-19 00:44:20,940 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-19 00:44:20,940 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-06-19 00:44:20,945 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-06-19 00:44:21,340 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-19 00:44:21,341 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-06-19 00:44:21,346 [ scc.git] DEBUG ## Unique users: []
2024-06-19 00:44:21,346 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:44:21,346 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:21,352 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-19 00:44:21,360 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:21,366 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-19 00:44:21,381 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-19 00:44:21,387 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-06-19 00:44:21,387 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-06-19 00:44:21,387 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-06-19 00:44:21,387 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-06-19 00:44:21,387 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-06-19 00:44:21,387 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-06-19 00:44:21,387 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-06-19 00:44:21,387 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-06-19 00:44:21,387 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-06-19 00:44:21,387 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-06-19 00:44:21,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:44:21,566 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-19 00:44:21,574 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:21,580 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-19 00:44:21,601 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-06-19 00:44:21,601 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-06-19 00:44:21,601 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-06-19 00:44:21,601 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-19 00:44:21,608 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-06-19 00:44:21,608 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-06-19 00:44:21,608 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-06-19 00:44:21,608 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-06-19 00:44:21,608 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-06-19 00:44:21,608 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-06-19 00:44:21,608 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-06-19 00:44:21,608 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-06-19 00:44:21,608 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-06-19 00:44:21,608 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-06-19 00:44:21,608 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-06-19 00:44:21,608 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-06-19 00:44:21,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:44:21,976 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-06-19 00:44:21,985 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:21,991 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 568 (Remove numpy from tests_require in setup.py) 15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-06-19 00:44:22,007 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-19 00:44:22,009 [ scc.git] DEBUG setup.py | 2 +-
2024-06-19 00:44:22,009 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-06-19 00:44:22,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:44:22,392 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-19 00:44:22,432 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:44:22,432 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:22,438 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-19 00:44:22,476 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-19 00:44:22,484 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2926cdfbb0> has no local changes
2024-06-19 00:44:22,484 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 560 will-moore 'Max projection bytes' (exclude comment)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
Generated by OMERO-plugins-push#101 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/)'
2024-06-19 00:44:22,495 [ scc.git] DEBUG [detached HEAD ec8d50ef] merge master -Dorg -Ssuccess-only
2024-06-19 00:44:22,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:44:22,496 [ scc.repo] DEBUG ## PRs found:
2024-06-19 00:44:22,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-06-19 00:44:23,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-06-19 00:44:23,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-06-19 00:44:24,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-19 00:44:24,844 [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-19 00:44:25,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-19 00:44:25,771 [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-19 00:44:25,772 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-06-19 00:44:25,772 [ scc.repo] DEBUG ## Branches found:
2024-06-19 00:44:25,772 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-19 00:44:25,772 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:44:25,772 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:25,778 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-19 00:44:25,783 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-19 00:44:25,784 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-19 00:44:25,789 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-19 00:44:25,796 [ scc.git] DEBUG Already up to date.
2024-06-19 00:44:25,796 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-06-19 00:44:26,173 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-06-19 00:44:26,173 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-06-19 00:44:26,179 [ scc.git] DEBUG ## Unique users: []
2024-06-19 00:44:26,179 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:44:26,179 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:26,185 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-19 00:44:26,192 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:26,198 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-19 00:44:26,208 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-06-19 00:44:26,208 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-19 00:44:26,211 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-06-19 00:44:26,211 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-06-19 00:44:26,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:44:26,377 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-19 00:44:26,420 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:44:26,420 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:26,427 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-19 00:44:26,466 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-19 00:44:26,472 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2926d1cdf0> has no local changes
2024-06-19 00:44:26,473 [ 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#101 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/)'
2024-06-19 00:44:26,481 [ scc.git] DEBUG [detached HEAD f60d0b0] merge master -Dorg -Ssuccess-only
2024-06-19 00:44:26,481 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:44:26,481 [ scc.repo] DEBUG ## PRs found:
2024-06-19 00:44:26,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-06-19 00:44:27,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-06-19 00:44:27,421 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-19 00:44:27,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-19 00:44:28,506 [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-19 00:44:29,032 [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-19 00:44:29,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-19 00:44:29,966 [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-19 00:44:29,967 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-19 00:44:29,967 [ scc.repo] DEBUG ## Branches found:
2024-06-19 00:44:29,967 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-19 00:44:29,967 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:44:29,968 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:29,975 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-19 00:44:29,980 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-19 00:44:29,981 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-19 00:44:29,987 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-19 00:44:29,994 [ scc.git] DEBUG Already up to date.
2024-06-19 00:44:29,995 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-06-19 00:44:30,377 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-06-19 00:44:30,377 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-06-19 00:44:30,384 [ scc.git] DEBUG ## Unique users: []
2024-06-19 00:44:30,384 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:44:30,384 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:30,390 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-06-19 00:44:30,396 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:30,401 [ 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-19 00:44:30,412 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-19 00:44:30,416 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-06-19 00:44:30,416 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-06-19 00:44:30,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:44:30,567 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-19 00:44:30,610 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:44:30,610 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:30,618 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-19 00:44:30,658 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-19 00:44:30,666 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2926d1c340> has no local changes
2024-06-19 00:44:30,666 [ 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#101 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/)'
2024-06-19 00:44:30,676 [ scc.git] DEBUG [detached HEAD cd1fb7d] merge master -Dorg -Ssuccess-only
2024-06-19 00:44:30,677 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:44:30,677 [ scc.repo] DEBUG ## PRs found:
2024-06-19 00:44:31,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-06-19 00:44:31,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/476 HTTP/1.1" 200 None
2024-06-19 00:44:31,621 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-19 00:44:32,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/549fb585c07c2cbf9711ba5495fc9f40099f5ce5 HTTP/1.1" 200 None
2024-06-19 00:44:32,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/549fb585c07c2cbf9711ba5495fc9f40099f5ce5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-19 00:44:33,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/549fb585c07c2cbf9711ba5495fc9f40099f5ce5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-19 00:44:33,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/549fb585c07c2cbf9711ba5495fc9f40099f5ce5 HTTP/1.1" 200 None
2024-06-19 00:44:34,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/549fb585c07c2cbf9711ba5495fc9f40099f5ce5?per_page=1 HTTP/1.1" 200 2
2024-06-19 00:44:34,217 [ scc.repo] DEBUG - PR 476 dependabot[bot] 'Bump braces from 3.0.2 to 3.0.3'
2024-06-19 00:44:34,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-06-19 00:44:35,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-06-19 00:44:35,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-19 00:44:36,176 [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-19 00:44:36,641 [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-19 00:44:37,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-19 00:44:37,552 [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-19 00:44:37,553 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-19 00:44:38,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-06-19 00:44:38,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-06-19 00:44:38,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-19 00:44:39,488 [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-19 00:44:39,960 [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-19 00:44:40,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-19 00:44:40,904 [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-19 00:44:40,904 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-06-19 00:44:41,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-06-19 00:44:41,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-06-19 00:44:42,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-19 00:44:42,833 [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-19 00:44:43,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-19 00:44:43,756 [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-19 00:44:43,757 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-06-19 00:44:43,757 [ scc.repo] DEBUG ## Branches found:
2024-06-19 00:44:43,758 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-19 00:44:43,758 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:44:43,758 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:43,764 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-19 00:44:43,768 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-19 00:44:43,768 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-19 00:44:43,773 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-19 00:44:43,779 [ scc.git] DEBUG Already up to date.
2024-06-19 00:44:43,779 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-06-19 00:44:44,151 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-19 00:44:44,152 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-06-19 00:44:44,157 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-06-19 00:44:44,540 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-19 00:44:44,540 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-06-19 00:44:44,545 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-06-19 00:44:44,947 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-19 00:44:44,947 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-06-19 00:44:44,952 [ scc.git] DEBUG Calling 'git fetch origin pull/476/head'
2024-06-19 00:44:45,326 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-19 00:44:45,326 [ scc.git] DEBUG * branch refs/pull/476/head -> FETCH_HEAD
2024-06-19 00:44:45,331 [ scc.git] DEBUG ## Unique users: []
2024-06-19 00:44:45,331 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:44:45,331 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:45,337 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-19 00:44:45,344 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:45,349 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-19 00:44:45,360 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-06-19 00:44:45,361 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-19 00:44:45,364 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-06-19 00:44:45,364 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-06-19 00:44:45,364 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-06-19 00:44:45,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:44:45,538 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-19 00:44:45,545 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:45,551 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-19 00:44:45,569 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-06-19 00:44:45,569 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-06-19 00:44:45,569 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-06-19 00:44:45,569 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-06-19 00:44:45,570 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-19 00:44:45,574 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-06-19 00:44:45,574 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-06-19 00:44:45,574 [ scc.git] DEBUG src/app/header.html | 5 +
2024-06-19 00:44:45,574 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-06-19 00:44:45,574 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-06-19 00:44:45,574 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-06-19 00:44:45,574 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-06-19 00:44:45,574 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-06-19 00:44:45,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:44:45,947 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-19 00:44:45,955 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:45,960 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-19 00:44:45,975 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-06-19 00:44:45,975 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-19 00:44:45,979 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-06-19 00:44:45,979 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-06-19 00:44:45,979 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-06-19 00:44:46,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:44:46,365 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...549fb585c07c2cbf9711ba5495fc9f40099f5ce5'
2024-06-19 00:44:46,373 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:46,378 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 476 (Bump braces from 3.0.2 to 3.0.3) 549fb585c07c2cbf9711ba5495fc9f40099f5ce5'
2024-06-19 00:44:46,393 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-19 00:44:46,428 [ scc.git] DEBUG package-lock.json | 28 ++++++++++++++--------------
2024-06-19 00:44:46,428 [ scc.git] DEBUG 1 file changed, 14 insertions(+), 14 deletions(-)
2024-06-19 00:44:46,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:44:46,792 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-19 00:44:46,834 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:44:46,834 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:46,840 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-19 00:44:46,879 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-19 00:44:46,889 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2926d07370> has no local changes
2024-06-19 00:44:46,889 [ 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'
- PR 476 dependabot[bot] 'Bump braces from 3.0.2 to 3.0.3'
Generated by OMERO-plugins-push#101 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/)'
2024-06-19 00:44:46,902 [ scc.git] DEBUG [detached HEAD a154e9e] merge master -Dorg -Ssuccess-only
2024-06-19 00:44:46,902 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:44:46,903 [ scc.repo] DEBUG ## PRs found:
2024-06-19 00:44:47,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-06-19 00:44:47,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-06-19 00:44:48,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-06-19 00:44:48,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-19 00:44:49,429 [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-19 00:44:49,891 [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-19 00:44:50,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-19 00:44:50,911 [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-19 00:44:50,911 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-06-19 00:44:50,912 [ scc.repo] DEBUG ## Branches found:
2024-06-19 00:44:50,912 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-19 00:44:50,912 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:44:50,912 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:50,926 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-19 00:44:50,934 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-19 00:44:50,934 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-19 00:44:50,944 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-19 00:44:50,951 [ scc.git] DEBUG Already up to date.
2024-06-19 00:44:50,952 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-06-19 00:44:51,330 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-06-19 00:44:51,331 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-06-19 00:44:51,336 [ scc.git] DEBUG ## Unique users: []
2024-06-19 00:44:51,336 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:44:51,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:51,342 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-19 00:44:51,349 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:51,356 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-19 00:44:51,368 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-19 00:44:51,371 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-06-19 00:44:51,371 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-06-19 00:44:51,371 [ scc.git] DEBUG requirements.txt | 2 +-
2024-06-19 00:44:51,371 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-06-19 00:44:51,371 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-06-19 00:44:51,371 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-06-19 00:44:51,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:44:51,542 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-19 00:44:51,583 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:44:51,583 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:51,590 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-19 00:44:51,629 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-19 00:44:51,636 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f29244a7bb0> has no local changes
2024-06-19 00:44:51,636 [ 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#101 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/)'
2024-06-19 00:44:51,651 [ scc.git] DEBUG [detached HEAD c47548a] merge master -Dorg -Ssuccess-only
2024-06-19 00:44:51,652 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:44:51,652 [ scc.repo] DEBUG ## PRs found:
2024-06-19 00:44:52,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-06-19 00:44:52,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-06-19 00:44:53,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-06-19 00:44:53,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-19 00:44:54,190 [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-19 00:44:54,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-19 00:44:55,058 [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-19 00:44:55,059 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-19 00:44:55,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-06-19 00:44:56,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-06-19 00:44:56,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-19 00:44:57,056 [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-19 00:44:57,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-19 00:44:58,047 [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-19 00:44:58,048 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-19 00:44:58,048 [ scc.repo] DEBUG ## Branches found:
2024-06-19 00:44:58,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-19 00:44:58,049 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:44:58,049 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:58,055 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-19 00:44:58,060 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-19 00:44:58,060 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-19 00:44:58,066 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-19 00:44:58,072 [ scc.git] DEBUG Already up to date.
2024-06-19 00:44:58,072 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-06-19 00:44:58,451 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-19 00:44:58,451 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-06-19 00:44:58,456 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-06-19 00:44:58,847 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-19 00:44:58,847 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-06-19 00:44:58,852 [ scc.git] DEBUG ## Unique users: []
2024-06-19 00:44:58,852 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:44:58,852 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:58,859 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-19 00:44:58,866 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:58,872 [ 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-19 00:44:58,887 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-06-19 00:44:58,887 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-06-19 00:44:58,887 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-19 00:44:58,887 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-19 00:44:58,888 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-19 00:44:58,888 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-19 00:44:58,895 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-19 00:44:58,903 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-19 00:44:59,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:44:59,096 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-19 00:44:59,105 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-19 00:44:59,112 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#101](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-06-19 00:44:59,117 [ scc.config] DEBUG Found github.token
2024-06-19 00:44:59,117 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-06-19 00:44:59,117 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-19 00:44:59,125 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:59,131 [ 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-19 00:44:59,148 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-19 00:44:59,148 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-19 00:44:59,148 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-06-19 00:44:59,148 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-19 00:44:59,149 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-19 00:44:59,157 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-19 00:44:59,164 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-19 00:44:59,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:44:59,514 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-19 00:44:59,522 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-19 00:44:59,529 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#101](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/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-19 00:44:59,534 [ scc.config] DEBUG Found github.token
2024-06-19 00:44:59,534 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-06-19 00:44:59,534 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-19 00:44:59,586 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:44:59,586 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:44:59,594 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-19 00:44:59,638 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-19 00:44:59,646 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2926ceaf40> has no local changes
2024-06-19 00:44:59,647 [ 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#101 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/)'
2024-06-19 00:44:59,656 [ scc.git] DEBUG [detached HEAD 2bea3f4] merge master -Dorg -Ssuccess-only
2024-06-19 00:44:59,656 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:44:59,656 [ scc.repo] DEBUG ## PRs found:
2024-06-19 00:45:00,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-06-19 00:45:00,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-06-19 00:45:00,517 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-19 00:45:01,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-19 00:45:01,646 [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-19 00:45:02,110 [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-19 00:45:02,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-19 00:45:03,106 [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-19 00:45:03,107 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-19 00:45:03,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-06-19 00:45:03,586 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-19 00:45:04,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-19 00:45:04,683 [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-19 00:45:05,180 [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-19 00:45:05,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-19 00:45:06,150 [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-19 00:45:06,151 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-19 00:45:06,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-06-19 00:45:06,677 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-19 00:45:07,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-19 00:45:07,746 [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-19 00:45:08,197 [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-19 00:45:08,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-19 00:45:09,168 [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-19 00:45:09,169 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-19 00:45:09,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-06-19 00:45:10,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-06-19 00:45:10,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-06-19 00:45:11,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-06-19 00:45:11,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-06-19 00:45:12,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-06-19 00:45:12,121 [ scc.repo] DEBUG ## Branches found:
2024-06-19 00:45:12,122 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-19 00:45:12,122 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:12,122 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:12,128 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-19 00:45:12,134 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-19 00:45:12,134 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-19 00:45:12,141 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-19 00:45:12,148 [ scc.git] DEBUG Already up to date.
2024-06-19 00:45:12,149 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-06-19 00:45:12,575 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-19 00:45:12,576 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-06-19 00:45:12,582 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-06-19 00:45:12,968 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-19 00:45:12,968 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-06-19 00:45:12,973 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-06-19 00:45:13,356 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-19 00:45:13,357 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-06-19 00:45:13,362 [ scc.git] DEBUG ## Unique users: []
2024-06-19 00:45:13,362 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:13,362 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:13,368 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-06-19 00:45:13,374 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:13,378 [ 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-19 00:45:13,390 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-19 00:45:13,393 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-06-19 00:45:13,393 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-06-19 00:45:13,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:13,554 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-06-19 00:45:13,565 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:13,574 [ 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-19 00:45:13,594 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-19 00:45:13,595 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-19 00:45:13,599 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-06-19 00:45:13,600 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-06-19 00:45:13,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:13,979 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-06-19 00:45:13,986 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:13,994 [ 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-19 00:45:14,007 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-19 00:45:14,008 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-19 00:45:14,011 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-06-19 00:45:14,011 [ scc.git] DEBUG package.json | 2 +-
2024-06-19 00:45:14,011 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-06-19 00:45:14,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:14,390 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-19 00:45:14,433 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:14,434 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:14,441 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-19 00:45:14,484 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-19 00:45:14,492 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f292445f640> has no local changes
2024-06-19 00:45:14,492 [ 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#101 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/)'
2024-06-19 00:45:14,501 [ scc.git] DEBUG [detached HEAD cf98986] merge master -Dorg -Ssuccess-only
2024-06-19 00:45:14,501 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:14,502 [ scc.repo] DEBUG ## PRs found:
2024-06-19 00:45:14,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-06-19 00:45:15,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-06-19 00:45:15,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-19 00:45:16,461 [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-19 00:45:16,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-19 00:45:17,320 [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-19 00:45:17,321 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-06-19 00:45:17,321 [ scc.repo] DEBUG ## Branches found:
2024-06-19 00:45:17,321 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-19 00:45:17,321 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:17,321 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:17,328 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-19 00:45:17,333 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-19 00:45:17,333 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-19 00:45:17,339 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-19 00:45:17,346 [ scc.git] DEBUG Already up to date.
2024-06-19 00:45:17,347 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-19 00:45:17,740 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-06-19 00:45:17,740 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-19 00:45:17,745 [ scc.git] DEBUG ## Unique users: []
2024-06-19 00:45:17,745 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:17,745 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:17,751 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-19 00:45:17,758 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:17,764 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-19 00:45:17,773 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-19 00:45:17,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:17,943 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-19 00:45:17,983 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:17,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:17,990 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-19 00:45:18,033 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-19 00:45:18,039 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2926cddbe0> has no local changes
2024-06-19 00:45:18,040 [ 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#101 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/)'
2024-06-19 00:45:18,048 [ scc.git] DEBUG [detached HEAD c3acf90] merge master -Dorg -Ssuccess-only
2024-06-19 00:45:18,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:18,048 [ scc.repo] DEBUG ## PRs found:
2024-06-19 00:45:18,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-06-19 00:45:18,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-06-19 00:45:19,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-06-19 00:45:19,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-06-19 00:45:20,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-19 00:45:20,826 [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-19 00:45:21,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-19 00:45:21,816 [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-19 00:45:21,816 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-19 00:45:21,816 [ scc.repo] DEBUG ## Branches found:
2024-06-19 00:45:21,817 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-19 00:45:21,817 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:21,817 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:21,823 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-19 00:45:21,828 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-19 00:45:21,829 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-19 00:45:21,834 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-19 00:45:21,840 [ scc.git] DEBUG Already up to date.
2024-06-19 00:45:21,841 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-06-19 00:45:22,235 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-06-19 00:45:22,235 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-06-19 00:45:22,241 [ scc.git] DEBUG ## Unique users: []
2024-06-19 00:45:22,241 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:22,241 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:22,247 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-06-19 00:45:22,254 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:22,260 [ 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-19 00:45:22,270 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-06-19 00:45:22,271 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-19 00:45:22,273 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-06-19 00:45:22,274 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-06-19 00:45:22,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:22,421 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-19 00:45:22,460 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:22,461 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:22,466 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-19 00:45:22,507 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-19 00:45:22,514 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2924417550> has no local changes
2024-06-19 00:45:22,514 [ 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#101 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/)'
2024-06-19 00:45:22,524 [ scc.git] DEBUG [detached HEAD 1936b6d] merge master -Dorg -Ssuccess-only
2024-06-19 00:45:22,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:22,525 [ scc.repo] DEBUG ## PRs found:
2024-06-19 00:45:22,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-06-19 00:45:23,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-06-19 00:45:23,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-06-19 00:45:24,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-19 00:45:24,928 [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-19 00:45:25,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-19 00:45:25,863 [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-19 00:45:25,864 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-19 00:45:25,864 [ scc.repo] DEBUG ## Branches found:
2024-06-19 00:45:25,864 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-19 00:45:25,865 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:25,865 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:25,871 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-19 00:45:25,877 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-19 00:45:25,877 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-19 00:45:25,883 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-19 00:45:25,889 [ scc.git] DEBUG Already up to date.
2024-06-19 00:45:25,889 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-19 00:45:26,267 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-06-19 00:45:26,267 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-19 00:45:26,272 [ scc.git] DEBUG ## Unique users: []
2024-06-19 00:45:26,272 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:26,272 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:26,277 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-19 00:45:26,283 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:26,287 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-19 00:45:26,297 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-06-19 00:45:26,297 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-06-19 00:45:26,297 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-06-19 00:45:26,297 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-06-19 00:45:26,297 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-06-19 00:45:26,297 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-06-19 00:45:26,297 [ scc.git] DEBUG Auto-merging setup.py
2024-06-19 00:45:26,297 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-06-19 00:45:26,298 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-19 00:45:26,298 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-19 00:45:26,303 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-19 00:45:26,309 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-06-19 00:45:26,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:26,472 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-19 00:45:26,478 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-19 00:45:26,483 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#101](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- setup.py
- omero_signup/views.py
- omero_signup/signup_settings.py
--conflicts
2024-06-19 00:45:26,488 [ scc.config] DEBUG Found github.token
2024-06-19 00:45:26,488 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-06-19 00:45:26,488 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-19 00:45:26,527 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:26,527 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:26,532 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-19 00:45:26,572 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-19 00:45:26,579 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2924491f40> has no local changes
2024-06-19 00:45:26,579 [ 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#101 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/)'
2024-06-19 00:45:26,588 [ scc.git] DEBUG [detached HEAD 40531ee] merge master -Dorg -Ssuccess-only
2024-06-19 00:45:26,588 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:26,589 [ scc.repo] DEBUG ## PRs found:
2024-06-19 00:45:26,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-06-19 00:45:27,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-06-19 00:45:27,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-06-19 00:45:28,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-19 00:45:28,878 [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-19 00:45:29,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-19 00:45:29,791 [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-19 00:45:29,792 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-19 00:45:29,792 [ scc.repo] DEBUG ## Branches found:
2024-06-19 00:45:29,792 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-19 00:45:29,792 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:29,792 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:29,800 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-19 00:45:29,806 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-19 00:45:29,806 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-19 00:45:29,813 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-19 00:45:29,820 [ scc.git] DEBUG Already up to date.
2024-06-19 00:45:29,820 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-06-19 00:45:30,189 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-06-19 00:45:30,189 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-06-19 00:45:30,195 [ scc.git] DEBUG ## Unique users: []
2024-06-19 00:45:30,195 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:30,195 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:30,202 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-06-19 00:45:30,210 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:30,217 [ 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-19 00:45:30,232 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-19 00:45:30,235 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-06-19 00:45:30,235 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-06-19 00:45:30,235 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-06-19 00:45:30,236 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-06-19 00:45:30,236 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-06-19 00:45:30,236 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-06-19 00:45:30,236 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-06-19 00:45:30,236 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-06-19 00:45:30,238 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-06-19 00:45:30,238 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-06-19 00:45:30,238 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-06-19 00:45:30,238 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-06-19 00:45:30,238 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-06-19 00:45:30,238 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-06-19 00:45:30,238 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-06-19 00:45:30,238 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-06-19 00:45:30,239 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-06-19 00:45:30,239 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-06-19 00:45:30,239 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-06-19 00:45:30,239 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-06-19 00:45:30,239 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-06-19 00:45:30,239 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-06-19 00:45:30,239 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-06-19 00:45:30,239 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-06-19 00:45:30,239 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-06-19 00:45:30,239 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-06-19 00:45:30,239 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-06-19 00:45:30,239 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-06-19 00:45:30,239 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-06-19 00:45:30,239 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-06-19 00:45:30,239 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-06-19 00:45:30,239 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-06-19 00:45:30,239 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-06-19 00:45:30,239 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-06-19 00:45:30,239 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-06-19 00:45:30,239 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-06-19 00:45:30,239 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-06-19 00:45:30,239 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-06-19 00:45:30,240 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-06-19 00:45:30,240 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-06-19 00:45:30,240 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-06-19 00:45:30,240 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-06-19 00:45:30,240 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-06-19 00:45:30,240 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-06-19 00:45:30,240 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-06-19 00:45:30,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:30,401 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-19 00:45:30,444 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:30,444 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:30,450 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-19 00:45:30,491 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-19 00:45:30,499 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2924417730> has no local changes
2024-06-19 00:45:30,499 [ 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#101 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/)'
2024-06-19 00:45:30,509 [ scc.git] DEBUG [detached HEAD 5ad6b05] merge master -Dorg -Ssuccess-only
2024-06-19 00:45:30,510 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:30,510 [ scc.repo] DEBUG ## PRs found:
2024-06-19 00:45:30,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-06-19 00:45:30,844 [ scc.repo] DEBUG ## Branches found:
2024-06-19 00:45:30,844 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-19 00:45:30,844 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:30,844 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:30,850 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-19 00:45:30,856 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-19 00:45:30,856 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-19 00:45:30,863 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-19 00:45:30,870 [ scc.git] DEBUG Already up to date.
2024-06-19 00:45:30,870 [ scc.git] DEBUG ## Unique users: []
2024-06-19 00:45:30,870 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:30,870 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:30,875 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-19 00:45:30,912 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:30,912 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:30,917 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-19 00:45:30,955 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-19 00:45:30,961 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2924428b80> has no local changes
2024-06-19 00:45:30,961 [ 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#101 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/)'
2024-06-19 00:45:30,969 [ scc.git] DEBUG [detached HEAD 41d9979] merge master -Dorg -Ssuccess-only
2024-06-19 00:45:30,969 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:30,969 [ scc.repo] DEBUG ## PRs found:
2024-06-19 00:45:31,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-06-19 00:45:31,277 [ scc.repo] DEBUG ## Branches found:
2024-06-19 00:45:31,277 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-19 00:45:31,277 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:31,277 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:31,284 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-19 00:45:31,289 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-19 00:45:31,289 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-19 00:45:31,295 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-19 00:45:31,301 [ scc.git] DEBUG Already up to date.
2024-06-19 00:45:31,301 [ scc.git] DEBUG ## Unique users: []
2024-06-19 00:45:31,301 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:31,301 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:31,306 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-19 00:45:31,348 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:31,349 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:31,356 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-19 00:45:31,395 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-19 00:45:31,401 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2924459d90> has no local changes
2024-06-19 00:45:31,401 [ 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#101 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/)'
2024-06-19 00:45:31,408 [ scc.git] DEBUG [detached HEAD 57a4bc2] merge master -Dorg -Ssuccess-only
2024-06-19 00:45:31,409 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:31,409 [ scc.git] INFO Overriding base-branch from master to main
2024-06-19 00:45:31,409 [ scc.repo] DEBUG ## PRs found:
2024-06-19 00:45:31,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-06-19 00:45:32,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-06-19 00:45:32,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-06-19 00:45:33,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-06-19 00:45:33,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-19 00:45:34,332 [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-19 00:45:34,807 [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-19 00:45:35,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-19 00:45:35,771 [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-19 00:45:35,771 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-19 00:45:35,771 [ scc.repo] DEBUG ## Branches found:
2024-06-19 00:45:35,772 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-19 00:45:35,772 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:35,772 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:35,778 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-06-19 00:45:35,783 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-19 00:45:35,783 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-06-19 00:45:35,789 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-06-19 00:45:35,794 [ scc.git] DEBUG Already up to date.
2024-06-19 00:45:35,794 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-06-19 00:45:36,166 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-06-19 00:45:36,167 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-06-19 00:45:36,173 [ scc.git] DEBUG ## Unique users: []
2024-06-19 00:45:36,173 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:36,173 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:36,179 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-19 00:45:36,185 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:36,189 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-19 00:45:36,198 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-06-19 00:45:36,198 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-06-19 00:45:36,198 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-19 00:45:36,198 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-19 00:45:36,205 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-19 00:45:36,215 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-06-19 00:45:36,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:36,376 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-19 00:45:36,384 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-19 00:45:36,392 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#101](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-06-19 00:45:36,401 [ scc.config] DEBUG Found github.token
2024-06-19 00:45:36,401 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-06-19 00:45:36,401 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-19 00:45:36,450 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:36,450 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:36,456 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-19 00:45:36,494 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-19 00:45:36,501 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2924453b50> has no local changes
2024-06-19 00:45:36,501 [ 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#101 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/)'
2024-06-19 00:45:36,509 [ scc.git] DEBUG [detached HEAD 3b7ce19] merge master -Dorg -Ssuccess-only
2024-06-19 00:45:36,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:36,509 [ scc.repo] DEBUG ## PRs found:
2024-06-19 00:45:36,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-06-19 00:45:36,787 [ scc.repo] DEBUG ## Branches found:
2024-06-19 00:45:36,787 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-19 00:45:36,787 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:36,787 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:36,793 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-19 00:45:36,798 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-19 00:45:36,798 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-19 00:45:36,804 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-19 00:45:36,810 [ scc.git] DEBUG Already up to date.
2024-06-19 00:45:36,811 [ scc.git] DEBUG ## Unique users: []
2024-06-19 00:45:36,811 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:36,811 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:36,816 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-19 00:45:36,854 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:36,854 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:36,860 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-19 00:45:36,896 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-19 00:45:36,902 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2924446e80> has no local changes
2024-06-19 00:45:36,903 [ 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#101 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/)'
2024-06-19 00:45:36,910 [ scc.git] DEBUG [detached HEAD c1614b4] merge master -Dorg -Ssuccess-only
2024-06-19 00:45:36,911 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:36,911 [ scc.repo] DEBUG ## PRs found:
2024-06-19 00:45:37,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-06-19 00:45:37,210 [ scc.repo] DEBUG ## Branches found:
2024-06-19 00:45:37,210 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-19 00:45:37,210 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:37,210 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:37,215 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-19 00:45:37,220 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-19 00:45:37,220 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-19 00:45:37,225 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-19 00:45:37,230 [ scc.git] DEBUG Already up to date.
2024-06-19 00:45:37,231 [ scc.git] DEBUG ## Unique users: []
2024-06-19 00:45:37,231 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:37,231 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:37,235 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-19 00:45:37,273 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:37,273 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:37,278 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-19 00:45:37,315 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-19 00:45:37,321 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2924393400> has no local changes
2024-06-19 00:45:37,321 [ 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#101 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/)'
2024-06-19 00:45:37,330 [ scc.git] DEBUG [detached HEAD bc08c45] merge master -Dorg -Ssuccess-only
2024-06-19 00:45:37,330 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:37,330 [ scc.repo] DEBUG ## PRs found:
2024-06-19 00:45:37,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-06-19 00:45:38,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-06-19 00:45:38,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-06-19 00:45:39,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-19 00:45:39,641 [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-19 00:45:40,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-19 00:45:40,585 [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-19 00:45:40,586 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-06-19 00:45:40,586 [ scc.repo] DEBUG ## Branches found:
2024-06-19 00:45:40,586 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-19 00:45:40,586 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:40,586 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:40,593 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-19 00:45:40,599 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-19 00:45:40,599 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-19 00:45:40,605 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-19 00:45:40,611 [ scc.git] DEBUG Already up to date.
2024-06-19 00:45:40,612 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-06-19 00:45:42,000 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-06-19 00:45:42,001 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-06-19 00:45:42,005 [ scc.git] DEBUG ## Unique users: []
2024-06-19 00:45:42,005 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:42,006 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:42,011 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-19 00:45:42,017 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:42,023 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-19 00:45:42,035 [ scc.git] DEBUG Auto-merging Dockerfile
2024-06-19 00:45:42,035 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-06-19 00:45:42,036 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-19 00:45:42,036 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-19 00:45:42,043 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-19 00:45:42,051 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-06-19 00:45:42,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:42,212 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-19 00:45:42,219 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-19 00:45:42,225 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#101](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-06-19 00:45:42,231 [ scc.config] DEBUG Found github.token
2024-06-19 00:45:42,231 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-06-19 00:45:42,231 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-19 00:45:42,281 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:42,282 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:42,290 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-19 00:45:42,336 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-19 00:45:42,344 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f29243d8b80> has no local changes
2024-06-19 00:45:42,344 [ 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#101 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/)'
2024-06-19 00:45:42,353 [ scc.git] DEBUG [detached HEAD a9c2e6f] merge master -Dorg -Ssuccess-only
2024-06-19 00:45:42,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:42,354 [ scc.git] INFO Overriding base-branch from master to develop
2024-06-19 00:45:42,354 [ scc.repo] DEBUG ## PRs found:
2024-06-19 00:45:42,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-06-19 00:45:43,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-06-19 00:45:43,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-06-19 00:45:44,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-06-19 00:45:44,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-06-19 00:45:45,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-06-19 00:45:45,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-06-19 00:45:46,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-19 00:45:46,721 [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-19 00:45:47,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-19 00:45:47,673 [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-19 00:45:47,675 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-19 00:45:48,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-06-19 00:45:48,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-06-19 00:45:49,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-06-19 00:45:49,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-06-19 00:45:49,619 [ scc.repo] DEBUG ## Branches found:
2024-06-19 00:45:49,619 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-19 00:45:49,619 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:49,619 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:49,626 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-06-19 00:45:49,634 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-19 00:45:49,634 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-06-19 00:45:49,643 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-06-19 00:45:49,653 [ scc.git] DEBUG Already up to date.
2024-06-19 00:45:49,653 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-06-19 00:45:50,038 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-06-19 00:45:50,038 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-06-19 00:45:50,045 [ scc.git] DEBUG ## Unique users: []
2024-06-19 00:45:50,045 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:50,045 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:50,054 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-19 00:45:50,066 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:50,072 [ 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-19 00:45:50,084 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-06-19 00:45:50,084 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-06-19 00:45:50,085 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-19 00:45:50,085 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-19 00:45:50,091 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-19 00:45:50,099 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-06-19 00:45:50,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:50,250 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-19 00:45:50,259 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-19 00:45:50,267 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#101](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-06-19 00:45:50,274 [ scc.config] DEBUG Found github.token
2024-06-19 00:45:50,274 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-06-19 00:45:50,275 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-19 00:45:50,317 [ scc.git] DEBUG Get sha1 of %s
2024-06-19 00:45:50,318 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-19 00:45:50,323 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-19 00:45:50,367 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-19 00:45:50,374 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f29243dcc70> has no local changes
2024-06-19 00:45:50,375 [ 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#101 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/)'
2024-06-19 00:45:50,385 [ scc.git] DEBUG [detached HEAD 367895a] merge master -Dorg -Ssuccess-only
2024-06-19 00:45:50,385 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:50,385 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-19 00:45:50,461 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-06-19 00:45:50,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:50,675 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-06-19 00:45:50,682 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-06-19 00:45:51,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:51,101 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-06-19 00:45:51,106 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-06-19 00:45:51,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:51,511 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-06-19 00:45:51,516 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-06-19 00:45:51,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:51,933 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-06-19 00:45:52,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:52,339 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-06-19 00:45:52,343 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-06-19 00:45:52,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:52,759 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-06-19 00:45:52,765 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-06-19 00:45:53,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:53,166 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-06-19 00:45:53,172 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-06-19 00:45:53,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:53,570 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-06-19 00:45:53,577 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-06-19 00:45:53,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:53,976 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-06-19 00:45:53,981 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-06-19 00:45:54,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:54,392 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-06-19 00:45:54,399 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-06-19 00:45:54,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:54,793 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-06-19 00:45:54,800 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-06-19 00:45:55,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:55,213 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-06-19 00:45:55,219 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-06-19 00:45:55,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:55,617 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-06-19 00:45:56,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:56,038 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-06-19 00:45:56,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:56,430 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-06-19 00:45:56,437 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-06-19 00:45:56,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:56,850 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-06-19 00:45:57,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:57,258 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-06-19 00:45:57,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:57,668 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-06-19 00:45:57,678 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-06-19 00:45:58,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:58,105 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-06-19 00:45:58,111 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-06-19 00:45:58,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:58,515 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-06-19 00:45:58,523 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-06-19 00:45:58,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:58,965 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-06-19 00:45:58,971 [ scc.config] DEBUG Found submodule.scripts.url
2024-06-19 00:45:59,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-19 00:45:59,383 [ scc.config] DEBUG Found submodule.scripts.branch
2024-06-19 00:45:59,383 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-19 00:45:59,490 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2927dfbc40> has local changes
2024-06-19 00:45:59,490 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 373 dependabot[bot] 'Bump omero-test-infra from `7688c54` to `cda3ec6`'
- PR 375 dependabot[bot] 'Bump omero-figure from `3d9e3b8` to `ffc7e07`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 63 sbesson 'Remove python-future dependency'
- PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
- PR 65 will-moore 'gateway_required() uses omero_user_token if no username and password'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 560 will-moore 'Max projection bytes' (exclude comment)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
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'
- PR 476 dependabot[bot] 'Bump braces from 3.0.2 to 3.0.3'
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#101 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/101/)'
2024-06-19 00:45:59,507 [ scc.git] DEBUG [detached HEAD b6bf9fa] merge master -Dorg -Ssuccess-only
2024-06-19 00:45:59,507 [ scc.merge] INFO Repository: ome/omero-plugins
2024-06-19 00:45:59,507 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-06-19 00:45:59,507 [ scc.merge] INFO Already up to date.
2024-06-19 00:45:59,507 [ scc.merge] INFO
2024-06-19 00:45:59,508 [ scc.merge] INFO Merged PRs:
2024-06-19 00:45:59,508 [ scc.merge] INFO - PR 373 dependabot[bot] 'Bump omero-test-infra from `7688c54` to `cda3ec6`'
2024-06-19 00:45:59,508 [ scc.merge] INFO - PR 375 dependabot[bot] 'Bump omero-figure from `3d9e3b8` to `ffc7e07`'
2024-06-19 00:45:59,508 [ scc.merge] INFO
2024-06-19 00:45:59,508 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-06-19 00:45:59,508 [ scc.merge] INFO Already up to date.
2024-06-19 00:45:59,508 [ scc.merge] INFO
2024-06-19 00:45:59,508 [ scc.merge] INFO
2024-06-19 00:45:59,508 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-06-19 00:45:59,508 [ scc.merge] INFO Excluded PRs:
2024-06-19 00:45:59,508 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-06-19 00:45:59,508 [ scc.merge] INFO Already up to date.
2024-06-19 00:45:59,508 [ scc.merge] INFO
2024-06-19 00:45:59,508 [ scc.merge] INFO Merged PRs:
2024-06-19 00:45:59,508 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-06-19 00:45:59,508 [ scc.merge] INFO
2024-06-19 00:45:59,508 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-06-19 00:45:59,508 [ scc.merge] INFO Excluded PRs:
2024-06-19 00:45:59,508 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-06-19 00:45:59,508 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-06-19 00:45:59,508 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-06-19 00:45:59,508 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-06-19 00:45:59,508 [ scc.merge] INFO Already up to date.
2024-06-19 00:45:59,508 [ scc.merge] INFO
2024-06-19 00:45:59,508 [ scc.merge] INFO Merged PRs:
2024-06-19 00:45:59,508 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-06-19 00:45:59,508 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-06-19 00:45:59,508 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-06-19 00:45:59,508 [ scc.merge] INFO - PR 65 will-moore 'gateway_required() uses omero_user_token if no username and password'
2024-06-19 00:45:59,508 [ scc.merge] INFO
2024-06-19 00:45:59,508 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-06-19 00:45:59,508 [ scc.merge] INFO Excluded PRs:
2024-06-19 00:45:59,508 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-19 00:45:59,508 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-06-19 00:45:59,508 [ scc.merge] INFO Already up to date.
2024-06-19 00:45:59,509 [ scc.merge] INFO
2024-06-19 00:45:59,509 [ scc.merge] INFO Merged PRs:
2024-06-19 00:45:59,509 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-06-19 00:45:59,509 [ scc.merge] INFO
2024-06-19 00:45:59,509 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-19 00:45:59,509 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-06-19 00:45:59,509 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-06-19 00:45:59,509 [ scc.merge] INFO
2024-06-19 00:45:59,509 [ scc.merge] INFO Repository: ome/omero-figure
2024-06-19 00:45:59,509 [ scc.merge] INFO Excluded PRs:
2024-06-19 00:45:59,509 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes' (exclude comment)
2024-06-19 00:45:59,509 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-06-19 00:45:59,509 [ scc.merge] INFO Already up to date.
2024-06-19 00:45:59,509 [ scc.merge] INFO
2024-06-19 00:45:59,509 [ scc.merge] INFO Merged PRs:
2024-06-19 00:45:59,509 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-06-19 00:45:59,509 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-06-19 00:45:59,509 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-06-19 00:45:59,509 [ scc.merge] INFO
2024-06-19 00:45:59,509 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-06-19 00:45:59,509 [ scc.merge] INFO Already up to date.
2024-06-19 00:45:59,509 [ scc.merge] INFO
2024-06-19 00:45:59,509 [ scc.merge] INFO Merged PRs:
2024-06-19 00:45:59,509 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-06-19 00:45:59,509 [ scc.merge] INFO
2024-06-19 00:45:59,509 [ scc.merge] INFO Repository: ome/omero-gallery
2024-06-19 00:45:59,509 [ scc.merge] INFO Already up to date.
2024-06-19 00:45:59,509 [ scc.merge] INFO
2024-06-19 00:45:59,509 [ scc.merge] INFO Merged PRs:
2024-06-19 00:45:59,509 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-19 00:45:59,509 [ scc.merge] INFO
2024-06-19 00:45:59,509 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-06-19 00:45:59,509 [ scc.merge] INFO Excluded PRs:
2024-06-19 00:45:59,509 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-06-19 00:45:59,509 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-06-19 00:45:59,509 [ scc.merge] INFO Already up to date.
2024-06-19 00:45:59,509 [ scc.merge] INFO
2024-06-19 00:45:59,510 [ scc.merge] INFO Merged PRs:
2024-06-19 00:45:59,510 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-06-19 00:45:59,510 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-06-19 00:45:59,510 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-19 00:45:59,510 [ scc.merge] INFO - PR 476 dependabot[bot] 'Bump braces from 3.0.2 to 3.0.3'
2024-06-19 00:45:59,510 [ scc.merge] INFO
2024-06-19 00:45:59,510 [ scc.merge] INFO Repository: ome/omero-mapr
2024-06-19 00:45:59,510 [ scc.merge] INFO Excluded PRs:
2024-06-19 00:45:59,510 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-06-19 00:45:59,510 [ scc.merge] INFO Already up to date.
2024-06-19 00:45:59,510 [ scc.merge] INFO
2024-06-19 00:45:59,510 [ scc.merge] INFO Merged PRs:
2024-06-19 00:45:59,510 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-06-19 00:45:59,510 [ scc.merge] INFO
2024-06-19 00:45:59,510 [ scc.merge] INFO Repository: ome/omero-metadata
2024-06-19 00:45:59,510 [ scc.merge] INFO Already up to date.
2024-06-19 00:45:59,510 [ scc.merge] INFO
2024-06-19 00:45:59,510 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-19 00:45:59,510 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-19 00:45:59,510 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-19 00:45:59,510 [ scc.merge] INFO
2024-06-19 00:45:59,510 [ scc.merge] INFO Repository: ome/omero-parade
2024-06-19 00:45:59,510 [ scc.merge] INFO Excluded PRs:
2024-06-19 00:45:59,510 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-06-19 00:45:59,510 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-06-19 00:45:59,510 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-06-19 00:45:59,510 [ scc.merge] INFO Already up to date.
2024-06-19 00:45:59,510 [ scc.merge] INFO
2024-06-19 00:45:59,510 [ scc.merge] INFO Merged PRs:
2024-06-19 00:45:59,510 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-19 00:45:59,510 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-19 00:45:59,510 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-19 00:45:59,510 [ scc.merge] INFO
2024-06-19 00:45:59,510 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-06-19 00:45:59,510 [ scc.merge] INFO Already up to date.
2024-06-19 00:45:59,510 [ scc.merge] INFO
2024-06-19 00:45:59,510 [ scc.merge] INFO Merged PRs:
2024-06-19 00:45:59,511 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-06-19 00:45:59,511 [ scc.merge] INFO
2024-06-19 00:45:59,511 [ scc.merge] INFO Repository: ome/omero-rois
2024-06-19 00:45:59,511 [ scc.merge] INFO Excluded PRs:
2024-06-19 00:45:59,511 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-19 00:45:59,511 [ scc.merge] INFO Already up to date.
2024-06-19 00:45:59,511 [ scc.merge] INFO
2024-06-19 00:45:59,511 [ scc.merge] INFO Merged PRs:
2024-06-19 00:45:59,511 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-19 00:45:59,511 [ scc.merge] INFO
2024-06-19 00:45:59,511 [ scc.merge] INFO Repository: ome/omero-signup
2024-06-19 00:45:59,511 [ scc.merge] INFO Already up to date.
2024-06-19 00:45:59,511 [ scc.merge] INFO
2024-06-19 00:45:59,511 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-19 00:45:59,511 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-19 00:45:59,511 [ scc.merge] INFO
2024-06-19 00:45:59,511 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-06-19 00:45:59,511 [ scc.merge] INFO Already up to date.
2024-06-19 00:45:59,511 [ scc.merge] INFO
2024-06-19 00:45:59,511 [ scc.merge] INFO Merged PRs:
2024-06-19 00:45:59,511 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-19 00:45:59,511 [ scc.merge] INFO
2024-06-19 00:45:59,511 [ scc.merge] INFO Repository: ome/omero-upload
2024-06-19 00:45:59,511 [ scc.merge] INFO Already up to date.
2024-06-19 00:45:59,511 [ scc.merge] INFO
2024-06-19 00:45:59,511 [ scc.merge] INFO
2024-06-19 00:45:59,511 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-06-19 00:45:59,511 [ scc.merge] INFO Already up to date.
2024-06-19 00:45:59,511 [ scc.merge] INFO
2024-06-19 00:45:59,511 [ scc.merge] INFO
2024-06-19 00:45:59,511 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-06-19 00:45:59,511 [ scc.merge] INFO Excluded PRs:
2024-06-19 00:45:59,511 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-06-19 00:45:59,511 [ scc.merge] INFO Already up to date.
2024-06-19 00:45:59,511 [ scc.merge] INFO
2024-06-19 00:45:59,511 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-19 00:45:59,511 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-19 00:45:59,512 [ scc.merge] INFO
2024-06-19 00:45:59,512 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-06-19 00:45:59,512 [ scc.merge] INFO Already up to date.
2024-06-19 00:45:59,512 [ scc.merge] INFO
2024-06-19 00:45:59,512 [ scc.merge] INFO
2024-06-19 00:45:59,512 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-06-19 00:45:59,512 [ scc.merge] INFO Already up to date.
2024-06-19 00:45:59,512 [ scc.merge] INFO
2024-06-19 00:45:59,512 [ scc.merge] INFO
2024-06-19 00:45:59,512 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-06-19 00:45:59,512 [ scc.merge] INFO Already up to date.
2024-06-19 00:45:59,512 [ scc.merge] INFO
2024-06-19 00:45:59,512 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-19 00:45:59,512 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-06-19 00:45:59,512 [ scc.merge] INFO
2024-06-19 00:45:59,512 [ scc.merge] INFO Repository: ome/scripts
2024-06-19 00:45:59,512 [ scc.merge] INFO Excluded PRs:
2024-06-19 00:45:59,512 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-06-19 00:45:59,512 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-06-19 00:45:59,512 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-06-19 00:45:59,512 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-06-19 00:45:59,512 [ scc.merge] INFO Already up to date.
2024-06-19 00:45:59,512 [ scc.merge] INFO
2024-06-19 00:45:59,513 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-19 00:45:59,513 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-19 00:45:59,513 [ scc.merge] INFO
2024-06-19 00:45:59,513 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-06-19 00:45:59,513 [ scc.git] DEBUG Calling 'git remote'
2024-06-19 00:45:59,520 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-06-19 00:45:59,520 [ scc.git] DEBUG Calling 'git remote'
2024-06-19 00:45:59,527 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:59,527 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-06-19 00:45:59,527 [ scc.git] DEBUG Calling 'git remote'
2024-06-19 00:45:59,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:59,535 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-06-19 00:45:59,535 [ scc.git] DEBUG Calling 'git remote'
2024-06-19 00:45:59,542 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:59,543 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-06-19 00:45:59,543 [ scc.git] DEBUG Calling 'git remote'
2024-06-19 00:45:59,550 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:59,550 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-19 00:45:59,551 [ scc.git] DEBUG Calling 'git remote'
2024-06-19 00:45:59,558 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:59,558 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-19 00:45:59,559 [ scc.git] DEBUG Calling 'git remote'
2024-06-19 00:45:59,567 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:59,568 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-19 00:45:59,568 [ scc.git] DEBUG Calling 'git remote'
2024-06-19 00:45:59,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:59,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-19 00:45:59,576 [ scc.git] DEBUG Calling 'git remote'
2024-06-19 00:45:59,582 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:59,583 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-19 00:45:59,583 [ scc.git] DEBUG Calling 'git remote'
2024-06-19 00:45:59,589 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:59,590 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-19 00:45:59,590 [ scc.git] DEBUG Calling 'git remote'
2024-06-19 00:45:59,597 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:59,597 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-19 00:45:59,597 [ scc.git] DEBUG Calling 'git remote'
2024-06-19 00:45:59,604 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:59,604 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-19 00:45:59,604 [ scc.git] DEBUG Calling 'git remote'
2024-06-19 00:45:59,619 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:59,619 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-19 00:45:59,619 [ scc.git] DEBUG Calling 'git remote'
2024-06-19 00:45:59,626 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:59,626 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-19 00:45:59,626 [ scc.git] DEBUG Calling 'git remote'
2024-06-19 00:45:59,632 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:59,633 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-19 00:45:59,633 [ scc.git] DEBUG Calling 'git remote'
2024-06-19 00:45:59,640 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:59,640 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-19 00:45:59,641 [ scc.git] DEBUG Calling 'git remote'
2024-06-19 00:45:59,647 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:59,648 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-19 00:45:59,648 [ scc.git] DEBUG Calling 'git remote'
2024-06-19 00:45:59,655 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:59,655 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-19 00:45:59,655 [ scc.git] DEBUG Calling 'git remote'
2024-06-19 00:45:59,663 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:59,663 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-19 00:45:59,663 [ scc.git] DEBUG Calling 'git remote'
2024-06-19 00:45:59,670 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:59,671 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-19 00:45:59,671 [ scc.git] DEBUG Calling 'git remote'
2024-06-19 00:45:59,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:59,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-19 00:45:59,679 [ scc.git] DEBUG Calling 'git remote'
2024-06-19 00:45:59,687 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-19 00:45:59,687 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-19 00:45:59,687 [ scc.git] DEBUG Calling 'git remote'
2024-06-19 00:45:59,694 [ 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 36ca447] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 2ca566b
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from ffc7e075
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from 7b7a637
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 5a90893
nothing to commit, working tree clean
[detached HEAD a3c40e6] 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-19 00:46:48,036 [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-19 00:46:57,109 [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-19 00:46:59,487 [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-19 00:47:04,126 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-06-19 00:47:50,946 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/f6f303f9/images/svgs/logo.svg){kind=logo}
