Console Output
Skipping 75 KB..
Full Log906 [ scc.git] DEBUG Auto-merging src/omero_zarr/util.py
2024-05-28 00:41:15,906 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-28 00:41:15,912 [ scc.git] DEBUG Calling 'git reset --hard 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-05-28 00:41:15,919 [ scc.git] DEBUG HEAD is now at 2ca566b Merge pull request #160 from ome/pre-commit-ci-update-config
2024-05-28 00:41:16,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:41:16,279 [ scc.git] DEBUG Calling 'git merge-base 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473 553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-05-28 00:41:16,287 [ scc.git] DEBUG Calling 'git diff --name-only eff38d0408f9d50de13b28dfe09e4382965e203f..2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-05-28 00:41:16,293 [ scc.git] INFO - PR 123 will-moore 'Support export of Fileset:ID'
Conflicting PR. Removed from build [OMERO-plugins-push#79](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/consoleText) for more details.
Possible conflicts:
- PR #102 will-moore 'Zarr export tests'
- src/omero_zarr/raw_pixels.py
- Upstream changes
- src/omero_zarr/raw_pixels.py
- .isort.cfg
--conflicts
2024-05-28 00:41:16,298 [ scc.config] DEBUG Found github.token
2024-05-28 00:41:16,298 [ scc.git] DEBUG Not adding comment to issue #123, already --conflicts.
2024-05-28 00:41:16,298 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a14f62a940f4974a305b3f5858049ee493b898ef'
2024-05-28 00:41:16,304 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:41:16,308 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 147 (Name option) a14f62a940f4974a305b3f5858049ee493b898ef'
2024-05-28 00:41:16,321 [ scc.git] DEBUG Auto-merging src/omero_zarr/masks.py
2024-05-28 00:41:16,321 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-05-28 00:41:16,321 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-28 00:41:16,324 [ scc.git] DEBUG README.rst | 30 ++++++++++++++++++------------
2024-05-28 00:41:16,324 [ scc.git] DEBUG src/omero_zarr/cli.py | 9 +++++++++
2024-05-28 00:41:16,324 [ scc.git] DEBUG src/omero_zarr/masks.py | 4 ++--
2024-05-28 00:41:16,324 [ scc.git] DEBUG src/omero_zarr/raw_pixels.py | 28 +++++++++++++++++++++++-----
2024-05-28 00:41:16,324 [ scc.git] DEBUG src/omero_zarr/util.py | 2 +-
2024-05-28 00:41:16,325 [ scc.git] DEBUG 5 files changed, 53 insertions(+), 20 deletions(-)
2024-05-28 00:41:16,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:41:16,699 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-28 00:41:16,741 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:41:16,742 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:41:16,749 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-28 00:41:16,786 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-28 00:41:16,792 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1224c87b50> has no local changes
2024-05-28 00:41:16,792 [ 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#79 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/)'
2024-05-28 00:41:16,801 [ scc.git] DEBUG [detached HEAD aecc68f] merge master -Dorg -Ssuccess-only
2024-05-28 00:41:16,801 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:41:16,801 [ scc.repo] DEBUG ## PRs found:
2024-05-28 00:41:17,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-05-28 00:41:17,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562 HTTP/1.1" 200 None
2024-05-28 00:41:18,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562/comments HTTP/1.1" 200 None
2024-05-28 00:41:18,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23 HTTP/1.1" 200 None
2024-05-28 00:41:19,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-28 00:41:19,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-28 00:41:20,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23 HTTP/1.1" 200 None
2024-05-28 00:41:20,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/0c814d66251860ddb01c00ade8469e45f7a1be23?per_page=1 HTTP/1.1" 200 2
2024-05-28 00:41:20,494 [ scc.repo] DEBUG - PR 562 will-moore 'Add changelog 7.0.0'
2024-05-28 00:41:20,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560 HTTP/1.1" 200 None
2024-05-28 00:41:21,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560/comments HTTP/1.1" 200 None
2024-05-28 00:41:21,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569 HTTP/1.1" 200 None
2024-05-28 00:41:22,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-28 00:41:22,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-28 00:41:23,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/b7cad07be139b0ba61a8d0fc2bf3033f90909569 HTTP/1.1" 200 None
2024-05-28 00:41:23,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/b7cad07be139b0ba61a8d0fc2bf3033f90909569?per_page=1 HTTP/1.1" 200 2
2024-05-28 00:41:23,811 [ scc.repo] DEBUG - PR 560 will-moore 'Max projection bytes'
2024-05-28 00:41:24,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-05-28 00:41:24,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-05-28 00:41:25,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-28 00:41:25,668 [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-05-28 00:41:26,130 [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-05-28 00:41:26,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-28 00:41:26,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/3179811fd0a1d65e2dc5f56013cf92e086da24ab?per_page=1 HTTP/1.1" 200 2
2024-05-28 00:41:26,984 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-05-28 00:41:27,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-05-28 00:41:27,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-28 00:41:28,409 [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-05-28 00:41:28,888 [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-05-28 00:41:29,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-28 00:41:29,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24?per_page=1 HTTP/1.1" 200 2
2024-05-28 00:41:29,838 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-05-28 00:41:30,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543 HTTP/1.1" 200 None
2024-05-28 00:41:30,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543/comments HTTP/1.1" 200 None
2024-05-28 00:41:30,758 [ scc.repo] DEBUG ## Branches found:
2024-05-28 00:41:30,758 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-28 00:41:30,758 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:41:30,758 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:41:30,765 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-28 00:41:30,770 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-28 00:41:30,770 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-28 00:41:30,776 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-28 00:41:30,781 [ scc.git] DEBUG Already up to date.
2024-05-28 00:41:30,781 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-05-28 00:41:31,274 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-28 00:41:31,275 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-05-28 00:41:31,281 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-05-28 00:41:31,680 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-28 00:41:31,680 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-05-28 00:41:31,685 [ scc.git] DEBUG Calling 'git fetch origin pull/560/head'
2024-05-28 00:41:32,166 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-28 00:41:32,166 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-05-28 00:41:32,171 [ scc.git] DEBUG Calling 'git fetch origin pull/562/head'
2024-05-28 00:41:32,553 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-28 00:41:32,553 [ scc.git] DEBUG * branch refs/pull/562/head -> FETCH_HEAD
2024-05-28 00:41:32,558 [ scc.git] DEBUG ## Unique users: []
2024-05-28 00:41:32,558 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:41:32,558 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:41:32,564 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-28 00:41:32,572 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:41:32,578 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-28 00:41:32,724 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-28 00:41:32,730 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-05-28 00:41:32,730 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-05-28 00:41:32,730 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-05-28 00:41:32,730 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-05-28 00:41:32,730 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-05-28 00:41:32,730 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-05-28 00:41:32,730 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-05-28 00:41:32,730 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-05-28 00:41:32,730 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-05-28 00:41:32,730 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-05-28 00:41:32,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:41:32,897 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-28 00:41:32,905 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:41:32,909 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-28 00:41:32,928 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-28 00:41:32,928 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-05-28 00:41:32,928 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-05-28 00:41:32,929 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-28 00:41:32,935 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-05-28 00:41:32,935 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-05-28 00:41:32,935 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-05-28 00:41:32,935 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-05-28 00:41:32,935 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-05-28 00:41:32,935 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-05-28 00:41:32,935 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-05-28 00:41:32,935 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-05-28 00:41:32,935 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-05-28 00:41:32,935 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-05-28 00:41:32,935 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-05-28 00:41:32,935 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-05-28 00:41:33,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:41:33,310 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b7cad07be139b0ba61a8d0fc2bf3033f90909569'
2024-05-28 00:41:33,318 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:41:33,324 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) b7cad07be139b0ba61a8d0fc2bf3033f90909569'
2024-05-28 00:41:33,538 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-05-28 00:41:33,538 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-05-28 00:41:33,538 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-05-28 00:41:33,538 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-28 00:41:33,538 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-05-28 00:41:33,539 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-28 00:41:33,546 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-05-28 00:41:33,546 [ scc.git] DEBUG omero_figure/urls.py | 8 +++
2024-05-28 00:41:33,546 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-05-28 00:41:33,546 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-05-28 00:41:33,547 [ scc.git] DEBUG src/index.html | 1 +
2024-05-28 00:41:33,547 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-05-28 00:41:33,547 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-05-28 00:41:33,547 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-05-28 00:41:33,547 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-05-28 00:41:33,547 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-05-28 00:41:33,547 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-05-28 00:41:33,547 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-05-28 00:41:33,547 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-05-28 00:41:33,547 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-05-28 00:41:33,547 [ scc.git] DEBUG 14 files changed, 161 insertions(+), 14 deletions(-)
2024-05-28 00:41:33,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:41:33,718 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0c814d66251860ddb01c00ade8469e45f7a1be23'
2024-05-28 00:41:33,727 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:41:33,733 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 562 (Add changelog 7.0.0) 0c814d66251860ddb01c00ade8469e45f7a1be23'
2024-05-28 00:41:33,750 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-28 00:41:33,753 [ scc.git] DEBUG CHANGELOG.md | 10 ++++++++++
2024-05-28 00:41:33,753 [ scc.git] DEBUG 1 file changed, 10 insertions(+)
2024-05-28 00:41:34,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:41:34,119 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-28 00:41:34,158 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:41:34,159 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:41:34,164 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-28 00:41:34,202 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-28 00:41:34,212 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1224cd1f70> has no local changes
2024-05-28 00:41:34,212 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 562 will-moore 'Add changelog 7.0.0'
Generated by OMERO-plugins-push#79 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/)'
2024-05-28 00:41:34,221 [ scc.git] DEBUG [detached HEAD 368c49a0] merge master -Dorg -Ssuccess-only
2024-05-28 00:41:34,221 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:41:34,222 [ scc.repo] DEBUG ## PRs found:
2024-05-28 00:41:34,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-05-28 00:41:35,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-05-28 00:41:35,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-05-28 00:41:35,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-28 00:41:36,424 [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-05-28 00:41:36,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-28 00:41:37,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-05-28 00:41:37,319 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-05-28 00:41:37,319 [ scc.repo] DEBUG ## Branches found:
2024-05-28 00:41:37,319 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-28 00:41:37,319 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:41:37,320 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:41:37,325 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-28 00:41:37,331 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-28 00:41:37,332 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-28 00:41:37,337 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-28 00:41:37,344 [ scc.git] DEBUG Already up to date.
2024-05-28 00:41:37,344 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-05-28 00:41:37,730 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-05-28 00:41:37,730 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-05-28 00:41:37,737 [ scc.git] DEBUG ## Unique users: []
2024-05-28 00:41:37,737 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:41:37,737 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:41:37,744 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-28 00:41:37,751 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:41:37,763 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-28 00:41:37,776 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-05-28 00:41:37,777 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-28 00:41:37,779 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-05-28 00:41:37,780 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-05-28 00:41:37,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:41:37,942 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-28 00:41:37,988 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:41:37,988 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:41:37,995 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-28 00:41:38,050 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-28 00:41:38,057 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1224cd1e20> has no local changes
2024-05-28 00:41:38,057 [ 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#79 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/)'
2024-05-28 00:41:38,067 [ scc.git] DEBUG [detached HEAD ccb6314] merge master -Dorg -Ssuccess-only
2024-05-28 00:41:38,067 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:41:38,068 [ scc.repo] DEBUG ## PRs found:
2024-05-28 00:41:38,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-05-28 00:41:38,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-05-28 00:41:38,889 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-28 00:41:39,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-28 00:41:39,929 [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-05-28 00:41:40,391 [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-05-28 00:41:40,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-28 00:41:41,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-05-28 00:41:41,329 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-28 00:41:41,329 [ scc.repo] DEBUG ## Branches found:
2024-05-28 00:41:41,329 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-28 00:41:41,329 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:41:41,329 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:41:41,337 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-28 00:41:41,344 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-28 00:41:41,344 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-28 00:41:41,351 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-28 00:41:41,359 [ scc.git] DEBUG Already up to date.
2024-05-28 00:41:41,359 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-05-28 00:41:41,735 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-05-28 00:41:41,735 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-05-28 00:41:41,740 [ scc.git] DEBUG ## Unique users: []
2024-05-28 00:41:41,740 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:41:41,740 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:41:41,748 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-05-28 00:41:41,756 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:41:41,763 [ 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-05-28 00:41:41,776 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-28 00:41:41,782 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-05-28 00:41:41,782 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-05-28 00:41:41,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:41:41,943 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-28 00:41:41,992 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:41:41,992 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:41:42,000 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-28 00:41:42,044 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-28 00:41:42,052 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1224cb3d30> has no local changes
2024-05-28 00:41:42,052 [ 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#79 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/)'
2024-05-28 00:41:42,062 [ scc.git] DEBUG [detached HEAD ebc0190] merge master -Dorg -Ssuccess-only
2024-05-28 00:41:42,062 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:41:42,062 [ scc.repo] DEBUG ## PRs found:
2024-05-28 00:41:42,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-05-28 00:41:42,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-05-28 00:41:43,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-05-28 00:41:43,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-28 00:41:44,365 [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-05-28 00:41:44,817 [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-05-28 00:41:45,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-28 00:41:45,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-05-28 00:41:45,749 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-28 00:41:46,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-05-28 00:41:46,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-05-28 00:41:47,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-05-28 00:41:47,683 [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-05-28 00:41:48,150 [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-05-28 00:41:48,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-05-28 00:41:49,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-05-28 00:41:49,020 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-05-28 00:41:49,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-05-28 00:41:50,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-05-28 00:41:50,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-28 00:41:50,955 [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-05-28 00:41:51,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-28 00:41:51,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-05-28 00:41:51,868 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-05-28 00:41:51,869 [ scc.repo] DEBUG ## Branches found:
2024-05-28 00:41:51,869 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-28 00:41:51,869 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:41:51,869 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:41:51,877 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-28 00:41:51,883 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-28 00:41:51,883 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-28 00:41:51,890 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-28 00:41:51,898 [ scc.git] DEBUG Already up to date.
2024-05-28 00:41:51,898 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-05-28 00:41:52,349 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-28 00:41:52,349 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-05-28 00:41:52,355 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-05-28 00:41:52,724 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-28 00:41:52,725 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-05-28 00:41:52,732 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-05-28 00:41:53,107 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-28 00:41:53,107 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-05-28 00:41:53,112 [ scc.git] DEBUG ## Unique users: []
2024-05-28 00:41:53,112 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:41:53,112 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:41:53,119 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-28 00:41:53,127 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:41:53,134 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-28 00:41:53,148 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-05-28 00:41:53,148 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-28 00:41:53,153 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-05-28 00:41:53,153 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-05-28 00:41:53,153 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-05-28 00:41:53,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:41:53,317 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-05-28 00:41:53,326 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:41:53,334 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-05-28 00:41:53,359 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-05-28 00:41:53,360 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-05-28 00:41:53,360 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-05-28 00:41:53,360 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-05-28 00:41:53,361 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-28 00:41:53,368 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-05-28 00:41:53,368 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-05-28 00:41:53,368 [ scc.git] DEBUG src/app/header.html | 5 +
2024-05-28 00:41:53,368 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-05-28 00:41:53,368 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-05-28 00:41:53,368 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-05-28 00:41:53,369 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-05-28 00:41:53,369 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-05-28 00:41:53,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:41:53,725 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-28 00:41:53,738 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:41:53,748 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-28 00:41:53,768 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-05-28 00:41:53,768 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-28 00:41:53,772 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-05-28 00:41:53,773 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-05-28 00:41:53,773 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-05-28 00:41:54,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:41:54,130 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-28 00:41:54,177 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:41:54,178 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:41:54,186 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-28 00:41:54,236 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-28 00:41:54,246 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1224c943a0> has no local changes
2024-05-28 00:41:54,246 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
Generated by OMERO-plugins-push#79 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/)'
2024-05-28 00:41:54,260 [ scc.git] DEBUG [detached HEAD fc1e8b5] merge master -Dorg -Ssuccess-only
2024-05-28 00:41:54,260 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:41:54,260 [ scc.repo] DEBUG ## PRs found:
2024-05-28 00:41:54,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-05-28 00:41:55,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-05-28 00:41:55,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-05-28 00:41:56,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-28 00:41:56,572 [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-05-28 00:41:57,062 [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-05-28 00:41:57,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-28 00:41:57,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-05-28 00:41:57,897 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-05-28 00:41:57,897 [ scc.repo] DEBUG ## Branches found:
2024-05-28 00:41:57,897 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-28 00:41:57,898 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:41:57,898 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:41:57,907 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-28 00:41:57,917 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-28 00:41:57,917 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-28 00:41:57,928 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-28 00:41:57,937 [ scc.git] DEBUG Already up to date.
2024-05-28 00:41:57,937 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-05-28 00:41:58,335 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-05-28 00:41:58,335 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-05-28 00:41:58,341 [ scc.git] DEBUG ## Unique users: []
2024-05-28 00:41:58,341 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:41:58,341 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:41:58,347 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-28 00:41:58,355 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:41:58,360 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-28 00:41:58,371 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-28 00:41:58,374 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-05-28 00:41:58,374 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-05-28 00:41:58,374 [ scc.git] DEBUG requirements.txt | 2 +-
2024-05-28 00:41:58,374 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-05-28 00:41:58,374 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-05-28 00:41:58,374 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-05-28 00:41:58,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:41:58,521 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-28 00:41:58,562 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:41:58,562 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:41:58,568 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-28 00:41:58,605 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-28 00:41:58,612 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1224453b50> has no local changes
2024-05-28 00:41:58,613 [ 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#79 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/)'
2024-05-28 00:41:58,622 [ scc.git] DEBUG [detached HEAD d304776] merge master -Dorg -Ssuccess-only
2024-05-28 00:41:58,622 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:41:58,623 [ scc.repo] DEBUG ## PRs found:
2024-05-28 00:41:59,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-05-28 00:41:59,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-05-28 00:42:00,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-05-28 00:42:00,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-28 00:42:00,982 [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-05-28 00:42:01,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-28 00:42:01,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-05-28 00:42:01,901 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-28 00:42:02,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-05-28 00:42:02,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-05-28 00:42:03,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-28 00:42:03,798 [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-05-28 00:42:04,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-28 00:42:04,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-05-28 00:42:04,771 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-28 00:42:04,771 [ scc.repo] DEBUG ## Branches found:
2024-05-28 00:42:04,771 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-28 00:42:04,772 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:04,772 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:04,779 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-28 00:42:04,784 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-28 00:42:04,785 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-28 00:42:04,790 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-28 00:42:04,796 [ scc.git] DEBUG Already up to date.
2024-05-28 00:42:04,797 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-05-28 00:42:05,157 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-28 00:42:05,157 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-05-28 00:42:05,162 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-05-28 00:42:05,541 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-28 00:42:05,542 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-05-28 00:42:05,551 [ scc.git] DEBUG ## Unique users: []
2024-05-28 00:42:05,551 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:05,551 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:05,561 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-28 00:42:05,573 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:05,580 [ 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-05-28 00:42:05,599 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-05-28 00:42:05,599 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-05-28 00:42:05,599 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-28 00:42:05,599 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-28 00:42:05,599 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-28 00:42:05,600 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-28 00:42:05,611 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-28 00:42:05,623 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-28 00:42:05,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:42:05,796 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-28 00:42:05,810 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-28 00:42:05,821 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#79](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-05-28 00:42:05,832 [ scc.config] DEBUG Found github.token
2024-05-28 00:42:05,832 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-05-28 00:42:05,832 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-28 00:42:05,849 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:05,880 [ 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-05-28 00:42:05,918 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-28 00:42:05,919 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-28 00:42:05,919 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-05-28 00:42:05,920 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-28 00:42:05,921 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-28 00:42:05,933 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-28 00:42:05,948 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-28 00:42:06,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:42:06,203 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-28 00:42:06,218 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-28 00:42:06,235 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#79](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/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-05-28 00:42:06,243 [ scc.config] DEBUG Found github.token
2024-05-28 00:42:06,243 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-05-28 00:42:06,243 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-28 00:42:06,298 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:06,299 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:06,309 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-28 00:42:06,363 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-28 00:42:06,376 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1224c7df10> has no local changes
2024-05-28 00:42:06,377 [ 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#79 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/)'
2024-05-28 00:42:06,392 [ scc.git] DEBUG [detached HEAD c978373] merge master -Dorg -Ssuccess-only
2024-05-28 00:42:06,394 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:42:06,395 [ scc.repo] DEBUG ## PRs found:
2024-05-28 00:42:06,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-05-28 00:42:07,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-05-28 00:42:07,247 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-28 00:42:07,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-28 00:42:08,360 [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-05-28 00:42:08,815 [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-05-28 00:42:09,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-28 00:42:09,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-05-28 00:42:09,709 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-28 00:42:10,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-05-28 00:42:10,168 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-28 00:42:10,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-28 00:42:11,169 [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-05-28 00:42:11,668 [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-05-28 00:42:12,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-28 00:42:12,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-05-28 00:42:12,621 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-28 00:42:13,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-05-28 00:42:13,093 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-28 00:42:13,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-28 00:42:14,131 [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-05-28 00:42:14,644 [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-05-28 00:42:15,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-28 00:42:15,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-05-28 00:42:15,528 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-28 00:42:15,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-05-28 00:42:16,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-05-28 00:42:16,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-05-28 00:42:17,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-05-28 00:42:17,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-05-28 00:42:18,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-05-28 00:42:18,318 [ scc.repo] DEBUG ## Branches found:
2024-05-28 00:42:18,319 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-28 00:42:18,319 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:18,319 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:18,325 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-28 00:42:18,330 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-28 00:42:18,330 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-28 00:42:18,336 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-28 00:42:18,342 [ scc.git] DEBUG Already up to date.
2024-05-28 00:42:18,343 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-05-28 00:42:18,777 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-28 00:42:18,777 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-05-28 00:42:18,784 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-05-28 00:42:19,160 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-28 00:42:19,161 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-05-28 00:42:19,167 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-05-28 00:42:19,564 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-28 00:42:19,565 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-05-28 00:42:19,570 [ scc.git] DEBUG ## Unique users: []
2024-05-28 00:42:19,570 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:19,570 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:19,577 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-05-28 00:42:19,582 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:19,588 [ 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-05-28 00:42:19,598 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-28 00:42:19,601 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-05-28 00:42:19,601 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-05-28 00:42:19,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:42:19,775 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-05-28 00:42:19,784 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:19,790 [ 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-05-28 00:42:19,802 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-28 00:42:19,803 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-28 00:42:19,806 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-05-28 00:42:19,806 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-05-28 00:42:20,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:42:20,183 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-05-28 00:42:20,190 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:20,202 [ 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-05-28 00:42:20,229 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-28 00:42:20,229 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-28 00:42:20,233 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-05-28 00:42:20,233 [ scc.git] DEBUG package.json | 2 +-
2024-05-28 00:42:20,233 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-05-28 00:42:20,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:42:20,587 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-28 00:42:20,626 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:20,626 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:20,633 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-28 00:42:20,679 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-28 00:42:20,687 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f122440b640> has no local changes
2024-05-28 00:42:20,688 [ 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#79 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/)'
2024-05-28 00:42:20,698 [ scc.git] DEBUG [detached HEAD 5b2d933] merge master -Dorg -Ssuccess-only
2024-05-28 00:42:20,698 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:42:20,698 [ scc.repo] DEBUG ## PRs found:
2024-05-28 00:42:21,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-05-28 00:42:21,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-05-28 00:42:22,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-28 00:42:22,540 [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-05-28 00:42:22,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-28 00:42:23,392 [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-05-28 00:42:23,392 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-05-28 00:42:23,392 [ scc.repo] DEBUG ## Branches found:
2024-05-28 00:42:23,392 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-28 00:42:23,393 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:23,393 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:23,399 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-28 00:42:23,405 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-28 00:42:23,405 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-28 00:42:23,411 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-28 00:42:23,416 [ scc.git] DEBUG Already up to date.
2024-05-28 00:42:23,417 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-28 00:42:23,783 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-05-28 00:42:23,784 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-28 00:42:23,788 [ scc.git] DEBUG ## Unique users: []
2024-05-28 00:42:23,788 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:23,788 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:23,795 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-28 00:42:23,802 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:23,809 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-28 00:42:23,823 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-28 00:42:23,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:42:23,985 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-28 00:42:24,024 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:24,024 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:24,029 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-28 00:42:24,072 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-28 00:42:24,079 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1224c88df0> has no local changes
2024-05-28 00:42:24,079 [ 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#79 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/)'
2024-05-28 00:42:24,088 [ scc.git] DEBUG [detached HEAD a476116] merge master -Dorg -Ssuccess-only
2024-05-28 00:42:24,088 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:42:24,089 [ scc.repo] DEBUG ## PRs found:
2024-05-28 00:42:24,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-05-28 00:42:24,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-05-28 00:42:25,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-05-28 00:42:25,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-05-28 00:42:26,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-28 00:42:26,830 [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-05-28 00:42:27,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-28 00:42:27,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-05-28 00:42:27,764 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-28 00:42:27,764 [ scc.repo] DEBUG ## Branches found:
2024-05-28 00:42:27,764 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-28 00:42:27,764 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:27,764 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:27,770 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-28 00:42:27,776 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-28 00:42:27,776 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-28 00:42:27,783 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-28 00:42:27,790 [ scc.git] DEBUG Already up to date.
2024-05-28 00:42:27,790 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-05-28 00:42:28,233 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-05-28 00:42:28,233 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-05-28 00:42:28,239 [ scc.git] DEBUG ## Unique users: []
2024-05-28 00:42:28,239 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:28,239 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:28,245 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-05-28 00:42:28,252 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:28,258 [ 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-05-28 00:42:28,270 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-05-28 00:42:28,270 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-28 00:42:28,273 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-05-28 00:42:28,274 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-05-28 00:42:28,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:42:28,435 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-28 00:42:28,475 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:28,475 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:28,481 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-28 00:42:28,526 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-28 00:42:28,533 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f12243c3520> has no local changes
2024-05-28 00:42:28,533 [ 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#79 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/)'
2024-05-28 00:42:28,541 [ scc.git] DEBUG [detached HEAD 862530d] merge master -Dorg -Ssuccess-only
2024-05-28 00:42:28,542 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:42:28,542 [ scc.repo] DEBUG ## PRs found:
2024-05-28 00:42:28,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-05-28 00:42:29,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-05-28 00:42:29,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-05-28 00:42:30,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-28 00:42:30,837 [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-05-28 00:42:31,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-28 00:42:31,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-05-28 00:42:31,704 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-28 00:42:31,704 [ scc.repo] DEBUG ## Branches found:
2024-05-28 00:42:31,704 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-28 00:42:31,704 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:31,705 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:31,711 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-28 00:42:31,717 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-28 00:42:31,717 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-28 00:42:31,724 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-28 00:42:31,730 [ scc.git] DEBUG Already up to date.
2024-05-28 00:42:31,731 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-28 00:42:32,174 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-05-28 00:42:32,174 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-28 00:42:32,179 [ scc.git] DEBUG ## Unique users: []
2024-05-28 00:42:32,180 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:32,180 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:32,187 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-28 00:42:32,201 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:32,207 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-28 00:42:32,220 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-05-28 00:42:32,220 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-05-28 00:42:32,220 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-05-28 00:42:32,220 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-05-28 00:42:32,220 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-05-28 00:42:32,220 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-05-28 00:42:32,221 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-28 00:42:32,221 [ scc.git] DEBUG Auto-merging setup.py
2024-05-28 00:42:32,221 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-05-28 00:42:32,221 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-28 00:42:32,228 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-28 00:42:32,235 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-05-28 00:42:32,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:42:32,396 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-28 00:42:32,404 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-28 00:42:32,417 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#79](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/views.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
--conflicts
2024-05-28 00:42:32,425 [ scc.config] DEBUG Found github.token
2024-05-28 00:42:32,425 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-05-28 00:42:32,425 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-28 00:42:32,467 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:32,467 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:32,473 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-28 00:42:32,514 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-28 00:42:32,521 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f12243c3670> has no local changes
2024-05-28 00:42:32,521 [ 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#79 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/)'
2024-05-28 00:42:32,531 [ scc.git] DEBUG [detached HEAD d836703] merge master -Dorg -Ssuccess-only
2024-05-28 00:42:32,532 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:42:32,532 [ scc.repo] DEBUG ## PRs found:
2024-05-28 00:42:32,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-05-28 00:42:33,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-05-28 00:42:33,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-05-28 00:42:34,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-28 00:42:34,767 [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-05-28 00:42:35,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-28 00:42:35,666 [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-05-28 00:42:35,667 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-28 00:42:35,667 [ scc.repo] DEBUG ## Branches found:
2024-05-28 00:42:35,667 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-28 00:42:35,667 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:35,667 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:35,674 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-28 00:42:35,681 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-28 00:42:35,682 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-28 00:42:35,690 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-28 00:42:35,699 [ scc.git] DEBUG Already up to date.
2024-05-28 00:42:35,699 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-05-28 00:42:36,235 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-05-28 00:42:36,235 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-05-28 00:42:36,242 [ scc.git] DEBUG ## Unique users: []
2024-05-28 00:42:36,243 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:36,243 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:36,252 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-05-28 00:42:36,261 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:36,267 [ 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-05-28 00:42:36,333 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-28 00:42:36,337 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-05-28 00:42:36,337 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-05-28 00:42:36,337 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-05-28 00:42:36,337 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-05-28 00:42:36,337 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-05-28 00:42:36,337 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-05-28 00:42:36,339 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-05-28 00:42:36,340 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-05-28 00:42:36,340 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-05-28 00:42:36,340 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-05-28 00:42:36,340 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-05-28 00:42:36,340 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-05-28 00:42:36,340 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-05-28 00:42:36,340 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-05-28 00:42:36,340 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-05-28 00:42:36,340 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-05-28 00:42:36,340 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-05-28 00:42:36,340 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-05-28 00:42:36,340 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-05-28 00:42:36,340 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-05-28 00:42:36,340 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-05-28 00:42:36,340 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-05-28 00:42:36,340 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-05-28 00:42:36,340 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-05-28 00:42:36,340 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-05-28 00:42:36,340 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-05-28 00:42:36,340 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-05-28 00:42:36,340 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-05-28 00:42:36,340 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-05-28 00:42:36,340 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-05-28 00:42:36,340 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-05-28 00:42:36,340 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-05-28 00:42:36,340 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-05-28 00:42:36,340 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-05-28 00:42:36,340 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-05-28 00:42:36,340 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-05-28 00:42:36,341 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-05-28 00:42:36,341 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-05-28 00:42:36,341 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-05-28 00:42:36,341 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-05-28 00:42:36,341 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-05-28 00:42:36,341 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-05-28 00:42:36,341 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-05-28 00:42:36,341 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-05-28 00:42:36,341 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-05-28 00:42:36,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:42:36,495 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-28 00:42:36,538 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:36,538 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:36,545 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-28 00:42:36,584 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-28 00:42:36,592 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f12243c3580> has no local changes
2024-05-28 00:42:36,592 [ 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#79 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/)'
2024-05-28 00:42:36,603 [ scc.git] DEBUG [detached HEAD 5997060] merge master -Dorg -Ssuccess-only
2024-05-28 00:42:36,603 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:42:36,604 [ scc.repo] DEBUG ## PRs found:
2024-05-28 00:42:36,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-05-28 00:42:36,919 [ scc.repo] DEBUG ## Branches found:
2024-05-28 00:42:36,920 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-28 00:42:36,920 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:36,920 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:36,930 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-28 00:42:36,939 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-28 00:42:36,940 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-28 00:42:36,948 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-28 00:42:36,958 [ scc.git] DEBUG Already up to date.
2024-05-28 00:42:36,958 [ scc.git] DEBUG ## Unique users: []
2024-05-28 00:42:36,958 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:36,958 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:36,965 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-28 00:42:37,010 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:37,010 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:37,016 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-28 00:42:37,058 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-28 00:42:37,064 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f12243fdd60> has no local changes
2024-05-28 00:42:37,065 [ 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#79 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/)'
2024-05-28 00:42:37,074 [ scc.git] DEBUG [detached HEAD c1ec584] merge master -Dorg -Ssuccess-only
2024-05-28 00:42:37,074 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:42:37,074 [ scc.repo] DEBUG ## PRs found:
2024-05-28 00:42:37,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-05-28 00:42:37,342 [ scc.repo] DEBUG ## Branches found:
2024-05-28 00:42:37,342 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-28 00:42:37,342 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:37,342 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:37,348 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-28 00:42:37,352 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-28 00:42:37,353 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-28 00:42:37,359 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-28 00:42:37,365 [ scc.git] DEBUG Already up to date.
2024-05-28 00:42:37,365 [ scc.git] DEBUG ## Unique users: []
2024-05-28 00:42:37,365 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:37,366 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:37,371 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-28 00:42:37,411 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:37,411 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:37,417 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-28 00:42:37,465 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-28 00:42:37,471 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f12243d4bb0> has no local changes
2024-05-28 00:42:37,472 [ 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#79 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/)'
2024-05-28 00:42:37,487 [ scc.git] DEBUG [detached HEAD 397fcc3] merge master -Dorg -Ssuccess-only
2024-05-28 00:42:37,487 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:42:37,488 [ scc.git] INFO Overriding base-branch from master to main
2024-05-28 00:42:37,488 [ scc.repo] DEBUG ## PRs found:
2024-05-28 00:42:37,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-05-28 00:42:38,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-05-28 00:42:38,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-05-28 00:42:39,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-05-28 00:42:39,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-28 00:42:40,228 [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-05-28 00:42:40,713 [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-05-28 00:42:41,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-28 00:42:41,618 [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-05-28 00:42:41,619 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-28 00:42:41,620 [ scc.repo] DEBUG ## Branches found:
2024-05-28 00:42:41,620 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-28 00:42:41,620 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:41,620 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:41,626 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-05-28 00:42:41,631 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-28 00:42:41,631 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-05-28 00:42:41,637 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-05-28 00:42:41,643 [ scc.git] DEBUG Already up to date.
2024-05-28 00:42:41,643 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-05-28 00:42:42,008 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-05-28 00:42:42,008 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-05-28 00:42:42,013 [ scc.git] DEBUG ## Unique users: []
2024-05-28 00:42:42,013 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:42,013 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:42,021 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-28 00:42:42,026 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:42,032 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-28 00:42:42,043 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-05-28 00:42:42,043 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-05-28 00:42:42,043 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-28 00:42:42,043 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-28 00:42:42,050 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-28 00:42:42,056 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-05-28 00:42:42,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:42:42,215 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-28 00:42:42,223 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-28 00:42:42,230 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#79](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-05-28 00:42:42,237 [ scc.config] DEBUG Found github.token
2024-05-28 00:42:42,237 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-05-28 00:42:42,237 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-28 00:42:42,280 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:42,281 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:42,288 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-28 00:42:42,328 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-28 00:42:42,336 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1224cb3b80> has no local changes
2024-05-28 00:42:42,336 [ 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#79 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/)'
2024-05-28 00:42:42,345 [ scc.git] DEBUG [detached HEAD 7ef4544] merge master -Dorg -Ssuccess-only
2024-05-28 00:42:42,346 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:42:42,346 [ scc.repo] DEBUG ## PRs found:
2024-05-28 00:42:42,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-05-28 00:42:42,654 [ scc.repo] DEBUG ## Branches found:
2024-05-28 00:42:42,654 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-28 00:42:42,655 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:42,655 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:42,664 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-28 00:42:42,669 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-28 00:42:42,669 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-28 00:42:42,675 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-28 00:42:42,681 [ scc.git] DEBUG Already up to date.
2024-05-28 00:42:42,682 [ scc.git] DEBUG ## Unique users: []
2024-05-28 00:42:42,682 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:42,682 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:42,687 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-28 00:42:42,727 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:42,728 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:42,733 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-28 00:42:42,782 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-28 00:42:42,792 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f12243c7e50> has no local changes
2024-05-28 00:42:42,793 [ 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#79 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/)'
2024-05-28 00:42:42,803 [ scc.git] DEBUG [detached HEAD c3ddb73] merge master -Dorg -Ssuccess-only
2024-05-28 00:42:42,804 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:42:42,804 [ scc.repo] DEBUG ## PRs found:
2024-05-28 00:42:43,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-05-28 00:42:43,073 [ scc.repo] DEBUG ## Branches found:
2024-05-28 00:42:43,073 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-28 00:42:43,073 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:43,073 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:43,080 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-28 00:42:43,087 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-28 00:42:43,088 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-28 00:42:43,095 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-28 00:42:43,103 [ scc.git] DEBUG Already up to date.
2024-05-28 00:42:43,103 [ scc.git] DEBUG ## Unique users: []
2024-05-28 00:42:43,103 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:43,103 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:43,110 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-28 00:42:43,156 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:43,156 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:43,163 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-28 00:42:43,210 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-28 00:42:43,218 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f122433e490> has no local changes
2024-05-28 00:42:43,218 [ 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#79 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/)'
2024-05-28 00:42:43,228 [ scc.git] DEBUG [detached HEAD c00ffc5] merge master -Dorg -Ssuccess-only
2024-05-28 00:42:43,229 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:42:43,229 [ scc.repo] DEBUG ## PRs found:
2024-05-28 00:42:43,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-05-28 00:42:44,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-05-28 00:42:44,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-05-28 00:42:45,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-28 00:42:45,479 [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-05-28 00:42:45,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-28 00:42:46,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-05-28 00:42:46,369 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-05-28 00:42:46,369 [ scc.repo] DEBUG ## Branches found:
2024-05-28 00:42:46,369 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-28 00:42:46,369 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:46,369 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:46,375 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-28 00:42:46,380 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-28 00:42:46,380 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-28 00:42:46,386 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-28 00:42:46,391 [ scc.git] DEBUG Already up to date.
2024-05-28 00:42:46,392 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-05-28 00:42:46,771 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-05-28 00:42:46,771 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-05-28 00:42:46,777 [ scc.git] DEBUG ## Unique users: []
2024-05-28 00:42:46,777 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:46,778 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:46,785 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-28 00:42:46,795 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:46,807 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-28 00:42:46,821 [ scc.git] DEBUG Auto-merging Dockerfile
2024-05-28 00:42:46,822 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-05-28 00:42:46,822 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-28 00:42:46,822 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-28 00:42:46,831 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-28 00:42:46,839 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-05-28 00:42:46,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:42:46,994 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-28 00:42:47,001 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-28 00:42:47,007 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#79](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-05-28 00:42:47,013 [ scc.config] DEBUG Found github.token
2024-05-28 00:42:47,013 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-05-28 00:42:47,014 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-28 00:42:47,057 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:47,057 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:47,063 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-28 00:42:47,106 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-28 00:42:47,113 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1224383be0> has no local changes
2024-05-28 00:42:47,114 [ 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#79 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/)'
2024-05-28 00:42:47,125 [ scc.git] DEBUG [detached HEAD 314ff13] merge master -Dorg -Ssuccess-only
2024-05-28 00:42:47,125 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:42:47,126 [ scc.git] INFO Overriding base-branch from master to develop
2024-05-28 00:42:47,126 [ scc.repo] DEBUG ## PRs found:
2024-05-28 00:42:47,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-05-28 00:42:48,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-05-28 00:42:48,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-05-28 00:42:49,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-05-28 00:42:49,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-05-28 00:42:49,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-05-28 00:42:50,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-05-28 00:42:50,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-28 00:42:51,220 [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-05-28 00:42:51,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-28 00:42:52,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-05-28 00:42:52,114 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-28 00:42:52,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-05-28 00:42:53,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-05-28 00:42:53,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-05-28 00:42:54,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-05-28 00:42:54,023 [ scc.repo] DEBUG ## Branches found:
2024-05-28 00:42:54,023 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-28 00:42:54,023 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:54,023 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:54,033 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-05-28 00:42:54,044 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-28 00:42:54,044 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-05-28 00:42:54,054 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-05-28 00:42:54,065 [ scc.git] DEBUG Already up to date.
2024-05-28 00:42:54,065 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-05-28 00:42:54,477 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-05-28 00:42:54,478 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-05-28 00:42:54,484 [ scc.git] DEBUG ## Unique users: []
2024-05-28 00:42:54,484 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:54,484 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:54,493 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-28 00:42:54,505 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:54,513 [ 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-05-28 00:42:54,591 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-05-28 00:42:54,591 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-05-28 00:42:54,592 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-28 00:42:54,592 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-28 00:42:54,599 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-28 00:42:54,607 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-28 00:42:54,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:42:54,766 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-28 00:42:54,775 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-28 00:42:54,781 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#79](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-05-28 00:42:54,787 [ scc.config] DEBUG Found github.token
2024-05-28 00:42:54,787 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-05-28 00:42:54,787 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-28 00:42:54,830 [ scc.git] DEBUG Get sha1 of %s
2024-05-28 00:42:54,830 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-28 00:42:54,837 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-28 00:42:54,879 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-28 00:42:54,887 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f12243b2d30> has no local changes
2024-05-28 00:42:54,887 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#79 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/)'
2024-05-28 00:42:54,899 [ scc.git] DEBUG [detached HEAD c3b6a27] merge master -Dorg -Ssuccess-only
2024-05-28 00:42:54,899 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:42:54,899 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-28 00:42:55,016 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-05-28 00:42:55,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:42:55,188 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-05-28 00:42:55,193 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-05-28 00:42:55,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:42:55,587 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-05-28 00:42:55,596 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-05-28 00:42:55,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:42:56,014 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-05-28 00:42:56,020 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-05-28 00:42:56,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:42:56,435 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-05-28 00:42:56,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:42:56,836 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-05-28 00:42:56,842 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-05-28 00:42:57,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:42:57,241 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-05-28 00:42:57,249 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-05-28 00:42:57,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:42:57,651 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-05-28 00:42:57,657 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-05-28 00:42:58,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:42:58,067 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-05-28 00:42:58,076 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-05-28 00:42:58,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:42:58,469 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-05-28 00:42:58,479 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-05-28 00:42:58,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:42:58,871 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-05-28 00:42:58,879 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-05-28 00:42:59,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:42:59,283 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-05-28 00:42:59,289 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-05-28 00:42:59,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:42:59,690 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-05-28 00:42:59,698 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-05-28 00:43:00,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:43:00,098 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-05-28 00:43:00,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:43:00,515 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-05-28 00:43:00,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:43:00,940 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-05-28 00:43:00,949 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-05-28 00:43:01,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:43:01,342 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-05-28 00:43:01,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:43:01,743 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-05-28 00:43:02,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:43:02,161 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-05-28 00:43:02,166 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-05-28 00:43:02,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:43:02,569 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-05-28 00:43:02,574 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-05-28 00:43:02,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:43:02,974 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-05-28 00:43:02,979 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-05-28 00:43:03,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:43:03,384 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-05-28 00:43:03,388 [ scc.config] DEBUG Found submodule.scripts.url
2024-05-28 00:43:03,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-28 00:43:03,802 [ scc.config] DEBUG Found submodule.scripts.branch
2024-05-28 00:43:03,803 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-28 00:43:03,904 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1225ddd2e0> has local changes
2024-05-28 00:43:03,905 [ 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'
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 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 562 will-moore 'Add changelog 7.0.0'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#79 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/79/)'
2024-05-28 00:43:03,922 [ scc.git] DEBUG [detached HEAD 4bc3ec1] merge master -Dorg -Ssuccess-only
2024-05-28 00:43:03,922 [ scc.merge] INFO Repository: ome/omero-plugins
2024-05-28 00:43:03,922 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-05-28 00:43:03,922 [ scc.merge] INFO Already up to date.
2024-05-28 00:43:03,922 [ scc.merge] INFO
2024-05-28 00:43:03,922 [ scc.merge] INFO
2024-05-28 00:43:03,922 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-05-28 00:43:03,922 [ scc.merge] INFO Already up to date.
2024-05-28 00:43:03,922 [ scc.merge] INFO
2024-05-28 00:43:03,922 [ scc.merge] INFO
2024-05-28 00:43:03,922 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-05-28 00:43:03,922 [ scc.merge] INFO Excluded PRs:
2024-05-28 00:43:03,922 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-05-28 00:43:03,923 [ scc.merge] INFO Already up to date.
2024-05-28 00:43:03,923 [ scc.merge] INFO
2024-05-28 00:43:03,923 [ scc.merge] INFO Merged PRs:
2024-05-28 00:43:03,923 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-05-28 00:43:03,923 [ scc.merge] INFO
2024-05-28 00:43:03,923 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-05-28 00:43:03,923 [ scc.merge] INFO Excluded PRs:
2024-05-28 00:43:03,923 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-05-28 00:43:03,923 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-05-28 00:43:03,923 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-05-28 00:43:03,923 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-05-28 00:43:03,923 [ scc.merge] INFO Already up to date.
2024-05-28 00:43:03,923 [ scc.merge] INFO
2024-05-28 00:43:03,923 [ scc.merge] INFO Merged PRs:
2024-05-28 00:43:03,923 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-05-28 00:43:03,923 [ scc.merge] INFO
2024-05-28 00:43:03,923 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-05-28 00:43:03,923 [ scc.merge] INFO Excluded PRs:
2024-05-28 00:43:03,923 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-28 00:43:03,923 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-05-28 00:43:03,923 [ scc.merge] INFO Already up to date.
2024-05-28 00:43:03,923 [ scc.merge] INFO
2024-05-28 00:43:03,923 [ scc.merge] INFO Merged PRs:
2024-05-28 00:43:03,923 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-05-28 00:43:03,923 [ scc.merge] INFO
2024-05-28 00:43:03,923 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-28 00:43:03,923 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-05-28 00:43:03,923 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-05-28 00:43:03,923 [ scc.merge] INFO
2024-05-28 00:43:03,923 [ scc.merge] INFO Repository: ome/omero-figure
2024-05-28 00:43:03,923 [ scc.merge] INFO Excluded PRs:
2024-05-28 00:43:03,923 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-05-28 00:43:03,924 [ scc.merge] INFO Already up to date.
2024-05-28 00:43:03,924 [ scc.merge] INFO
2024-05-28 00:43:03,924 [ scc.merge] INFO Merged PRs:
2024-05-28 00:43:03,924 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-05-28 00:43:03,924 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-05-28 00:43:03,924 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-05-28 00:43:03,924 [ scc.merge] INFO - PR 562 will-moore 'Add changelog 7.0.0'
2024-05-28 00:43:03,924 [ scc.merge] INFO
2024-05-28 00:43:03,924 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-05-28 00:43:03,924 [ scc.merge] INFO Already up to date.
2024-05-28 00:43:03,924 [ scc.merge] INFO
2024-05-28 00:43:03,924 [ scc.merge] INFO Merged PRs:
2024-05-28 00:43:03,924 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-05-28 00:43:03,924 [ scc.merge] INFO
2024-05-28 00:43:03,924 [ scc.merge] INFO Repository: ome/omero-gallery
2024-05-28 00:43:03,924 [ scc.merge] INFO Already up to date.
2024-05-28 00:43:03,924 [ scc.merge] INFO
2024-05-28 00:43:03,924 [ scc.merge] INFO Merged PRs:
2024-05-28 00:43:03,924 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-28 00:43:03,924 [ scc.merge] INFO
2024-05-28 00:43:03,924 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-05-28 00:43:03,924 [ scc.merge] INFO Excluded PRs:
2024-05-28 00:43:03,924 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-05-28 00:43:03,924 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-05-28 00:43:03,924 [ scc.merge] INFO Already up to date.
2024-05-28 00:43:03,924 [ scc.merge] INFO
2024-05-28 00:43:03,924 [ scc.merge] INFO Merged PRs:
2024-05-28 00:43:03,924 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-05-28 00:43:03,924 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-05-28 00:43:03,924 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-28 00:43:03,924 [ scc.merge] INFO
2024-05-28 00:43:03,924 [ scc.merge] INFO Repository: ome/omero-mapr
2024-05-28 00:43:03,924 [ scc.merge] INFO Excluded PRs:
2024-05-28 00:43:03,924 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-05-28 00:43:03,924 [ scc.merge] INFO Already up to date.
2024-05-28 00:43:03,925 [ scc.merge] INFO
2024-05-28 00:43:03,925 [ scc.merge] INFO Merged PRs:
2024-05-28 00:43:03,925 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-05-28 00:43:03,925 [ scc.merge] INFO
2024-05-28 00:43:03,925 [ scc.merge] INFO Repository: ome/omero-metadata
2024-05-28 00:43:03,925 [ scc.merge] INFO Already up to date.
2024-05-28 00:43:03,925 [ scc.merge] INFO
2024-05-28 00:43:03,925 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-28 00:43:03,925 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-28 00:43:03,925 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-28 00:43:03,925 [ scc.merge] INFO
2024-05-28 00:43:03,925 [ scc.merge] INFO Repository: ome/omero-parade
2024-05-28 00:43:03,925 [ scc.merge] INFO Excluded PRs:
2024-05-28 00:43:03,925 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-05-28 00:43:03,925 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-05-28 00:43:03,925 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-05-28 00:43:03,925 [ scc.merge] INFO Already up to date.
2024-05-28 00:43:03,925 [ scc.merge] INFO
2024-05-28 00:43:03,926 [ scc.merge] INFO Merged PRs:
2024-05-28 00:43:03,926 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-28 00:43:03,926 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-28 00:43:03,926 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-28 00:43:03,926 [ scc.merge] INFO
2024-05-28 00:43:03,926 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-05-28 00:43:03,926 [ scc.merge] INFO Already up to date.
2024-05-28 00:43:03,926 [ scc.merge] INFO
2024-05-28 00:43:03,926 [ scc.merge] INFO Merged PRs:
2024-05-28 00:43:03,926 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-05-28 00:43:03,926 [ scc.merge] INFO
2024-05-28 00:43:03,926 [ scc.merge] INFO Repository: ome/omero-rois
2024-05-28 00:43:03,926 [ scc.merge] INFO Excluded PRs:
2024-05-28 00:43:03,926 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-28 00:43:03,926 [ scc.merge] INFO Already up to date.
2024-05-28 00:43:03,926 [ scc.merge] INFO
2024-05-28 00:43:03,926 [ scc.merge] INFO Merged PRs:
2024-05-28 00:43:03,926 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-28 00:43:03,926 [ scc.merge] INFO
2024-05-28 00:43:03,926 [ scc.merge] INFO Repository: ome/omero-signup
2024-05-28 00:43:03,926 [ scc.merge] INFO Already up to date.
2024-05-28 00:43:03,926 [ scc.merge] INFO
2024-05-28 00:43:03,926 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-28 00:43:03,926 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-28 00:43:03,926 [ scc.merge] INFO
2024-05-28 00:43:03,926 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-05-28 00:43:03,926 [ scc.merge] INFO Already up to date.
2024-05-28 00:43:03,926 [ scc.merge] INFO
2024-05-28 00:43:03,926 [ scc.merge] INFO Merged PRs:
2024-05-28 00:43:03,926 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-28 00:43:03,926 [ scc.merge] INFO
2024-05-28 00:43:03,926 [ scc.merge] INFO Repository: ome/omero-upload
2024-05-28 00:43:03,926 [ scc.merge] INFO Already up to date.
2024-05-28 00:43:03,926 [ scc.merge] INFO
2024-05-28 00:43:03,926 [ scc.merge] INFO
2024-05-28 00:43:03,926 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-05-28 00:43:03,927 [ scc.merge] INFO Already up to date.
2024-05-28 00:43:03,927 [ scc.merge] INFO
2024-05-28 00:43:03,927 [ scc.merge] INFO
2024-05-28 00:43:03,927 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-05-28 00:43:03,927 [ scc.merge] INFO Excluded PRs:
2024-05-28 00:43:03,927 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-05-28 00:43:03,927 [ scc.merge] INFO Already up to date.
2024-05-28 00:43:03,927 [ scc.merge] INFO
2024-05-28 00:43:03,927 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-28 00:43:03,927 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-28 00:43:03,927 [ scc.merge] INFO
2024-05-28 00:43:03,927 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-05-28 00:43:03,927 [ scc.merge] INFO Already up to date.
2024-05-28 00:43:03,927 [ scc.merge] INFO
2024-05-28 00:43:03,927 [ scc.merge] INFO
2024-05-28 00:43:03,927 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-05-28 00:43:03,927 [ scc.merge] INFO Already up to date.
2024-05-28 00:43:03,927 [ scc.merge] INFO
2024-05-28 00:43:03,927 [ scc.merge] INFO
2024-05-28 00:43:03,927 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-05-28 00:43:03,927 [ scc.merge] INFO Already up to date.
2024-05-28 00:43:03,927 [ scc.merge] INFO
2024-05-28 00:43:03,927 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-28 00:43:03,927 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-05-28 00:43:03,927 [ scc.merge] INFO
2024-05-28 00:43:03,927 [ scc.merge] INFO Repository: ome/scripts
2024-05-28 00:43:03,927 [ scc.merge] INFO Excluded PRs:
2024-05-28 00:43:03,927 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-05-28 00:43:03,927 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-05-28 00:43:03,927 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-05-28 00:43:03,927 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-05-28 00:43:03,927 [ scc.merge] INFO Already up to date.
2024-05-28 00:43:03,927 [ scc.merge] INFO
2024-05-28 00:43:03,927 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-28 00:43:03,927 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-28 00:43:03,928 [ scc.merge] INFO
2024-05-28 00:43:03,928 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-28 00:43:03,928 [ scc.git] DEBUG Calling 'git remote'
2024-05-28 00:43:03,935 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-05-28 00:43:03,935 [ scc.git] DEBUG Calling 'git remote'
2024-05-28 00:43:03,941 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:43:03,941 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-05-28 00:43:03,941 [ scc.git] DEBUG Calling 'git remote'
2024-05-28 00:43:03,947 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:43:03,948 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-05-28 00:43:03,948 [ scc.git] DEBUG Calling 'git remote'
2024-05-28 00:43:03,955 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:43:03,955 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-05-28 00:43:03,955 [ scc.git] DEBUG Calling 'git remote'
2024-05-28 00:43:03,963 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:43:03,963 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-28 00:43:03,963 [ scc.git] DEBUG Calling 'git remote'
2024-05-28 00:43:03,969 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:43:03,969 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-28 00:43:03,969 [ scc.git] DEBUG Calling 'git remote'
2024-05-28 00:43:03,976 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:43:03,976 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-28 00:43:03,976 [ scc.git] DEBUG Calling 'git remote'
2024-05-28 00:43:03,983 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:43:03,983 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-28 00:43:03,983 [ scc.git] DEBUG Calling 'git remote'
2024-05-28 00:43:03,990 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:43:03,991 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-28 00:43:03,991 [ scc.git] DEBUG Calling 'git remote'
2024-05-28 00:43:03,997 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:43:03,998 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-28 00:43:03,998 [ scc.git] DEBUG Calling 'git remote'
2024-05-28 00:43:04,007 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:43:04,008 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-28 00:43:04,008 [ scc.git] DEBUG Calling 'git remote'
2024-05-28 00:43:04,016 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:43:04,016 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-28 00:43:04,016 [ scc.git] DEBUG Calling 'git remote'
2024-05-28 00:43:04,023 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:43:04,023 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-28 00:43:04,023 [ scc.git] DEBUG Calling 'git remote'
2024-05-28 00:43:04,030 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:43:04,030 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-28 00:43:04,030 [ scc.git] DEBUG Calling 'git remote'
2024-05-28 00:43:04,037 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:43:04,037 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-28 00:43:04,037 [ scc.git] DEBUG Calling 'git remote'
2024-05-28 00:43:04,043 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:43:04,043 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-28 00:43:04,043 [ scc.git] DEBUG Calling 'git remote'
2024-05-28 00:43:04,049 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:43:04,049 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-28 00:43:04,049 [ scc.git] DEBUG Calling 'git remote'
2024-05-28 00:43:04,055 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:43:04,055 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-28 00:43:04,055 [ scc.git] DEBUG Calling 'git remote'
2024-05-28 00:43:04,061 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:43:04,062 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-28 00:43:04,062 [ scc.git] DEBUG Calling 'git remote'
2024-05-28 00:43:04,067 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:43:04,068 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-28 00:43:04,068 [ scc.git] DEBUG Calling 'git remote'
2024-05-28 00:43:04,074 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:43:04,074 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-28 00:43:04,074 [ scc.git] DEBUG Calling 'git remote'
2024-05-28 00:43:04,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-28 00:43:04,081 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-28 00:43:04,081 [ scc.git] DEBUG Calling 'git remote'
2024-05-28 00:43:04,087 [ 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 f6e4902] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 2ca566b
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from 3d9e3b87
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from 7b7a637
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from 7688c54
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 a7319f6] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-05-28 00:43:50,782 [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-05-28 00:43:59,737 [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-05-28 00:44:02,039 [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-05-28 00:44:06,548 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-05-28 00:44:53,474 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/f6f303f9/images/svgs/logo.svg){kind=logo}
