Console Output
Skipping 72 KB..
Full Logit] DEBUG ## Unique users: []
2024-05-17 07:16:25,001 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:16:25,001 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:16:25,006 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f22d4074b7c458ad24320cf5a6f8adb9e686aa44'
2024-05-17 07:16:25,013 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:16:25,018 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 102 (Zarr export tests) f22d4074b7c458ad24320cf5a6f8adb9e686aa44'
2024-05-17 07:16:25,274 [ scc.git] DEBUG Auto-merging src/omero_zarr/cli.py
2024-05-17 07:16:25,274 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-05-17 07:16:25,274 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_zarr/raw_pixels.py
2024-05-17 07:16:25,274 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-17 07:16:25,274 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-17 07:16:25,280 [ scc.git] DEBUG Calling 'git reset --hard 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-05-17 07:16:25,287 [ scc.git] DEBUG HEAD is now at 2ca566b Merge pull request #160 from ome/pre-commit-ci-update-config
2024-05-17 07:16:25,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:16:25,456 [ scc.git] DEBUG Calling 'git merge-base 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473 f22d4074b7c458ad24320cf5a6f8adb9e686aa44'
2024-05-17 07:16:25,464 [ scc.git] DEBUG Calling 'git diff --name-only 782a1cd0077bcc2871f21e9f0acdc25ae7745243..2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-05-17 07:16:25,470 [ scc.git] INFO - PR 102 will-moore 'Zarr export tests'
Conflicting PR. Removed from build [OMERO-plugins-push#68](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_zarr/raw_pixels.py
--conflicts
2024-05-17 07:16:25,475 [ scc.config] DEBUG Found github.token
2024-05-17 07:16:25,475 [ scc.git] DEBUG Not adding comment to issue #102, already --conflicts.
2024-05-17 07:16:25,475 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-05-17 07:16:25,481 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:16:25,486 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 123 (Support export of Fileset:ID) 553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-05-17 07:16:25,522 [ scc.git] DEBUG Auto-merging .isort.cfg
2024-05-17 07:16:25,522 [ scc.git] DEBUG CONFLICT (content): Merge conflict in .isort.cfg
2024-05-17 07:16:25,522 [ scc.git] DEBUG Auto-merging setup.py
2024-05-17 07:16:25,522 [ scc.git] DEBUG Auto-merging src/omero_zarr/cli.py
2024-05-17 07:16:25,523 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-05-17 07:16:25,523 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_zarr/raw_pixels.py
2024-05-17 07:16:25,523 [ scc.git] DEBUG Auto-merging src/omero_zarr/util.py
2024-05-17 07:16:25,523 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-17 07:16:25,523 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-17 07:16:25,529 [ scc.git] DEBUG Calling 'git reset --hard 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-05-17 07:16:25,536 [ scc.git] DEBUG HEAD is now at 2ca566b Merge pull request #160 from ome/pre-commit-ci-update-config
2024-05-17 07:16:25,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:16:25,874 [ scc.git] DEBUG Calling 'git merge-base 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473 553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-05-17 07:16:25,883 [ scc.git] DEBUG Calling 'git diff --name-only eff38d0408f9d50de13b28dfe09e4382965e203f..2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-05-17 07:16:25,889 [ scc.git] INFO - PR 123 will-moore 'Support export of Fileset:ID'
Conflicting PR. Removed from build [OMERO-plugins-push#68](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/consoleText) for more details.
Possible conflicts:
- PR #102 will-moore 'Zarr export tests'
- src/omero_zarr/raw_pixels.py
- Upstream changes
- .isort.cfg
- src/omero_zarr/raw_pixels.py
--conflicts
2024-05-17 07:16:25,896 [ scc.config] DEBUG Found github.token
2024-05-17 07:16:25,897 [ scc.git] DEBUG Not adding comment to issue #123, already --conflicts.
2024-05-17 07:16:25,897 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a14f62a940f4974a305b3f5858049ee493b898ef'
2024-05-17 07:16:25,905 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:16:25,911 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 147 (Name option) a14f62a940f4974a305b3f5858049ee493b898ef'
2024-05-17 07:16:25,926 [ scc.git] DEBUG Auto-merging src/omero_zarr/masks.py
2024-05-17 07:16:25,927 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-05-17 07:16:25,927 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-17 07:16:25,931 [ scc.git] DEBUG README.rst | 30 ++++++++++++++++++------------
2024-05-17 07:16:25,931 [ scc.git] DEBUG src/omero_zarr/cli.py | 9 +++++++++
2024-05-17 07:16:25,931 [ scc.git] DEBUG src/omero_zarr/masks.py | 4 ++--
2024-05-17 07:16:25,931 [ scc.git] DEBUG src/omero_zarr/raw_pixels.py | 28 +++++++++++++++++++++++-----
2024-05-17 07:16:25,931 [ scc.git] DEBUG src/omero_zarr/util.py | 2 +-
2024-05-17 07:16:25,931 [ scc.git] DEBUG 5 files changed, 53 insertions(+), 20 deletions(-)
2024-05-17 07:16:26,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:16:26,290 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-17 07:16:26,334 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:16:26,335 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:16:26,341 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-17 07:16:26,384 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-17 07:16:26,392 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a5ebe6640> has no local changes
2024-05-17 07:16:26,392 [ 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#68 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/)'
2024-05-17 07:16:26,403 [ scc.git] DEBUG [detached HEAD 3451e9b] merge master -Dorg -Ssuccess-only
2024-05-17 07:16:26,403 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:16:26,404 [ scc.repo] DEBUG ## PRs found:
2024-05-17 07:16:26,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-05-17 07:16:27,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560 HTTP/1.1" 200 None
2024-05-17 07:16:27,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/560/comments HTTP/1.1" 200 None
2024-05-17 07:16:28,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/93463371bd79d20cd7abe760db0e7cbdbb897919 HTTP/1.1" 200 None
2024-05-17 07:16:28,744 [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-17 07:16:29,238 [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-17 07:16:29,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-05-17 07:16:30,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-05-17 07:16:30,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-17 07:16:31,156 [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-17 07:16:31,620 [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-17 07:16:32,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-05-17 07:16:32,506 [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-17 07:16:32,507 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-05-17 07:16:32,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-05-17 07:16:33,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-17 07:16:33,997 [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-17 07:16:34,521 [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-17 07:16:34,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-05-17 07:16:35,384 [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-17 07:16:35,385 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-05-17 07:16:35,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543 HTTP/1.1" 200 None
2024-05-17 07:16:36,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543/comments HTTP/1.1" 200 None
2024-05-17 07:16:36,392 [ scc.repo] DEBUG ## Branches found:
2024-05-17 07:16:36,392 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-17 07:16:36,392 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:16:36,392 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:16:36,398 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-17 07:16:36,404 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-17 07:16:36,404 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-17 07:16:36,412 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-17 07:16:36,420 [ scc.git] DEBUG Already up to date.
2024-05-17 07:16:36,421 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-05-17 07:16:37,307 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-17 07:16:37,307 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-05-17 07:16:37,313 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-05-17 07:16:37,906 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-05-17 07:16:37,907 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-05-17 07:16:37,912 [ scc.git] DEBUG ## Unique users: []
2024-05-17 07:16:37,912 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:16:37,912 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:16:37,919 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-17 07:16:37,928 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:16:37,935 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-05-17 07:16:38,138 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-17 07:16:38,147 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-05-17 07:16:38,147 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-05-17 07:16:38,147 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-05-17 07:16:38,147 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-05-17 07:16:38,147 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-05-17 07:16:38,147 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-05-17 07:16:38,147 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-05-17 07:16:38,147 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-05-17 07:16:38,147 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-05-17 07:16:38,147 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-05-17 07:16:38,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:16:38,307 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-17 07:16:38,319 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:16:38,325 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-05-17 07:16:38,477 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-05-17 07:16:38,477 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-05-17 07:16:38,477 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-05-17 07:16:38,477 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-17 07:16:38,484 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-05-17 07:16:38,484 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-05-17 07:16:38,484 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-05-17 07:16:38,484 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-05-17 07:16:38,484 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-05-17 07:16:38,484 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-05-17 07:16:38,484 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-05-17 07:16:38,484 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-05-17 07:16:38,484 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-05-17 07:16:38,484 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-05-17 07:16:38,484 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-05-17 07:16:38,485 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-05-17 07:16:38,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:16:38,725 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-17 07:16:38,767 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:16:38,767 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:16:38,773 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-17 07:16:38,815 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-17 07:16:38,825 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a5ec28be0> has no local changes
2024-05-17 07:16:38,825 [ 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'
Generated by OMERO-plugins-push#68 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/)'
2024-05-17 07:16:38,838 [ scc.git] DEBUG [detached HEAD 4e02b4ee] merge master -Dorg -Ssuccess-only
2024-05-17 07:16:38,839 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:16:38,839 [ scc.repo] DEBUG ## PRs found:
2024-05-17 07:16:39,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-05-17 07:16:39,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-05-17 07:16:40,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-05-17 07:16:40,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-17 07:16:41,195 [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-17 07:16:41,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-05-17 07:16:42,152 [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-17 07:16:42,153 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-05-17 07:16:42,154 [ scc.repo] DEBUG ## Branches found:
2024-05-17 07:16:42,154 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-17 07:16:42,154 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:16:42,154 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:16:42,160 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-17 07:16:42,165 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-17 07:16:42,165 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-17 07:16:42,171 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-17 07:16:42,178 [ scc.git] DEBUG Already up to date.
2024-05-17 07:16:42,178 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-05-17 07:16:42,577 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-05-17 07:16:42,577 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-05-17 07:16:42,590 [ scc.git] DEBUG ## Unique users: []
2024-05-17 07:16:42,590 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:16:42,590 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:16:42,598 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-17 07:16:42,604 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:16:42,608 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-05-17 07:16:42,643 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-05-17 07:16:42,644 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-17 07:16:42,646 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-05-17 07:16:42,647 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-05-17 07:16:42,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:16:42,800 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-17 07:16:42,846 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:16:42,847 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:16:42,852 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-17 07:16:42,896 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-17 07:16:42,904 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a5ebf8550> has no local changes
2024-05-17 07:16:42,904 [ 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#68 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/)'
2024-05-17 07:16:42,914 [ scc.git] DEBUG [detached HEAD 526eb3a] merge master -Dorg -Ssuccess-only
2024-05-17 07:16:42,914 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:16:42,915 [ scc.repo] DEBUG ## PRs found:
2024-05-17 07:16:43,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-05-17 07:16:43,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-05-17 07:16:43,778 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-17 07:16:44,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-17 07:16:44,825 [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-17 07:16:45,390 [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-17 07:16:45,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-05-17 07:16:46,244 [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-17 07:16:46,245 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-17 07:16:46,246 [ scc.repo] DEBUG ## Branches found:
2024-05-17 07:16:46,246 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-17 07:16:46,246 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:16:46,246 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:16:46,252 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-17 07:16:46,258 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-17 07:16:46,258 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-17 07:16:46,263 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-17 07:16:46,269 [ scc.git] DEBUG Already up to date.
2024-05-17 07:16:46,269 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-05-17 07:16:46,666 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-05-17 07:16:46,666 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-05-17 07:16:46,670 [ scc.git] DEBUG ## Unique users: []
2024-05-17 07:16:46,670 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:16:46,671 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:16:46,676 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-05-17 07:16:46,681 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:16:46,686 [ 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-17 07:16:46,697 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-17 07:16:46,702 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-05-17 07:16:46,702 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-05-17 07:16:46,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:16:46,861 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-17 07:16:46,903 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:16:46,903 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:16:46,910 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-17 07:16:46,955 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-17 07:16:46,963 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a5ebff9d0> has no local changes
2024-05-17 07:16:46,964 [ 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#68 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/)'
2024-05-17 07:16:46,974 [ scc.git] DEBUG [detached HEAD 8d80649] merge master -Dorg -Ssuccess-only
2024-05-17 07:16:46,974 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:16:46,975 [ scc.repo] DEBUG ## PRs found:
2024-05-17 07:16:47,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-05-17 07:16:47,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-05-17 07:16:48,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-05-17 07:16:48,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-17 07:16:49,312 [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-17 07:16:49,781 [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-17 07:16:50,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-05-17 07:16:50,726 [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-17 07:16:50,727 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-17 07:16:51,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469 HTTP/1.1" 200 None
2024-05-17 07:16:51,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469/comments HTTP/1.1" 200 None
2024-05-17 07:16:52,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/0eaee155506e5851ccebed9a01799cf86ebb9f63 HTTP/1.1" 200 None
2024-05-17 07:16:52,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/0eaee155506e5851ccebed9a01799cf86ebb9f63/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-17 07:16:53,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/0eaee155506e5851ccebed9a01799cf86ebb9f63/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-17 07:16:53,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/0eaee155506e5851ccebed9a01799cf86ebb9f63 HTTP/1.1" 200 None
2024-05-17 07:16:54,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/0eaee155506e5851ccebed9a01799cf86ebb9f63?per_page=1 HTTP/1.1" 200 2
2024-05-17 07:16:54,040 [ scc.repo] DEBUG - PR 469 will-moore 'changelog 0.14.0'
2024-05-17 07:16:54,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-05-17 07:16:55,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-05-17 07:16:55,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-05-17 07:16:56,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-17 07:16:56,484 [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-17 07:16:56,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-05-17 07:16:57,406 [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-17 07:16:57,406 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-05-17 07:16:57,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-05-17 07:16:58,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-05-17 07:16:58,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-17 07:16:59,328 [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-17 07:16:59,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-05-17 07:17:00,262 [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-17 07:17:00,262 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-05-17 07:17:00,263 [ scc.repo] DEBUG ## Branches found:
2024-05-17 07:17:00,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-17 07:17:00,263 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:00,263 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:00,271 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-17 07:17:00,277 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-17 07:17:00,277 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-17 07:17:00,283 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-17 07:17:00,289 [ scc.git] DEBUG Already up to date.
2024-05-17 07:17:00,290 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-05-17 07:17:00,810 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-17 07:17:00,810 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-05-17 07:17:00,816 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-05-17 07:17:01,784 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-17 07:17:01,784 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-05-17 07:17:01,790 [ scc.git] DEBUG Calling 'git fetch origin pull/469/head'
2024-05-17 07:17:02,225 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-17 07:17:02,225 [ scc.git] DEBUG * branch refs/pull/469/head -> FETCH_HEAD
2024-05-17 07:17:02,234 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-05-17 07:17:02,747 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-05-17 07:17:02,747 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-05-17 07:17:02,756 [ scc.git] DEBUG ## Unique users: []
2024-05-17 07:17:02,756 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:02,756 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:02,766 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-17 07:17:02,777 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:02,788 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-05-17 07:17:02,847 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-05-17 07:17:02,848 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-17 07:17:02,853 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-05-17 07:17:02,853 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-05-17 07:17:02,853 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-05-17 07:17:03,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:17:03,022 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-05-17 07:17:03,032 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:03,039 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-05-17 07:17:03,157 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-05-17 07:17:03,157 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-05-17 07:17:03,157 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-05-17 07:17:03,158 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-05-17 07:17:03,158 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-17 07:17:03,163 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-05-17 07:17:03,163 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-05-17 07:17:03,163 [ scc.git] DEBUG src/app/header.html | 5 +
2024-05-17 07:17:03,163 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-05-17 07:17:03,163 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-05-17 07:17:03,163 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-05-17 07:17:03,163 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-05-17 07:17:03,163 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-05-17 07:17:03,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:17:03,429 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0eaee155506e5851ccebed9a01799cf86ebb9f63'
2024-05-17 07:17:03,438 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:03,445 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 469 (changelog 0.14.0) 0eaee155506e5851ccebed9a01799cf86ebb9f63'
2024-05-17 07:17:03,500 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-17 07:17:03,503 [ scc.git] DEBUG CHANGELOG.md | 9 ++++++++-
2024-05-17 07:17:03,503 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-05-17 07:17:03,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:17:03,839 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-17 07:17:03,846 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:03,852 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-05-17 07:17:03,895 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-05-17 07:17:03,896 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-17 07:17:03,899 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-05-17 07:17:03,899 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-05-17 07:17:03,899 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-05-17 07:17:04,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:17:04,275 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-17 07:17:04,328 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:04,329 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:04,337 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-17 07:17:04,391 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-17 07:17:04,401 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a5c39b5b0> has no local changes
2024-05-17 07:17:04,402 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 469 will-moore 'changelog 0.14.0'
- PR 471 will-moore 'Z projection disabled tooltip'
Generated by OMERO-plugins-push#68 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/)'
2024-05-17 07:17:04,414 [ scc.git] DEBUG [detached HEAD f574382] merge master -Dorg -Ssuccess-only
2024-05-17 07:17:04,414 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:17:04,415 [ scc.repo] DEBUG ## PRs found:
2024-05-17 07:17:04,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-05-17 07:17:05,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-05-17 07:17:05,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-05-17 07:17:06,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-17 07:17:06,843 [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-17 07:17:07,320 [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-17 07:17:07,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-05-17 07:17:08,257 [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-17 07:17:08,258 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-05-17 07:17:08,259 [ scc.repo] DEBUG ## Branches found:
2024-05-17 07:17:08,259 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-17 07:17:08,259 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:08,259 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:08,269 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-17 07:17:08,291 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-17 07:17:08,292 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-17 07:17:08,301 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-17 07:17:08,310 [ scc.git] DEBUG Already up to date.
2024-05-17 07:17:08,310 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-05-17 07:17:08,737 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-05-17 07:17:08,737 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-05-17 07:17:08,742 [ scc.git] DEBUG ## Unique users: []
2024-05-17 07:17:08,743 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:08,743 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:08,753 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-17 07:17:08,762 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:08,770 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-05-17 07:17:08,785 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-17 07:17:08,790 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-05-17 07:17:08,790 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-05-17 07:17:08,790 [ scc.git] DEBUG requirements.txt | 2 +-
2024-05-17 07:17:08,790 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-05-17 07:17:08,790 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-05-17 07:17:08,790 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-05-17 07:17:09,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:17:09,050 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-17 07:17:09,175 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:09,175 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:09,189 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-17 07:17:09,263 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-17 07:17:09,276 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a5ebfb550> has no local changes
2024-05-17 07:17:09,277 [ 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#68 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/)'
2024-05-17 07:17:09,294 [ scc.git] DEBUG [detached HEAD 3a42381] merge master -Dorg -Ssuccess-only
2024-05-17 07:17:09,294 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:17:09,295 [ scc.repo] DEBUG ## PRs found:
2024-05-17 07:17:09,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-05-17 07:17:10,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-05-17 07:17:10,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-05-17 07:17:11,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-17 07:17:11,661 [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-17 07:17:12,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-05-17 07:17:12,600 [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-17 07:17:12,601 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-17 07:17:13,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-05-17 07:17:13,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-05-17 07:17:14,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-17 07:17:14,523 [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-17 07:17:14,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-05-17 07:17:15,404 [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-17 07:17:15,406 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-17 07:17:15,406 [ scc.repo] DEBUG ## Branches found:
2024-05-17 07:17:15,406 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-17 07:17:15,406 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:15,406 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:15,418 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-17 07:17:15,426 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-17 07:17:15,427 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-17 07:17:15,435 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-17 07:17:15,444 [ scc.git] DEBUG Already up to date.
2024-05-17 07:17:15,444 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-05-17 07:17:15,943 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-17 07:17:15,943 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-05-17 07:17:15,953 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-05-17 07:17:16,596 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-05-17 07:17:16,596 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-05-17 07:17:16,602 [ scc.git] DEBUG ## Unique users: []
2024-05-17 07:17:16,602 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:16,603 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:16,618 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-17 07:17:16,632 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:16,644 [ 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-17 07:17:16,724 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-05-17 07:17:16,725 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-05-17 07:17:16,725 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-17 07:17:16,725 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-17 07:17:16,725 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-17 07:17:16,726 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-17 07:17:16,736 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-17 07:17:16,746 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-17 07:17:16,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:17:16,904 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-05-17 07:17:16,915 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-17 07:17:16,924 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#68](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-05-17 07:17:16,931 [ scc.config] DEBUG Found github.token
2024-05-17 07:17:16,932 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-05-17 07:17:16,932 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-17 07:17:16,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:16,953 [ 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-17 07:17:17,001 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-05-17 07:17:17,001 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-05-17 07:17:17,001 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-05-17 07:17:17,001 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-17 07:17:17,001 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-17 07:17:17,009 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-17 07:17:17,020 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-05-17 07:17:17,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:17:17,304 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-05-17 07:17:17,314 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-05-17 07:17:17,321 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#68](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/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-17 07:17:17,328 [ scc.config] DEBUG Found github.token
2024-05-17 07:17:17,329 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-05-17 07:17:17,329 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-17 07:17:17,373 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:17,374 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:17,379 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-17 07:17:17,421 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-17 07:17:17,429 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a5c39b550> has no local changes
2024-05-17 07:17:17,429 [ 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#68 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/)'
2024-05-17 07:17:17,440 [ scc.git] DEBUG [detached HEAD 6069aa6] merge master -Dorg -Ssuccess-only
2024-05-17 07:17:17,440 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:17:17,440 [ scc.repo] DEBUG ## PRs found:
2024-05-17 07:17:17,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-05-17 07:17:18,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-05-17 07:17:18,366 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-17 07:17:18,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-17 07:17:19,507 [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-17 07:17:20,062 [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-17 07:17:20,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-05-17 07:17:21,010 [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-17 07:17:21,012 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-17 07:17:21,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-05-17 07:17:21,467 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-17 07:17:22,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-17 07:17:22,590 [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-17 07:17:23,090 [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-17 07:17:23,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-05-17 07:17:23,965 [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-17 07:17:23,966 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-17 07:17:24,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-05-17 07:17:24,448 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-17 07:17:24,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-17 07:17:25,502 [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-17 07:17:26,019 [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-17 07:17:26,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-05-17 07:17:27,026 [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-17 07:17:27,027 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-17 07:17:27,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-05-17 07:17:27,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-05-17 07:17:28,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-05-17 07:17:28,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-05-17 07:17:29,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-05-17 07:17:29,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-05-17 07:17:29,932 [ scc.repo] DEBUG ## Branches found:
2024-05-17 07:17:29,932 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-17 07:17:29,932 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:29,932 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:29,941 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-17 07:17:29,952 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-17 07:17:29,953 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-17 07:17:29,960 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-17 07:17:29,968 [ scc.git] DEBUG Already up to date.
2024-05-17 07:17:29,969 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-05-17 07:17:30,346 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-17 07:17:30,346 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-05-17 07:17:30,352 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-05-17 07:17:30,735 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-17 07:17:30,735 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-05-17 07:17:30,740 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-05-17 07:17:31,139 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-05-17 07:17:31,139 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-05-17 07:17:31,146 [ scc.git] DEBUG ## Unique users: []
2024-05-17 07:17:31,146 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:31,146 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:31,154 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-05-17 07:17:31,162 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:31,170 [ 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-17 07:17:31,184 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-17 07:17:31,186 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-05-17 07:17:31,186 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-05-17 07:17:31,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:17:31,348 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-05-17 07:17:31,355 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:31,363 [ 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-17 07:17:31,416 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-17 07:17:31,416 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-17 07:17:31,419 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-05-17 07:17:31,420 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-05-17 07:17:31,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:17:31,765 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-05-17 07:17:31,772 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:31,778 [ 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-17 07:17:31,806 [ scc.git] DEBUG Auto-merging package-lock.json
2024-05-17 07:17:31,807 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-17 07:17:31,810 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-05-17 07:17:31,810 [ scc.git] DEBUG package.json | 2 +-
2024-05-17 07:17:31,810 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-05-17 07:17:32,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:17:32,190 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-17 07:17:32,255 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:32,255 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:32,262 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-17 07:17:32,302 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-17 07:17:32,310 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a5ebeafd0> has no local changes
2024-05-17 07:17:32,310 [ 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#68 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/)'
2024-05-17 07:17:32,319 [ scc.git] DEBUG [detached HEAD a4d79f3] merge master -Dorg -Ssuccess-only
2024-05-17 07:17:32,319 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:17:32,320 [ scc.repo] DEBUG ## PRs found:
2024-05-17 07:17:32,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-05-17 07:17:33,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-05-17 07:17:33,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-17 07:17:34,158 [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-17 07:17:34,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-05-17 07:17:35,097 [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-17 07:17:35,098 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-05-17 07:17:35,098 [ scc.repo] DEBUG ## Branches found:
2024-05-17 07:17:35,098 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-17 07:17:35,098 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:35,099 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:35,106 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-17 07:17:35,113 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-17 07:17:35,113 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-17 07:17:35,122 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-17 07:17:35,129 [ scc.git] DEBUG Already up to date.
2024-05-17 07:17:35,130 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-17 07:17:35,508 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-05-17 07:17:35,508 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-17 07:17:35,512 [ scc.git] DEBUG ## Unique users: []
2024-05-17 07:17:35,512 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:35,512 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:35,519 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-17 07:17:35,525 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:35,531 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-05-17 07:17:35,540 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-17 07:17:35,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:17:35,709 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-17 07:17:35,753 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:35,754 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:35,759 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-17 07:17:35,802 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-17 07:17:35,810 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a5c364340> has no local changes
2024-05-17 07:17:35,810 [ 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#68 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/)'
2024-05-17 07:17:35,819 [ scc.git] DEBUG [detached HEAD 2807d7f] merge master -Dorg -Ssuccess-only
2024-05-17 07:17:35,820 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:17:35,820 [ scc.repo] DEBUG ## PRs found:
2024-05-17 07:17:36,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-05-17 07:17:36,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-05-17 07:17:37,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-05-17 07:17:37,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-05-17 07:17:38,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-17 07:17:38,586 [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-17 07:17:39,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-05-17 07:17:39,515 [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-17 07:17:39,516 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-17 07:17:39,517 [ scc.repo] DEBUG ## Branches found:
2024-05-17 07:17:39,517 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-17 07:17:39,517 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:39,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:39,525 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-17 07:17:39,531 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-17 07:17:39,531 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-17 07:17:39,536 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-17 07:17:39,542 [ scc.git] DEBUG Already up to date.
2024-05-17 07:17:39,542 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-05-17 07:17:39,985 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-05-17 07:17:39,985 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-05-17 07:17:39,990 [ scc.git] DEBUG ## Unique users: []
2024-05-17 07:17:39,990 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:39,990 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:39,996 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-05-17 07:17:40,004 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:40,010 [ 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-17 07:17:40,021 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-05-17 07:17:40,022 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-17 07:17:40,024 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-05-17 07:17:40,024 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-05-17 07:17:40,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:17:40,186 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-17 07:17:40,230 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:40,230 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:40,236 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-17 07:17:40,276 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-17 07:17:40,284 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a5c3a75b0> has no local changes
2024-05-17 07:17:40,284 [ 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#68 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/)'
2024-05-17 07:17:40,294 [ scc.git] DEBUG [detached HEAD 046ecdd] merge master -Dorg -Ssuccess-only
2024-05-17 07:17:40,294 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:17:40,295 [ scc.repo] DEBUG ## PRs found:
2024-05-17 07:17:40,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-05-17 07:17:41,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-05-17 07:17:41,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-05-17 07:17:42,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-17 07:17:42,669 [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-17 07:17:43,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-05-17 07:17:43,620 [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-17 07:17:43,621 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-17 07:17:43,621 [ scc.repo] DEBUG ## Branches found:
2024-05-17 07:17:43,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-17 07:17:43,621 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:43,621 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:43,627 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-17 07:17:43,632 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-17 07:17:43,633 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-17 07:17:43,639 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-17 07:17:43,646 [ scc.git] DEBUG Already up to date.
2024-05-17 07:17:43,646 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-05-17 07:17:44,091 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-05-17 07:17:44,091 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-05-17 07:17:44,099 [ scc.git] DEBUG ## Unique users: []
2024-05-17 07:17:44,099 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:44,099 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:44,113 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-17 07:17:44,124 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:44,134 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-17 07:17:44,183 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-05-17 07:17:44,183 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-05-17 07:17:44,183 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-05-17 07:17:44,183 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-05-17 07:17:44,183 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-05-17 07:17:44,184 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-05-17 07:17:44,184 [ scc.git] DEBUG Auto-merging setup.py
2024-05-17 07:17:44,184 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-05-17 07:17:44,184 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-17 07:17:44,184 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-17 07:17:44,190 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-17 07:17:44,197 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-05-17 07:17:44,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:17:44,363 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-05-17 07:17:44,371 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-05-17 07:17:44,380 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#68](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/signup_settings.py
- omero_signup/views.py
- omero_signup/urls.py
--conflicts
2024-05-17 07:17:44,387 [ scc.config] DEBUG Found github.token
2024-05-17 07:17:44,388 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-05-17 07:17:44,388 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-17 07:17:44,431 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:44,431 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:44,437 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-17 07:17:44,477 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-17 07:17:44,484 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a5ebffe80> has no local changes
2024-05-17 07:17:44,484 [ 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#68 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/)'
2024-05-17 07:17:44,494 [ scc.git] DEBUG [detached HEAD f8379fe] merge master -Dorg -Ssuccess-only
2024-05-17 07:17:44,494 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:17:44,494 [ scc.repo] DEBUG ## PRs found:
2024-05-17 07:17:44,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-05-17 07:17:45,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-05-17 07:17:45,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-05-17 07:17:46,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-17 07:17:46,772 [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-17 07:17:47,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-05-17 07:17:47,678 [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-17 07:17:47,679 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-17 07:17:47,679 [ scc.repo] DEBUG ## Branches found:
2024-05-17 07:17:47,680 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-17 07:17:47,680 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:47,680 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:47,687 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-17 07:17:47,694 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-17 07:17:47,694 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-17 07:17:47,701 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-17 07:17:47,709 [ scc.git] DEBUG Already up to date.
2024-05-17 07:17:47,709 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-05-17 07:17:48,203 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-05-17 07:17:48,204 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-05-17 07:17:48,209 [ scc.git] DEBUG ## Unique users: []
2024-05-17 07:17:48,209 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:48,209 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:48,216 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-05-17 07:17:48,223 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:48,230 [ 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-17 07:17:48,255 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-17 07:17:48,259 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-05-17 07:17:48,259 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-05-17 07:17:48,259 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-05-17 07:17:48,259 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-05-17 07:17:48,259 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-05-17 07:17:48,259 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-05-17 07:17:48,259 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-05-17 07:17:48,259 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-05-17 07:17:48,259 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-05-17 07:17:48,259 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-05-17 07:17:48,259 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-05-17 07:17:48,261 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-05-17 07:17:48,261 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-05-17 07:17:48,261 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-05-17 07:17:48,261 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-05-17 07:17:48,262 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-05-17 07:17:48,262 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-05-17 07:17:48,262 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-05-17 07:17:48,262 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-05-17 07:17:48,262 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-05-17 07:17:48,262 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-05-17 07:17:48,262 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-05-17 07:17:48,262 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-05-17 07:17:48,262 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-05-17 07:17:48,262 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-05-17 07:17:48,262 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-05-17 07:17:48,262 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-05-17 07:17:48,262 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-05-17 07:17:48,262 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-05-17 07:17:48,262 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-05-17 07:17:48,262 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-05-17 07:17:48,262 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-05-17 07:17:48,262 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-05-17 07:17:48,262 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-05-17 07:17:48,262 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-05-17 07:17:48,262 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-05-17 07:17:48,262 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-05-17 07:17:48,262 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-05-17 07:17:48,262 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-05-17 07:17:48,262 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-05-17 07:17:48,262 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-05-17 07:17:48,262 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-05-17 07:17:48,263 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-05-17 07:17:48,263 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-05-17 07:17:48,263 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-05-17 07:17:48,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:17:48,432 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-17 07:17:48,477 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:48,477 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:48,483 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-17 07:17:48,528 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-17 07:17:48,536 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a5ebeadf0> has no local changes
2024-05-17 07:17:48,537 [ 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#68 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/)'
2024-05-17 07:17:48,551 [ scc.git] DEBUG [detached HEAD 1f5e404] merge master -Dorg -Ssuccess-only
2024-05-17 07:17:48,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:17:48,551 [ scc.repo] DEBUG ## PRs found:
2024-05-17 07:17:48,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-05-17 07:17:48,887 [ scc.repo] DEBUG ## Branches found:
2024-05-17 07:17:48,887 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-17 07:17:48,887 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:48,887 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:48,893 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-17 07:17:48,898 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-17 07:17:48,899 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-17 07:17:48,904 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-17 07:17:48,910 [ scc.git] DEBUG Already up to date.
2024-05-17 07:17:48,911 [ scc.git] DEBUG ## Unique users: []
2024-05-17 07:17:48,911 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:48,911 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:48,916 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-17 07:17:48,958 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:48,958 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:48,964 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-17 07:17:49,005 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-17 07:17:49,013 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a5c3b8fa0> has no local changes
2024-05-17 07:17:49,013 [ 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#68 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/)'
2024-05-17 07:17:49,023 [ scc.git] DEBUG [detached HEAD dcef776] merge master -Dorg -Ssuccess-only
2024-05-17 07:17:49,023 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:17:49,023 [ scc.repo] DEBUG ## PRs found:
2024-05-17 07:17:49,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-05-17 07:17:49,330 [ scc.repo] DEBUG ## Branches found:
2024-05-17 07:17:49,330 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-17 07:17:49,330 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:49,330 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:49,338 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-17 07:17:49,346 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-17 07:17:49,346 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-17 07:17:49,353 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-17 07:17:49,363 [ scc.git] DEBUG Already up to date.
2024-05-17 07:17:49,364 [ scc.git] DEBUG ## Unique users: []
2024-05-17 07:17:49,364 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:49,364 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:49,371 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-17 07:17:49,418 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:49,419 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:49,428 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-17 07:17:49,487 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-17 07:17:49,498 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a5c359f70> has no local changes
2024-05-17 07:17:49,499 [ 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#68 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/)'
2024-05-17 07:17:49,509 [ scc.git] DEBUG [detached HEAD f273498] merge master -Dorg -Ssuccess-only
2024-05-17 07:17:49,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:17:49,510 [ scc.git] INFO Overriding base-branch from master to main
2024-05-17 07:17:49,510 [ scc.repo] DEBUG ## PRs found:
2024-05-17 07:17:49,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-05-17 07:17:50,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-05-17 07:17:50,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-05-17 07:17:51,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-05-17 07:17:51,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-17 07:17:52,330 [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-17 07:17:52,809 [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-17 07:17:53,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-05-17 07:17:53,732 [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-17 07:17:53,733 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-17 07:17:53,733 [ scc.repo] DEBUG ## Branches found:
2024-05-17 07:17:53,734 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-17 07:17:53,734 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:53,734 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:53,741 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-05-17 07:17:53,748 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-17 07:17:53,748 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-05-17 07:17:53,756 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-05-17 07:17:53,762 [ scc.git] DEBUG Already up to date.
2024-05-17 07:17:53,763 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-05-17 07:17:54,233 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-05-17 07:17:54,233 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-05-17 07:17:54,238 [ scc.git] DEBUG ## Unique users: []
2024-05-17 07:17:54,238 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:54,238 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:54,244 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-17 07:17:54,249 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:54,254 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-17 07:17:54,279 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-05-17 07:17:54,280 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-05-17 07:17:54,280 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-17 07:17:54,280 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-17 07:17:54,288 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-17 07:17:54,295 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-05-17 07:17:54,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:17:54,463 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-05-17 07:17:54,471 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-05-17 07:17:54,478 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#68](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-05-17 07:17:54,484 [ scc.config] DEBUG Found github.token
2024-05-17 07:17:54,484 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-05-17 07:17:54,485 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-17 07:17:54,535 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:54,535 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:54,543 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-17 07:17:54,594 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-17 07:17:54,603 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a5c339430> has no local changes
2024-05-17 07:17:54,604 [ 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#68 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/)'
2024-05-17 07:17:54,617 [ scc.git] DEBUG [detached HEAD fa7bd4c] merge master -Dorg -Ssuccess-only
2024-05-17 07:17:54,617 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:17:54,618 [ scc.repo] DEBUG ## PRs found:
2024-05-17 07:17:54,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-05-17 07:17:54,895 [ scc.repo] DEBUG ## Branches found:
2024-05-17 07:17:54,895 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-17 07:17:54,895 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:54,895 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:54,901 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-17 07:17:54,906 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-17 07:17:54,906 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-17 07:17:54,912 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-17 07:17:54,918 [ scc.git] DEBUG Already up to date.
2024-05-17 07:17:54,918 [ scc.git] DEBUG ## Unique users: []
2024-05-17 07:17:54,918 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:54,918 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:54,924 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-17 07:17:54,964 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:54,965 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:54,971 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-17 07:17:55,010 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-17 07:17:55,016 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a5c373e50> has no local changes
2024-05-17 07:17:55,016 [ 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#68 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/)'
2024-05-17 07:17:55,025 [ scc.git] DEBUG [detached HEAD 37583ba] merge master -Dorg -Ssuccess-only
2024-05-17 07:17:55,025 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:17:55,026 [ scc.repo] DEBUG ## PRs found:
2024-05-17 07:17:55,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-05-17 07:17:55,331 [ scc.repo] DEBUG ## Branches found:
2024-05-17 07:17:55,331 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-17 07:17:55,331 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:55,331 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:55,341 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-17 07:17:55,352 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-17 07:17:55,352 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-17 07:17:55,363 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-17 07:17:55,375 [ scc.git] DEBUG Already up to date.
2024-05-17 07:17:55,375 [ scc.git] DEBUG ## Unique users: []
2024-05-17 07:17:55,375 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:55,375 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:55,386 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-17 07:17:55,457 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:55,457 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:55,468 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-17 07:17:55,518 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-17 07:17:55,528 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a5c286940> has no local changes
2024-05-17 07:17:55,528 [ 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#68 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/)'
2024-05-17 07:17:55,541 [ scc.git] DEBUG [detached HEAD de9b2d1] merge master -Dorg -Ssuccess-only
2024-05-17 07:17:55,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:17:55,541 [ scc.repo] DEBUG ## PRs found:
2024-05-17 07:17:55,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-05-17 07:17:56,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-05-17 07:17:56,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-05-17 07:17:57,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-17 07:17:57,764 [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-17 07:17:58,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-05-17 07:17:58,687 [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-17 07:17:58,688 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-05-17 07:17:58,689 [ scc.repo] DEBUG ## Branches found:
2024-05-17 07:17:58,689 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-17 07:17:58,689 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:58,689 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:58,699 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-17 07:17:58,709 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-17 07:17:58,710 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-17 07:17:58,720 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-17 07:17:58,730 [ scc.git] DEBUG Already up to date.
2024-05-17 07:17:58,732 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-05-17 07:17:59,174 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-05-17 07:17:59,174 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-05-17 07:17:59,179 [ scc.git] DEBUG ## Unique users: []
2024-05-17 07:17:59,180 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:59,180 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:59,188 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-17 07:17:59,196 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:59,203 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-17 07:17:59,245 [ scc.git] DEBUG Auto-merging Dockerfile
2024-05-17 07:17:59,245 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-05-17 07:17:59,245 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-17 07:17:59,246 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-17 07:17:59,255 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-17 07:17:59,264 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-05-17 07:17:59,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:17:59,425 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-05-17 07:17:59,433 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-05-17 07:17:59,446 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#68](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-05-17 07:17:59,459 [ scc.config] DEBUG Found github.token
2024-05-17 07:17:59,461 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-05-17 07:17:59,461 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-17 07:17:59,527 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:17:59,527 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:17:59,541 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-17 07:17:59,620 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-17 07:17:59,632 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a5c2cd9d0> has no local changes
2024-05-17 07:17:59,633 [ 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#68 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/)'
2024-05-17 07:17:59,650 [ scc.git] DEBUG [detached HEAD 6d7d2d5] merge master -Dorg -Ssuccess-only
2024-05-17 07:17:59,651 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:17:59,651 [ scc.git] INFO Overriding base-branch from master to develop
2024-05-17 07:17:59,651 [ scc.repo] DEBUG ## PRs found:
2024-05-17 07:18:00,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-05-17 07:18:00,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-05-17 07:18:01,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-05-17 07:18:01,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-05-17 07:18:01,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-05-17 07:18:02,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-05-17 07:18:02,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-05-17 07:18:03,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-17 07:18:03,935 [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-17 07:18:04,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-17 07:18:04,794 [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-17 07:18:04,795 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-17 07:18:05,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-05-17 07:18:05,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-05-17 07:18:06,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-05-17 07:18:06,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-05-17 07:18:06,835 [ scc.repo] DEBUG ## Branches found:
2024-05-17 07:18:06,836 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-17 07:18:06,836 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:18:06,836 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:18:06,842 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-05-17 07:18:06,848 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-17 07:18:06,848 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-05-17 07:18:06,854 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-05-17 07:18:06,861 [ scc.git] DEBUG Already up to date.
2024-05-17 07:18:06,861 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-05-17 07:18:07,314 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-05-17 07:18:07,314 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-05-17 07:18:07,318 [ scc.git] DEBUG ## Unique users: []
2024-05-17 07:18:07,319 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:18:07,319 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:18:07,325 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-17 07:18:07,333 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:18:07,339 [ 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-17 07:18:07,402 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-05-17 07:18:07,403 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-05-17 07:18:07,403 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-17 07:18:07,404 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-17 07:18:07,411 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-17 07:18:07,420 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-17 07:18:07,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:18:07,577 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-17 07:18:07,585 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-17 07:18:07,592 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#68](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-05-17 07:18:07,598 [ scc.config] DEBUG Found github.token
2024-05-17 07:18:07,599 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-05-17 07:18:07,599 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-17 07:18:07,639 [ scc.git] DEBUG Get sha1 of %s
2024-05-17 07:18:07,639 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-17 07:18:07,646 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-17 07:18:07,685 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-17 07:18:07,693 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a5c286bb0> has no local changes
2024-05-17 07:18:07,693 [ 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#68 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/)'
2024-05-17 07:18:07,703 [ scc.git] DEBUG [detached HEAD a8e767d] merge master -Dorg -Ssuccess-only
2024-05-17 07:18:07,703 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:18:07,703 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-17 07:18:07,778 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-05-17 07:18:08,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:18:08,079 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-05-17 07:18:08,084 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-05-17 07:18:08,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:18:08,522 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-05-17 07:18:08,529 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-05-17 07:18:08,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:18:08,926 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-05-17 07:18:08,933 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-05-17 07:18:09,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:18:09,354 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-05-17 07:18:09,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:18:09,747 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-05-17 07:18:09,754 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-05-17 07:18:10,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:18:10,159 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-05-17 07:18:10,164 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-05-17 07:18:10,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:18:10,567 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-05-17 07:18:10,573 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-05-17 07:18:10,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:18:11,003 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-05-17 07:18:11,008 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-05-17 07:18:11,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:18:11,425 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-05-17 07:18:11,432 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-05-17 07:18:11,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:18:11,842 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-05-17 07:18:11,849 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-05-17 07:18:12,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:18:12,276 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-05-17 07:18:12,284 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-05-17 07:18:12,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:18:12,692 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-05-17 07:18:12,700 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-05-17 07:18:13,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:18:13,132 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-05-17 07:18:13,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:18:13,547 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-05-17 07:18:13,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:18:13,940 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-05-17 07:18:13,945 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-05-17 07:18:14,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:18:14,357 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-05-17 07:18:14,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:18:14,765 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-05-17 07:18:15,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:18:15,169 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-05-17 07:18:15,174 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-05-17 07:18:15,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:18:15,590 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-05-17 07:18:15,598 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-05-17 07:18:15,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:18:15,987 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-05-17 07:18:15,994 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-05-17 07:18:16,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:18:16,403 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-05-17 07:18:16,413 [ scc.config] DEBUG Found submodule.scripts.url
2024-05-17 07:18:16,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-17 07:18:16,823 [ scc.config] DEBUG Found submodule.scripts.branch
2024-05-17 07:18:16,823 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-17 07:18:16,954 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3a5fd85ac0> has local changes
2024-05-17 07:18:16,954 [ 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'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 469 will-moore 'changelog 0.14.0'
- PR 471 will-moore 'Z projection disabled tooltip'
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#68 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/68/)'
2024-05-17 07:18:16,977 [ scc.git] DEBUG [detached HEAD 5be66a3] merge master -Dorg -Ssuccess-only
2024-05-17 07:18:16,978 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-05-17 07:18:16,980 [ scc.merge] INFO Repository: ome/omero-plugins
2024-05-17 07:18:16,980 [ scc.merge] INFO Already up to date.
2024-05-17 07:18:16,980 [ scc.merge] INFO
2024-05-17 07:18:16,980 [ scc.merge] INFO
2024-05-17 07:18:16,980 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-05-17 07:18:16,981 [ scc.merge] INFO Already up to date.
2024-05-17 07:18:16,981 [ scc.merge] INFO
2024-05-17 07:18:16,981 [ scc.merge] INFO
2024-05-17 07:18:16,981 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-05-17 07:18:16,981 [ scc.merge] INFO Excluded PRs:
2024-05-17 07:18:16,981 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-05-17 07:18:16,981 [ scc.merge] INFO Already up to date.
2024-05-17 07:18:16,981 [ scc.merge] INFO
2024-05-17 07:18:16,981 [ scc.merge] INFO Merged PRs:
2024-05-17 07:18:16,981 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-05-17 07:18:16,981 [ scc.merge] INFO
2024-05-17 07:18:16,981 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-05-17 07:18:16,981 [ scc.merge] INFO Excluded PRs:
2024-05-17 07:18:16,981 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-05-17 07:18:16,981 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-05-17 07:18:16,982 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-05-17 07:18:16,982 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-05-17 07:18:16,982 [ scc.merge] INFO Already up to date.
2024-05-17 07:18:16,982 [ scc.merge] INFO
2024-05-17 07:18:16,982 [ scc.merge] INFO Merged PRs:
2024-05-17 07:18:16,982 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-05-17 07:18:16,982 [ scc.merge] INFO
2024-05-17 07:18:16,982 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-05-17 07:18:16,982 [ scc.merge] INFO Excluded PRs:
2024-05-17 07:18:16,982 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-17 07:18:16,982 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-05-17 07:18:16,982 [ scc.merge] INFO Already up to date.
2024-05-17 07:18:16,982 [ scc.merge] INFO
2024-05-17 07:18:16,982 [ scc.merge] INFO Merged PRs:
2024-05-17 07:18:16,982 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-05-17 07:18:16,982 [ scc.merge] INFO
2024-05-17 07:18:16,982 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-17 07:18:16,982 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-05-17 07:18:16,982 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-05-17 07:18:16,983 [ scc.merge] INFO
2024-05-17 07:18:16,983 [ scc.merge] INFO Repository: ome/omero-figure
2024-05-17 07:18:16,983 [ scc.merge] INFO Excluded PRs:
2024-05-17 07:18:16,983 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes' (status: failure)
2024-05-17 07:18:16,983 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-05-17 07:18:16,983 [ scc.merge] INFO Already up to date.
2024-05-17 07:18:16,983 [ scc.merge] INFO
2024-05-17 07:18:16,983 [ scc.merge] INFO Merged PRs:
2024-05-17 07:18:16,983 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-05-17 07:18:16,983 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-05-17 07:18:16,983 [ scc.merge] INFO
2024-05-17 07:18:16,983 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-05-17 07:18:16,983 [ scc.merge] INFO Already up to date.
2024-05-17 07:18:16,983 [ scc.merge] INFO
2024-05-17 07:18:16,983 [ scc.merge] INFO Merged PRs:
2024-05-17 07:18:16,983 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-05-17 07:18:16,983 [ scc.merge] INFO
2024-05-17 07:18:16,983 [ scc.merge] INFO Repository: ome/omero-gallery
2024-05-17 07:18:16,983 [ scc.merge] INFO Already up to date.
2024-05-17 07:18:16,983 [ scc.merge] INFO
2024-05-17 07:18:16,984 [ scc.merge] INFO Merged PRs:
2024-05-17 07:18:16,984 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-05-17 07:18:16,984 [ scc.merge] INFO
2024-05-17 07:18:16,984 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-05-17 07:18:16,984 [ scc.merge] INFO Excluded PRs:
2024-05-17 07:18:16,984 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-05-17 07:18:16,984 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-05-17 07:18:16,984 [ scc.merge] INFO Already up to date.
2024-05-17 07:18:16,984 [ scc.merge] INFO
2024-05-17 07:18:16,984 [ scc.merge] INFO Merged PRs:
2024-05-17 07:18:16,984 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-05-17 07:18:16,984 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-05-17 07:18:16,984 [ scc.merge] INFO - PR 469 will-moore 'changelog 0.14.0'
2024-05-17 07:18:16,984 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-05-17 07:18:16,984 [ scc.merge] INFO
2024-05-17 07:18:16,984 [ scc.merge] INFO Repository: ome/omero-mapr
2024-05-17 07:18:16,984 [ scc.merge] INFO Excluded PRs:
2024-05-17 07:18:16,984 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-05-17 07:18:16,984 [ scc.merge] INFO Already up to date.
2024-05-17 07:18:16,984 [ scc.merge] INFO
2024-05-17 07:18:16,984 [ scc.merge] INFO Merged PRs:
2024-05-17 07:18:16,985 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-05-17 07:18:16,985 [ scc.merge] INFO
2024-05-17 07:18:16,985 [ scc.merge] INFO Repository: ome/omero-metadata
2024-05-17 07:18:16,985 [ scc.merge] INFO Already up to date.
2024-05-17 07:18:16,985 [ scc.merge] INFO
2024-05-17 07:18:16,985 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-17 07:18:16,985 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-05-17 07:18:16,985 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-05-17 07:18:16,985 [ scc.merge] INFO
2024-05-17 07:18:16,985 [ scc.merge] INFO Repository: ome/omero-parade
2024-05-17 07:18:16,985 [ scc.merge] INFO Excluded PRs:
2024-05-17 07:18:16,985 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-05-17 07:18:16,985 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-05-17 07:18:16,985 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-05-17 07:18:16,985 [ scc.merge] INFO Already up to date.
2024-05-17 07:18:16,985 [ scc.merge] INFO
2024-05-17 07:18:16,985 [ scc.merge] INFO Merged PRs:
2024-05-17 07:18:16,985 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-05-17 07:18:16,985 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-05-17 07:18:16,985 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-05-17 07:18:16,985 [ scc.merge] INFO
2024-05-17 07:18:16,985 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-05-17 07:18:16,985 [ scc.merge] INFO Already up to date.
2024-05-17 07:18:16,986 [ scc.merge] INFO
2024-05-17 07:18:16,986 [ scc.merge] INFO Merged PRs:
2024-05-17 07:18:16,986 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-05-17 07:18:16,986 [ scc.merge] INFO
2024-05-17 07:18:16,986 [ scc.merge] INFO Repository: ome/omero-rois
2024-05-17 07:18:16,986 [ scc.merge] INFO Excluded PRs:
2024-05-17 07:18:16,986 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-17 07:18:16,986 [ scc.merge] INFO Already up to date.
2024-05-17 07:18:16,986 [ scc.merge] INFO
2024-05-17 07:18:16,986 [ scc.merge] INFO Merged PRs:
2024-05-17 07:18:16,986 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-05-17 07:18:16,986 [ scc.merge] INFO
2024-05-17 07:18:16,986 [ scc.merge] INFO Repository: ome/omero-signup
2024-05-17 07:18:16,986 [ scc.merge] INFO Already up to date.
2024-05-17 07:18:16,986 [ scc.merge] INFO
2024-05-17 07:18:16,986 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-17 07:18:16,986 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-05-17 07:18:16,986 [ scc.merge] INFO
2024-05-17 07:18:16,986 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-05-17 07:18:16,986 [ scc.merge] INFO Already up to date.
2024-05-17 07:18:16,986 [ scc.merge] INFO
2024-05-17 07:18:16,986 [ scc.merge] INFO Merged PRs:
2024-05-17 07:18:16,986 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-05-17 07:18:16,987 [ scc.merge] INFO
2024-05-17 07:18:16,987 [ scc.merge] INFO Repository: ome/omero-upload
2024-05-17 07:18:16,987 [ scc.merge] INFO Already up to date.
2024-05-17 07:18:16,987 [ scc.merge] INFO
2024-05-17 07:18:16,987 [ scc.merge] INFO
2024-05-17 07:18:16,987 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-05-17 07:18:16,987 [ scc.merge] INFO Already up to date.
2024-05-17 07:18:16,987 [ scc.merge] INFO
2024-05-17 07:18:16,987 [ scc.merge] INFO
2024-05-17 07:18:16,987 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-05-17 07:18:16,987 [ scc.merge] INFO Excluded PRs:
2024-05-17 07:18:16,987 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-05-17 07:18:16,987 [ scc.merge] INFO Already up to date.
2024-05-17 07:18:16,987 [ scc.merge] INFO
2024-05-17 07:18:16,987 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-17 07:18:16,987 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-05-17 07:18:16,987 [ scc.merge] INFO
2024-05-17 07:18:16,987 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-05-17 07:18:16,987 [ scc.merge] INFO Already up to date.
2024-05-17 07:18:16,987 [ scc.merge] INFO
2024-05-17 07:18:16,987 [ scc.merge] INFO
2024-05-17 07:18:16,987 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-05-17 07:18:16,988 [ scc.merge] INFO Already up to date.
2024-05-17 07:18:16,988 [ scc.merge] INFO
2024-05-17 07:18:16,988 [ scc.merge] INFO
2024-05-17 07:18:16,988 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-05-17 07:18:16,988 [ scc.merge] INFO Already up to date.
2024-05-17 07:18:16,988 [ scc.merge] INFO
2024-05-17 07:18:16,988 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-17 07:18:16,988 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-05-17 07:18:16,988 [ scc.merge] INFO
2024-05-17 07:18:16,988 [ scc.merge] INFO Repository: ome/scripts
2024-05-17 07:18:16,988 [ scc.merge] INFO Excluded PRs:
2024-05-17 07:18:16,988 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-05-17 07:18:16,988 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-05-17 07:18:16,988 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-05-17 07:18:16,988 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-05-17 07:18:16,988 [ scc.merge] INFO Already up to date.
2024-05-17 07:18:16,988 [ scc.merge] INFO
2024-05-17 07:18:16,988 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-17 07:18:16,988 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-17 07:18:16,988 [ scc.merge] INFO
2024-05-17 07:18:16,989 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-17 07:18:16,989 [ scc.git] DEBUG Calling 'git remote'
2024-05-17 07:18:17,000 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-05-17 07:18:17,000 [ scc.git] DEBUG Calling 'git remote'
2024-05-17 07:18:17,010 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:18:17,010 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-05-17 07:18:17,010 [ scc.git] DEBUG Calling 'git remote'
2024-05-17 07:18:17,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:18:17,019 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-05-17 07:18:17,019 [ scc.git] DEBUG Calling 'git remote'
2024-05-17 07:18:17,028 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:18:17,029 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-05-17 07:18:17,029 [ scc.git] DEBUG Calling 'git remote'
2024-05-17 07:18:17,040 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:18:17,040 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-05-17 07:18:17,040 [ scc.git] DEBUG Calling 'git remote'
2024-05-17 07:18:17,050 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:18:17,050 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-05-17 07:18:17,051 [ scc.git] DEBUG Calling 'git remote'
2024-05-17 07:18:17,060 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:18:17,061 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-05-17 07:18:17,061 [ scc.git] DEBUG Calling 'git remote'
2024-05-17 07:18:17,070 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:18:17,070 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-05-17 07:18:17,070 [ scc.git] DEBUG Calling 'git remote'
2024-05-17 07:18:17,079 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:18:17,079 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-05-17 07:18:17,080 [ scc.git] DEBUG Calling 'git remote'
2024-05-17 07:18:17,089 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:18:17,090 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-05-17 07:18:17,090 [ scc.git] DEBUG Calling 'git remote'
2024-05-17 07:18:17,101 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:18:17,101 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-05-17 07:18:17,101 [ scc.git] DEBUG Calling 'git remote'
2024-05-17 07:18:17,110 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:18:17,111 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-05-17 07:18:17,111 [ scc.git] DEBUG Calling 'git remote'
2024-05-17 07:18:17,120 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:18:17,120 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-05-17 07:18:17,120 [ scc.git] DEBUG Calling 'git remote'
2024-05-17 07:18:17,135 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:18:17,135 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-05-17 07:18:17,136 [ scc.git] DEBUG Calling 'git remote'
2024-05-17 07:18:17,145 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:18:17,145 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-05-17 07:18:17,145 [ scc.git] DEBUG Calling 'git remote'
2024-05-17 07:18:17,156 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:18:17,156 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-05-17 07:18:17,156 [ scc.git] DEBUG Calling 'git remote'
2024-05-17 07:18:17,166 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:18:17,167 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-05-17 07:18:17,167 [ scc.git] DEBUG Calling 'git remote'
2024-05-17 07:18:17,175 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:18:17,175 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-05-17 07:18:17,175 [ scc.git] DEBUG Calling 'git remote'
2024-05-17 07:18:17,185 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:18:17,186 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-05-17 07:18:17,186 [ scc.git] DEBUG Calling 'git remote'
2024-05-17 07:18:17,196 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:18:17,196 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-05-17 07:18:17,196 [ scc.git] DEBUG Calling 'git remote'
2024-05-17 07:18:17,207 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:18:17,207 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-05-17 07:18:17,207 [ scc.git] DEBUG Calling 'git remote'
2024-05-17 07:18:17,218 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-05-17 07:18:17,219 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-05-17 07:18:17,219 [ scc.git] DEBUG Calling 'git remote'
2024-05-17 07:18:17,230 [ 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 5588d07] 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 227b023] 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-17 07:19:06,908 [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-17 07:19:16,049 [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-17 07:19:18,657 [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-17 07:19:23,248 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-05-17 07:20:10,985 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/d0200910/images/svgs/logo.svg){kind=logo}
