Console Output
Skipping 77 KB..
Full LogFound github.token
2024-05-18 00:43:05,342 [ scc.git] DEBUG Not adding comment to issue #123, already --conflicts.
2024-05-18 00:43:05,342 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a14f62a940f4974a305b3f5858049ee493b898ef'
2024-05-18 00:43:05,348 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:43:05,353 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 147 (Name option) a14f62a940f4974a305b3f5858049ee493b898ef'
2024-05-18 00:43:05,406 [ scc.git] DEBUG Auto-merging src/omero_zarr/masks.py
2024-05-18 00:43:05,406 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-05-18 00:43:05,406 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:43:05,410 [ scc.git] DEBUG README.rst | 30 ++++++++++++++++++------------
2024-05-18 00:43:05,410 [ scc.git] DEBUG src/omero_zarr/cli.py | 9 +++++++++
2024-05-18 00:43:05,410 [ scc.git] DEBUG src/omero_zarr/masks.py | 4 ++--
2024-05-18 00:43:05,410 [ scc.git] DEBUG src/omero_zarr/raw_pixels.py | 28 +++++++++++++++++++++++-----
2024-05-18 00:43:05,410 [ scc.git] DEBUG src/omero_zarr/util.py | 2 +-
2024-05-18 00:43:05,410 [ scc.git] DEBUG 5 files changed, 53 insertions(+), 20 deletions(-)
2024-05-18 00:43:05,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:43:05,742 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-18 00:43:05,785 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:43:05,785 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:43:05,791 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:43:05,839 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-18 00:43:05,846 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbfc70ad640> has no local changes
2024-05-18 00:43:05,847 [ 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#69 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/)'
2024-05-18 00:43:05,856 [ scc.git] DEBUG [detached HEAD ac9e1e6] merge master -Dorg -Ssuccess-only
2024-05-18 00:43:05,857 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:43:05,857 [ scc.repo] DEBUG ## PRs found:
2024-05-18 00:43:06,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-05-18 00:43:06,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562 HTTP/1.1" 200 None
2024-05-18 00:43:07,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23 HTTP/1.1" 200 None
2024-05-18 00:43:07,666 [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-18 00:43:08,153 [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-18 00:43:08,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23 HTTP/1.1" 200 None
2024-05-18 00:43:09,057 [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-18 00:43:09,058 [ scc.repo] DEBUG - PR 562 will-moore 'Add changelog 7.0.0'
2024-05-18 00:43:09,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560 HTTP/1.1" 200 None
2024-05-18 00:43:10,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560/comments HTTP/1.1" 200 None
2024-05-18 00:43:10,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/93463371bd79d20cd7abe760db0e7cbdbb897919 HTTP/1.1" 200 None
2024-05-18 00:43:10,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/93463371bd79d20cd7abe760db0e7cbdbb897919/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-18 00:43:11,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/93463371bd79d20cd7abe760db0e7cbdbb897919/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-18 00:43:11,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-05-18 00:43:12,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-05-18 00:43:12,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-18 00:43:13,277 [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-18 00:43:13,752 [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-18 00:43:14,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-18 00:43:14,604 [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-18 00:43:14,605 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-05-18 00:43:15,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-05-18 00:43:15,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-18 00:43:16,013 [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-18 00:43:16,472 [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-18 00:43:16,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-18 00:43:17,356 [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-18 00:43:17,357 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-05-18 00:43:17,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543 HTTP/1.1" 200 None
2024-05-18 00:43:18,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543/comments HTTP/1.1" 200 None
2024-05-18 00:43:18,285 [ scc.repo] DEBUG ## Branches found:
2024-05-18 00:43:18,285 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-18 00:43:18,285 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:43:18,285 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:43:18,293 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-18 00:43:18,299 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-18 00:43:18,299 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-18 00:43:18,306 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-18 00:43:18,313 [ scc.git] DEBUG Already up to date.
2024-05-18 00:43:18,314 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-05-18 00:43:19,490 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-18 00:43:19,490 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-05-18 00:43:19,495 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-05-18 00:43:20,282 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-18 00:43:20,282 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-05-18 00:43:20,288 [ scc.git] DEBUG Calling 'git fetch origin pull/562/head'
2024-05-18 00:43:20,848 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-18 00:43:20,848 [ scc.git] DEBUG * branch refs/pull/562/head -> FETCH_HEAD
2024-05-18 00:43:20,851 [ scc.git] DEBUG ## Unique users: []
2024-05-18 00:43:20,851 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:43:20,851 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:43:20,857 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-18 00:43:20,864 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:43:20,870 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-18 00:43:21,019 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:43:21,026 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-05-18 00:43:21,026 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-05-18 00:43:21,026 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-05-18 00:43:21,026 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-05-18 00:43:21,026 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-05-18 00:43:21,028 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-05-18 00:43:21,028 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-05-18 00:43:21,028 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-05-18 00:43:21,029 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-05-18 00:43:21,029 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-05-18 00:43:21,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:43:21,181 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-18 00:43:21,189 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:43:21,194 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-18 00:43:21,347 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-18 00:43:21,347 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-05-18 00:43:21,347 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-05-18 00:43:21,348 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:43:21,354 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-05-18 00:43:21,354 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-05-18 00:43:21,354 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-05-18 00:43:21,355 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-05-18 00:43:21,355 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-05-18 00:43:21,355 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-05-18 00:43:21,355 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-05-18 00:43:21,355 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-05-18 00:43:21,355 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-05-18 00:43:21,355 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-05-18 00:43:21,355 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-05-18 00:43:21,355 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-05-18 00:43:21,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:43:21,587 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0c814d66251860ddb01c00ade8469e45f7a1be23'
2024-05-18 00:43:21,596 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:43:21,602 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 562 (Add changelog 7.0.0) 0c814d66251860ddb01c00ade8469e45f7a1be23'
2024-05-18 00:43:21,619 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:43:21,622 [ scc.git] DEBUG CHANGELOG.md | 10 ++++++++++
2024-05-18 00:43:21,622 [ scc.git] DEBUG 1 file changed, 10 insertions(+)
2024-05-18 00:43:21,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:43:21,989 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-18 00:43:22,034 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:43:22,034 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:43:22,040 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:43:22,080 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-18 00:43:22,089 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbfc7106be0> has no local changes
2024-05-18 00:43:22,089 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 560 will-moore 'Max projection bytes' (status: failure)
- 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 562 will-moore 'Add changelog 7.0.0'
Generated by OMERO-plugins-push#69 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/)'
2024-05-18 00:43:22,099 [ scc.git] DEBUG [detached HEAD aff5da05] merge master -Dorg -Ssuccess-only
2024-05-18 00:43:22,099 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:43:22,099 [ scc.repo] DEBUG ## PRs found:
2024-05-18 00:43:22,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-05-18 00:43:22,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-05-18 00:43:23,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-05-18 00:43:23,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-18 00:43:24,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-18 00:43:24,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-18 00:43:25,282 [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-18 00:43:25,283 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-05-18 00:43:25,283 [ scc.repo] DEBUG ## Branches found:
2024-05-18 00:43:25,283 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-18 00:43:25,283 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:43:25,283 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:43:25,289 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-18 00:43:25,295 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-18 00:43:25,295 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-18 00:43:25,302 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-18 00:43:25,308 [ scc.git] DEBUG Already up to date.
2024-05-18 00:43:25,309 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-05-18 00:43:25,668 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-05-18 00:43:25,669 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-05-18 00:43:25,673 [ scc.git] DEBUG ## Unique users: []
2024-05-18 00:43:25,673 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:43:25,674 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:43:25,680 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-18 00:43:25,686 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:43:25,692 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-18 00:43:25,730 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-05-18 00:43:25,731 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:43:25,733 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-05-18 00:43:25,733 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-05-18 00:43:25,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:43:25,891 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-18 00:43:25,934 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:43:25,934 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:43:25,940 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:43:25,982 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-18 00:43:25,988 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbfc70bd550> has no local changes
2024-05-18 00:43:25,988 [ 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#69 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/)'
2024-05-18 00:43:25,998 [ scc.git] DEBUG [detached HEAD 8920bad] merge master -Dorg -Ssuccess-only
2024-05-18 00:43:25,998 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:43:25,998 [ scc.repo] DEBUG ## PRs found:
2024-05-18 00:43:26,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-05-18 00:43:26,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-05-18 00:43:26,828 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-18 00:43:27,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-18 00:43:27,773 [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-18 00:43:28,272 [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-18 00:43:28,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-18 00:43:29,251 [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-18 00:43:29,251 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-18 00:43:29,252 [ scc.repo] DEBUG ## Branches found:
2024-05-18 00:43:29,252 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-18 00:43:29,252 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:43:29,252 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:43:29,258 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-18 00:43:29,264 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-18 00:43:29,264 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-18 00:43:29,270 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-18 00:43:29,276 [ scc.git] DEBUG Already up to date.
2024-05-18 00:43:29,277 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-05-18 00:43:29,646 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-05-18 00:43:29,647 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-05-18 00:43:29,652 [ scc.git] DEBUG ## Unique users: []
2024-05-18 00:43:29,652 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:43:29,653 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:43:29,658 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-05-18 00:43:29,666 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:43:29,672 [ 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-18 00:43:29,684 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:43:29,688 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-05-18 00:43:29,689 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-05-18 00:43:29,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:43:29,852 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-18 00:43:29,897 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:43:29,898 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:43:29,904 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:43:29,947 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-18 00:43:29,957 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbfc70c5820> has no local changes
2024-05-18 00:43:29,958 [ 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#69 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/)'
2024-05-18 00:43:29,969 [ scc.git] DEBUG [detached HEAD 88c44e0] merge master -Dorg -Ssuccess-only
2024-05-18 00:43:29,970 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:43:29,970 [ scc.repo] DEBUG ## PRs found:
2024-05-18 00:43:30,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-05-18 00:43:30,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/475 HTTP/1.1" 200 None
2024-05-18 00:43:31,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/4a89dc6f0646b38c9c91d5f15003dcabad5c479f HTTP/1.1" 200 None
2024-05-18 00:43:31,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/4a89dc6f0646b38c9c91d5f15003dcabad5c479f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-18 00:43:32,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/4a89dc6f0646b38c9c91d5f15003dcabad5c479f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-18 00:43:32,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/4a89dc6f0646b38c9c91d5f15003dcabad5c479f HTTP/1.1" 200 None
2024-05-18 00:43:33,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/4a89dc6f0646b38c9c91d5f15003dcabad5c479f?per_page=1 HTTP/1.1" 200 2
2024-05-18 00:43:33,071 [ scc.repo] DEBUG - PR 475 will-moore 'Update build and publish in gha'
2024-05-18 00:43:33,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-05-18 00:43:34,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-05-18 00:43:34,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-18 00:43:34,908 [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-18 00:43:35,361 [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-18 00:43:35,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-18 00:43:36,254 [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-18 00:43:36,255 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-18 00:43:36,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469 HTTP/1.1" 200 None
2024-05-18 00:43:37,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469/comments HTTP/1.1" 200 None
2024-05-18 00:43:37,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/0eaee155506e5851ccebed9a01799cf86ebb9f63 HTTP/1.1" 200 None
2024-05-18 00:43:38,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/0eaee155506e5851ccebed9a01799cf86ebb9f63/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-18 00:43:38,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/0eaee155506e5851ccebed9a01799cf86ebb9f63/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-18 00:43:38,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/0eaee155506e5851ccebed9a01799cf86ebb9f63 HTTP/1.1" 200 None
2024-05-18 00:43:39,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/0eaee155506e5851ccebed9a01799cf86ebb9f63?per_page=1 HTTP/1.1" 200 2
2024-05-18 00:43:39,344 [ scc.repo] DEBUG - PR 469 will-moore 'changelog 0.14.0'
2024-05-18 00:43:39,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-05-18 00:43:40,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-05-18 00:43:40,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-05-18 00:43:41,219 [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-18 00:43:41,689 [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-18 00:43:42,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-05-18 00:43:42,591 [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-18 00:43:42,592 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-05-18 00:43:43,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-05-18 00:43:43,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-05-18 00:43:43,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-18 00:43:44,390 [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-18 00:43:44,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-18 00:43:45,269 [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-18 00:43:45,270 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-05-18 00:43:45,270 [ scc.repo] DEBUG ## Branches found:
2024-05-18 00:43:45,270 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-18 00:43:45,270 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:43:45,270 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:43:45,277 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-18 00:43:45,282 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-18 00:43:45,282 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-18 00:43:45,288 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-18 00:43:45,294 [ scc.git] DEBUG Already up to date.
2024-05-18 00:43:45,294 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-05-18 00:43:45,684 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-18 00:43:45,684 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-05-18 00:43:45,689 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-05-18 00:43:46,119 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-18 00:43:46,119 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-05-18 00:43:46,124 [ scc.git] DEBUG Calling 'git fetch origin pull/469/head'
2024-05-18 00:43:46,572 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-18 00:43:46,572 [ scc.git] DEBUG * branch refs/pull/469/head -> FETCH_HEAD
2024-05-18 00:43:46,579 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-05-18 00:43:46,959 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-18 00:43:46,959 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-05-18 00:43:46,964 [ scc.git] DEBUG Calling 'git fetch origin pull/475/head'
2024-05-18 00:43:47,510 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-18 00:43:47,510 [ scc.git] DEBUG * branch refs/pull/475/head -> FETCH_HEAD
2024-05-18 00:43:47,513 [ scc.git] DEBUG ## Unique users: []
2024-05-18 00:43:47,513 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:43:47,513 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:43:47,519 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-18 00:43:47,527 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:43:47,533 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-18 00:43:47,634 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-05-18 00:43:47,635 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:43:47,638 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-05-18 00:43:47,639 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-05-18 00:43:47,639 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-05-18 00:43:47,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:43:47,798 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-05-18 00:43:47,805 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:43:47,810 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-05-18 00:43:47,828 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-05-18 00:43:47,829 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-05-18 00:43:47,829 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-05-18 00:43:47,829 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-05-18 00:43:47,829 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:43:47,833 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-05-18 00:43:47,833 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-05-18 00:43:47,833 [ scc.git] DEBUG src/app/header.html | 5 +
2024-05-18 00:43:47,833 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-05-18 00:43:47,833 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-05-18 00:43:47,833 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-05-18 00:43:47,833 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-05-18 00:43:47,833 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-05-18 00:43:48,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:43:48,204 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0eaee155506e5851ccebed9a01799cf86ebb9f63'
2024-05-18 00:43:48,211 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:43:48,216 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 469 (changelog 0.14.0) 0eaee155506e5851ccebed9a01799cf86ebb9f63'
2024-05-18 00:43:48,229 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:43:48,232 [ scc.git] DEBUG CHANGELOG.md | 9 ++++++++-
2024-05-18 00:43:48,232 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-05-18 00:43:48,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:43:48,606 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-18 00:43:48,614 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:43:48,619 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-18 00:43:48,631 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-05-18 00:43:48,632 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:43:48,635 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-05-18 00:43:48,635 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-05-18 00:43:48,635 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-05-18 00:43:49,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:43:49,013 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4a89dc6f0646b38c9c91d5f15003dcabad5c479f'
2024-05-18 00:43:49,022 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:43:49,029 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 475 (Update build and publish in gha) 4a89dc6f0646b38c9c91d5f15003dcabad5c479f'
2024-05-18 00:43:49,041 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:43:49,044 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++---
2024-05-18 00:43:49,044 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-05-18 00:43:49,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:43:49,424 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-18 00:43:49,469 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:43:49,469 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:43:49,476 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:43:49,517 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-18 00:43:49,526 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbfc40605b0> has no local changes
2024-05-18 00:43:49,526 [ 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 469 will-moore 'changelog 0.14.0'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 475 will-moore 'Update build and publish in gha'
Generated by OMERO-plugins-push#69 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/)'
2024-05-18 00:43:49,535 [ scc.git] DEBUG [detached HEAD 7638b71] merge master -Dorg -Ssuccess-only
2024-05-18 00:43:49,536 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:43:49,536 [ scc.repo] DEBUG ## PRs found:
2024-05-18 00:43:49,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-05-18 00:43:50,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-05-18 00:43:50,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-05-18 00:43:51,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-18 00:43:51,774 [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-18 00:43:52,208 [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-18 00:43:52,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-18 00:43:53,060 [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-18 00:43:53,061 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-05-18 00:43:53,061 [ scc.repo] DEBUG ## Branches found:
2024-05-18 00:43:53,061 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-18 00:43:53,061 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:43:53,061 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:43:53,067 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-18 00:43:53,072 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-18 00:43:53,073 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-18 00:43:53,078 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-18 00:43:53,083 [ scc.git] DEBUG Already up to date.
2024-05-18 00:43:53,084 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-05-18 00:43:53,450 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-05-18 00:43:53,450 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-05-18 00:43:53,455 [ scc.git] DEBUG ## Unique users: []
2024-05-18 00:43:53,455 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:43:53,455 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:43:53,461 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-18 00:43:53,468 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:43:53,473 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-18 00:43:53,482 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:43:53,485 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-05-18 00:43:53,485 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-05-18 00:43:53,485 [ scc.git] DEBUG requirements.txt | 2 +-
2024-05-18 00:43:53,485 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-05-18 00:43:53,485 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-05-18 00:43:53,485 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-05-18 00:43:53,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:43:53,650 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-18 00:43:53,691 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:43:53,692 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:43:53,698 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:43:53,739 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-18 00:43:53,747 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbfc70a54f0> has no local changes
2024-05-18 00:43:53,747 [ 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#69 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/)'
2024-05-18 00:43:53,756 [ scc.git] DEBUG [detached HEAD a22dab4] merge master -Dorg -Ssuccess-only
2024-05-18 00:43:53,757 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:43:53,757 [ scc.repo] DEBUG ## PRs found:
2024-05-18 00:43:54,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-05-18 00:43:54,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-05-18 00:43:55,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-05-18 00:43:55,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-18 00:43:55,963 [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-18 00:43:56,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-18 00:43:56,810 [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-18 00:43:56,811 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-18 00:43:57,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-05-18 00:43:57,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-05-18 00:43:58,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-18 00:43:58,588 [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-18 00:43:59,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-18 00:43:59,445 [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-18 00:43:59,446 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-18 00:43:59,446 [ scc.repo] DEBUG ## Branches found:
2024-05-18 00:43:59,446 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-18 00:43:59,446 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:43:59,446 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:43:59,453 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-18 00:43:59,458 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-18 00:43:59,458 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-18 00:43:59,463 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-18 00:43:59,469 [ scc.git] DEBUG Already up to date.
2024-05-18 00:43:59,469 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-05-18 00:43:59,831 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-18 00:43:59,831 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-05-18 00:43:59,836 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-05-18 00:44:00,206 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-18 00:44:00,206 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-05-18 00:44:00,211 [ scc.git] DEBUG ## Unique users: []
2024-05-18 00:44:00,211 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:00,211 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:00,217 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-18 00:44:00,225 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:00,231 [ 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-18 00:44:00,314 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-05-18 00:44:00,314 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-05-18 00:44:00,314 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-18 00:44:00,314 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-18 00:44:00,314 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-18 00:44:00,315 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-18 00:44:00,322 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-18 00:44:00,329 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-18 00:44:00,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:00,495 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-18 00:44:00,503 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-18 00:44:00,510 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#69](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-05-18 00:44:00,516 [ scc.config] DEBUG Found github.token
2024-05-18 00:44:00,516 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-05-18 00:44:00,517 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-18 00:44:00,524 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:00,529 [ 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-18 00:44:00,546 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-18 00:44:00,546 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-18 00:44:00,546 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-05-18 00:44:00,546 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-18 00:44:00,546 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-18 00:44:00,553 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-18 00:44:00,560 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-18 00:44:00,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:00,909 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-18 00:44:00,918 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-18 00:44:00,925 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#69](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/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-18 00:44:00,931 [ scc.config] DEBUG Found github.token
2024-05-18 00:44:00,931 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-05-18 00:44:00,932 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-18 00:44:00,977 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:00,977 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:00,984 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:44:01,026 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-18 00:44:01,033 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbfc4060550> has no local changes
2024-05-18 00:44:01,034 [ 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#69 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/)'
2024-05-18 00:44:01,042 [ scc.git] DEBUG [detached HEAD 095ab51] merge master -Dorg -Ssuccess-only
2024-05-18 00:44:01,043 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:01,043 [ scc.repo] DEBUG ## PRs found:
2024-05-18 00:44:01,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-05-18 00:44:01,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-05-18 00:44:01,898 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-18 00:44:02,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-18 00:44:02,930 [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-18 00:44:03,399 [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-18 00:44:03,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-18 00:44:04,258 [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-18 00:44:04,259 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-18 00:44:04,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-05-18 00:44:04,741 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-18 00:44:05,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-18 00:44:05,755 [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-18 00:44:06,221 [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-18 00:44:06,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-18 00:44:07,089 [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-18 00:44:07,090 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-18 00:44:07,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-05-18 00:44:07,558 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-18 00:44:08,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-18 00:44:08,504 [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-18 00:44:08,964 [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-18 00:44:09,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-18 00:44:09,810 [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-18 00:44:09,811 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-18 00:44:10,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-05-18 00:44:10,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-05-18 00:44:11,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-05-18 00:44:11,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-05-18 00:44:12,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-05-18 00:44:12,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-05-18 00:44:12,583 [ scc.repo] DEBUG ## Branches found:
2024-05-18 00:44:12,583 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-18 00:44:12,584 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:12,584 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:12,594 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-18 00:44:12,604 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-18 00:44:12,604 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-18 00:44:12,615 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-18 00:44:12,626 [ scc.git] DEBUG Already up to date.
2024-05-18 00:44:12,626 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-05-18 00:44:13,014 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-18 00:44:13,014 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-05-18 00:44:13,020 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-05-18 00:44:13,446 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-18 00:44:13,446 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-05-18 00:44:13,455 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-05-18 00:44:13,845 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-18 00:44:13,845 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-05-18 00:44:13,851 [ scc.git] DEBUG ## Unique users: []
2024-05-18 00:44:13,851 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:13,851 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:13,859 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-05-18 00:44:13,866 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:13,875 [ 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-18 00:44:13,886 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:44:13,890 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-05-18 00:44:13,890 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-05-18 00:44:14,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:14,043 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-05-18 00:44:14,050 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:14,057 [ 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-18 00:44:14,070 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-18 00:44:14,071 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:44:14,074 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-05-18 00:44:14,074 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-05-18 00:44:14,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:14,452 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-05-18 00:44:14,459 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:14,466 [ 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-18 00:44:14,480 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-18 00:44:14,481 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:44:14,485 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-05-18 00:44:14,485 [ scc.git] DEBUG package.json | 2 +-
2024-05-18 00:44:14,485 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-05-18 00:44:14,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:14,873 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-18 00:44:14,926 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:14,926 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:14,933 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:44:14,977 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-18 00:44:14,985 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbfc7098fd0> has no local changes
2024-05-18 00:44:14,985 [ 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#69 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/)'
2024-05-18 00:44:14,996 [ scc.git] DEBUG [detached HEAD 90daeeb] merge master -Dorg -Ssuccess-only
2024-05-18 00:44:14,996 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:14,997 [ scc.repo] DEBUG ## PRs found:
2024-05-18 00:44:15,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-05-18 00:44:15,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-05-18 00:44:16,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-18 00:44:16,815 [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-18 00:44:17,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-18 00:44:17,688 [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-18 00:44:17,689 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-05-18 00:44:17,689 [ scc.repo] DEBUG ## Branches found:
2024-05-18 00:44:17,689 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-18 00:44:17,689 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:17,689 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:17,695 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-18 00:44:17,701 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-18 00:44:17,701 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-18 00:44:17,707 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-18 00:44:17,714 [ scc.git] DEBUG Already up to date.
2024-05-18 00:44:17,714 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-18 00:44:18,145 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-05-18 00:44:18,145 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-18 00:44:18,151 [ scc.git] DEBUG ## Unique users: []
2024-05-18 00:44:18,152 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:18,152 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:18,158 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-18 00:44:18,165 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:18,171 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-18 00:44:18,182 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:44:18,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:18,332 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-18 00:44:18,375 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:18,375 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:18,382 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:44:18,424 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-18 00:44:18,430 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbfc4029340> has no local changes
2024-05-18 00:44:18,431 [ 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#69 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/)'
2024-05-18 00:44:18,441 [ scc.git] DEBUG [detached HEAD 15c8efd] merge master -Dorg -Ssuccess-only
2024-05-18 00:44:18,441 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:18,442 [ scc.repo] DEBUG ## PRs found:
2024-05-18 00:44:18,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-05-18 00:44:19,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-05-18 00:44:19,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-05-18 00:44:20,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-05-18 00:44:20,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-18 00:44:21,190 [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-18 00:44:21,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-18 00:44:22,036 [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-18 00:44:22,037 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-18 00:44:22,037 [ scc.repo] DEBUG ## Branches found:
2024-05-18 00:44:22,037 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-18 00:44:22,038 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:22,038 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:22,045 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-18 00:44:22,052 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-18 00:44:22,053 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-18 00:44:22,061 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-18 00:44:22,069 [ scc.git] DEBUG Already up to date.
2024-05-18 00:44:22,069 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-05-18 00:44:22,484 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-05-18 00:44:22,484 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-05-18 00:44:22,489 [ scc.git] DEBUG ## Unique users: []
2024-05-18 00:44:22,489 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:22,489 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:22,497 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-05-18 00:44:22,505 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:22,513 [ 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-18 00:44:22,523 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-05-18 00:44:22,524 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:44:22,527 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-05-18 00:44:22,527 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-05-18 00:44:22,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:22,689 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-18 00:44:22,739 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:22,740 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:22,748 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:44:22,794 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-18 00:44:22,802 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbfc40755b0> has no local changes
2024-05-18 00:44:22,802 [ 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#69 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/)'
2024-05-18 00:44:22,813 [ scc.git] DEBUG [detached HEAD b666124] merge master -Dorg -Ssuccess-only
2024-05-18 00:44:22,814 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:22,814 [ scc.repo] DEBUG ## PRs found:
2024-05-18 00:44:23,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-05-18 00:44:23,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-05-18 00:44:24,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-05-18 00:44:24,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-18 00:44:25,036 [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-18 00:44:25,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-18 00:44:25,880 [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-18 00:44:25,881 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-18 00:44:25,881 [ scc.repo] DEBUG ## Branches found:
2024-05-18 00:44:25,881 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-18 00:44:25,882 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:25,882 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:25,888 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-18 00:44:25,893 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-18 00:44:25,893 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-18 00:44:25,899 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-18 00:44:25,905 [ scc.git] DEBUG Already up to date.
2024-05-18 00:44:25,906 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-18 00:44:26,284 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-05-18 00:44:26,284 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-18 00:44:26,289 [ scc.git] DEBUG ## Unique users: []
2024-05-18 00:44:26,289 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:26,289 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:26,297 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-18 00:44:26,305 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:26,311 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-18 00:44:26,417 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-05-18 00:44:26,417 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-05-18 00:44:26,417 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-05-18 00:44:26,418 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-05-18 00:44:26,418 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-05-18 00:44:26,418 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-05-18 00:44:26,418 [ scc.git] DEBUG Auto-merging setup.py
2024-05-18 00:44:26,418 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-05-18 00:44:26,418 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-18 00:44:26,418 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-18 00:44:26,425 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-18 00:44:26,434 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-05-18 00:44:26,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:26,630 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-18 00:44:26,638 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-18 00:44:26,647 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#69](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/signup_settings.py
- omero_signup/views.py
- setup.py
--conflicts
2024-05-18 00:44:26,654 [ scc.config] DEBUG Found github.token
2024-05-18 00:44:26,655 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-05-18 00:44:26,655 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-18 00:44:26,698 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:26,698 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:26,706 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:44:26,755 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-18 00:44:26,764 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbfc70c5df0> has no local changes
2024-05-18 00:44:26,765 [ 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#69 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/)'
2024-05-18 00:44:26,776 [ scc.git] DEBUG [detached HEAD d62cd0d] merge master -Dorg -Ssuccess-only
2024-05-18 00:44:26,777 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:26,777 [ scc.repo] DEBUG ## PRs found:
2024-05-18 00:44:27,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-05-18 00:44:27,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-05-18 00:44:28,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-05-18 00:44:28,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-18 00:44:28,980 [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-18 00:44:29,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-18 00:44:29,832 [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-18 00:44:29,833 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-18 00:44:29,833 [ scc.repo] DEBUG ## Branches found:
2024-05-18 00:44:29,833 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-18 00:44:29,833 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:29,833 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:29,840 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-18 00:44:29,845 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-18 00:44:29,846 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-18 00:44:29,853 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-18 00:44:29,861 [ scc.git] DEBUG Already up to date.
2024-05-18 00:44:29,861 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-05-18 00:44:30,239 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-05-18 00:44:30,240 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-05-18 00:44:30,245 [ scc.git] DEBUG ## Unique users: []
2024-05-18 00:44:30,245 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:30,245 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:30,252 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-05-18 00:44:30,261 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:30,270 [ 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-18 00:44:30,347 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-18 00:44:30,350 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-05-18 00:44:30,350 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-05-18 00:44:30,350 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-05-18 00:44:30,350 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-05-18 00:44:30,350 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-05-18 00:44:30,350 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-05-18 00:44:30,351 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-05-18 00:44:30,351 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-05-18 00:44:30,351 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-05-18 00:44:30,351 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-05-18 00:44:30,351 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-05-18 00:44:30,351 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-05-18 00:44:30,351 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-05-18 00:44:30,351 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-05-18 00:44:30,352 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-05-18 00:44:30,352 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-05-18 00:44:30,352 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-05-18 00:44:30,353 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-05-18 00:44:30,353 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-05-18 00:44:30,353 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-05-18 00:44:30,353 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-05-18 00:44:30,353 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-05-18 00:44:30,353 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-05-18 00:44:30,353 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-05-18 00:44:30,353 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-05-18 00:44:30,353 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-05-18 00:44:30,353 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-05-18 00:44:30,353 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-05-18 00:44:30,354 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-05-18 00:44:30,354 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-05-18 00:44:30,354 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-05-18 00:44:30,354 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-05-18 00:44:30,354 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-05-18 00:44:30,354 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-05-18 00:44:30,354 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-05-18 00:44:30,354 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-05-18 00:44:30,354 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-05-18 00:44:30,354 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-05-18 00:44:30,354 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-05-18 00:44:30,354 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-05-18 00:44:30,354 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-05-18 00:44:30,354 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-05-18 00:44:30,354 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-05-18 00:44:30,354 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-05-18 00:44:30,354 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-05-18 00:44:30,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:30,514 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-18 00:44:30,558 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:30,559 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:30,567 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:44:30,611 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-18 00:44:30,619 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbfc7098df0> has no local changes
2024-05-18 00:44:30,620 [ 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#69 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/)'
2024-05-18 00:44:30,630 [ scc.git] DEBUG [detached HEAD 770b07f] merge master -Dorg -Ssuccess-only
2024-05-18 00:44:30,631 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:30,631 [ scc.repo] DEBUG ## PRs found:
2024-05-18 00:44:30,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-05-18 00:44:30,948 [ scc.repo] DEBUG ## Branches found:
2024-05-18 00:44:30,948 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-18 00:44:30,948 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:30,948 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:30,957 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-18 00:44:30,965 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-18 00:44:30,965 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-18 00:44:30,974 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-18 00:44:30,984 [ scc.git] DEBUG Already up to date.
2024-05-18 00:44:30,984 [ scc.git] DEBUG ## Unique users: []
2024-05-18 00:44:30,984 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:30,984 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:30,993 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-18 00:44:31,045 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:31,046 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:31,055 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:44:31,106 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-18 00:44:31,118 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbfc405efa0> has no local changes
2024-05-18 00:44:31,118 [ 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#69 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/)'
2024-05-18 00:44:31,133 [ scc.git] DEBUG [detached HEAD ade0102] merge master -Dorg -Ssuccess-only
2024-05-18 00:44:31,134 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:31,134 [ scc.repo] DEBUG ## PRs found:
2024-05-18 00:44:31,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-05-18 00:44:31,371 [ scc.repo] DEBUG ## Branches found:
2024-05-18 00:44:31,371 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-18 00:44:31,371 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:31,371 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:31,378 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-18 00:44:31,383 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-18 00:44:31,383 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-18 00:44:31,390 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-18 00:44:31,398 [ scc.git] DEBUG Already up to date.
2024-05-18 00:44:31,398 [ scc.git] DEBUG ## Unique users: []
2024-05-18 00:44:31,398 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:31,399 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:31,405 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-18 00:44:31,448 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:31,448 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:31,455 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:44:31,498 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-18 00:44:31,507 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbfc4040f70> has no local changes
2024-05-18 00:44:31,507 [ 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#69 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/)'
2024-05-18 00:44:31,516 [ scc.git] DEBUG [detached HEAD fa151f0] merge master -Dorg -Ssuccess-only
2024-05-18 00:44:31,517 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:31,517 [ scc.git] INFO Overriding base-branch from master to main
2024-05-18 00:44:31,517 [ scc.repo] DEBUG ## PRs found:
2024-05-18 00:44:31,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-05-18 00:44:32,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-05-18 00:44:32,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-05-18 00:44:33,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-05-18 00:44:33,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-18 00:44:34,182 [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-18 00:44:34,647 [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-18 00:44:35,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-18 00:44:35,489 [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-18 00:44:35,492 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-18 00:44:35,493 [ scc.repo] DEBUG ## Branches found:
2024-05-18 00:44:35,493 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-18 00:44:35,494 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:35,494 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:35,510 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-05-18 00:44:35,522 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-18 00:44:35,522 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-05-18 00:44:35,533 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-05-18 00:44:35,548 [ scc.git] DEBUG Already up to date.
2024-05-18 00:44:35,549 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-05-18 00:44:35,944 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-05-18 00:44:35,944 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-05-18 00:44:35,957 [ scc.git] DEBUG ## Unique users: []
2024-05-18 00:44:35,958 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:35,958 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:35,970 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-18 00:44:35,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:35,999 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-18 00:44:36,025 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-05-18 00:44:36,026 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-05-18 00:44:36,026 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-18 00:44:36,026 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-18 00:44:36,042 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-18 00:44:36,067 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-05-18 00:44:36,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:36,234 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-18 00:44:36,246 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-18 00:44:36,258 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#69](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-05-18 00:44:36,270 [ scc.config] DEBUG Found github.token
2024-05-18 00:44:36,271 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-05-18 00:44:36,271 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-18 00:44:36,349 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:36,349 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:36,362 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:44:36,426 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-18 00:44:36,435 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbfa47f4190> has no local changes
2024-05-18 00:44:36,435 [ 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#69 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/)'
2024-05-18 00:44:36,453 [ scc.git] DEBUG [detached HEAD 31b25d3] merge master -Dorg -Ssuccess-only
2024-05-18 00:44:36,454 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:36,455 [ scc.repo] DEBUG ## PRs found:
2024-05-18 00:44:36,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-05-18 00:44:36,652 [ scc.repo] DEBUG ## Branches found:
2024-05-18 00:44:36,652 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-18 00:44:36,652 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:36,652 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:36,665 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-18 00:44:36,680 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-18 00:44:36,681 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-18 00:44:36,694 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-18 00:44:36,707 [ scc.git] DEBUG Already up to date.
2024-05-18 00:44:36,707 [ scc.git] DEBUG ## Unique users: []
2024-05-18 00:44:36,707 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:36,708 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:36,720 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-18 00:44:36,796 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:36,796 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:36,808 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:44:36,881 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-18 00:44:36,895 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbfc400ee50> has no local changes
2024-05-18 00:44:36,896 [ 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#69 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/)'
2024-05-18 00:44:36,912 [ scc.git] DEBUG [detached HEAD e5d96bc] merge master -Dorg -Ssuccess-only
2024-05-18 00:44:36,914 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:36,914 [ scc.repo] DEBUG ## PRs found:
2024-05-18 00:44:37,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-05-18 00:44:37,093 [ scc.repo] DEBUG ## Branches found:
2024-05-18 00:44:37,093 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-18 00:44:37,093 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:37,094 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:37,107 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-18 00:44:37,117 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-18 00:44:37,118 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-18 00:44:37,132 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-18 00:44:37,147 [ scc.git] DEBUG Already up to date.
2024-05-18 00:44:37,148 [ scc.git] DEBUG ## Unique users: []
2024-05-18 00:44:37,148 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:37,148 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:37,162 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-18 00:44:37,249 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:37,250 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:37,266 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:44:37,356 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-18 00:44:37,374 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbfa473c940> has no local changes
2024-05-18 00:44:37,375 [ 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#69 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/)'
2024-05-18 00:44:37,393 [ scc.git] DEBUG [detached HEAD cf0b4cb] merge master -Dorg -Ssuccess-only
2024-05-18 00:44:37,394 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:37,395 [ scc.repo] DEBUG ## PRs found:
2024-05-18 00:44:37,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-05-18 00:44:38,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-05-18 00:44:38,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-05-18 00:44:38,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-18 00:44:39,517 [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-18 00:44:40,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-18 00:44:40,428 [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-18 00:44:40,429 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-05-18 00:44:40,429 [ scc.repo] DEBUG ## Branches found:
2024-05-18 00:44:40,429 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-18 00:44:40,429 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:40,430 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:40,436 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-18 00:44:40,443 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-18 00:44:40,443 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-18 00:44:40,449 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-18 00:44:40,457 [ scc.git] DEBUG Already up to date.
2024-05-18 00:44:40,457 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-05-18 00:44:40,857 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-05-18 00:44:40,857 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-05-18 00:44:40,863 [ scc.git] DEBUG ## Unique users: []
2024-05-18 00:44:40,864 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:40,864 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:40,870 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-18 00:44:40,877 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:40,887 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-18 00:44:40,916 [ scc.git] DEBUG Auto-merging Dockerfile
2024-05-18 00:44:40,916 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-05-18 00:44:40,916 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-18 00:44:40,917 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-18 00:44:40,942 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-18 00:44:40,955 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-05-18 00:44:41,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:41,113 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-18 00:44:41,119 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-18 00:44:41,127 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#69](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-05-18 00:44:41,133 [ scc.config] DEBUG Found github.token
2024-05-18 00:44:41,133 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-05-18 00:44:41,133 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-18 00:44:41,178 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:41,178 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:41,185 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:44:41,231 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-18 00:44:41,239 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbfa47a1310> has no local changes
2024-05-18 00:44:41,240 [ 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#69 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/)'
2024-05-18 00:44:41,250 [ scc.git] DEBUG [detached HEAD 320eee8] merge master -Dorg -Ssuccess-only
2024-05-18 00:44:41,250 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:41,250 [ scc.git] INFO Overriding base-branch from master to develop
2024-05-18 00:44:41,251 [ scc.repo] DEBUG ## PRs found:
2024-05-18 00:44:41,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-05-18 00:44:42,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-05-18 00:44:42,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-05-18 00:44:43,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-05-18 00:44:43,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-05-18 00:44:44,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-05-18 00:44:44,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-05-18 00:44:44,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-18 00:44:45,370 [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-18 00:44:45,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-18 00:44:46,238 [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-18 00:44:46,239 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-18 00:44:46,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-05-18 00:44:47,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-05-18 00:44:47,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-05-18 00:44:48,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-05-18 00:44:48,193 [ scc.repo] DEBUG ## Branches found:
2024-05-18 00:44:48,194 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-18 00:44:48,194 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:48,194 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:48,206 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-05-18 00:44:48,214 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-18 00:44:48,214 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-05-18 00:44:48,222 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-05-18 00:44:48,230 [ scc.git] DEBUG Already up to date.
2024-05-18 00:44:48,230 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-05-18 00:44:48,667 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-05-18 00:44:48,668 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-05-18 00:44:48,686 [ scc.git] DEBUG ## Unique users: []
2024-05-18 00:44:48,687 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:48,687 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:48,704 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-18 00:44:48,718 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:48,730 [ 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-18 00:44:48,795 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-05-18 00:44:48,795 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-05-18 00:44:48,795 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-18 00:44:48,796 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-18 00:44:48,813 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-18 00:44:48,829 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-18 00:44:48,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:49,006 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-18 00:44:49,029 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-18 00:44:49,044 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#69](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-05-18 00:44:49,057 [ scc.config] DEBUG Found github.token
2024-05-18 00:44:49,058 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-05-18 00:44:49,058 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-18 00:44:49,154 [ scc.git] DEBUG Get sha1 of %s
2024-05-18 00:44:49,155 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-18 00:44:49,175 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:44:49,245 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-18 00:44:49,260 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbfa473cbb0> has no local changes
2024-05-18 00:44:49,260 [ 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#69 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/)'
2024-05-18 00:44:49,276 [ scc.git] DEBUG [detached HEAD fa7ee66] merge master -Dorg -Ssuccess-only
2024-05-18 00:44:49,277 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:49,277 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-18 00:44:49,403 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-05-18 00:44:49,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:49,585 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-05-18 00:44:49,598 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-05-18 00:44:49,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:50,011 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-05-18 00:44:50,024 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-05-18 00:44:50,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:50,408 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-05-18 00:44:50,419 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-05-18 00:44:50,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:50,833 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-05-18 00:44:51,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:51,249 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-05-18 00:44:51,270 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-05-18 00:44:51,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:51,653 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-05-18 00:44:51,663 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-05-18 00:44:52,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:52,096 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-05-18 00:44:52,112 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-05-18 00:44:52,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:52,498 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-05-18 00:44:52,513 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-05-18 00:44:52,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:52,914 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-05-18 00:44:52,924 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-05-18 00:44:53,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:53,332 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-05-18 00:44:53,342 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-05-18 00:44:53,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:53,737 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-05-18 00:44:53,746 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-05-18 00:44:54,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:54,151 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-05-18 00:44:54,162 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-05-18 00:44:54,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:54,564 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-05-18 00:44:54,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:54,974 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-05-18 00:44:55,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:55,377 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-05-18 00:44:55,384 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-05-18 00:44:55,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:55,802 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-05-18 00:44:56,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:56,224 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-05-18 00:44:56,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:56,622 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-05-18 00:44:56,630 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-05-18 00:44:57,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:57,065 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-05-18 00:44:57,072 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-05-18 00:44:57,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:57,436 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-05-18 00:44:57,448 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-05-18 00:44:57,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:57,872 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-05-18 00:44:57,888 [ scc.config] DEBUG Found submodule.scripts.url
2024-05-18 00:44:58,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-18 00:44:58,303 [ scc.config] DEBUG Found submodule.scripts.branch
2024-05-18 00:44:58,304 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-18 00:44:58,393 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbfca574460> has local changes
2024-05-18 00:44:58,393 [ 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 560 will-moore 'Max projection bytes' (status: failure)
- 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 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 469 will-moore 'changelog 0.14.0'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 475 will-moore 'Update build and publish in gha'
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#69 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/69/)'
2024-05-18 00:44:58,409 [ scc.git] DEBUG [detached HEAD 777fab3] merge master -Dorg -Ssuccess-only
2024-05-18 00:44:58,409 [ scc.merge] INFO Repository: ome/omero-plugins
2024-05-18 00:44:58,409 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-05-18 00:44:58,409 [ scc.merge] INFO Already up to date.
2024-05-18 00:44:58,409 [ scc.merge] INFO
2024-05-18 00:44:58,409 [ scc.merge] INFO
2024-05-18 00:44:58,409 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-05-18 00:44:58,409 [ scc.merge] INFO Already up to date.
2024-05-18 00:44:58,409 [ scc.merge] INFO
2024-05-18 00:44:58,409 [ scc.merge] INFO
2024-05-18 00:44:58,409 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-05-18 00:44:58,409 [ scc.merge] INFO Excluded PRs:
2024-05-18 00:44:58,409 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-05-18 00:44:58,409 [ scc.merge] INFO Already up to date.
2024-05-18 00:44:58,409 [ scc.merge] INFO
2024-05-18 00:44:58,409 [ scc.merge] INFO Merged PRs:
2024-05-18 00:44:58,410 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-05-18 00:44:58,410 [ scc.merge] INFO
2024-05-18 00:44:58,410 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-05-18 00:44:58,410 [ scc.merge] INFO Excluded PRs:
2024-05-18 00:44:58,410 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-05-18 00:44:58,410 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-05-18 00:44:58,410 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-05-18 00:44:58,410 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-05-18 00:44:58,410 [ scc.merge] INFO Already up to date.
2024-05-18 00:44:58,410 [ scc.merge] INFO
2024-05-18 00:44:58,410 [ scc.merge] INFO Merged PRs:
2024-05-18 00:44:58,410 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-05-18 00:44:58,410 [ scc.merge] INFO
2024-05-18 00:44:58,410 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-05-18 00:44:58,410 [ scc.merge] INFO Excluded PRs:
2024-05-18 00:44:58,410 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-18 00:44:58,410 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-05-18 00:44:58,410 [ scc.merge] INFO Already up to date.
2024-05-18 00:44:58,410 [ scc.merge] INFO
2024-05-18 00:44:58,410 [ scc.merge] INFO Merged PRs:
2024-05-18 00:44:58,410 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-05-18 00:44:58,410 [ scc.merge] INFO
2024-05-18 00:44:58,410 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-18 00:44:58,410 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-05-18 00:44:58,410 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-05-18 00:44:58,410 [ scc.merge] INFO
2024-05-18 00:44:58,410 [ scc.merge] INFO Repository: ome/omero-figure
2024-05-18 00:44:58,410 [ scc.merge] INFO Excluded PRs:
2024-05-18 00:44:58,410 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes' (status: failure)
2024-05-18 00:44:58,410 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-05-18 00:44:58,410 [ scc.merge] INFO Already up to date.
2024-05-18 00:44:58,410 [ scc.merge] INFO
2024-05-18 00:44:58,410 [ scc.merge] INFO Merged PRs:
2024-05-18 00:44:58,410 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-05-18 00:44:58,410 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-05-18 00:44:58,410 [ scc.merge] INFO - PR 562 will-moore 'Add changelog 7.0.0'
2024-05-18 00:44:58,411 [ scc.merge] INFO
2024-05-18 00:44:58,411 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-05-18 00:44:58,411 [ scc.merge] INFO Already up to date.
2024-05-18 00:44:58,411 [ scc.merge] INFO
2024-05-18 00:44:58,411 [ scc.merge] INFO Merged PRs:
2024-05-18 00:44:58,411 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-05-18 00:44:58,411 [ scc.merge] INFO
2024-05-18 00:44:58,411 [ scc.merge] INFO Repository: ome/omero-gallery
2024-05-18 00:44:58,411 [ scc.merge] INFO Already up to date.
2024-05-18 00:44:58,411 [ scc.merge] INFO
2024-05-18 00:44:58,411 [ scc.merge] INFO Merged PRs:
2024-05-18 00:44:58,411 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-18 00:44:58,411 [ scc.merge] INFO
2024-05-18 00:44:58,411 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-05-18 00:44:58,411 [ scc.merge] INFO Excluded PRs:
2024-05-18 00:44:58,411 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-05-18 00:44:58,411 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-05-18 00:44:58,411 [ scc.merge] INFO Already up to date.
2024-05-18 00:44:58,411 [ scc.merge] INFO
2024-05-18 00:44:58,411 [ scc.merge] INFO Merged PRs:
2024-05-18 00:44:58,411 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-05-18 00:44:58,411 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-05-18 00:44:58,411 [ scc.merge] INFO - PR 469 will-moore 'changelog 0.14.0'
2024-05-18 00:44:58,411 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-18 00:44:58,411 [ scc.merge] INFO - PR 475 will-moore 'Update build and publish in gha'
2024-05-18 00:44:58,411 [ scc.merge] INFO
2024-05-18 00:44:58,411 [ scc.merge] INFO Repository: ome/omero-mapr
2024-05-18 00:44:58,411 [ scc.merge] INFO Excluded PRs:
2024-05-18 00:44:58,411 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-05-18 00:44:58,411 [ scc.merge] INFO Already up to date.
2024-05-18 00:44:58,411 [ scc.merge] INFO
2024-05-18 00:44:58,411 [ scc.merge] INFO Merged PRs:
2024-05-18 00:44:58,411 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-05-18 00:44:58,411 [ scc.merge] INFO
2024-05-18 00:44:58,411 [ scc.merge] INFO Repository: ome/omero-metadata
2024-05-18 00:44:58,412 [ scc.merge] INFO Already up to date.
2024-05-18 00:44:58,412 [ scc.merge] INFO
2024-05-18 00:44:58,412 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-18 00:44:58,412 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-18 00:44:58,412 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-18 00:44:58,412 [ scc.merge] INFO
2024-05-18 00:44:58,412 [ scc.merge] INFO Repository: ome/omero-parade
2024-05-18 00:44:58,412 [ scc.merge] INFO Excluded PRs:
2024-05-18 00:44:58,412 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-05-18 00:44:58,412 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-05-18 00:44:58,412 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-05-18 00:44:58,412 [ scc.merge] INFO Already up to date.
2024-05-18 00:44:58,412 [ scc.merge] INFO
2024-05-18 00:44:58,412 [ scc.merge] INFO Merged PRs:
2024-05-18 00:44:58,412 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-18 00:44:58,412 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-18 00:44:58,412 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-18 00:44:58,412 [ scc.merge] INFO
2024-05-18 00:44:58,412 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-05-18 00:44:58,412 [ scc.merge] INFO Already up to date.
2024-05-18 00:44:58,412 [ scc.merge] INFO
2024-05-18 00:44:58,412 [ scc.merge] INFO Merged PRs:
2024-05-18 00:44:58,412 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-05-18 00:44:58,412 [ scc.merge] INFO
2024-05-18 00:44:58,412 [ scc.merge] INFO Repository: ome/omero-rois
2024-05-18 00:44:58,412 [ scc.merge] INFO Excluded PRs:
2024-05-18 00:44:58,412 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-18 00:44:58,412 [ scc.merge] INFO Already up to date.
2024-05-18 00:44:58,412 [ scc.merge] INFO
2024-05-18 00:44:58,412 [ scc.merge] INFO Merged PRs:
2024-05-18 00:44:58,412 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-18 00:44:58,412 [ scc.merge] INFO
2024-05-18 00:44:58,412 [ scc.merge] INFO Repository: ome/omero-signup
2024-05-18 00:44:58,412 [ scc.merge] INFO Already up to date.
2024-05-18 00:44:58,412 [ scc.merge] INFO
2024-05-18 00:44:58,412 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-18 00:44:58,412 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-18 00:44:58,413 [ scc.merge] INFO
2024-05-18 00:44:58,413 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-05-18 00:44:58,413 [ scc.merge] INFO Already up to date.
2024-05-18 00:44:58,413 [ scc.merge] INFO
2024-05-18 00:44:58,413 [ scc.merge] INFO Merged PRs:
2024-05-18 00:44:58,413 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-18 00:44:58,413 [ scc.merge] INFO
2024-05-18 00:44:58,413 [ scc.merge] INFO Repository: ome/omero-upload
2024-05-18 00:44:58,413 [ scc.merge] INFO Already up to date.
2024-05-18 00:44:58,413 [ scc.merge] INFO
2024-05-18 00:44:58,413 [ scc.merge] INFO
2024-05-18 00:44:58,413 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-05-18 00:44:58,413 [ scc.merge] INFO Already up to date.
2024-05-18 00:44:58,413 [ scc.merge] INFO
2024-05-18 00:44:58,413 [ scc.merge] INFO
2024-05-18 00:44:58,413 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-05-18 00:44:58,413 [ scc.merge] INFO Excluded PRs:
2024-05-18 00:44:58,413 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-05-18 00:44:58,413 [ scc.merge] INFO Already up to date.
2024-05-18 00:44:58,413 [ scc.merge] INFO
2024-05-18 00:44:58,413 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-18 00:44:58,413 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-18 00:44:58,413 [ scc.merge] INFO
2024-05-18 00:44:58,413 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-05-18 00:44:58,413 [ scc.merge] INFO Already up to date.
2024-05-18 00:44:58,413 [ scc.merge] INFO
2024-05-18 00:44:58,413 [ scc.merge] INFO
2024-05-18 00:44:58,413 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-05-18 00:44:58,413 [ scc.merge] INFO Already up to date.
2024-05-18 00:44:58,413 [ scc.merge] INFO
2024-05-18 00:44:58,413 [ scc.merge] INFO
2024-05-18 00:44:58,413 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-05-18 00:44:58,413 [ scc.merge] INFO Already up to date.
2024-05-18 00:44:58,413 [ scc.merge] INFO
2024-05-18 00:44:58,413 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-18 00:44:58,413 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-05-18 00:44:58,414 [ scc.merge] INFO
2024-05-18 00:44:58,414 [ scc.merge] INFO Repository: ome/scripts
2024-05-18 00:44:58,414 [ scc.merge] INFO Excluded PRs:
2024-05-18 00:44:58,414 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-05-18 00:44:58,414 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-05-18 00:44:58,414 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-05-18 00:44:58,414 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-05-18 00:44:58,414 [ scc.merge] INFO Already up to date.
2024-05-18 00:44:58,414 [ scc.merge] INFO
2024-05-18 00:44:58,414 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-18 00:44:58,414 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-18 00:44:58,414 [ scc.merge] INFO
2024-05-18 00:44:58,414 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-18 00:44:58,414 [ scc.git] DEBUG Calling 'git remote'
2024-05-18 00:44:58,421 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-05-18 00:44:58,421 [ scc.git] DEBUG Calling 'git remote'
2024-05-18 00:44:58,428 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:58,428 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-05-18 00:44:58,428 [ scc.git] DEBUG Calling 'git remote'
2024-05-18 00:44:58,434 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:58,435 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-05-18 00:44:58,435 [ scc.git] DEBUG Calling 'git remote'
2024-05-18 00:44:58,443 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:58,443 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-05-18 00:44:58,443 [ scc.git] DEBUG Calling 'git remote'
2024-05-18 00:44:58,450 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:58,451 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-18 00:44:58,451 [ scc.git] DEBUG Calling 'git remote'
2024-05-18 00:44:58,458 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:58,459 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-18 00:44:58,459 [ scc.git] DEBUG Calling 'git remote'
2024-05-18 00:44:58,466 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:58,466 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-18 00:44:58,466 [ scc.git] DEBUG Calling 'git remote'
2024-05-18 00:44:58,473 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:58,474 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-18 00:44:58,474 [ scc.git] DEBUG Calling 'git remote'
2024-05-18 00:44:58,481 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:58,481 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-18 00:44:58,481 [ scc.git] DEBUG Calling 'git remote'
2024-05-18 00:44:58,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:58,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-18 00:44:58,488 [ scc.git] DEBUG Calling 'git remote'
2024-05-18 00:44:58,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:58,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-18 00:44:58,495 [ scc.git] DEBUG Calling 'git remote'
2024-05-18 00:44:58,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:58,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-18 00:44:58,502 [ scc.git] DEBUG Calling 'git remote'
2024-05-18 00:44:58,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:58,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-18 00:44:58,509 [ scc.git] DEBUG Calling 'git remote'
2024-05-18 00:44:58,515 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:58,515 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-18 00:44:58,515 [ scc.git] DEBUG Calling 'git remote'
2024-05-18 00:44:58,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:58,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-18 00:44:58,523 [ scc.git] DEBUG Calling 'git remote'
2024-05-18 00:44:58,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:58,530 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-18 00:44:58,530 [ scc.git] DEBUG Calling 'git remote'
2024-05-18 00:44:58,536 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:58,537 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-18 00:44:58,537 [ scc.git] DEBUG Calling 'git remote'
2024-05-18 00:44:58,544 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:58,544 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-18 00:44:58,544 [ scc.git] DEBUG Calling 'git remote'
2024-05-18 00:44:58,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:58,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-18 00:44:58,551 [ scc.git] DEBUG Calling 'git remote'
2024-05-18 00:44:58,557 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:58,558 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-18 00:44:58,558 [ scc.git] DEBUG Calling 'git remote'
2024-05-18 00:44:58,564 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:58,564 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-18 00:44:58,564 [ scc.git] DEBUG Calling 'git remote'
2024-05-18 00:44:58,570 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-18 00:44:58,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-18 00:44:58,571 [ scc.git] DEBUG Calling 'git remote'
2024-05-18 00:44:58,577 [ 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 599164f] 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 54c3753
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 a0148a6
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 20c03ee] 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-18 00:45:46,778 [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-18 00:45:55,784 [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-18 00:45:58,150 [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-18 00:46:02,752 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-05-18 00:46:50,539 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/b864b239/images/svgs/logo.svg){kind=logo}
