Console Output
Skipping 73 KB..
Full Log05-21 00:42:27,443 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-05-21 00:42:27,443 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_zarr/raw_pixels.py
2024-05-21 00:42:27,443 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-21 00:42:27,444 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-21 00:42:27,450 [ scc.git] DEBUG Calling 'git reset --hard 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-05-21 00:42:27,456 [ scc.git] DEBUG HEAD is now at 2ca566b Merge pull request #160 from ome/pre-commit-ci-update-config
2024-05-21 00:42:27,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:42:27,656 [ scc.git] DEBUG Calling 'git merge-base 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473 f22d4074b7c458ad24320cf5a6f8adb9e686aa44'
2024-05-21 00:42:27,664 [ scc.git] DEBUG Calling 'git diff --name-only 782a1cd0077bcc2871f21e9f0acdc25ae7745243..2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-05-21 00:42:27,670 [ scc.git] INFO - PR 102 will-moore 'Zarr export tests'
Conflicting PR. Removed from build [OMERO-plugins-push#72](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_zarr/raw_pixels.py
--conflicts
2024-05-21 00:42:27,675 [ scc.config] DEBUG Found github.token
2024-05-21 00:42:27,675 [ scc.git] DEBUG Not adding comment to issue #102, already --conflicts.
2024-05-21 00:42:27,675 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-05-21 00:42:27,681 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:42:27,686 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 123 (Support export of Fileset:ID) 553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-05-21 00:42:27,711 [ scc.git] DEBUG Auto-merging .isort.cfg
2024-05-21 00:42:27,712 [ scc.git] DEBUG CONFLICT (content): Merge conflict in .isort.cfg
2024-05-21 00:42:27,712 [ scc.git] DEBUG Auto-merging setup.py
2024-05-21 00:42:27,712 [ scc.git] DEBUG Auto-merging src/omero_zarr/cli.py
2024-05-21 00:42:27,712 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-05-21 00:42:27,712 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_zarr/raw_pixels.py
2024-05-21 00:42:27,712 [ scc.git] DEBUG Auto-merging src/omero_zarr/util.py
2024-05-21 00:42:27,712 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-21 00:42:27,712 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-21 00:42:27,719 [ scc.git] DEBUG Calling 'git reset --hard 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-05-21 00:42:27,726 [ scc.git] DEBUG HEAD is now at 2ca566b Merge pull request #160 from ome/pre-commit-ci-update-config
2024-05-21 00:42:28,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:42:28,053 [ scc.git] DEBUG Calling 'git merge-base 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473 553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-05-21 00:42:28,061 [ scc.git] DEBUG Calling 'git diff --name-only eff38d0408f9d50de13b28dfe09e4382965e203f..2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-05-21 00:42:28,067 [ scc.git] INFO - PR 123 will-moore 'Support export of Fileset:ID'
Conflicting PR. Removed from build [OMERO-plugins-push#72](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/consoleText) for more details.
Possible conflicts:
- PR #102 will-moore 'Zarr export tests'
- src/omero_zarr/raw_pixels.py
- Upstream changes
- src/omero_zarr/raw_pixels.py
- .isort.cfg
--conflicts
2024-05-21 00:42:28,085 [ scc.config] DEBUG Found github.token
2024-05-21 00:42:28,086 [ scc.git] DEBUG Not adding comment to issue #123, already --conflicts.
2024-05-21 00:42:28,086 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a14f62a940f4974a305b3f5858049ee493b898ef'
2024-05-21 00:42:28,093 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:42:28,098 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 147 (Name option) a14f62a940f4974a305b3f5858049ee493b898ef'
2024-05-21 00:42:28,126 [ scc.git] DEBUG Auto-merging src/omero_zarr/masks.py
2024-05-21 00:42:28,126 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-05-21 00:42:28,127 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-21 00:42:28,130 [ scc.git] DEBUG README.rst | 30 ++++++++++++++++++------------
2024-05-21 00:42:28,130 [ scc.git] DEBUG src/omero_zarr/cli.py | 9 +++++++++
2024-05-21 00:42:28,130 [ scc.git] DEBUG src/omero_zarr/masks.py | 4 ++--
2024-05-21 00:42:28,130 [ scc.git] DEBUG src/omero_zarr/raw_pixels.py | 28 +++++++++++++++++++++++-----
2024-05-21 00:42:28,130 [ scc.git] DEBUG src/omero_zarr/util.py | 2 +-
2024-05-21 00:42:28,130 [ scc.git] DEBUG 5 files changed, 53 insertions(+), 20 deletions(-)
2024-05-21 00:42:28,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:42:28,452 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-21 00:42:28,496 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:42:28,497 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:42:28,504 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-21 00:42:28,548 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-21 00:42:28,556 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f09b8a25640> has no local changes
2024-05-21 00:42:28,556 [ 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#72 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/)'
2024-05-21 00:42:28,566 [ scc.git] DEBUG [detached HEAD 07817f4] merge master -Dorg -Ssuccess-only
2024-05-21 00:42:28,567 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:42:28,567 [ scc.repo] DEBUG ## PRs found:
2024-05-21 00:42:28,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-05-21 00:42:29,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562 HTTP/1.1" 200 None
2024-05-21 00:42:29,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23 HTTP/1.1" 200 None
2024-05-21 00:42:30,359 [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-21 00:42:30,817 [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-21 00:42:31,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/0c814d66251860ddb01c00ade8469e45f7a1be23 HTTP/1.1" 200 None
2024-05-21 00:42:31,653 [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-21 00:42:31,654 [ scc.repo] DEBUG - PR 562 will-moore 'Add changelog 7.0.0'
2024-05-21 00:42:32,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560 HTTP/1.1" 200 None
2024-05-21 00:42:32,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560/comments HTTP/1.1" 200 None
2024-05-21 00:42:33,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/93463371bd79d20cd7abe760db0e7cbdbb897919 HTTP/1.1" 200 None
2024-05-21 00:42:33,487 [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-21 00:42:33,965 [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-21 00:42:34,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-05-21 00:42:34,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-05-21 00:42:35,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-21 00:42:35,848 [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-21 00:42:36,317 [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-21 00:42:36,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-21 00:42:37,167 [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-21 00:42:37,168 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-05-21 00:42:37,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-05-21 00:42:38,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-21 00:42:38,727 [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-21 00:42:39,211 [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-21 00:42:39,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-21 00:42:40,074 [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-21 00:42:40,075 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-05-21 00:42:40,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543 HTTP/1.1" 200 None
2024-05-21 00:42:41,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543/comments HTTP/1.1" 200 None
2024-05-21 00:42:41,010 [ scc.repo] DEBUG ## Branches found:
2024-05-21 00:42:41,010 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-21 00:42:41,010 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:42:41,010 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:42:41,016 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-21 00:42:41,021 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-21 00:42:41,022 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-21 00:42:41,028 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-21 00:42:41,034 [ scc.git] DEBUG Already up to date.
2024-05-21 00:42:41,034 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-05-21 00:42:41,444 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-21 00:42:41,445 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-05-21 00:42:41,452 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-05-21 00:42:41,977 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-21 00:42:41,977 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-05-21 00:42:41,983 [ scc.git] DEBUG Calling 'git fetch origin pull/562/head'
2024-05-21 00:42:42,387 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-21 00:42:42,388 [ scc.git] DEBUG * branch refs/pull/562/head -> FETCH_HEAD
2024-05-21 00:42:42,393 [ scc.git] DEBUG ## Unique users: []
2024-05-21 00:42:42,393 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:42:42,393 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:42:42,401 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-21 00:42:42,412 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:42:42,419 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-21 00:42:42,530 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-21 00:42:42,537 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-05-21 00:42:42,537 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-05-21 00:42:42,537 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-05-21 00:42:42,537 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-05-21 00:42:42,537 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-05-21 00:42:42,537 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-05-21 00:42:42,539 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-05-21 00:42:42,540 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-05-21 00:42:42,540 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-05-21 00:42:42,540 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-05-21 00:42:42,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:42:42,704 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-21 00:42:42,717 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:42:42,727 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-21 00:42:42,892 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-21 00:42:42,892 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-05-21 00:42:42,892 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-05-21 00:42:42,893 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-21 00:42:42,903 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-05-21 00:42:42,903 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-05-21 00:42:42,903 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-05-21 00:42:42,903 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-05-21 00:42:42,903 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-05-21 00:42:42,903 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-05-21 00:42:42,903 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-05-21 00:42:42,903 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-05-21 00:42:42,903 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-05-21 00:42:42,903 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-05-21 00:42:42,903 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-05-21 00:42:42,903 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-05-21 00:42:43,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:42:43,111 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0c814d66251860ddb01c00ade8469e45f7a1be23'
2024-05-21 00:42:43,124 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:42:43,131 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 562 (Add changelog 7.0.0) 0c814d66251860ddb01c00ade8469e45f7a1be23'
2024-05-21 00:42:43,164 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-21 00:42:43,167 [ scc.git] DEBUG CHANGELOG.md | 10 ++++++++++
2024-05-21 00:42:43,168 [ scc.git] DEBUG 1 file changed, 10 insertions(+)
2024-05-21 00:42:43,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:42:43,523 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-21 00:42:43,570 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:42:43,571 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:42:43,580 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-21 00:42:43,624 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-21 00:42:43,635 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f09b8a71be0> has no local changes
2024-05-21 00:42:43,635 [ 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#72 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/)'
2024-05-21 00:42:43,651 [ scc.git] DEBUG [detached HEAD 9af47e5c] merge master -Dorg -Ssuccess-only
2024-05-21 00:42:43,651 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:42:43,652 [ scc.repo] DEBUG ## PRs found:
2024-05-21 00:42:44,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-05-21 00:42:44,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-05-21 00:42:45,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-05-21 00:42:45,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-21 00:42:46,027 [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-21 00:42:46,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-21 00:42:46,950 [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-21 00:42:46,951 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-05-21 00:42:46,951 [ scc.repo] DEBUG ## Branches found:
2024-05-21 00:42:46,951 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-21 00:42:46,951 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:42:46,951 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:42:46,958 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-21 00:42:46,964 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-21 00:42:46,964 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-21 00:42:46,973 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-21 00:42:46,981 [ scc.git] DEBUG Already up to date.
2024-05-21 00:42:46,982 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-05-21 00:42:47,418 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-05-21 00:42:47,419 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-05-21 00:42:47,425 [ scc.git] DEBUG ## Unique users: []
2024-05-21 00:42:47,425 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:42:47,425 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:42:47,433 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-21 00:42:47,442 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:42:47,451 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-21 00:42:47,499 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-05-21 00:42:47,500 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-21 00:42:47,504 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-05-21 00:42:47,504 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-05-21 00:42:47,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:42:47,667 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-21 00:42:47,722 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:42:47,723 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:42:47,744 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-21 00:42:47,814 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-21 00:42:47,833 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f09bbe79430> has no local changes
2024-05-21 00:42:47,834 [ 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#72 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/)'
2024-05-21 00:42:47,850 [ scc.git] DEBUG [detached HEAD 60f6f1a] merge master -Dorg -Ssuccess-only
2024-05-21 00:42:47,851 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:42:47,851 [ scc.repo] DEBUG ## PRs found:
2024-05-21 00:42:48,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-05-21 00:42:48,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-05-21 00:42:48,610 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-21 00:42:49,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-21 00:42:49,639 [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-21 00:42:50,157 [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-21 00:42:50,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-21 00:42:51,071 [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-21 00:42:51,072 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-21 00:42:51,072 [ scc.repo] DEBUG ## Branches found:
2024-05-21 00:42:51,072 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-21 00:42:51,072 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:42:51,072 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:42:51,079 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-21 00:42:51,085 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-21 00:42:51,085 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-21 00:42:51,091 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-21 00:42:51,098 [ scc.git] DEBUG Already up to date.
2024-05-21 00:42:51,099 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-05-21 00:42:51,474 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-05-21 00:42:51,474 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-05-21 00:42:51,479 [ scc.git] DEBUG ## Unique users: []
2024-05-21 00:42:51,479 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:42:51,479 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:42:51,488 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-05-21 00:42:51,496 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:42:51,505 [ 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-21 00:42:51,524 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-21 00:42:51,528 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-05-21 00:42:51,529 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-05-21 00:42:51,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:42:51,701 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-21 00:42:51,749 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:42:51,750 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:42:51,760 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-21 00:42:51,809 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-21 00:42:51,830 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f09b8a50bb0> has no local changes
2024-05-21 00:42:51,830 [ 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#72 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/)'
2024-05-21 00:42:51,847 [ scc.git] DEBUG [detached HEAD b75e2a9] merge master -Dorg -Ssuccess-only
2024-05-21 00:42:51,848 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:42:51,848 [ scc.repo] DEBUG ## PRs found:
2024-05-21 00:42:52,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-05-21 00:42:52,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-05-21 00:42:53,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-05-21 00:42:53,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-21 00:42:54,061 [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-21 00:42:54,542 [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-21 00:42:55,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-21 00:42:55,489 [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-21 00:42:55,490 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-21 00:42:55,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-05-21 00:42:56,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-05-21 00:42:56,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-05-21 00:42:57,418 [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-21 00:42:57,883 [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-21 00:42:58,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-05-21 00:42:58,748 [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-21 00:42:58,749 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-05-21 00:42:59,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-05-21 00:42:59,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-05-21 00:43:00,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-21 00:43:00,546 [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-21 00:43:01,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-21 00:43:01,427 [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-21 00:43:01,428 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-05-21 00:43:01,428 [ scc.repo] DEBUG ## Branches found:
2024-05-21 00:43:01,429 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-21 00:43:01,429 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:01,429 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:01,436 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-21 00:43:01,444 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-21 00:43:01,445 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-21 00:43:01,454 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-21 00:43:01,468 [ scc.git] DEBUG Updating 54c3753..a96e845
2024-05-21 00:43:02,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls/469 HTTP/1.1" 200 None
2024-05-21 00:43:02,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls/475 HTTP/1.1" 200 None
2024-05-21 00:43:02,605 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-05-21 00:43:03,047 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-21 00:43:03,047 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-05-21 00:43:03,055 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-05-21 00:43:04,136 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-21 00:43:04,136 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-05-21 00:43:04,142 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-05-21 00:43:04,615 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-21 00:43:04,615 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-05-21 00:43:04,621 [ scc.git] DEBUG ## Unique users: []
2024-05-21 00:43:04,621 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:04,621 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:04,630 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-21 00:43:04,644 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:04,660 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-21 00:43:04,731 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-05-21 00:43:04,732 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-21 00:43:04,736 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-05-21 00:43:04,736 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-05-21 00:43:04,736 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-05-21 00:43:04,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:43:04,904 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-05-21 00:43:04,916 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:04,924 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-05-21 00:43:05,077 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-05-21 00:43:05,078 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-05-21 00:43:05,078 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-05-21 00:43:05,078 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-05-21 00:43:05,079 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-21 00:43:05,084 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-05-21 00:43:05,085 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-05-21 00:43:05,085 [ scc.git] DEBUG src/app/header.html | 5 +
2024-05-21 00:43:05,085 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-05-21 00:43:05,085 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-05-21 00:43:05,085 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-05-21 00:43:05,085 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-05-21 00:43:05,085 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-05-21 00:43:05,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:43:05,318 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-21 00:43:05,334 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:05,347 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-21 00:43:05,409 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-05-21 00:43:05,411 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-21 00:43:05,416 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-05-21 00:43:05,417 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-05-21 00:43:05,417 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-05-21 00:43:05,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:43:05,729 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-21 00:43:05,800 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:05,801 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:05,813 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-21 00:43:05,859 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-21 00:43:05,868 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f09b81e15b0> has no local changes
2024-05-21 00:43:05,868 [ 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)
Updating 54c3753..a96e845
Previously merged:
- PR 469 will-moore 'changelog 0.14.0'
- PR 475 will-moore 'Update build and publish in gha'
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
Generated by OMERO-plugins-push#72 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/)'
2024-05-21 00:43:05,878 [ scc.git] DEBUG [detached HEAD c412e7e] merge master -Dorg -Ssuccess-only
2024-05-21 00:43:05,879 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:43:05,879 [ scc.repo] DEBUG ## PRs found:
2024-05-21 00:43:06,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-05-21 00:43:06,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-05-21 00:43:07,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-05-21 00:43:07,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-21 00:43:08,154 [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-21 00:43:08,615 [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-21 00:43:09,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-21 00:43:09,475 [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-21 00:43:09,476 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-05-21 00:43:09,476 [ scc.repo] DEBUG ## Branches found:
2024-05-21 00:43:09,476 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-21 00:43:09,477 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:09,477 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:09,483 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-21 00:43:09,489 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-21 00:43:09,490 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-21 00:43:09,496 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-21 00:43:09,503 [ scc.git] DEBUG Already up to date.
2024-05-21 00:43:09,503 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-05-21 00:43:09,876 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-05-21 00:43:09,876 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-05-21 00:43:09,881 [ scc.git] DEBUG ## Unique users: []
2024-05-21 00:43:09,881 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:09,881 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:09,888 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-21 00:43:09,895 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:09,902 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-21 00:43:09,914 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-21 00:43:09,917 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-05-21 00:43:09,917 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-05-21 00:43:09,917 [ scc.git] DEBUG requirements.txt | 2 +-
2024-05-21 00:43:09,917 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-05-21 00:43:09,917 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-05-21 00:43:09,917 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-05-21 00:43:10,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:43:10,077 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-21 00:43:10,127 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:10,127 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:10,136 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-21 00:43:10,187 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-21 00:43:10,196 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f09b81e1550> has no local changes
2024-05-21 00:43:10,196 [ 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#72 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/)'
2024-05-21 00:43:10,206 [ scc.git] DEBUG [detached HEAD 19e391e] merge master -Dorg -Ssuccess-only
2024-05-21 00:43:10,206 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:43:10,206 [ scc.repo] DEBUG ## PRs found:
2024-05-21 00:43:10,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-05-21 00:43:11,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-05-21 00:43:11,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-05-21 00:43:11,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-21 00:43:12,418 [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-21 00:43:12,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-21 00:43:13,317 [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-21 00:43:13,318 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-21 00:43:13,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-05-21 00:43:14,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-05-21 00:43:14,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-21 00:43:15,202 [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-21 00:43:15,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-21 00:43:16,114 [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-21 00:43:16,115 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-21 00:43:16,115 [ scc.repo] DEBUG ## Branches found:
2024-05-21 00:43:16,115 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-21 00:43:16,115 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:16,115 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:16,123 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-21 00:43:16,129 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-21 00:43:16,130 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-21 00:43:16,136 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-21 00:43:16,143 [ scc.git] DEBUG Already up to date.
2024-05-21 00:43:16,144 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-05-21 00:43:16,642 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-21 00:43:16,643 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-05-21 00:43:16,647 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-05-21 00:43:17,222 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-21 00:43:17,222 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-05-21 00:43:17,227 [ scc.git] DEBUG ## Unique users: []
2024-05-21 00:43:17,227 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:17,227 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:17,234 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-21 00:43:17,242 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:17,248 [ 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-21 00:43:17,299 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-05-21 00:43:17,299 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-05-21 00:43:17,299 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-21 00:43:17,299 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-21 00:43:17,299 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-21 00:43:17,300 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-21 00:43:17,307 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-21 00:43:17,315 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-21 00:43:17,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:43:17,477 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-21 00:43:17,486 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-21 00:43:17,491 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#72](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-05-21 00:43:17,495 [ scc.config] DEBUG Found github.token
2024-05-21 00:43:17,496 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-05-21 00:43:17,496 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-21 00:43:17,502 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:17,507 [ 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-21 00:43:17,546 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-21 00:43:17,546 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-21 00:43:17,546 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-05-21 00:43:17,546 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-21 00:43:17,547 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-21 00:43:17,553 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-21 00:43:17,560 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-21 00:43:17,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:43:17,894 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-21 00:43:17,902 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-21 00:43:17,908 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#72](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/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-21 00:43:17,913 [ scc.config] DEBUG Found github.token
2024-05-21 00:43:17,913 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-05-21 00:43:17,913 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-21 00:43:17,956 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:17,956 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:17,962 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-21 00:43:18,005 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-21 00:43:18,013 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f09b81f1d00> has no local changes
2024-05-21 00:43:18,013 [ 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#72 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/)'
2024-05-21 00:43:18,022 [ scc.git] DEBUG [detached HEAD bdc156a] merge master -Dorg -Ssuccess-only
2024-05-21 00:43:18,022 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:43:18,022 [ scc.repo] DEBUG ## PRs found:
2024-05-21 00:43:18,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-05-21 00:43:18,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-05-21 00:43:18,950 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-21 00:43:19,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-21 00:43:19,891 [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-21 00:43:20,360 [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-21 00:43:20,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-21 00:43:21,318 [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-21 00:43:21,319 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-21 00:43:21,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-05-21 00:43:21,774 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-21 00:43:22,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-21 00:43:22,711 [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-21 00:43:23,189 [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-21 00:43:23,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-21 00:43:24,154 [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-21 00:43:24,155 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-21 00:43:24,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-05-21 00:43:24,621 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-21 00:43:25,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-21 00:43:25,646 [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-21 00:43:26,139 [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-21 00:43:26,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-21 00:43:27,010 [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-21 00:43:27,011 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-21 00:43:27,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-05-21 00:43:27,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-05-21 00:43:28,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-05-21 00:43:28,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-05-21 00:43:29,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-05-21 00:43:29,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-05-21 00:43:29,896 [ scc.repo] DEBUG ## Branches found:
2024-05-21 00:43:29,896 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-21 00:43:29,897 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:29,897 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:29,902 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-21 00:43:29,907 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-21 00:43:29,907 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-21 00:43:29,913 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-21 00:43:29,918 [ scc.git] DEBUG Already up to date.
2024-05-21 00:43:29,919 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-05-21 00:43:30,297 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-21 00:43:30,297 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-05-21 00:43:30,302 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-05-21 00:43:30,661 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-21 00:43:30,662 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-05-21 00:43:30,666 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-05-21 00:43:31,040 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-21 00:43:31,040 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-05-21 00:43:31,044 [ scc.git] DEBUG ## Unique users: []
2024-05-21 00:43:31,044 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:31,044 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:31,049 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-05-21 00:43:31,055 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:31,059 [ 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-21 00:43:31,069 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-21 00:43:31,072 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-05-21 00:43:31,073 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-05-21 00:43:31,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:43:31,238 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-05-21 00:43:31,245 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:31,252 [ 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-21 00:43:31,297 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-21 00:43:31,298 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-21 00:43:31,301 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-05-21 00:43:31,301 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-05-21 00:43:31,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:43:31,657 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-05-21 00:43:31,665 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:31,670 [ 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-21 00:43:31,699 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-21 00:43:31,700 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-21 00:43:31,704 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-05-21 00:43:31,704 [ scc.git] DEBUG package.json | 2 +-
2024-05-21 00:43:31,704 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-05-21 00:43:32,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:43:32,062 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-21 00:43:32,105 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:32,105 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:32,112 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-21 00:43:32,151 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-21 00:43:32,158 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f09b8a38df0> has no local changes
2024-05-21 00:43:32,158 [ 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#72 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/)'
2024-05-21 00:43:32,166 [ scc.git] DEBUG [detached HEAD c502e4f] merge master -Dorg -Ssuccess-only
2024-05-21 00:43:32,167 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:43:32,167 [ scc.repo] DEBUG ## PRs found:
2024-05-21 00:43:32,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-05-21 00:43:33,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-05-21 00:43:33,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-21 00:43:33,925 [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-21 00:43:34,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-21 00:43:34,788 [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-21 00:43:34,789 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-05-21 00:43:34,789 [ scc.repo] DEBUG ## Branches found:
2024-05-21 00:43:34,789 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-21 00:43:34,789 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:34,789 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:34,797 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-21 00:43:34,805 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-21 00:43:34,805 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-21 00:43:34,812 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-21 00:43:34,820 [ scc.git] DEBUG Already up to date.
2024-05-21 00:43:34,821 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-21 00:43:35,212 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-05-21 00:43:35,212 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-21 00:43:35,219 [ scc.git] DEBUG ## Unique users: []
2024-05-21 00:43:35,219 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:35,219 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:35,226 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-21 00:43:35,235 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:35,242 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-21 00:43:35,255 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-21 00:43:35,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:43:35,425 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-21 00:43:35,471 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:35,472 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:35,479 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-21 00:43:35,537 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-21 00:43:35,549 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f09b81a71c0> has no local changes
2024-05-21 00:43:35,549 [ 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#72 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/)'
2024-05-21 00:43:35,564 [ scc.git] DEBUG [detached HEAD 038842e] merge master -Dorg -Ssuccess-only
2024-05-21 00:43:35,565 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:43:35,565 [ scc.repo] DEBUG ## PRs found:
2024-05-21 00:43:35,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-05-21 00:43:36,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-05-21 00:43:36,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-05-21 00:43:37,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-05-21 00:43:37,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-21 00:43:38,156 [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-21 00:43:38,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-21 00:43:38,997 [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-21 00:43:38,998 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-21 00:43:38,998 [ scc.repo] DEBUG ## Branches found:
2024-05-21 00:43:38,999 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-21 00:43:38,999 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:38,999 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:39,008 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-21 00:43:39,017 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-21 00:43:39,018 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-21 00:43:39,026 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-21 00:43:39,036 [ scc.git] DEBUG Already up to date.
2024-05-21 00:43:39,036 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-05-21 00:43:39,538 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-05-21 00:43:39,538 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-05-21 00:43:39,544 [ scc.git] DEBUG ## Unique users: []
2024-05-21 00:43:39,544 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:39,544 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:39,551 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-05-21 00:43:39,558 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:39,564 [ 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-21 00:43:39,575 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-05-21 00:43:39,575 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-21 00:43:39,578 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-05-21 00:43:39,578 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-05-21 00:43:39,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:43:39,746 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-21 00:43:39,795 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:39,795 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:39,803 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-21 00:43:39,846 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-21 00:43:39,855 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f09b8a11fa0> has no local changes
2024-05-21 00:43:39,855 [ 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#72 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/)'
2024-05-21 00:43:39,866 [ scc.git] DEBUG [detached HEAD 75cbf2a] merge master -Dorg -Ssuccess-only
2024-05-21 00:43:39,867 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:43:39,867 [ scc.repo] DEBUG ## PRs found:
2024-05-21 00:43:40,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-05-21 00:43:40,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-05-21 00:43:41,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-05-21 00:43:41,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-21 00:43:42,015 [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-21 00:43:42,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-21 00:43:42,898 [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-21 00:43:42,898 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-21 00:43:42,898 [ scc.repo] DEBUG ## Branches found:
2024-05-21 00:43:42,899 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-21 00:43:42,899 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:42,899 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:42,906 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-21 00:43:42,913 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-21 00:43:42,913 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-21 00:43:42,919 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-21 00:43:42,926 [ scc.git] DEBUG Already up to date.
2024-05-21 00:43:42,927 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-21 00:43:43,326 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-05-21 00:43:43,326 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-21 00:43:43,331 [ scc.git] DEBUG ## Unique users: []
2024-05-21 00:43:43,331 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:43,331 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:43,338 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-21 00:43:43,345 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:43,352 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-21 00:43:43,393 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-05-21 00:43:43,393 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-05-21 00:43:43,394 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-05-21 00:43:43,394 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-05-21 00:43:43,394 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-05-21 00:43:43,394 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-05-21 00:43:43,394 [ scc.git] DEBUG Auto-merging setup.py
2024-05-21 00:43:43,394 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-05-21 00:43:43,394 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-21 00:43:43,394 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-21 00:43:43,400 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-21 00:43:43,408 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-05-21 00:43:43,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:43:43,570 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-21 00:43:43,578 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-21 00:43:43,584 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#72](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- setup.py
- omero_signup/views.py
- omero_signup/signup_settings.py
--conflicts
2024-05-21 00:43:43,589 [ scc.config] DEBUG Found github.token
2024-05-21 00:43:43,589 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-05-21 00:43:43,590 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-21 00:43:43,632 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:43,632 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:43,639 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-21 00:43:43,682 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-21 00:43:43,689 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f09b8a50d60> has no local changes
2024-05-21 00:43:43,690 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Generated by OMERO-plugins-push#72 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/)'
2024-05-21 00:43:43,699 [ scc.git] DEBUG [detached HEAD 249f5cc] merge master -Dorg -Ssuccess-only
2024-05-21 00:43:43,700 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:43:43,700 [ scc.repo] DEBUG ## PRs found:
2024-05-21 00:43:44,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-05-21 00:43:44,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-05-21 00:43:44,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-05-21 00:43:45,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-21 00:43:45,909 [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-21 00:43:46,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-21 00:43:46,765 [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-21 00:43:46,766 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-21 00:43:46,767 [ scc.repo] DEBUG ## Branches found:
2024-05-21 00:43:46,767 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-21 00:43:46,767 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:46,767 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:46,775 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-21 00:43:46,782 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-21 00:43:46,782 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-21 00:43:46,790 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-21 00:43:46,797 [ scc.git] DEBUG Already up to date.
2024-05-21 00:43:46,797 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-05-21 00:43:47,238 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-05-21 00:43:47,238 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-05-21 00:43:47,243 [ scc.git] DEBUG ## Unique users: []
2024-05-21 00:43:47,243 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:47,243 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:47,248 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-05-21 00:43:47,255 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:47,260 [ 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-21 00:43:47,280 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-21 00:43:47,283 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-05-21 00:43:47,283 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-05-21 00:43:47,283 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-05-21 00:43:47,284 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-05-21 00:43:47,284 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-05-21 00:43:47,284 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-05-21 00:43:47,284 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-05-21 00:43:47,284 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-05-21 00:43:47,284 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-05-21 00:43:47,286 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-05-21 00:43:47,286 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-05-21 00:43:47,286 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-05-21 00:43:47,286 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-05-21 00:43:47,286 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-05-21 00:43:47,286 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-05-21 00:43:47,286 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-05-21 00:43:47,286 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-05-21 00:43:47,286 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-05-21 00:43:47,286 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-05-21 00:43:47,286 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-05-21 00:43:47,286 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-05-21 00:43:47,286 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-05-21 00:43:47,286 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-05-21 00:43:47,286 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-05-21 00:43:47,286 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-05-21 00:43:47,286 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-05-21 00:43:47,286 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-05-21 00:43:47,286 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-05-21 00:43:47,286 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-05-21 00:43:47,286 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-05-21 00:43:47,287 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-05-21 00:43:47,287 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-05-21 00:43:47,287 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-05-21 00:43:47,287 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-05-21 00:43:47,287 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-05-21 00:43:47,287 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-05-21 00:43:47,287 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-05-21 00:43:47,287 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-05-21 00:43:47,287 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-05-21 00:43:47,287 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-05-21 00:43:47,287 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-05-21 00:43:47,287 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-05-21 00:43:47,287 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-05-21 00:43:47,287 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-05-21 00:43:47,287 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-05-21 00:43:47,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:43:47,440 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-21 00:43:47,487 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:47,487 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:47,496 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-21 00:43:47,541 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-21 00:43:47,549 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f09b8205eb0> has no local changes
2024-05-21 00:43:47,549 [ 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#72 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/)'
2024-05-21 00:43:47,561 [ scc.git] DEBUG [detached HEAD 9ae1f2c] merge master -Dorg -Ssuccess-only
2024-05-21 00:43:47,562 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:43:47,562 [ scc.repo] DEBUG ## PRs found:
2024-05-21 00:43:47,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-05-21 00:43:47,870 [ scc.repo] DEBUG ## Branches found:
2024-05-21 00:43:47,870 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-21 00:43:47,870 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:47,870 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:47,878 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-21 00:43:47,883 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-21 00:43:47,883 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-21 00:43:47,888 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-21 00:43:47,893 [ scc.git] DEBUG Already up to date.
2024-05-21 00:43:47,893 [ scc.git] DEBUG ## Unique users: []
2024-05-21 00:43:47,893 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:47,893 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:47,897 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-21 00:43:47,937 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:47,937 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:47,943 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-21 00:43:47,985 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-21 00:43:47,992 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f09b81bb4c0> has no local changes
2024-05-21 00:43:47,992 [ 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#72 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/)'
2024-05-21 00:43:48,002 [ scc.git] DEBUG [detached HEAD 680757a] merge master -Dorg -Ssuccess-only
2024-05-21 00:43:48,002 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:43:48,002 [ scc.repo] DEBUG ## PRs found:
2024-05-21 00:43:48,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-05-21 00:43:48,291 [ scc.repo] DEBUG ## Branches found:
2024-05-21 00:43:48,291 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-21 00:43:48,291 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:48,291 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:48,298 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-21 00:43:48,305 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-21 00:43:48,305 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-21 00:43:48,312 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-21 00:43:48,320 [ scc.git] DEBUG Already up to date.
2024-05-21 00:43:48,320 [ scc.git] DEBUG ## Unique users: []
2024-05-21 00:43:48,320 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:48,320 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:48,327 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-21 00:43:48,369 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:48,370 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:48,376 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-21 00:43:48,420 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-21 00:43:48,428 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f09b81acf70> has no local changes
2024-05-21 00:43:48,428 [ 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#72 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/)'
2024-05-21 00:43:48,438 [ scc.git] DEBUG [detached HEAD aa33240] merge master -Dorg -Ssuccess-only
2024-05-21 00:43:48,438 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:43:48,438 [ scc.git] INFO Overriding base-branch from master to main
2024-05-21 00:43:48,438 [ scc.repo] DEBUG ## PRs found:
2024-05-21 00:43:48,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-05-21 00:43:49,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-05-21 00:43:49,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-05-21 00:43:50,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-05-21 00:43:50,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-21 00:43:51,137 [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-21 00:43:51,620 [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-21 00:43:52,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-21 00:43:52,529 [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-21 00:43:52,530 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-21 00:43:52,530 [ scc.repo] DEBUG ## Branches found:
2024-05-21 00:43:52,530 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-21 00:43:52,531 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:52,531 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:52,540 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-05-21 00:43:52,546 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-21 00:43:52,547 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-05-21 00:43:52,554 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-05-21 00:43:52,562 [ scc.git] DEBUG Already up to date.
2024-05-21 00:43:52,563 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-05-21 00:43:53,030 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-05-21 00:43:53,031 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-05-21 00:43:53,038 [ scc.git] DEBUG ## Unique users: []
2024-05-21 00:43:53,038 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:53,038 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:53,046 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-21 00:43:53,055 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:53,061 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-21 00:43:53,079 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-05-21 00:43:53,079 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-05-21 00:43:53,079 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-21 00:43:53,080 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-21 00:43:53,088 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-21 00:43:53,095 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-05-21 00:43:53,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:43:53,259 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-21 00:43:53,266 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-21 00:43:53,274 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#72](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-05-21 00:43:53,281 [ scc.config] DEBUG Found github.token
2024-05-21 00:43:53,281 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-05-21 00:43:53,282 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-21 00:43:53,324 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:53,325 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:53,331 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-21 00:43:53,374 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-21 00:43:53,384 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f09b81b9e50> has no local changes
2024-05-21 00:43:53,384 [ 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#72 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/)'
2024-05-21 00:43:53,396 [ scc.git] DEBUG [detached HEAD 9487b1b] merge master -Dorg -Ssuccess-only
2024-05-21 00:43:53,397 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:43:53,397 [ scc.repo] DEBUG ## PRs found:
2024-05-21 00:43:53,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-05-21 00:43:53,681 [ scc.repo] DEBUG ## Branches found:
2024-05-21 00:43:53,681 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-21 00:43:53,681 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:53,681 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:53,687 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-21 00:43:53,693 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-21 00:43:53,693 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-21 00:43:53,699 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-21 00:43:53,705 [ scc.git] DEBUG Already up to date.
2024-05-21 00:43:53,705 [ scc.git] DEBUG ## Unique users: []
2024-05-21 00:43:53,706 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:53,706 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:53,711 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-21 00:43:53,750 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:53,750 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:53,756 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-21 00:43:53,796 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-21 00:43:53,802 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f09b8124f70> has no local changes
2024-05-21 00:43:53,803 [ 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#72 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/)'
2024-05-21 00:43:53,811 [ scc.git] DEBUG [detached HEAD 1544cb0] merge master -Dorg -Ssuccess-only
2024-05-21 00:43:53,811 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:43:53,811 [ scc.repo] DEBUG ## PRs found:
2024-05-21 00:43:54,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-05-21 00:43:54,112 [ scc.repo] DEBUG ## Branches found:
2024-05-21 00:43:54,112 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-21 00:43:54,112 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:54,112 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:54,119 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-21 00:43:54,124 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-21 00:43:54,125 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-21 00:43:54,131 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-21 00:43:54,138 [ scc.git] DEBUG Already up to date.
2024-05-21 00:43:54,139 [ scc.git] DEBUG ## Unique users: []
2024-05-21 00:43:54,139 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:54,139 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:54,146 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-21 00:43:54,187 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:54,187 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:54,194 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-21 00:43:54,236 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-21 00:43:54,244 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f09b8124640> has no local changes
2024-05-21 00:43:54,244 [ 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#72 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/)'
2024-05-21 00:43:54,254 [ scc.git] DEBUG [detached HEAD c6399ac] merge master -Dorg -Ssuccess-only
2024-05-21 00:43:54,254 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:43:54,255 [ scc.repo] DEBUG ## PRs found:
2024-05-21 00:43:54,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-05-21 00:43:55,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-05-21 00:43:55,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-05-21 00:43:55,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-21 00:43:56,420 [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-21 00:43:56,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-21 00:43:57,285 [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-21 00:43:57,286 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-05-21 00:43:57,286 [ scc.repo] DEBUG ## Branches found:
2024-05-21 00:43:57,286 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-21 00:43:57,286 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:57,287 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:57,296 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-21 00:43:57,303 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-21 00:43:57,303 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-21 00:43:57,310 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-21 00:43:57,317 [ scc.git] DEBUG Already up to date.
2024-05-21 00:43:57,318 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-05-21 00:43:57,725 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-05-21 00:43:57,726 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-05-21 00:43:57,734 [ scc.git] DEBUG ## Unique users: []
2024-05-21 00:43:57,734 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:57,735 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:57,744 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-21 00:43:57,755 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:57,764 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-21 00:43:57,806 [ scc.git] DEBUG Auto-merging Dockerfile
2024-05-21 00:43:57,806 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-05-21 00:43:57,807 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-21 00:43:57,808 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-21 00:43:57,820 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-21 00:43:57,833 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-05-21 00:43:57,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:43:57,992 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-21 00:43:58,003 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-21 00:43:58,012 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#72](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-05-21 00:43:58,022 [ scc.config] DEBUG Found github.token
2024-05-21 00:43:58,022 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-05-21 00:43:58,023 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-21 00:43:58,071 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:43:58,071 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:43:58,080 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-21 00:43:58,130 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-21 00:43:58,141 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f09b81199d0> has no local changes
2024-05-21 00:43:58,141 [ 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#72 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/)'
2024-05-21 00:43:58,153 [ scc.git] DEBUG [detached HEAD a63e1be] merge master -Dorg -Ssuccess-only
2024-05-21 00:43:58,154 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:43:58,154 [ scc.git] INFO Overriding base-branch from master to develop
2024-05-21 00:43:58,154 [ scc.repo] DEBUG ## PRs found:
2024-05-21 00:43:58,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-05-21 00:43:58,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-05-21 00:43:59,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-05-21 00:43:59,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-05-21 00:44:00,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-05-21 00:44:00,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-05-21 00:44:01,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-05-21 00:44:01,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-21 00:44:02,237 [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-21 00:44:02,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-21 00:44:03,078 [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-21 00:44:03,079 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-21 00:44:03,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-05-21 00:44:04,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-05-21 00:44:04,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-05-21 00:44:05,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-05-21 00:44:05,010 [ scc.repo] DEBUG ## Branches found:
2024-05-21 00:44:05,010 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-21 00:44:05,011 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:44:05,011 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:44:05,020 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-05-21 00:44:05,032 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-21 00:44:05,033 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-05-21 00:44:05,042 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-05-21 00:44:05,051 [ scc.git] DEBUG Already up to date.
2024-05-21 00:44:05,052 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-05-21 00:44:05,597 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-05-21 00:44:05,597 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-05-21 00:44:05,602 [ scc.git] DEBUG ## Unique users: []
2024-05-21 00:44:05,603 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:44:05,603 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:44:05,610 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-21 00:44:05,619 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:44:05,626 [ 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-21 00:44:05,666 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-05-21 00:44:05,667 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-05-21 00:44:05,667 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-21 00:44:05,667 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-21 00:44:05,674 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-21 00:44:05,681 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-21 00:44:05,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:44:05,841 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-21 00:44:05,850 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-21 00:44:05,858 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#72](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-05-21 00:44:05,867 [ scc.config] DEBUG Found github.token
2024-05-21 00:44:05,867 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-05-21 00:44:05,867 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-21 00:44:05,913 [ scc.git] DEBUG Get sha1 of %s
2024-05-21 00:44:05,914 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-21 00:44:05,921 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-21 00:44:05,964 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-21 00:44:05,973 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f09b8164d90> has no local changes
2024-05-21 00:44:05,973 [ 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#72 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/)'
2024-05-21 00:44:05,989 [ scc.git] DEBUG [detached HEAD 535d2ff] merge master -Dorg -Ssuccess-only
2024-05-21 00:44:05,991 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:44:05,991 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-21 00:44:06,072 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-05-21 00:44:06,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:44:06,266 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-05-21 00:44:06,274 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-05-21 00:44:06,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:44:06,673 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-05-21 00:44:06,677 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-05-21 00:44:07,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:44:07,088 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-05-21 00:44:07,094 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-05-21 00:44:07,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:44:07,508 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-05-21 00:44:07,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:44:07,929 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-05-21 00:44:07,938 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-05-21 00:44:08,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:44:08,322 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-05-21 00:44:08,329 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-05-21 00:44:08,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:44:08,742 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-05-21 00:44:08,749 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-05-21 00:44:09,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:44:09,147 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-05-21 00:44:09,155 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-05-21 00:44:09,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:44:09,559 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-05-21 00:44:09,564 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-05-21 00:44:09,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:44:09,966 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-05-21 00:44:09,972 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-05-21 00:44:10,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:44:10,373 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-05-21 00:44:10,381 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-05-21 00:44:10,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:44:10,777 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-05-21 00:44:10,785 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-05-21 00:44:11,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:44:11,203 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-05-21 00:44:11,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:44:11,596 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-05-21 00:44:12,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:44:12,034 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-05-21 00:44:12,040 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-05-21 00:44:12,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:44:12,448 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-05-21 00:44:12,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:44:12,851 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-05-21 00:44:13,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:44:13,252 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-05-21 00:44:13,257 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-05-21 00:44:13,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:44:13,657 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-05-21 00:44:13,664 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-05-21 00:44:14,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:44:14,066 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-05-21 00:44:14,075 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-05-21 00:44:14,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:44:14,476 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-05-21 00:44:14,481 [ scc.config] DEBUG Found submodule.scripts.url
2024-05-21 00:44:14,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-21 00:44:14,876 [ scc.config] DEBUG Found submodule.scripts.branch
2024-05-21 00:44:14,877 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-21 00:44:14,964 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f09bbee9460> has local changes
2024-05-21 00:44:14,964 [ 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)
Updating 54c3753..a96e845
Previously merged:
- PR 469 will-moore 'changelog 0.14.0'
- PR 475 will-moore 'Update build and publish in gha'
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#72 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/72/)'
2024-05-21 00:44:14,982 [ scc.git] DEBUG [detached HEAD 1e226cb] merge master -Dorg -Ssuccess-only
2024-05-21 00:44:14,982 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-05-21 00:44:14,983 [ scc.merge] INFO Repository: ome/omero-plugins
2024-05-21 00:44:14,983 [ scc.merge] INFO Already up to date.
2024-05-21 00:44:14,983 [ scc.merge] INFO
2024-05-21 00:44:14,983 [ scc.merge] INFO
2024-05-21 00:44:14,983 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-05-21 00:44:14,983 [ scc.merge] INFO Already up to date.
2024-05-21 00:44:14,983 [ scc.merge] INFO
2024-05-21 00:44:14,983 [ scc.merge] INFO
2024-05-21 00:44:14,983 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-05-21 00:44:14,983 [ scc.merge] INFO Excluded PRs:
2024-05-21 00:44:14,983 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-05-21 00:44:14,983 [ scc.merge] INFO Already up to date.
2024-05-21 00:44:14,983 [ scc.merge] INFO
2024-05-21 00:44:14,983 [ scc.merge] INFO Merged PRs:
2024-05-21 00:44:14,983 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-05-21 00:44:14,983 [ scc.merge] INFO
2024-05-21 00:44:14,983 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-05-21 00:44:14,983 [ scc.merge] INFO Excluded PRs:
2024-05-21 00:44:14,983 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-05-21 00:44:14,983 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-05-21 00:44:14,983 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-05-21 00:44:14,983 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-05-21 00:44:14,983 [ scc.merge] INFO Already up to date.
2024-05-21 00:44:14,983 [ scc.merge] INFO
2024-05-21 00:44:14,983 [ scc.merge] INFO Merged PRs:
2024-05-21 00:44:14,983 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-05-21 00:44:14,983 [ scc.merge] INFO
2024-05-21 00:44:14,983 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-05-21 00:44:14,983 [ scc.merge] INFO Excluded PRs:
2024-05-21 00:44:14,983 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-21 00:44:14,984 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-05-21 00:44:14,984 [ scc.merge] INFO Already up to date.
2024-05-21 00:44:14,984 [ scc.merge] INFO
2024-05-21 00:44:14,984 [ scc.merge] INFO Merged PRs:
2024-05-21 00:44:14,984 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-05-21 00:44:14,984 [ scc.merge] INFO
2024-05-21 00:44:14,984 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-21 00:44:14,984 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-05-21 00:44:14,984 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-05-21 00:44:14,984 [ scc.merge] INFO
2024-05-21 00:44:14,984 [ scc.merge] INFO Repository: ome/omero-figure
2024-05-21 00:44:14,984 [ scc.merge] INFO Excluded PRs:
2024-05-21 00:44:14,984 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes' (status: failure)
2024-05-21 00:44:14,984 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-05-21 00:44:14,984 [ scc.merge] INFO Already up to date.
2024-05-21 00:44:14,984 [ scc.merge] INFO
2024-05-21 00:44:14,984 [ scc.merge] INFO Merged PRs:
2024-05-21 00:44:14,984 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-05-21 00:44:14,984 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-05-21 00:44:14,984 [ scc.merge] INFO - PR 562 will-moore 'Add changelog 7.0.0'
2024-05-21 00:44:14,984 [ scc.merge] INFO
2024-05-21 00:44:14,984 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-05-21 00:44:14,984 [ scc.merge] INFO Already up to date.
2024-05-21 00:44:14,984 [ scc.merge] INFO
2024-05-21 00:44:14,984 [ scc.merge] INFO Merged PRs:
2024-05-21 00:44:14,984 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-05-21 00:44:14,984 [ scc.merge] INFO
2024-05-21 00:44:14,984 [ scc.merge] INFO Repository: ome/omero-gallery
2024-05-21 00:44:14,984 [ scc.merge] INFO Already up to date.
2024-05-21 00:44:14,984 [ scc.merge] INFO
2024-05-21 00:44:14,984 [ scc.merge] INFO Merged PRs:
2024-05-21 00:44:14,984 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-21 00:44:14,984 [ scc.merge] INFO
2024-05-21 00:44:14,984 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-05-21 00:44:14,984 [ scc.merge] INFO Excluded PRs:
2024-05-21 00:44:14,984 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-05-21 00:44:14,984 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-05-21 00:44:14,984 [ scc.merge] INFO Updating 54c3753..a96e845
2024-05-21 00:44:14,985 [ scc.merge] INFO Previously merged:
2024-05-21 00:44:14,985 [ scc.merge] INFO - PR 469 will-moore 'changelog 0.14.0'
2024-05-21 00:44:14,985 [ scc.merge] INFO - PR 475 will-moore 'Update build and publish in gha'
2024-05-21 00:44:14,985 [ scc.merge] INFO
2024-05-21 00:44:14,985 [ scc.merge] INFO Merged PRs:
2024-05-21 00:44:14,985 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-05-21 00:44:14,985 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-05-21 00:44:14,985 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-21 00:44:14,985 [ scc.merge] INFO
2024-05-21 00:44:14,985 [ scc.merge] INFO Repository: ome/omero-mapr
2024-05-21 00:44:14,985 [ scc.merge] INFO Excluded PRs:
2024-05-21 00:44:14,985 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-05-21 00:44:14,985 [ scc.merge] INFO Already up to date.
2024-05-21 00:44:14,985 [ scc.merge] INFO
2024-05-21 00:44:14,985 [ scc.merge] INFO Merged PRs:
2024-05-21 00:44:14,985 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-05-21 00:44:14,985 [ scc.merge] INFO
2024-05-21 00:44:14,985 [ scc.merge] INFO Repository: ome/omero-metadata
2024-05-21 00:44:14,985 [ scc.merge] INFO Already up to date.
2024-05-21 00:44:14,985 [ scc.merge] INFO
2024-05-21 00:44:14,985 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-21 00:44:14,985 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-21 00:44:14,985 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-21 00:44:14,985 [ scc.merge] INFO
2024-05-21 00:44:14,985 [ scc.merge] INFO Repository: ome/omero-parade
2024-05-21 00:44:14,985 [ scc.merge] INFO Excluded PRs:
2024-05-21 00:44:14,985 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-05-21 00:44:14,985 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-05-21 00:44:14,985 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-05-21 00:44:14,985 [ scc.merge] INFO Already up to date.
2024-05-21 00:44:14,985 [ scc.merge] INFO
2024-05-21 00:44:14,985 [ scc.merge] INFO Merged PRs:
2024-05-21 00:44:14,985 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-21 00:44:14,985 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-21 00:44:14,985 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-21 00:44:14,985 [ scc.merge] INFO
2024-05-21 00:44:14,985 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-05-21 00:44:14,985 [ scc.merge] INFO Already up to date.
2024-05-21 00:44:14,985 [ scc.merge] INFO
2024-05-21 00:44:14,986 [ scc.merge] INFO Merged PRs:
2024-05-21 00:44:14,986 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-05-21 00:44:14,986 [ scc.merge] INFO
2024-05-21 00:44:14,986 [ scc.merge] INFO Repository: ome/omero-rois
2024-05-21 00:44:14,986 [ scc.merge] INFO Excluded PRs:
2024-05-21 00:44:14,986 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-21 00:44:14,986 [ scc.merge] INFO Already up to date.
2024-05-21 00:44:14,986 [ scc.merge] INFO
2024-05-21 00:44:14,986 [ scc.merge] INFO Merged PRs:
2024-05-21 00:44:14,986 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-21 00:44:14,986 [ scc.merge] INFO
2024-05-21 00:44:14,986 [ scc.merge] INFO Repository: ome/omero-signup
2024-05-21 00:44:14,986 [ scc.merge] INFO Already up to date.
2024-05-21 00:44:14,986 [ scc.merge] INFO
2024-05-21 00:44:14,986 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-21 00:44:14,986 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-21 00:44:14,986 [ scc.merge] INFO
2024-05-21 00:44:14,986 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-05-21 00:44:14,986 [ scc.merge] INFO Already up to date.
2024-05-21 00:44:14,986 [ scc.merge] INFO
2024-05-21 00:44:14,986 [ scc.merge] INFO Merged PRs:
2024-05-21 00:44:14,986 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-21 00:44:14,986 [ scc.merge] INFO
2024-05-21 00:44:14,986 [ scc.merge] INFO Repository: ome/omero-upload
2024-05-21 00:44:14,986 [ scc.merge] INFO Already up to date.
2024-05-21 00:44:14,986 [ scc.merge] INFO
2024-05-21 00:44:14,986 [ scc.merge] INFO
2024-05-21 00:44:14,986 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-05-21 00:44:14,986 [ scc.merge] INFO Already up to date.
2024-05-21 00:44:14,986 [ scc.merge] INFO
2024-05-21 00:44:14,986 [ scc.merge] INFO
2024-05-21 00:44:14,986 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-05-21 00:44:14,986 [ scc.merge] INFO Excluded PRs:
2024-05-21 00:44:14,986 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-05-21 00:44:14,986 [ scc.merge] INFO Already up to date.
2024-05-21 00:44:14,986 [ scc.merge] INFO
2024-05-21 00:44:14,986 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-21 00:44:14,986 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-21 00:44:14,986 [ scc.merge] INFO
2024-05-21 00:44:14,987 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-05-21 00:44:14,987 [ scc.merge] INFO Already up to date.
2024-05-21 00:44:14,987 [ scc.merge] INFO
2024-05-21 00:44:14,987 [ scc.merge] INFO
2024-05-21 00:44:14,987 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-05-21 00:44:14,987 [ scc.merge] INFO Already up to date.
2024-05-21 00:44:14,987 [ scc.merge] INFO
2024-05-21 00:44:14,987 [ scc.merge] INFO
2024-05-21 00:44:14,987 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-05-21 00:44:14,987 [ scc.merge] INFO Already up to date.
2024-05-21 00:44:14,987 [ scc.merge] INFO
2024-05-21 00:44:14,987 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-21 00:44:14,987 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-05-21 00:44:14,987 [ scc.merge] INFO
2024-05-21 00:44:14,987 [ scc.merge] INFO Repository: ome/scripts
2024-05-21 00:44:14,987 [ scc.merge] INFO Excluded PRs:
2024-05-21 00:44:14,987 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-05-21 00:44:14,987 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-05-21 00:44:14,987 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-05-21 00:44:14,987 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-05-21 00:44:14,987 [ scc.merge] INFO Already up to date.
2024-05-21 00:44:14,987 [ scc.merge] INFO
2024-05-21 00:44:14,987 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-21 00:44:14,987 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-21 00:44:14,987 [ scc.merge] INFO
2024-05-21 00:44:14,987 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-21 00:44:14,987 [ scc.git] DEBUG Calling 'git remote'
2024-05-21 00:44:14,999 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-05-21 00:44:14,999 [ scc.git] DEBUG Calling 'git remote'
2024-05-21 00:44:15,006 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:44:15,007 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-05-21 00:44:15,007 [ scc.git] DEBUG Calling 'git remote'
2024-05-21 00:44:15,013 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:44:15,014 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-05-21 00:44:15,014 [ scc.git] DEBUG Calling 'git remote'
2024-05-21 00:44:15,021 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:44:15,021 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-05-21 00:44:15,021 [ scc.git] DEBUG Calling 'git remote'
2024-05-21 00:44:15,027 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:44:15,028 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-21 00:44:15,028 [ scc.git] DEBUG Calling 'git remote'
2024-05-21 00:44:15,034 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:44:15,035 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-21 00:44:15,035 [ scc.git] DEBUG Calling 'git remote'
2024-05-21 00:44:15,041 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:44:15,042 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-21 00:44:15,042 [ scc.git] DEBUG Calling 'git remote'
2024-05-21 00:44:15,047 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:44:15,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-21 00:44:15,048 [ scc.git] DEBUG Calling 'git remote'
2024-05-21 00:44:15,053 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:44:15,053 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-21 00:44:15,053 [ scc.git] DEBUG Calling 'git remote'
2024-05-21 00:44:15,059 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:44:15,059 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-21 00:44:15,059 [ scc.git] DEBUG Calling 'git remote'
2024-05-21 00:44:15,065 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:44:15,066 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-21 00:44:15,066 [ scc.git] DEBUG Calling 'git remote'
2024-05-21 00:44:15,075 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:44:15,075 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-21 00:44:15,075 [ scc.git] DEBUG Calling 'git remote'
2024-05-21 00:44:15,082 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:44:15,083 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-21 00:44:15,083 [ scc.git] DEBUG Calling 'git remote'
2024-05-21 00:44:15,090 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:44:15,091 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-21 00:44:15,091 [ scc.git] DEBUG Calling 'git remote'
2024-05-21 00:44:15,098 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:44:15,099 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-21 00:44:15,099 [ scc.git] DEBUG Calling 'git remote'
2024-05-21 00:44:15,108 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:44:15,108 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-21 00:44:15,108 [ scc.git] DEBUG Calling 'git remote'
2024-05-21 00:44:15,117 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:44:15,117 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-21 00:44:15,117 [ scc.git] DEBUG Calling 'git remote'
2024-05-21 00:44:15,126 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:44:15,127 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-21 00:44:15,127 [ scc.git] DEBUG Calling 'git remote'
2024-05-21 00:44:15,133 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:44:15,133 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-21 00:44:15,133 [ scc.git] DEBUG Calling 'git remote'
2024-05-21 00:44:15,142 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:44:15,143 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-21 00:44:15,143 [ scc.git] DEBUG Calling 'git remote'
2024-05-21 00:44:15,150 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:44:15,150 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-21 00:44:15,150 [ scc.git] DEBUG Calling 'git remote'
2024-05-21 00:44:15,156 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-21 00:44:15,157 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-21 00:44:15,157 [ scc.git] DEBUG Calling 'git remote'
2024-05-21 00:44:15,163 [ 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 cbfbb22] 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 60f91b6] 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-21 00:45:01,803 [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-21 00:45:10,857 [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-21 00:45:13,260 [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-21 00:45:17,811 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-05-21 00:46:02,980 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/f5fa13f0/images/svgs/logo.svg){kind=logo}
