Console Output
Skipping 82 KB..
Full Logconflicts.
2024-06-21 00:45:47,919 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a14f62a940f4974a305b3f5858049ee493b898ef'
2024-06-21 00:45:47,925 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:45:47,929 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 147 (Name option) a14f62a940f4974a305b3f5858049ee493b898ef'
2024-06-21 00:45:47,957 [ scc.git] DEBUG Auto-merging src/omero_zarr/masks.py
2024-06-21 00:45:47,957 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-06-21 00:45:47,958 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-21 00:45:47,961 [ scc.git] DEBUG README.rst | 30 ++++++++++++++++++------------
2024-06-21 00:45:47,961 [ scc.git] DEBUG src/omero_zarr/cli.py | 9 +++++++++
2024-06-21 00:45:47,961 [ scc.git] DEBUG src/omero_zarr/masks.py | 4 ++--
2024-06-21 00:45:47,961 [ scc.git] DEBUG src/omero_zarr/raw_pixels.py | 28 +++++++++++++++++++++++-----
2024-06-21 00:45:47,961 [ scc.git] DEBUG src/omero_zarr/util.py | 2 +-
2024-06-21 00:45:47,961 [ scc.git] DEBUG 5 files changed, 53 insertions(+), 20 deletions(-)
2024-06-21 00:45:48,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:45:48,314 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-21 00:45:48,354 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:45:48,355 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:45:48,360 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-21 00:45:48,396 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-21 00:45:48,403 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f736b707b50> has no local changes
2024-06-21 00:45:48,403 [ 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#103 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/)'
2024-06-21 00:45:48,412 [ scc.git] DEBUG [detached HEAD 2250249] merge master -Dorg -Ssuccess-only
2024-06-21 00:45:48,412 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:45:48,412 [ scc.repo] DEBUG ## PRs found:
2024-06-21 00:45:48,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-06-21 00:45:49,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/568 HTTP/1.1" 200 None
2024-06-21 00:45:49,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/568/comments HTTP/1.1" 200 None
2024-06-21 00:45:50,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6 HTTP/1.1" 200 None
2024-06-21 00:45:50,792 [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-21 00:45:51,287 [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-21 00:45:51,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6 HTTP/1.1" 200 None
2024-06-21 00:45:52,140 [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-21 00:45:52,140 [ scc.repo] DEBUG - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-06-21 00:45:52,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-06-21 00:45:53,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-06-21 00:45:53,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-21 00:45:54,035 [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-21 00:45:54,502 [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-21 00:45:54,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-21 00:45:55,416 [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-21 00:45:55,417 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-06-21 00:45:55,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-06-21 00:45:56,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-21 00:45:56,896 [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-21 00:45:57,359 [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-21 00:45:57,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-21 00:45:58,283 [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-21 00:45:58,284 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-06-21 00:45:58,284 [ scc.repo] DEBUG ## Branches found:
2024-06-21 00:45:58,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-21 00:45:58,284 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:45:58,284 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:45:58,292 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-21 00:45:58,300 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-21 00:45:58,300 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-21 00:45:58,308 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-21 00:45:58,315 [ scc.git] DEBUG Already up to date.
2024-06-21 00:45:58,316 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-06-21 00:45:59,473 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-21 00:45:59,474 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-06-21 00:45:59,480 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-06-21 00:46:00,023 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-21 00:46:00,023 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-06-21 00:46:00,030 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-06-21 00:46:00,447 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-21 00:46:00,448 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-06-21 00:46:00,454 [ scc.git] DEBUG ## Unique users: []
2024-06-21 00:46:00,454 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:46:00,454 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:00,461 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-21 00:46:00,469 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:00,476 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-21 00:46:00,669 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-21 00:46:00,676 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-06-21 00:46:00,677 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-06-21 00:46:00,677 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-06-21 00:46:00,677 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-06-21 00:46:00,677 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-06-21 00:46:00,677 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-06-21 00:46:00,677 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-06-21 00:46:00,677 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-06-21 00:46:00,677 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-06-21 00:46:00,677 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-06-21 00:46:00,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:46:00,846 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-21 00:46:00,855 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:00,861 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-21 00:46:00,951 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-06-21 00:46:00,951 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-06-21 00:46:00,951 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-06-21 00:46:00,952 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-21 00:46:00,958 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-06-21 00:46:00,958 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-06-21 00:46:00,958 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-06-21 00:46:00,958 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-06-21 00:46:00,958 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-06-21 00:46:00,958 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-06-21 00:46:00,958 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-06-21 00:46:00,958 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-06-21 00:46:00,958 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-06-21 00:46:00,958 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-06-21 00:46:00,958 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-06-21 00:46:00,958 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-06-21 00:46:01,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:46:01,250 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-06-21 00:46:01,259 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:01,266 [ 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-21 00:46:01,282 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-21 00:46:01,285 [ scc.git] DEBUG setup.py | 2 +-
2024-06-21 00:46:01,285 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-06-21 00:46:01,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:46:01,661 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-21 00:46:01,704 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:46:01,704 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:01,715 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-21 00:46:01,757 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-21 00:46:01,766 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f736b75c2b0> has no local changes
2024-06-21 00:46:01,766 [ 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#103 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/)'
2024-06-21 00:46:01,777 [ scc.git] DEBUG [detached HEAD 8ad3410a] merge master -Dorg -Ssuccess-only
2024-06-21 00:46:01,777 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:46:01,778 [ scc.repo] DEBUG ## PRs found:
2024-06-21 00:46:02,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-06-21 00:46:02,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-06-21 00:46:03,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-06-21 00:46:03,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-21 00:46:04,099 [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-21 00:46:04,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-21 00:46:05,102 [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-21 00:46:05,103 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-06-21 00:46:05,103 [ scc.repo] DEBUG ## Branches found:
2024-06-21 00:46:05,103 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-21 00:46:05,103 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:46:05,103 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:05,110 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-21 00:46:05,116 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-21 00:46:05,116 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-21 00:46:05,124 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-21 00:46:05,133 [ scc.git] DEBUG Already up to date.
2024-06-21 00:46:05,133 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-06-21 00:46:05,576 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-06-21 00:46:05,576 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-06-21 00:46:05,583 [ scc.git] DEBUG ## Unique users: []
2024-06-21 00:46:05,584 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:46:05,584 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:05,590 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-21 00:46:05,597 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:05,603 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-21 00:46:05,644 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-06-21 00:46:05,644 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-21 00:46:05,647 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-06-21 00:46:05,647 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-06-21 00:46:05,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:46:05,811 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-21 00:46:05,855 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:46:05,855 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:05,864 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-21 00:46:05,908 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-21 00:46:05,914 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f736b75ce20> has no local changes
2024-06-21 00:46:05,915 [ 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#103 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/)'
2024-06-21 00:46:05,923 [ scc.git] DEBUG [detached HEAD 37050d3] merge master -Dorg -Ssuccess-only
2024-06-21 00:46:05,924 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:46:05,924 [ scc.repo] DEBUG ## PRs found:
2024-06-21 00:46:06,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-06-21 00:46:06,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-06-21 00:46:06,772 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-21 00:46:07,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-21 00:46:07,824 [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-21 00:46:08,335 [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-21 00:46:08,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-21 00:46:09,334 [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-21 00:46:09,335 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-21 00:46:09,335 [ scc.repo] DEBUG ## Branches found:
2024-06-21 00:46:09,335 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-21 00:46:09,335 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:46:09,335 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:09,341 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-21 00:46:09,346 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-21 00:46:09,346 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-21 00:46:09,351 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-21 00:46:09,357 [ scc.git] DEBUG Already up to date.
2024-06-21 00:46:09,357 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-06-21 00:46:09,742 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-06-21 00:46:09,742 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-06-21 00:46:09,747 [ scc.git] DEBUG ## Unique users: []
2024-06-21 00:46:09,748 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:46:09,748 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:09,754 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-06-21 00:46:09,761 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:09,765 [ 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-21 00:46:09,776 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-21 00:46:09,780 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-06-21 00:46:09,780 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-06-21 00:46:09,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:46:09,981 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-21 00:46:10,023 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:46:10,023 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:10,030 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-21 00:46:10,072 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-21 00:46:10,082 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f736b75c310> has no local changes
2024-06-21 00:46:10,083 [ 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#103 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/)'
2024-06-21 00:46:10,094 [ scc.git] DEBUG [detached HEAD bd2e305] merge master -Dorg -Ssuccess-only
2024-06-21 00:46:10,094 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:46:10,095 [ scc.repo] DEBUG ## PRs found:
2024-06-21 00:46:10,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-06-21 00:46:10,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-06-21 00:46:11,001 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-21 00:46:11,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-06-21 00:46:12,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-21 00:46:12,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-21 00:46:13,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-06-21 00:46:13,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-06-21 00:46:13,658 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-06-21 00:46:14,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-06-21 00:46:14,133 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-21 00:46:14,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-06-21 00:46:15,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-21 00:46:15,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-21 00:46:16,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-06-21 00:46:16,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-06-21 00:46:16,743 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-06-21 00:46:17,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-06-21 00:46:17,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-06-21 00:46:18,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-21 00:46:18,675 [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-21 00:46:19,189 [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-21 00:46:19,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-21 00:46:20,046 [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-21 00:46:20,047 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-21 00:46:20,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-06-21 00:46:21,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-06-21 00:46:21,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-21 00:46:22,004 [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-21 00:46:22,581 [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-21 00:46:23,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-21 00:46:23,503 [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-21 00:46:23,504 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-06-21 00:46:23,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-06-21 00:46:24,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-06-21 00:46:24,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-21 00:46:25,397 [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-21 00:46:25,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-21 00:46:26,310 [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-21 00:46:26,311 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-06-21 00:46:26,312 [ scc.repo] DEBUG ## Branches found:
2024-06-21 00:46:26,312 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-21 00:46:26,312 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:46:26,312 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:26,319 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-21 00:46:26,325 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-21 00:46:26,325 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-21 00:46:26,382 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-21 00:46:26,390 [ scc.git] DEBUG Already up to date.
2024-06-21 00:46:26,391 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-06-21 00:46:27,025 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-21 00:46:27,026 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-06-21 00:46:27,031 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-06-21 00:46:28,075 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-21 00:46:28,075 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-06-21 00:46:28,082 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-06-21 00:46:28,561 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-21 00:46:28,561 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-06-21 00:46:28,566 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-06-21 00:46:28,959 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-21 00:46:28,959 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-06-21 00:46:28,964 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-06-21 00:46:29,344 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-21 00:46:29,344 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-06-21 00:46:29,349 [ scc.git] DEBUG ## Unique users: []
2024-06-21 00:46:29,349 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:46:29,349 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:29,354 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-21 00:46:29,360 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:29,365 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-21 00:46:29,465 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-06-21 00:46:29,466 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-21 00:46:29,470 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-06-21 00:46:29,470 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-06-21 00:46:29,470 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-06-21 00:46:29,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:46:29,631 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-21 00:46:29,640 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:29,647 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-21 00:46:29,683 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-06-21 00:46:29,683 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-06-21 00:46:29,683 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-06-21 00:46:29,683 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-06-21 00:46:29,684 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-21 00:46:29,688 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-06-21 00:46:29,689 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-06-21 00:46:29,689 [ scc.git] DEBUG src/app/header.html | 5 +
2024-06-21 00:46:29,689 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-06-21 00:46:29,689 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-06-21 00:46:29,689 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-06-21 00:46:29,689 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-06-21 00:46:29,689 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-06-21 00:46:30,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:46:30,040 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-21 00:46:30,048 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:30,056 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-21 00:46:30,111 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-06-21 00:46:30,112 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-21 00:46:30,115 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-06-21 00:46:30,115 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-06-21 00:46:30,115 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-06-21 00:46:30,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:46:30,464 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-06-21 00:46:30,493 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:30,500 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-06-21 00:46:30,526 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-21 00:46:30,536 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-06-21 00:46:30,536 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-06-21 00:46:30,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:46:30,868 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-06-21 00:46:30,882 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:30,888 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 478 (Bump socket.io from 4.6.1 to 4.7.5) 91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-06-21 00:46:30,950 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-21 00:46:30,951 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-21 00:46:31,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:46:31,266 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-21 00:46:31,305 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:46:31,305 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:31,310 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-21 00:46:31,348 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-21 00:46:31,358 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f736b734370> has no local changes
2024-06-21 00:46:31,358 [ 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 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
Generated by OMERO-plugins-push#103 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/)'
2024-06-21 00:46:31,367 [ scc.git] DEBUG [detached HEAD d3162fc] merge master -Dorg -Ssuccess-only
2024-06-21 00:46:31,368 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:46:31,368 [ scc.repo] DEBUG ## PRs found:
2024-06-21 00:46:31,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-06-21 00:46:32,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-06-21 00:46:32,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-06-21 00:46:33,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-21 00:46:33,797 [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-21 00:46:34,277 [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-21 00:46:34,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-21 00:46:35,186 [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-21 00:46:35,187 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-06-21 00:46:35,187 [ scc.repo] DEBUG ## Branches found:
2024-06-21 00:46:35,187 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-21 00:46:35,188 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:46:35,188 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:35,199 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-21 00:46:35,206 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-21 00:46:35,207 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-21 00:46:35,213 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-21 00:46:35,220 [ scc.git] DEBUG Already up to date.
2024-06-21 00:46:35,220 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-06-21 00:46:35,598 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-06-21 00:46:35,599 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-06-21 00:46:35,604 [ scc.git] DEBUG ## Unique users: []
2024-06-21 00:46:35,604 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:46:35,604 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:35,611 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-21 00:46:35,618 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:35,625 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-21 00:46:35,639 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-21 00:46:35,643 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-06-21 00:46:35,643 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-06-21 00:46:35,643 [ scc.git] DEBUG requirements.txt | 2 +-
2024-06-21 00:46:35,643 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-06-21 00:46:35,643 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-06-21 00:46:35,643 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-06-21 00:46:35,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:46:35,832 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-21 00:46:35,877 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:46:35,877 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:35,883 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-21 00:46:35,928 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-21 00:46:35,936 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f73686cebb0> has no local changes
2024-06-21 00:46:35,936 [ 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#103 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/)'
2024-06-21 00:46:35,947 [ scc.git] DEBUG [detached HEAD f479434] merge master -Dorg -Ssuccess-only
2024-06-21 00:46:35,948 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:46:35,948 [ scc.repo] DEBUG ## PRs found:
2024-06-21 00:46:36,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-06-21 00:46:36,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-06-21 00:46:37,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-06-21 00:46:37,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-21 00:46:38,406 [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-21 00:46:38,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-21 00:46:39,251 [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-21 00:46:39,252 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-21 00:46:39,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-06-21 00:46:40,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-06-21 00:46:40,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-21 00:46:41,098 [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-21 00:46:41,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-21 00:46:42,018 [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-21 00:46:42,018 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-21 00:46:42,019 [ scc.repo] DEBUG ## Branches found:
2024-06-21 00:46:42,019 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-21 00:46:42,019 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:46:42,019 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:42,026 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-21 00:46:42,032 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-21 00:46:42,032 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-21 00:46:42,039 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-21 00:46:42,047 [ scc.git] DEBUG Already up to date.
2024-06-21 00:46:42,048 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-06-21 00:46:42,531 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-21 00:46:42,532 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-06-21 00:46:42,538 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-06-21 00:46:43,817 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-21 00:46:43,817 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-06-21 00:46:43,822 [ scc.git] DEBUG ## Unique users: []
2024-06-21 00:46:43,823 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:46:43,823 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:43,828 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-21 00:46:43,837 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:43,843 [ 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-21 00:46:43,914 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-06-21 00:46:43,914 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-06-21 00:46:43,914 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-21 00:46:43,914 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-21 00:46:43,914 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-21 00:46:43,915 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-21 00:46:43,921 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-21 00:46:43,929 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-21 00:46:44,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:46:44,101 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-21 00:46:44,109 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-21 00:46:44,115 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#103](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-06-21 00:46:44,120 [ scc.config] DEBUG Found github.token
2024-06-21 00:46:44,120 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-06-21 00:46:44,120 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-21 00:46:44,128 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:44,133 [ 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-21 00:46:44,181 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-21 00:46:44,181 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-21 00:46:44,181 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-06-21 00:46:44,181 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-21 00:46:44,182 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-21 00:46:44,188 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-21 00:46:44,196 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-21 00:46:44,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:46:44,506 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-21 00:46:44,513 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-21 00:46:44,518 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#103](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/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-21 00:46:44,522 [ scc.config] DEBUG Found github.token
2024-06-21 00:46:44,523 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-06-21 00:46:44,523 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-21 00:46:44,561 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:46:44,561 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:44,566 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-21 00:46:44,603 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-21 00:46:44,610 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f736b6f8f40> has no local changes
2024-06-21 00:46:44,611 [ 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#103 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/)'
2024-06-21 00:46:44,620 [ scc.git] DEBUG [detached HEAD 72d81fe] merge master -Dorg -Ssuccess-only
2024-06-21 00:46:44,620 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:46:44,620 [ scc.repo] DEBUG ## PRs found:
2024-06-21 00:46:45,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-06-21 00:46:45,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-06-21 00:46:45,563 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-21 00:46:46,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-21 00:46:46,627 [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-21 00:46:47,155 [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-21 00:46:47,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-21 00:46:47,994 [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-21 00:46:47,995 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-21 00:46:48,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-06-21 00:46:48,474 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-21 00:46:49,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-21 00:46:49,536 [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-21 00:46:50,024 [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-21 00:46:50,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-21 00:46:50,952 [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-21 00:46:50,953 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-21 00:46:51,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-06-21 00:46:51,421 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-21 00:46:51,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-21 00:46:52,432 [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-21 00:46:52,985 [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-21 00:46:53,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-21 00:46:53,855 [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-21 00:46:53,856 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-21 00:46:54,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-06-21 00:46:54,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-06-21 00:46:55,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-06-21 00:46:55,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-06-21 00:46:56,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-06-21 00:46:56,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-06-21 00:46:56,712 [ scc.repo] DEBUG ## Branches found:
2024-06-21 00:46:56,712 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-21 00:46:56,712 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:46:56,712 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:56,719 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-21 00:46:56,726 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-21 00:46:56,726 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-21 00:46:56,732 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-21 00:46:56,738 [ scc.git] DEBUG Already up to date.
2024-06-21 00:46:56,739 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-06-21 00:46:57,116 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-21 00:46:57,116 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-06-21 00:46:57,121 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-06-21 00:46:57,520 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-21 00:46:57,520 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-06-21 00:46:57,525 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-06-21 00:46:57,915 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-21 00:46:57,915 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-06-21 00:46:57,922 [ scc.git] DEBUG ## Unique users: []
2024-06-21 00:46:57,922 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:46:57,922 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:57,930 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-06-21 00:46:57,937 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:57,943 [ 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-21 00:46:57,954 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-21 00:46:57,957 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-06-21 00:46:57,957 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-06-21 00:46:58,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:46:58,116 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-06-21 00:46:58,122 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:58,127 [ 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-21 00:46:58,207 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-21 00:46:58,207 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-21 00:46:58,211 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-06-21 00:46:58,211 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-06-21 00:46:58,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:46:58,525 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-06-21 00:46:58,531 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:58,536 [ 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-21 00:46:58,547 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-21 00:46:58,548 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-21 00:46:58,551 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-06-21 00:46:58,551 [ scc.git] DEBUG package.json | 2 +-
2024-06-21 00:46:58,551 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-06-21 00:46:58,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:46:58,942 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-21 00:46:58,983 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:46:58,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:46:58,995 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-21 00:46:59,054 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-21 00:46:59,063 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7368686640> has no local changes
2024-06-21 00:46:59,063 [ 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#103 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/)'
2024-06-21 00:46:59,074 [ scc.git] DEBUG [detached HEAD b6f4bc7] merge master -Dorg -Ssuccess-only
2024-06-21 00:46:59,075 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:46:59,075 [ scc.repo] DEBUG ## PRs found:
2024-06-21 00:46:59,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-06-21 00:46:59,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-06-21 00:47:00,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-21 00:47:00,862 [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-21 00:47:01,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-21 00:47:01,820 [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-21 00:47:01,821 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-06-21 00:47:01,821 [ scc.repo] DEBUG ## Branches found:
2024-06-21 00:47:01,821 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-21 00:47:01,821 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:01,821 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:01,827 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-21 00:47:01,832 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-21 00:47:01,832 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-21 00:47:01,838 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-21 00:47:01,844 [ scc.git] DEBUG Already up to date.
2024-06-21 00:47:01,845 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-21 00:47:02,209 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-06-21 00:47:02,210 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-21 00:47:02,214 [ scc.git] DEBUG ## Unique users: []
2024-06-21 00:47:02,214 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:02,214 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:02,220 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-21 00:47:02,226 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:02,233 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-21 00:47:02,243 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-21 00:47:02,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:47:02,412 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-21 00:47:02,455 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:02,455 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:02,462 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-21 00:47:02,506 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-21 00:47:02,513 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f736b703be0> has no local changes
2024-06-21 00:47:02,513 [ 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#103 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/)'
2024-06-21 00:47:03,784 [ scc.git] DEBUG [detached HEAD 74dc8a7] merge master -Dorg -Ssuccess-only
2024-06-21 00:47:03,785 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:03,785 [ scc.repo] DEBUG ## PRs found:
2024-06-21 00:47:04,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-06-21 00:47:04,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-06-21 00:47:04,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-06-21 00:47:05,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-06-21 00:47:05,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-21 00:47:06,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-21 00:47:06,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-21 00:47:07,297 [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-21 00:47:07,298 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-21 00:47:07,298 [ scc.repo] DEBUG ## Branches found:
2024-06-21 00:47:07,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-21 00:47:07,298 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:07,298 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:07,305 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-21 00:47:07,311 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-21 00:47:07,311 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-21 00:47:07,317 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-21 00:47:07,324 [ scc.git] DEBUG Already up to date.
2024-06-21 00:47:07,324 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-06-21 00:47:07,820 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-06-21 00:47:07,820 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-06-21 00:47:07,825 [ scc.git] DEBUG ## Unique users: []
2024-06-21 00:47:07,825 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:07,825 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:07,830 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-06-21 00:47:07,837 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:07,842 [ 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-21 00:47:07,852 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-06-21 00:47:07,853 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-21 00:47:07,855 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-06-21 00:47:07,855 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-06-21 00:47:08,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:47:08,031 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-21 00:47:08,077 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:08,078 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:08,083 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-21 00:47:08,122 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-21 00:47:08,128 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f736863d550> has no local changes
2024-06-21 00:47:08,129 [ 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#103 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/)'
2024-06-21 00:47:08,137 [ scc.git] DEBUG [detached HEAD 6e0a2d4] merge master -Dorg -Ssuccess-only
2024-06-21 00:47:08,137 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:08,138 [ scc.repo] DEBUG ## PRs found:
2024-06-21 00:47:08,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-06-21 00:47:09,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-06-21 00:47:09,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-06-21 00:47:10,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-21 00:47:10,485 [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-21 00:47:11,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-21 00:47:11,445 [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-21 00:47:11,445 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-21 00:47:11,446 [ scc.repo] DEBUG ## Branches found:
2024-06-21 00:47:11,446 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-21 00:47:11,446 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:11,446 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:11,458 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-21 00:47:11,470 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-21 00:47:11,471 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-21 00:47:11,491 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-21 00:47:11,503 [ scc.git] DEBUG Already up to date.
2024-06-21 00:47:11,504 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-21 00:47:11,935 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-06-21 00:47:11,935 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-21 00:47:11,942 [ scc.git] DEBUG ## Unique users: []
2024-06-21 00:47:11,942 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:11,942 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:11,952 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-21 00:47:11,961 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:11,970 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-21 00:47:12,039 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-06-21 00:47:12,040 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-06-21 00:47:12,040 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-06-21 00:47:12,040 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-06-21 00:47:12,040 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-06-21 00:47:12,040 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-06-21 00:47:12,040 [ scc.git] DEBUG Auto-merging setup.py
2024-06-21 00:47:12,040 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-06-21 00:47:12,040 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-21 00:47:12,041 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-21 00:47:12,051 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-21 00:47:12,059 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-06-21 00:47:12,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:47:12,221 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-21 00:47:12,229 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-21 00:47:12,237 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#103](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/urls.py
- omero_signup/views.py
- omero_signup/signup_settings.py
--conflicts
2024-06-21 00:47:12,246 [ scc.config] DEBUG Found github.token
2024-06-21 00:47:12,246 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-06-21 00:47:12,246 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-21 00:47:12,289 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:12,289 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:12,295 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-21 00:47:12,339 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-21 00:47:12,346 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f73686aff40> has no local changes
2024-06-21 00:47:12,346 [ 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#103 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/)'
2024-06-21 00:47:12,355 [ scc.git] DEBUG [detached HEAD 2c69e0f] merge master -Dorg -Ssuccess-only
2024-06-21 00:47:12,356 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:12,356 [ scc.repo] DEBUG ## PRs found:
2024-06-21 00:47:12,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-06-21 00:47:13,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-06-21 00:47:13,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-06-21 00:47:14,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-21 00:47:14,645 [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-21 00:47:15,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-21 00:47:15,487 [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-21 00:47:15,487 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-21 00:47:15,488 [ scc.repo] DEBUG ## Branches found:
2024-06-21 00:47:15,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-21 00:47:15,488 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:15,488 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:15,494 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-21 00:47:15,500 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-21 00:47:15,500 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-21 00:47:15,508 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-21 00:47:15,516 [ scc.git] DEBUG Already up to date.
2024-06-21 00:47:15,516 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-06-21 00:47:16,021 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-06-21 00:47:16,022 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-06-21 00:47:16,028 [ scc.git] DEBUG ## Unique users: []
2024-06-21 00:47:16,028 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:16,028 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:16,034 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-06-21 00:47:16,042 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:16,048 [ 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-21 00:47:16,096 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-21 00:47:16,099 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-06-21 00:47:16,100 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-06-21 00:47:16,100 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-06-21 00:47:16,100 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-06-21 00:47:16,100 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-06-21 00:47:16,100 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-06-21 00:47:16,100 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-06-21 00:47:16,100 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-06-21 00:47:16,100 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-06-21 00:47:16,100 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-06-21 00:47:16,100 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-06-21 00:47:16,102 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-06-21 00:47:16,102 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-06-21 00:47:16,102 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-06-21 00:47:16,102 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-06-21 00:47:16,102 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-06-21 00:47:16,102 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-06-21 00:47:16,102 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-06-21 00:47:16,102 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-06-21 00:47:16,102 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-06-21 00:47:16,102 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-06-21 00:47:16,102 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-06-21 00:47:16,102 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-06-21 00:47:16,102 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-06-21 00:47:16,102 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-06-21 00:47:16,102 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-06-21 00:47:16,102 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-06-21 00:47:16,102 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-06-21 00:47:16,102 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-06-21 00:47:16,102 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-06-21 00:47:16,102 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-06-21 00:47:16,103 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-06-21 00:47:16,103 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-06-21 00:47:16,103 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-06-21 00:47:16,103 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-06-21 00:47:16,103 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-06-21 00:47:16,103 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-06-21 00:47:16,103 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-06-21 00:47:16,103 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-06-21 00:47:16,103 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-06-21 00:47:16,103 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-06-21 00:47:16,103 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-06-21 00:47:16,103 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-06-21 00:47:16,103 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-06-21 00:47:16,103 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-06-21 00:47:16,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:47:16,248 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-21 00:47:16,288 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:16,288 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:16,295 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-21 00:47:16,334 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-21 00:47:16,342 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f736863d730> has no local changes
2024-06-21 00:47:16,342 [ 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#103 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/)'
2024-06-21 00:47:16,352 [ scc.git] DEBUG [detached HEAD 7c28f19] merge master -Dorg -Ssuccess-only
2024-06-21 00:47:16,352 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:16,352 [ scc.repo] DEBUG ## PRs found:
2024-06-21 00:47:16,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-06-21 00:47:16,664 [ scc.repo] DEBUG ## Branches found:
2024-06-21 00:47:16,664 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-21 00:47:16,664 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:16,664 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:16,670 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-21 00:47:16,677 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-21 00:47:16,677 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-21 00:47:16,683 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-21 00:47:16,690 [ scc.git] DEBUG Already up to date.
2024-06-21 00:47:16,690 [ scc.git] DEBUG ## Unique users: []
2024-06-21 00:47:16,690 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:16,690 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:16,695 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-21 00:47:16,734 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:16,735 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:16,740 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-21 00:47:16,782 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-21 00:47:16,788 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f736864fb80> has no local changes
2024-06-21 00:47:16,788 [ 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#103 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/)'
2024-06-21 00:47:16,797 [ scc.git] DEBUG [detached HEAD 8b73f93] merge master -Dorg -Ssuccess-only
2024-06-21 00:47:16,797 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:16,797 [ scc.repo] DEBUG ## PRs found:
2024-06-21 00:47:17,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-06-21 00:47:17,097 [ scc.repo] DEBUG ## Branches found:
2024-06-21 00:47:17,097 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-21 00:47:17,097 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:17,097 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:17,103 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-21 00:47:17,109 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-21 00:47:17,109 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-21 00:47:17,115 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-21 00:47:17,123 [ scc.git] DEBUG Already up to date.
2024-06-21 00:47:17,123 [ scc.git] DEBUG ## Unique users: []
2024-06-21 00:47:17,123 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:17,123 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:17,132 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-21 00:47:17,180 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:17,181 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:17,186 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-21 00:47:17,246 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-21 00:47:17,255 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f73686a6d90> has no local changes
2024-06-21 00:47:17,255 [ 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#103 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/)'
2024-06-21 00:47:17,267 [ scc.git] DEBUG [detached HEAD 2a6dbcc] merge master -Dorg -Ssuccess-only
2024-06-21 00:47:17,268 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:17,269 [ scc.git] INFO Overriding base-branch from master to main
2024-06-21 00:47:17,269 [ scc.repo] DEBUG ## PRs found:
2024-06-21 00:47:17,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-06-21 00:47:18,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-06-21 00:47:18,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-06-21 00:47:19,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-06-21 00:47:19,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-21 00:47:20,051 [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-21 00:47:20,476 [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-21 00:47:20,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-21 00:47:21,314 [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-21 00:47:21,314 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-21 00:47:21,314 [ scc.repo] DEBUG ## Branches found:
2024-06-21 00:47:21,315 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-21 00:47:21,315 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:21,315 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:21,321 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-06-21 00:47:21,326 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-21 00:47:21,326 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-06-21 00:47:21,332 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-06-21 00:47:21,337 [ scc.git] DEBUG Already up to date.
2024-06-21 00:47:21,337 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-06-21 00:47:21,791 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-06-21 00:47:21,791 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-06-21 00:47:21,796 [ scc.git] DEBUG ## Unique users: []
2024-06-21 00:47:21,796 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:21,796 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:21,803 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-21 00:47:21,810 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:21,816 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-21 00:47:21,844 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-06-21 00:47:21,845 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-06-21 00:47:21,846 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-21 00:47:21,846 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-21 00:47:21,853 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-21 00:47:21,859 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-06-21 00:47:22,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:47:22,020 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-21 00:47:22,028 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-21 00:47:22,034 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#103](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-06-21 00:47:22,039 [ scc.config] DEBUG Found github.token
2024-06-21 00:47:22,040 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-06-21 00:47:22,040 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-21 00:47:22,084 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:22,084 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:22,090 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-21 00:47:22,133 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-21 00:47:22,140 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f736867eee0> has no local changes
2024-06-21 00:47:22,140 [ 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#103 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/)'
2024-06-21 00:47:22,149 [ scc.git] DEBUG [detached HEAD 9177a4d] merge master -Dorg -Ssuccess-only
2024-06-21 00:47:22,149 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:22,150 [ scc.repo] DEBUG ## PRs found:
2024-06-21 00:47:22,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-06-21 00:47:22,439 [ scc.repo] DEBUG ## Branches found:
2024-06-21 00:47:22,439 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-21 00:47:22,439 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:22,439 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:22,447 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-21 00:47:22,455 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-21 00:47:22,455 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-21 00:47:22,461 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-21 00:47:22,467 [ scc.git] DEBUG Already up to date.
2024-06-21 00:47:22,467 [ scc.git] DEBUG ## Unique users: []
2024-06-21 00:47:22,467 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:22,467 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:22,472 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-21 00:47:22,511 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:22,511 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:22,517 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-21 00:47:22,556 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-21 00:47:22,562 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7368653e80> has no local changes
2024-06-21 00:47:22,562 [ 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#103 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/)'
2024-06-21 00:47:22,571 [ scc.git] DEBUG [detached HEAD 90fe35c] merge master -Dorg -Ssuccess-only
2024-06-21 00:47:22,572 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:22,572 [ scc.repo] DEBUG ## PRs found:
2024-06-21 00:47:22,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-06-21 00:47:22,872 [ scc.repo] DEBUG ## Branches found:
2024-06-21 00:47:22,872 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-21 00:47:22,872 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:22,872 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:22,878 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-21 00:47:22,884 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-21 00:47:22,884 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-21 00:47:22,892 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-21 00:47:22,899 [ scc.git] DEBUG Already up to date.
2024-06-21 00:47:22,899 [ scc.git] DEBUG ## Unique users: []
2024-06-21 00:47:22,899 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:22,900 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:22,907 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-21 00:47:22,952 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:22,952 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:22,960 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-21 00:47:23,003 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-21 00:47:23,011 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f73685b9400> has no local changes
2024-06-21 00:47:23,011 [ 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#103 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/)'
2024-06-21 00:47:23,022 [ scc.git] DEBUG [detached HEAD 4264819] merge master -Dorg -Ssuccess-only
2024-06-21 00:47:23,022 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:23,022 [ scc.repo] DEBUG ## PRs found:
2024-06-21 00:47:23,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-06-21 00:47:23,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-06-21 00:47:24,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-06-21 00:47:24,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-21 00:47:25,211 [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-21 00:47:25,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-21 00:47:26,119 [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-21 00:47:26,121 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-06-21 00:47:26,121 [ scc.repo] DEBUG ## Branches found:
2024-06-21 00:47:26,121 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-21 00:47:26,121 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:26,121 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:26,130 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-21 00:47:26,137 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-21 00:47:26,138 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-21 00:47:26,145 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-21 00:47:26,153 [ scc.git] DEBUG Already up to date.
2024-06-21 00:47:26,154 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-06-21 00:47:26,620 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-06-21 00:47:26,621 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-06-21 00:47:26,626 [ scc.git] DEBUG ## Unique users: []
2024-06-21 00:47:26,626 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:26,626 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:26,633 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-21 00:47:26,641 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:26,647 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-21 00:47:26,697 [ scc.git] DEBUG Auto-merging Dockerfile
2024-06-21 00:47:26,697 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-06-21 00:47:26,697 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-21 00:47:26,698 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-21 00:47:26,704 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-21 00:47:26,712 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-06-21 00:47:26,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:47:26,877 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-21 00:47:26,883 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-21 00:47:26,889 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#103](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-06-21 00:47:26,895 [ scc.config] DEBUG Found github.token
2024-06-21 00:47:26,896 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-06-21 00:47:26,896 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-21 00:47:26,937 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:26,937 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:26,943 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-21 00:47:26,985 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-21 00:47:26,992 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f73685ffb80> has no local changes
2024-06-21 00:47:26,992 [ 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#103 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/)'
2024-06-21 00:47:27,002 [ scc.git] DEBUG [detached HEAD 103c865] merge master -Dorg -Ssuccess-only
2024-06-21 00:47:27,002 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:27,003 [ scc.git] INFO Overriding base-branch from master to develop
2024-06-21 00:47:27,003 [ scc.repo] DEBUG ## PRs found:
2024-06-21 00:47:28,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-06-21 00:47:28,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-06-21 00:47:29,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-06-21 00:47:29,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-06-21 00:47:30,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-06-21 00:47:30,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-06-21 00:47:31,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-06-21 00:47:31,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-21 00:47:32,055 [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-21 00:47:32,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-21 00:47:32,913 [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-21 00:47:32,914 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-21 00:47:33,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-06-21 00:47:33,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-06-21 00:47:34,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-06-21 00:47:34,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-06-21 00:47:34,880 [ scc.repo] DEBUG ## Branches found:
2024-06-21 00:47:34,880 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-21 00:47:34,880 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:34,881 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:34,892 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-06-21 00:47:34,902 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-21 00:47:34,902 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-06-21 00:47:34,916 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-06-21 00:47:34,930 [ scc.git] DEBUG Updating 5a90893..c20d273
2024-06-21 00:47:35,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/221 HTTP/1.1" 200 None
2024-06-21 00:47:35,436 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-06-21 00:47:35,870 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-06-21 00:47:35,870 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-06-21 00:47:35,874 [ scc.git] DEBUG ## Unique users: []
2024-06-21 00:47:35,875 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:35,875 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:35,882 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-21 00:47:35,890 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:35,897 [ 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-21 00:47:35,910 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-06-21 00:47:35,910 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-06-21 00:47:35,910 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-21 00:47:35,911 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-21 00:47:35,919 [ scc.git] DEBUG Calling 'git reset --hard c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-06-21 00:47:35,928 [ scc.git] DEBUG HEAD is now at c20d273 Merge pull request #221 from imcf/fix-typechecking
2024-06-21 00:47:36,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:47:36,079 [ scc.git] DEBUG Calling 'git merge-base c20d2734b711c659cecea83db6e2ebd7b7013636 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-21 00:47:36,092 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-06-21 00:47:36,100 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#103](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-06-21 00:47:36,107 [ scc.config] DEBUG Found github.token
2024-06-21 00:47:36,108 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-06-21 00:47:36,108 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-21 00:47:36,150 [ scc.git] DEBUG Get sha1 of %s
2024-06-21 00:47:36,150 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-21 00:47:36,157 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-21 00:47:36,197 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-21 00:47:36,204 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f73685f5d60> has no local changes
2024-06-21 00:47:36,204 [ 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)
Updating 5a90893..c20d273
Previously merged:
- PR 221 ehrenfeu 'Fix regression introduced in 6923640'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#103 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/)'
2024-06-21 00:47:36,213 [ scc.git] DEBUG [detached HEAD d0ef7e7] merge master -Dorg -Ssuccess-only
2024-06-21 00:47:36,213 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:36,213 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-21 00:47:36,289 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-06-21 00:47:36,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:47:36,507 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-06-21 00:47:36,515 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-06-21 00:47:36,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:47:36,916 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-06-21 00:47:36,922 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-06-21 00:47:37,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:47:37,317 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-06-21 00:47:37,322 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-06-21 00:47:37,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:47:37,721 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-06-21 00:47:38,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:47:38,112 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-06-21 00:47:38,118 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-06-21 00:47:38,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:47:38,536 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-06-21 00:47:38,542 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-06-21 00:47:38,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:47:38,941 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-06-21 00:47:38,946 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-06-21 00:47:39,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:47:39,393 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-06-21 00:47:39,398 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-06-21 00:47:39,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:47:39,813 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-06-21 00:47:39,819 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-06-21 00:47:40,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:47:40,235 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-06-21 00:47:40,241 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-06-21 00:47:40,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:47:40,641 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-06-21 00:47:40,647 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-06-21 00:47:41,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:47:41,073 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-06-21 00:47:41,085 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-06-21 00:47:41,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:47:41,482 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-06-21 00:47:41,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:47:41,892 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-06-21 00:47:42,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:47:42,300 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-06-21 00:47:42,305 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-06-21 00:47:42,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:47:42,710 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-06-21 00:47:43,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:47:43,164 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-06-21 00:47:43,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:47:43,580 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-06-21 00:47:43,585 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-06-21 00:47:43,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:47:43,997 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-06-21 00:47:44,003 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-06-21 00:47:44,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:47:44,391 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-06-21 00:47:44,395 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-06-21 00:47:44,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:47:44,804 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-06-21 00:47:44,809 [ scc.config] DEBUG Found submodule.scripts.url
2024-06-21 00:47:45,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-21 00:47:45,215 [ scc.config] DEBUG Found submodule.scripts.branch
2024-06-21 00:47:45,216 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-21 00:47:45,291 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f736c85d460> has local changes
2024-06-21 00:47:45,291 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 63 sbesson 'Remove python-future dependency'
- PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 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 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
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)
Updating 5a90893..c20d273
Previously merged:
- PR 221 ehrenfeu 'Fix regression introduced in 6923640'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#103 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/103/)'
2024-06-21 00:47:45,306 [ scc.git] DEBUG [detached HEAD cd797e4] merge master -Dorg -Ssuccess-only
2024-06-21 00:47:45,307 [ scc.merge] INFO Repository: ome/omero-plugins
2024-06-21 00:47:45,307 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-06-21 00:47:45,307 [ scc.merge] INFO Already up to date.
2024-06-21 00:47:45,307 [ scc.merge] INFO
2024-06-21 00:47:45,307 [ scc.merge] INFO
2024-06-21 00:47:45,307 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-06-21 00:47:45,307 [ scc.merge] INFO Already up to date.
2024-06-21 00:47:45,307 [ scc.merge] INFO
2024-06-21 00:47:45,307 [ scc.merge] INFO
2024-06-21 00:47:45,307 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-06-21 00:47:45,307 [ scc.merge] INFO Excluded PRs:
2024-06-21 00:47:45,307 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-06-21 00:47:45,307 [ scc.merge] INFO Already up to date.
2024-06-21 00:47:45,307 [ scc.merge] INFO
2024-06-21 00:47:45,307 [ scc.merge] INFO Merged PRs:
2024-06-21 00:47:45,307 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-06-21 00:47:45,307 [ scc.merge] INFO
2024-06-21 00:47:45,307 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-06-21 00:47:45,307 [ scc.merge] INFO Excluded PRs:
2024-06-21 00:47:45,307 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-06-21 00:47:45,307 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-06-21 00:47:45,308 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-06-21 00:47:45,308 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-06-21 00:47:45,308 [ scc.merge] INFO Already up to date.
2024-06-21 00:47:45,308 [ scc.merge] INFO
2024-06-21 00:47:45,308 [ scc.merge] INFO Merged PRs:
2024-06-21 00:47:45,308 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-06-21 00:47:45,308 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-06-21 00:47:45,308 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-06-21 00:47:45,308 [ scc.merge] INFO
2024-06-21 00:47:45,308 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-06-21 00:47:45,308 [ scc.merge] INFO Excluded PRs:
2024-06-21 00:47:45,308 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-21 00:47:45,308 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-06-21 00:47:45,308 [ scc.merge] INFO Already up to date.
2024-06-21 00:47:45,308 [ scc.merge] INFO
2024-06-21 00:47:45,308 [ scc.merge] INFO Merged PRs:
2024-06-21 00:47:45,308 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-06-21 00:47:45,308 [ scc.merge] INFO
2024-06-21 00:47:45,308 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-21 00:47:45,308 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-06-21 00:47:45,308 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-06-21 00:47:45,308 [ scc.merge] INFO
2024-06-21 00:47:45,308 [ scc.merge] INFO Repository: ome/omero-figure
2024-06-21 00:47:45,308 [ scc.merge] INFO Excluded PRs:
2024-06-21 00:47:45,308 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes' (exclude comment)
2024-06-21 00:47:45,308 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-06-21 00:47:45,308 [ scc.merge] INFO Already up to date.
2024-06-21 00:47:45,308 [ scc.merge] INFO
2024-06-21 00:47:45,308 [ scc.merge] INFO Merged PRs:
2024-06-21 00:47:45,308 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-06-21 00:47:45,308 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-06-21 00:47:45,308 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-06-21 00:47:45,308 [ scc.merge] INFO
2024-06-21 00:47:45,308 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-06-21 00:47:45,308 [ scc.merge] INFO Already up to date.
2024-06-21 00:47:45,308 [ scc.merge] INFO
2024-06-21 00:47:45,308 [ scc.merge] INFO Merged PRs:
2024-06-21 00:47:45,308 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-06-21 00:47:45,308 [ scc.merge] INFO
2024-06-21 00:47:45,308 [ scc.merge] INFO Repository: ome/omero-gallery
2024-06-21 00:47:45,309 [ scc.merge] INFO Already up to date.
2024-06-21 00:47:45,309 [ scc.merge] INFO
2024-06-21 00:47:45,309 [ scc.merge] INFO Merged PRs:
2024-06-21 00:47:45,309 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-21 00:47:45,309 [ scc.merge] INFO
2024-06-21 00:47:45,309 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-06-21 00:47:45,309 [ scc.merge] INFO Excluded PRs:
2024-06-21 00:47:45,309 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-06-21 00:47:45,309 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-06-21 00:47:45,309 [ scc.merge] INFO Already up to date.
2024-06-21 00:47:45,309 [ scc.merge] INFO
2024-06-21 00:47:45,309 [ scc.merge] INFO Merged PRs:
2024-06-21 00:47:45,309 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-06-21 00:47:45,309 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-06-21 00:47:45,309 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-21 00:47:45,309 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-06-21 00:47:45,309 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-06-21 00:47:45,309 [ scc.merge] INFO
2024-06-21 00:47:45,309 [ scc.merge] INFO Repository: ome/omero-mapr
2024-06-21 00:47:45,309 [ scc.merge] INFO Excluded PRs:
2024-06-21 00:47:45,309 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-06-21 00:47:45,309 [ scc.merge] INFO Already up to date.
2024-06-21 00:47:45,309 [ scc.merge] INFO
2024-06-21 00:47:45,309 [ scc.merge] INFO Merged PRs:
2024-06-21 00:47:45,309 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-06-21 00:47:45,309 [ scc.merge] INFO
2024-06-21 00:47:45,309 [ scc.merge] INFO Repository: ome/omero-metadata
2024-06-21 00:47:45,309 [ scc.merge] INFO Already up to date.
2024-06-21 00:47:45,309 [ scc.merge] INFO
2024-06-21 00:47:45,309 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-21 00:47:45,309 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-21 00:47:45,309 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-21 00:47:45,309 [ scc.merge] INFO
2024-06-21 00:47:45,309 [ scc.merge] INFO Repository: ome/omero-parade
2024-06-21 00:47:45,309 [ scc.merge] INFO Excluded PRs:
2024-06-21 00:47:45,309 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-06-21 00:47:45,309 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-06-21 00:47:45,309 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-06-21 00:47:45,309 [ scc.merge] INFO Already up to date.
2024-06-21 00:47:45,309 [ scc.merge] INFO
2024-06-21 00:47:45,309 [ scc.merge] INFO Merged PRs:
2024-06-21 00:47:45,310 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-21 00:47:45,310 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-21 00:47:45,310 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-21 00:47:45,310 [ scc.merge] INFO
2024-06-21 00:47:45,310 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-06-21 00:47:45,310 [ scc.merge] INFO Already up to date.
2024-06-21 00:47:45,310 [ scc.merge] INFO
2024-06-21 00:47:45,310 [ scc.merge] INFO Merged PRs:
2024-06-21 00:47:45,310 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-06-21 00:47:45,310 [ scc.merge] INFO
2024-06-21 00:47:45,310 [ scc.merge] INFO Repository: ome/omero-rois
2024-06-21 00:47:45,310 [ scc.merge] INFO Excluded PRs:
2024-06-21 00:47:45,310 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-21 00:47:45,310 [ scc.merge] INFO Already up to date.
2024-06-21 00:47:45,310 [ scc.merge] INFO
2024-06-21 00:47:45,310 [ scc.merge] INFO Merged PRs:
2024-06-21 00:47:45,310 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-21 00:47:45,310 [ scc.merge] INFO
2024-06-21 00:47:45,310 [ scc.merge] INFO Repository: ome/omero-signup
2024-06-21 00:47:45,310 [ scc.merge] INFO Already up to date.
2024-06-21 00:47:45,310 [ scc.merge] INFO
2024-06-21 00:47:45,310 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-21 00:47:45,310 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-21 00:47:45,310 [ scc.merge] INFO
2024-06-21 00:47:45,310 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-06-21 00:47:45,310 [ scc.merge] INFO Already up to date.
2024-06-21 00:47:45,310 [ scc.merge] INFO
2024-06-21 00:47:45,310 [ scc.merge] INFO Merged PRs:
2024-06-21 00:47:45,310 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-21 00:47:45,310 [ scc.merge] INFO
2024-06-21 00:47:45,310 [ scc.merge] INFO Repository: ome/omero-upload
2024-06-21 00:47:45,310 [ scc.merge] INFO Already up to date.
2024-06-21 00:47:45,310 [ scc.merge] INFO
2024-06-21 00:47:45,310 [ scc.merge] INFO
2024-06-21 00:47:45,310 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-06-21 00:47:45,310 [ scc.merge] INFO Already up to date.
2024-06-21 00:47:45,310 [ scc.merge] INFO
2024-06-21 00:47:45,310 [ scc.merge] INFO
2024-06-21 00:47:45,310 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-06-21 00:47:45,310 [ scc.merge] INFO Excluded PRs:
2024-06-21 00:47:45,310 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-06-21 00:47:45,311 [ scc.merge] INFO Already up to date.
2024-06-21 00:47:45,311 [ scc.merge] INFO
2024-06-21 00:47:45,311 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-21 00:47:45,311 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-21 00:47:45,311 [ scc.merge] INFO
2024-06-21 00:47:45,311 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-06-21 00:47:45,311 [ scc.merge] INFO Already up to date.
2024-06-21 00:47:45,311 [ scc.merge] INFO
2024-06-21 00:47:45,311 [ scc.merge] INFO
2024-06-21 00:47:45,311 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-06-21 00:47:45,311 [ scc.merge] INFO Already up to date.
2024-06-21 00:47:45,311 [ scc.merge] INFO
2024-06-21 00:47:45,311 [ scc.merge] INFO
2024-06-21 00:47:45,311 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-06-21 00:47:45,311 [ scc.merge] INFO Already up to date.
2024-06-21 00:47:45,311 [ scc.merge] INFO
2024-06-21 00:47:45,311 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-21 00:47:45,311 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-06-21 00:47:45,311 [ scc.merge] INFO
2024-06-21 00:47:45,311 [ scc.merge] INFO Repository: ome/scripts
2024-06-21 00:47:45,311 [ scc.merge] INFO Excluded PRs:
2024-06-21 00:47:45,311 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-06-21 00:47:45,311 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-06-21 00:47:45,311 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-06-21 00:47:45,311 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-06-21 00:47:45,311 [ scc.merge] INFO Updating 5a90893..c20d273
2024-06-21 00:47:45,311 [ scc.merge] INFO Previously merged:
2024-06-21 00:47:45,311 [ scc.merge] INFO - PR 221 ehrenfeu 'Fix regression introduced in 6923640'
2024-06-21 00:47:45,311 [ scc.merge] INFO
2024-06-21 00:47:45,311 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-21 00:47:45,311 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-21 00:47:45,311 [ scc.merge] INFO
2024-06-21 00:47:45,311 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-06-21 00:47:45,311 [ scc.git] DEBUG Calling 'git remote'
2024-06-21 00:47:45,317 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-06-21 00:47:45,317 [ scc.git] DEBUG Calling 'git remote'
2024-06-21 00:47:45,322 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:45,322 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-06-21 00:47:45,322 [ scc.git] DEBUG Calling 'git remote'
2024-06-21 00:47:45,326 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:45,326 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-06-21 00:47:45,326 [ scc.git] DEBUG Calling 'git remote'
2024-06-21 00:47:45,331 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:45,331 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-06-21 00:47:45,331 [ scc.git] DEBUG Calling 'git remote'
2024-06-21 00:47:45,335 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:45,335 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-21 00:47:45,335 [ scc.git] DEBUG Calling 'git remote'
2024-06-21 00:47:45,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:45,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-21 00:47:45,340 [ scc.git] DEBUG Calling 'git remote'
2024-06-21 00:47:45,344 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:45,344 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-21 00:47:45,344 [ scc.git] DEBUG Calling 'git remote'
2024-06-21 00:47:45,349 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:45,349 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-21 00:47:45,349 [ scc.git] DEBUG Calling 'git remote'
2024-06-21 00:47:45,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:45,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-21 00:47:45,354 [ scc.git] DEBUG Calling 'git remote'
2024-06-21 00:47:45,359 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:45,359 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-21 00:47:45,359 [ scc.git] DEBUG Calling 'git remote'
2024-06-21 00:47:45,363 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:45,364 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-21 00:47:45,364 [ scc.git] DEBUG Calling 'git remote'
2024-06-21 00:47:45,368 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:45,368 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-21 00:47:45,368 [ scc.git] DEBUG Calling 'git remote'
2024-06-21 00:47:45,373 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:45,373 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-21 00:47:45,373 [ scc.git] DEBUG Calling 'git remote'
2024-06-21 00:47:45,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:45,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-21 00:47:45,378 [ scc.git] DEBUG Calling 'git remote'
2024-06-21 00:47:45,383 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:45,383 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-21 00:47:45,383 [ scc.git] DEBUG Calling 'git remote'
2024-06-21 00:47:45,388 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:45,388 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-21 00:47:45,388 [ scc.git] DEBUG Calling 'git remote'
2024-06-21 00:47:45,392 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:45,393 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-21 00:47:45,393 [ scc.git] DEBUG Calling 'git remote'
2024-06-21 00:47:45,397 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:45,398 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-21 00:47:45,398 [ scc.git] DEBUG Calling 'git remote'
2024-06-21 00:47:45,402 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:45,403 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-21 00:47:45,403 [ scc.git] DEBUG Calling 'git remote'
2024-06-21 00:47:45,407 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:45,407 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-21 00:47:45,407 [ scc.git] DEBUG Calling 'git remote'
2024-06-21 00:47:45,412 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:45,412 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-21 00:47:45,412 [ scc.git] DEBUG Calling 'git remote'
2024-06-21 00:47:45,416 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-21 00:47:45,417 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-21 00:47:45,417 [ scc.git] DEBUG Calling 'git remote'
2024-06-21 00:47:45,421 [ 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 3bd0944] 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 9ffbc8b7
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 a8f380f
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 4d2e3f9] 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-21 00:48:33,774 [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-21 00:48:42,727 [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-21 00:48:45,184 [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-21 00:48:49,792 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-06-21 00:49:36,996 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/d0200910/images/svgs/logo.svg){kind=logo}
