Console Output
Skipping 82 KB..
Full Log] DEBUG Not adding comment to issue #102, already --conflicts.
2024-06-09 00:43:48,206 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-06-09 00:43:48,213 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:43:48,218 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 123 (Support export of Fileset:ID) 553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-06-09 00:43:48,259 [ scc.git] DEBUG Auto-merging .isort.cfg
2024-06-09 00:43:48,259 [ scc.git] DEBUG CONFLICT (content): Merge conflict in .isort.cfg
2024-06-09 00:43:48,259 [ scc.git] DEBUG Auto-merging setup.py
2024-06-09 00:43:48,259 [ scc.git] DEBUG Auto-merging src/omero_zarr/cli.py
2024-06-09 00:43:48,259 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-06-09 00:43:48,259 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_zarr/raw_pixels.py
2024-06-09 00:43:48,259 [ scc.git] DEBUG Auto-merging src/omero_zarr/util.py
2024-06-09 00:43:48,259 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-09 00:43:48,259 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-09 00:43:48,265 [ scc.git] DEBUG Calling 'git reset --hard 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-09 00:43:48,272 [ scc.git] DEBUG HEAD is now at 2ca566b Merge pull request #160 from ome/pre-commit-ci-update-config
2024-06-09 00:43:48,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:43:48,594 [ scc.git] DEBUG Calling 'git merge-base 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473 553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-06-09 00:43:48,601 [ scc.git] DEBUG Calling 'git diff --name-only eff38d0408f9d50de13b28dfe09e4382965e203f..2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-09 00:43:48,607 [ scc.git] INFO - PR 123 will-moore 'Support export of Fileset:ID'
Conflicting PR. Removed from build [OMERO-plugins-push#90](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/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-06-09 00:43:48,611 [ scc.config] DEBUG Found github.token
2024-06-09 00:43:48,612 [ scc.git] DEBUG Not adding comment to issue #123, already --conflicts.
2024-06-09 00:43:48,612 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a14f62a940f4974a305b3f5858049ee493b898ef'
2024-06-09 00:43:48,618 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:43:48,623 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 147 (Name option) a14f62a940f4974a305b3f5858049ee493b898ef'
2024-06-09 00:43:48,637 [ scc.git] DEBUG Auto-merging src/omero_zarr/masks.py
2024-06-09 00:43:48,637 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-06-09 00:43:48,637 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-09 00:43:48,641 [ scc.git] DEBUG README.rst | 30 ++++++++++++++++++------------
2024-06-09 00:43:48,641 [ scc.git] DEBUG src/omero_zarr/cli.py | 9 +++++++++
2024-06-09 00:43:48,641 [ scc.git] DEBUG src/omero_zarr/masks.py | 4 ++--
2024-06-09 00:43:48,641 [ scc.git] DEBUG src/omero_zarr/raw_pixels.py | 28 +++++++++++++++++++++++-----
2024-06-09 00:43:48,641 [ scc.git] DEBUG src/omero_zarr/util.py | 2 +-
2024-06-09 00:43:48,641 [ scc.git] DEBUG 5 files changed, 53 insertions(+), 20 deletions(-)
2024-06-09 00:43:49,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:43:49,008 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-09 00:43:49,050 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:43:49,050 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:43:49,056 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-09 00:43:49,098 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-09 00:43:49,105 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7adcb4c970> has no local changes
2024-06-09 00:43:49,105 [ 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#90 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/)'
2024-06-09 00:43:49,115 [ scc.git] DEBUG [detached HEAD 38fad10] merge master -Dorg -Ssuccess-only
2024-06-09 00:43:49,117 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:43:49,117 [ scc.repo] DEBUG ## PRs found:
2024-06-09 00:43:49,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-06-09 00:43:49,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/563 HTTP/1.1" 200 None
2024-06-09 00:43:50,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/563/comments HTTP/1.1" 200 None
2024-06-09 00:43:50,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/acd328badf4723b6ad334eeff22205a726b61043 HTTP/1.1" 200 None
2024-06-09 00:43:51,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/acd328badf4723b6ad334eeff22205a726b61043/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-09 00:43:51,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/acd328badf4723b6ad334eeff22205a726b61043/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-09 00:43:52,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/acd328badf4723b6ad334eeff22205a726b61043 HTTP/1.1" 200 None
2024-06-09 00:43:52,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/acd328badf4723b6ad334eeff22205a726b61043?per_page=1 HTTP/1.1" 200 2
2024-06-09 00:43:52,849 [ scc.repo] DEBUG - PR 563 will-moore 'Use path instead of re_path for all URLs'
2024-06-09 00:43:53,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562 HTTP/1.1" 200 None
2024-06-09 00:43:53,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562/comments HTTP/1.1" 200 None
2024-06-09 00:43:54,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/5750e2b744e687c5064df1b3ee304bfe7b5e6573 HTTP/1.1" 200 None
2024-06-09 00:43:54,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/5750e2b744e687c5064df1b3ee304bfe7b5e6573/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-09 00:43:55,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/5750e2b744e687c5064df1b3ee304bfe7b5e6573/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-09 00:43:55,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/5750e2b744e687c5064df1b3ee304bfe7b5e6573 HTTP/1.1" 200 None
2024-06-09 00:43:56,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/5750e2b744e687c5064df1b3ee304bfe7b5e6573?per_page=1 HTTP/1.1" 200 2
2024-06-09 00:43:56,185 [ scc.repo] DEBUG - PR 562 will-moore 'Add changelog 7.0.0'
2024-06-09 00:43:56,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-06-09 00:43:57,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-06-09 00:43:57,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-09 00:43:58,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-09 00:43:58,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-09 00:43:59,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-09 00:43:59,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/3179811fd0a1d65e2dc5f56013cf92e086da24ab?per_page=1 HTTP/1.1" 200 2
2024-06-09 00:43:59,534 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-06-09 00:44:00,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-06-09 00:44:00,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-09 00:44:01,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-09 00:44:01,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-09 00:44:02,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-09 00:44:02,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24?per_page=1 HTTP/1.1" 200 2
2024-06-09 00:44:02,533 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-06-09 00:44:02,533 [ scc.repo] DEBUG ## Branches found:
2024-06-09 00:44:02,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-09 00:44:02,534 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:44:02,534 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:02,539 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-09 00:44:02,547 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-09 00:44:02,547 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-09 00:44:02,554 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-09 00:44:02,560 [ scc.git] DEBUG Already up to date.
2024-06-09 00:44:02,561 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-06-09 00:44:03,257 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-09 00:44:03,257 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-06-09 00:44:03,262 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-06-09 00:44:03,839 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-09 00:44:03,839 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-06-09 00:44:03,844 [ scc.git] DEBUG Calling 'git fetch origin pull/562/head'
2024-06-09 00:44:04,283 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-09 00:44:04,283 [ scc.git] DEBUG * branch refs/pull/562/head -> FETCH_HEAD
2024-06-09 00:44:04,288 [ scc.git] DEBUG Calling 'git fetch origin pull/563/head'
2024-06-09 00:44:04,730 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-09 00:44:04,730 [ scc.git] DEBUG * branch refs/pull/563/head -> FETCH_HEAD
2024-06-09 00:44:04,735 [ scc.git] DEBUG ## Unique users: []
2024-06-09 00:44:04,736 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:44:04,736 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:04,741 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-09 00:44:04,748 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:04,753 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-09 00:44:04,920 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-09 00:44:04,926 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-06-09 00:44:04,927 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-06-09 00:44:04,927 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-06-09 00:44:04,927 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-06-09 00:44:04,927 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-06-09 00:44:04,927 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-06-09 00:44:04,927 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-06-09 00:44:04,927 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-06-09 00:44:04,927 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-06-09 00:44:04,927 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-06-09 00:44:05,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:44:05,090 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-09 00:44:05,099 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:05,105 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-09 00:44:05,234 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-06-09 00:44:05,234 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-06-09 00:44:05,234 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-06-09 00:44:05,235 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-09 00:44:05,245 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-06-09 00:44:05,245 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-06-09 00:44:05,245 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-06-09 00:44:05,245 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-06-09 00:44:05,245 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-06-09 00:44:05,245 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-06-09 00:44:05,246 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-06-09 00:44:05,246 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-06-09 00:44:05,246 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-06-09 00:44:05,246 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-06-09 00:44:05,246 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-06-09 00:44:05,246 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-06-09 00:44:05,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:44:05,503 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5750e2b744e687c5064df1b3ee304bfe7b5e6573'
2024-06-09 00:44:05,513 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:05,519 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 562 (Add changelog 7.0.0) 5750e2b744e687c5064df1b3ee304bfe7b5e6573'
2024-06-09 00:44:05,569 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-09 00:44:05,573 [ scc.git] DEBUG CHANGELOG.md | 10 ++++++++++
2024-06-09 00:44:05,573 [ scc.git] DEBUG README.rst | 2 +-
2024-06-09 00:44:05,573 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 1 deletion(-)
2024-06-09 00:44:05,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:44:05,913 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...acd328badf4723b6ad334eeff22205a726b61043'
2024-06-09 00:44:05,921 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:05,929 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 563 (Use path instead of re_path for all URLs) acd328badf4723b6ad334eeff22205a726b61043'
2024-06-09 00:44:05,948 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-09 00:44:05,951 [ scc.git] DEBUG omero_figure/urls.py | 68 +++++++++++++++++++++++++---------------------------
2024-06-09 00:44:05,952 [ scc.git] DEBUG 1 file changed, 32 insertions(+), 36 deletions(-)
2024-06-09 00:44:06,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:44:06,329 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-09 00:44:06,371 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:44:06,372 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:06,377 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-09 00:44:06,415 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-09 00:44:06,424 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7adcb07bb0> has no local changes
2024-06-09 00:44:06,424 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 560 will-moore 'Max projection bytes' (exclude comment)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 562 will-moore 'Add changelog 7.0.0'
- PR 563 will-moore 'Use path instead of re_path for all URLs'
Generated by OMERO-plugins-push#90 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/)'
2024-06-09 00:44:06,432 [ scc.git] DEBUG [detached HEAD 089a4e21] merge master -Dorg -Ssuccess-only
2024-06-09 00:44:06,433 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:44:06,433 [ scc.repo] DEBUG ## PRs found:
2024-06-09 00:44:06,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-06-09 00:44:07,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-06-09 00:44:07,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-06-09 00:44:08,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-09 00:44:08,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-09 00:44:09,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-09 00:44:09,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-06-09 00:44:09,676 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-06-09 00:44:09,676 [ scc.repo] DEBUG ## Branches found:
2024-06-09 00:44:09,676 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-09 00:44:09,677 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:44:09,677 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:09,682 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-09 00:44:09,687 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-09 00:44:09,688 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-09 00:44:09,696 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-09 00:44:09,703 [ scc.git] DEBUG Already up to date.
2024-06-09 00:44:09,704 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-06-09 00:44:10,128 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-06-09 00:44:10,128 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-06-09 00:44:10,132 [ scc.git] DEBUG ## Unique users: []
2024-06-09 00:44:10,133 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:44:10,133 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:10,139 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-09 00:44:10,144 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:10,149 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-09 00:44:10,191 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-06-09 00:44:10,192 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-09 00:44:10,195 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-06-09 00:44:10,195 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-06-09 00:44:10,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:44:10,356 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-09 00:44:10,398 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:44:10,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:10,404 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-09 00:44:10,447 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-09 00:44:10,454 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7adcb5ddf0> has no local changes
2024-06-09 00:44:10,454 [ 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#90 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/)'
2024-06-09 00:44:10,464 [ scc.git] DEBUG [detached HEAD 34ebb43] merge master -Dorg -Ssuccess-only
2024-06-09 00:44:10,464 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:44:10,464 [ scc.repo] DEBUG ## PRs found:
2024-06-09 00:44:10,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-06-09 00:44:11,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-06-09 00:44:11,328 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-09 00:44:11,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-09 00:44:12,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-09 00:44:12,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-09 00:44:13,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-09 00:44:13,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-06-09 00:44:13,908 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-09 00:44:13,908 [ scc.repo] DEBUG ## Branches found:
2024-06-09 00:44:13,909 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-09 00:44:13,909 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:44:13,909 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:13,914 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-09 00:44:13,920 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-09 00:44:13,920 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-09 00:44:13,925 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-09 00:44:13,933 [ scc.git] DEBUG Already up to date.
2024-06-09 00:44:13,933 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-06-09 00:44:14,339 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-06-09 00:44:14,339 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-06-09 00:44:14,343 [ scc.git] DEBUG ## Unique users: []
2024-06-09 00:44:14,343 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:44:14,344 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:14,349 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-06-09 00:44:14,353 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:14,358 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-06-09 00:44:14,368 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-09 00:44:14,372 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-06-09 00:44:14,372 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-06-09 00:44:14,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:44:14,523 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-09 00:44:14,560 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:44:14,560 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:14,565 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-09 00:44:14,600 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-09 00:44:14,607 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7adcb5d340> has no local changes
2024-06-09 00:44:14,607 [ 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#90 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/)'
2024-06-09 00:44:14,615 [ scc.git] DEBUG [detached HEAD d00e646] merge master -Dorg -Ssuccess-only
2024-06-09 00:44:14,616 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:44:14,616 [ scc.repo] DEBUG ## PRs found:
2024-06-09 00:44:15,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-06-09 00:44:15,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-06-09 00:44:16,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-06-09 00:44:16,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-09 00:44:17,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-09 00:44:17,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-09 00:44:18,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-09 00:44:18,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-06-09 00:44:18,467 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-09 00:44:18,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-06-09 00:44:19,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-06-09 00:44:19,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-09 00:44:20,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-09 00:44:20,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-09 00:44:21,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-09 00:44:21,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-06-09 00:44:21,885 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-06-09 00:44:22,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-06-09 00:44:22,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-06-09 00:44:23,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-09 00:44:23,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-09 00:44:24,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-09 00:44:24,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-06-09 00:44:24,718 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-06-09 00:44:24,718 [ scc.repo] DEBUG ## Branches found:
2024-06-09 00:44:24,718 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-09 00:44:24,719 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:44:24,719 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:24,725 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-09 00:44:24,730 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-09 00:44:24,730 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-09 00:44:24,737 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-09 00:44:24,743 [ scc.git] DEBUG Already up to date.
2024-06-09 00:44:24,743 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-06-09 00:44:25,272 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-09 00:44:25,272 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-06-09 00:44:25,278 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-06-09 00:44:26,227 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-09 00:44:26,227 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-06-09 00:44:26,232 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-06-09 00:44:26,673 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-09 00:44:26,674 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-06-09 00:44:26,679 [ scc.git] DEBUG ## Unique users: []
2024-06-09 00:44:26,679 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:44:26,679 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:26,685 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-09 00:44:26,692 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:26,697 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-09 00:44:26,770 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-06-09 00:44:26,779 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-09 00:44:26,784 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-06-09 00:44:26,784 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-06-09 00:44:26,784 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-06-09 00:44:26,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:44:26,944 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-09 00:44:26,952 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:26,958 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-09 00:44:27,082 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-06-09 00:44:27,082 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-06-09 00:44:27,082 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-06-09 00:44:27,082 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-06-09 00:44:27,082 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-09 00:44:27,088 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-06-09 00:44:27,088 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-06-09 00:44:27,088 [ scc.git] DEBUG src/app/header.html | 5 +
2024-06-09 00:44:27,088 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-06-09 00:44:27,088 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-06-09 00:44:27,088 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-06-09 00:44:27,088 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-06-09 00:44:27,088 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-06-09 00:44:27,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:44:27,384 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-09 00:44:27,392 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:27,397 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-09 00:44:27,450 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-06-09 00:44:27,451 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-09 00:44:27,454 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-06-09 00:44:27,454 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-06-09 00:44:27,455 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-06-09 00:44:27,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:44:27,791 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-09 00:44:27,834 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:44:27,834 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:27,839 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-09 00:44:27,888 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-09 00:44:27,896 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7adcb348e0> has no local changes
2024-06-09 00:44:27,896 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
Generated by OMERO-plugins-push#90 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/)'
2024-06-09 00:44:27,908 [ scc.git] DEBUG [detached HEAD 1362f15] merge master -Dorg -Ssuccess-only
2024-06-09 00:44:27,908 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:44:27,909 [ scc.repo] DEBUG ## PRs found:
2024-06-09 00:44:28,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-06-09 00:44:28,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-06-09 00:44:29,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-06-09 00:44:29,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-09 00:44:30,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-09 00:44:30,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-09 00:44:31,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-09 00:44:31,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-06-09 00:44:31,717 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-06-09 00:44:31,718 [ scc.repo] DEBUG ## Branches found:
2024-06-09 00:44:31,718 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-09 00:44:31,718 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:44:31,718 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:31,724 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-09 00:44:31,729 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-09 00:44:31,729 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-09 00:44:31,736 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-09 00:44:31,743 [ scc.git] DEBUG Already up to date.
2024-06-09 00:44:31,743 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-06-09 00:44:32,149 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-06-09 00:44:32,149 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-06-09 00:44:32,154 [ scc.git] DEBUG ## Unique users: []
2024-06-09 00:44:32,155 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:44:32,155 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:32,161 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-09 00:44:32,168 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:32,173 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-09 00:44:32,185 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-09 00:44:32,188 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-06-09 00:44:32,188 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-06-09 00:44:32,188 [ scc.git] DEBUG requirements.txt | 2 +-
2024-06-09 00:44:32,188 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-06-09 00:44:32,188 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-06-09 00:44:32,188 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-06-09 00:44:32,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:44:32,378 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-09 00:44:32,427 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:44:32,429 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:32,436 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-09 00:44:32,477 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-09 00:44:32,483 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7adc2d3bb0> has no local changes
2024-06-09 00:44:32,484 [ 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#90 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/)'
2024-06-09 00:44:32,492 [ scc.git] DEBUG [detached HEAD 390171f] merge master -Dorg -Ssuccess-only
2024-06-09 00:44:32,493 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:44:32,493 [ scc.repo] DEBUG ## PRs found:
2024-06-09 00:44:32,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-06-09 00:44:33,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-06-09 00:44:33,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-06-09 00:44:34,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-09 00:44:34,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-09 00:44:35,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-09 00:44:35,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-06-09 00:44:35,768 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-09 00:44:36,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-06-09 00:44:36,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-06-09 00:44:37,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-09 00:44:37,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-09 00:44:38,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-09 00:44:38,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-06-09 00:44:38,569 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-09 00:44:38,569 [ scc.repo] DEBUG ## Branches found:
2024-06-09 00:44:38,569 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-09 00:44:38,569 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:44:38,569 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:38,575 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-09 00:44:38,580 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-09 00:44:38,580 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-09 00:44:38,586 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-09 00:44:38,591 [ scc.git] DEBUG Already up to date.
2024-06-09 00:44:38,591 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-06-09 00:44:39,076 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-09 00:44:39,076 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-06-09 00:44:39,081 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-06-09 00:44:39,505 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-09 00:44:39,505 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-06-09 00:44:39,510 [ scc.git] DEBUG ## Unique users: []
2024-06-09 00:44:39,511 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:44:39,511 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:39,516 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-09 00:44:39,522 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:39,527 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-09 00:44:39,623 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-06-09 00:44:39,623 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-06-09 00:44:39,623 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-09 00:44:39,623 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-09 00:44:39,624 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-09 00:44:39,624 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-09 00:44:39,640 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-09 00:44:39,649 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-09 00:44:39,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:44:39,813 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-09 00:44:39,820 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-09 00:44:39,826 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#90](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-06-09 00:44:39,830 [ scc.config] DEBUG Found github.token
2024-06-09 00:44:39,830 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-06-09 00:44:39,830 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-09 00:44:39,836 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:39,840 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-09 00:44:39,896 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-09 00:44:39,897 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-09 00:44:39,897 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-06-09 00:44:39,897 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-09 00:44:39,897 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-09 00:44:39,903 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-09 00:44:39,910 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-09 00:44:40,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:44:40,243 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-09 00:44:40,250 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-09 00:44:40,254 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#90](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-06-09 00:44:40,259 [ scc.config] DEBUG Found github.token
2024-06-09 00:44:40,259 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-06-09 00:44:40,259 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-09 00:44:40,298 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:44:40,299 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:40,304 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-09 00:44:40,343 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-09 00:44:40,360 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7adcb1ff40> has no local changes
2024-06-09 00:44:40,360 [ 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#90 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/)'
2024-06-09 00:44:40,373 [ scc.git] DEBUG [detached HEAD e69da68] merge master -Dorg -Ssuccess-only
2024-06-09 00:44:40,373 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:44:40,374 [ scc.repo] DEBUG ## PRs found:
2024-06-09 00:44:40,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-06-09 00:44:41,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-06-09 00:44:41,292 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-09 00:44:41,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-09 00:44:42,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-09 00:44:42,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-09 00:44:43,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-09 00:44:43,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-06-09 00:44:43,704 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-09 00:44:44,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-06-09 00:44:44,177 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-09 00:44:44,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-09 00:44:45,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-09 00:44:45,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-09 00:44:46,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-09 00:44:46,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-06-09 00:44:46,576 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-09 00:44:47,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-06-09 00:44:47,046 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-09 00:44:47,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-09 00:44:48,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-09 00:44:48,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-09 00:44:49,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-09 00:44:49,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-06-09 00:44:49,566 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-09 00:44:50,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-06-09 00:44:50,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-06-09 00:44:50,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-06-09 00:44:51,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-06-09 00:44:51,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-06-09 00:44:52,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-06-09 00:44:52,363 [ scc.repo] DEBUG ## Branches found:
2024-06-09 00:44:52,364 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-09 00:44:52,364 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:44:52,364 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:52,370 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-09 00:44:52,375 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-09 00:44:52,375 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-09 00:44:52,381 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-09 00:44:52,387 [ scc.git] DEBUG Already up to date.
2024-06-09 00:44:52,387 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-06-09 00:44:52,765 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-09 00:44:52,765 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-06-09 00:44:52,771 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-06-09 00:44:53,152 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-09 00:44:53,153 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-06-09 00:44:53,159 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-06-09 00:44:53,555 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-09 00:44:53,555 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-06-09 00:44:53,560 [ scc.git] DEBUG ## Unique users: []
2024-06-09 00:44:53,560 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:44:53,560 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:53,566 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-06-09 00:44:53,573 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:53,578 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-06-09 00:44:53,589 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-09 00:44:53,592 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-06-09 00:44:53,592 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-06-09 00:44:53,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:44:53,757 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-06-09 00:44:53,765 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:53,771 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 129 (Bump @babel/traverse from 7.21.4 to 7.23.2) 733f52703019d4b6d7e375c121a25c107b64dbec'
2024-06-09 00:44:53,814 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-09 00:44:53,814 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-09 00:44:53,817 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-06-09 00:44:53,817 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-06-09 00:44:54,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:44:54,153 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-06-09 00:44:54,160 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:54,167 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (Bump axios from 1.3.5 to 1.6.0) a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-06-09 00:44:54,207 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-09 00:44:54,208 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-09 00:44:54,212 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-06-09 00:44:54,212 [ scc.git] DEBUG package.json | 2 +-
2024-06-09 00:44:54,212 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-06-09 00:44:54,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:44:54,551 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-09 00:44:54,594 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:44:54,595 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:54,600 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-09 00:44:54,645 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-09 00:44:54,653 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7adc28c640> has no local changes
2024-06-09 00:44:54,653 [ 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#90 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/)'
2024-06-09 00:44:54,664 [ scc.git] DEBUG [detached HEAD c9dbb75] merge master -Dorg -Ssuccess-only
2024-06-09 00:44:54,665 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:44:54,665 [ scc.repo] DEBUG ## PRs found:
2024-06-09 00:44:55,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-06-09 00:44:55,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-06-09 00:44:56,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-09 00:44:56,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-09 00:44:57,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-09 00:44:57,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-06-09 00:44:57,518 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-06-09 00:44:57,518 [ scc.repo] DEBUG ## Branches found:
2024-06-09 00:44:57,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-09 00:44:57,518 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:44:57,518 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:57,524 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-09 00:44:57,531 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-09 00:44:57,532 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-09 00:44:57,538 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-09 00:44:57,546 [ scc.git] DEBUG Already up to date.
2024-06-09 00:44:57,546 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-09 00:44:57,942 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-06-09 00:44:57,942 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-09 00:44:57,948 [ scc.git] DEBUG ## Unique users: []
2024-06-09 00:44:57,949 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:44:57,949 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:57,955 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-09 00:44:57,962 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:57,969 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-09 00:44:57,991 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-09 00:44:58,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:44:58,160 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-09 00:44:58,204 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:44:58,205 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:44:58,211 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-09 00:44:58,256 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-09 00:44:58,264 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7adcafdbe0> has no local changes
2024-06-09 00:44:58,264 [ 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#90 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/)'
2024-06-09 00:44:58,294 [ scc.git] DEBUG [detached HEAD 2805dbe] merge master -Dorg -Ssuccess-only
2024-06-09 00:44:58,295 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:44:58,295 [ scc.repo] DEBUG ## PRs found:
2024-06-09 00:44:58,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-06-09 00:44:59,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-06-09 00:44:59,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-06-09 00:45:00,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-06-09 00:45:00,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-09 00:45:01,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-09 00:45:01,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-09 00:45:01,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-06-09 00:45:01,995 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-09 00:45:01,996 [ scc.repo] DEBUG ## Branches found:
2024-06-09 00:45:01,996 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-09 00:45:01,996 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:01,996 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:02,002 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-09 00:45:02,008 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-09 00:45:02,008 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-09 00:45:02,014 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-09 00:45:02,021 [ scc.git] DEBUG Already up to date.
2024-06-09 00:45:02,021 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-06-09 00:45:02,543 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-06-09 00:45:02,543 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-06-09 00:45:02,548 [ scc.git] DEBUG ## Unique users: []
2024-06-09 00:45:02,548 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:02,548 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:02,555 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-06-09 00:45:02,561 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:02,566 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-06-09 00:45:02,575 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-06-09 00:45:02,576 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-09 00:45:02,578 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-06-09 00:45:02,581 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-06-09 00:45:02,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:45:02,752 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-09 00:45:02,792 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:02,792 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:02,798 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-09 00:45:02,841 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-09 00:45:02,848 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7adc241550> has no local changes
2024-06-09 00:45:02,848 [ 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#90 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/)'
2024-06-09 00:45:02,856 [ scc.git] DEBUG [detached HEAD 6217351] merge master -Dorg -Ssuccess-only
2024-06-09 00:45:02,857 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:02,857 [ scc.repo] DEBUG ## PRs found:
2024-06-09 00:45:03,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-06-09 00:45:03,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-06-09 00:45:04,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-06-09 00:45:04,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-09 00:45:05,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-09 00:45:05,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-09 00:45:06,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-06-09 00:45:06,206 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-09 00:45:06,206 [ scc.repo] DEBUG ## Branches found:
2024-06-09 00:45:06,206 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-09 00:45:06,207 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:06,207 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:06,213 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-09 00:45:06,219 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-09 00:45:06,219 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-09 00:45:06,226 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-09 00:45:06,233 [ scc.git] DEBUG Already up to date.
2024-06-09 00:45:06,233 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-09 00:45:06,658 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-06-09 00:45:06,658 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-09 00:45:06,663 [ scc.git] DEBUG ## Unique users: []
2024-06-09 00:45:06,663 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:06,663 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:06,669 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-09 00:45:06,678 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:06,684 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-09 00:45:06,726 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-06-09 00:45:06,726 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-06-09 00:45:06,726 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-06-09 00:45:06,726 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-06-09 00:45:06,726 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-06-09 00:45:06,726 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-06-09 00:45:06,726 [ scc.git] DEBUG Auto-merging setup.py
2024-06-09 00:45:06,726 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-06-09 00:45:06,727 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-09 00:45:06,727 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-09 00:45:06,733 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-09 00:45:06,739 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-06-09 00:45:06,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:45:06,886 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-09 00:45:06,893 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-09 00:45:06,899 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#90](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/views.py
- omero_signup/urls.py
- setup.py
--conflicts
2024-06-09 00:45:06,904 [ scc.config] DEBUG Found github.token
2024-06-09 00:45:06,905 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-06-09 00:45:06,905 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-09 00:45:06,944 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:06,944 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:06,949 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-09 00:45:06,990 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-09 00:45:06,997 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7adc2bef40> has no local changes
2024-06-09 00:45:06,997 [ 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#90 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/)'
2024-06-09 00:45:07,007 [ scc.git] DEBUG [detached HEAD 5eaba37] merge master -Dorg -Ssuccess-only
2024-06-09 00:45:07,008 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:07,008 [ scc.repo] DEBUG ## PRs found:
2024-06-09 00:45:07,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-06-09 00:45:07,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-06-09 00:45:08,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-06-09 00:45:08,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-09 00:45:09,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-09 00:45:09,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-09 00:45:10,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-06-09 00:45:10,167 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-09 00:45:10,167 [ scc.repo] DEBUG ## Branches found:
2024-06-09 00:45:10,167 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-09 00:45:10,167 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:10,167 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:10,174 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-09 00:45:10,180 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-09 00:45:10,180 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-09 00:45:10,187 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-09 00:45:10,194 [ scc.git] DEBUG Already up to date.
2024-06-09 00:45:10,194 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-06-09 00:45:10,681 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-06-09 00:45:10,682 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-06-09 00:45:10,687 [ scc.git] DEBUG ## Unique users: []
2024-06-09 00:45:10,687 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:10,687 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:10,694 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-06-09 00:45:10,702 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:10,708 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-06-09 00:45:10,735 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-09 00:45:10,739 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-06-09 00:45:10,739 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-06-09 00:45:10,739 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-06-09 00:45:10,739 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-06-09 00:45:10,739 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-06-09 00:45:10,739 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-06-09 00:45:10,739 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-06-09 00:45:10,739 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-06-09 00:45:10,739 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-06-09 00:45:10,739 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-06-09 00:45:10,739 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-06-09 00:45:10,739 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-06-09 00:45:10,739 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-06-09 00:45:10,739 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-06-09 00:45:10,739 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-06-09 00:45:10,739 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-06-09 00:45:10,739 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-06-09 00:45:10,742 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-06-09 00:45:10,742 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-06-09 00:45:10,742 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-06-09 00:45:10,742 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-06-09 00:45:10,742 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-06-09 00:45:10,742 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-06-09 00:45:10,742 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-06-09 00:45:10,742 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-06-09 00:45:10,742 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-06-09 00:45:10,743 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-06-09 00:45:10,743 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-06-09 00:45:10,743 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-06-09 00:45:10,743 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-06-09 00:45:10,743 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-06-09 00:45:10,743 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-06-09 00:45:10,743 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-06-09 00:45:10,743 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-06-09 00:45:10,743 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-06-09 00:45:10,743 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-06-09 00:45:10,743 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-06-09 00:45:10,743 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-06-09 00:45:10,743 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-06-09 00:45:10,743 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-06-09 00:45:10,743 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-06-09 00:45:10,743 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-06-09 00:45:10,743 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-06-09 00:45:10,743 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-06-09 00:45:10,743 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-06-09 00:45:10,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:45:10,958 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-09 00:45:10,998 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:10,999 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:11,005 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-09 00:45:11,045 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-09 00:45:11,053 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7adc241730> has no local changes
2024-06-09 00:45:11,053 [ 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#90 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/)'
2024-06-09 00:45:11,062 [ scc.git] DEBUG [detached HEAD 10fe649] merge master -Dorg -Ssuccess-only
2024-06-09 00:45:11,063 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:11,063 [ scc.repo] DEBUG ## PRs found:
2024-06-09 00:45:11,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-06-09 00:45:11,448 [ scc.repo] DEBUG ## Branches found:
2024-06-09 00:45:11,448 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-09 00:45:11,448 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:11,448 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:11,454 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-09 00:45:11,459 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-09 00:45:11,459 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-09 00:45:11,465 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-09 00:45:11,470 [ scc.git] DEBUG Already up to date.
2024-06-09 00:45:11,471 [ scc.git] DEBUG ## Unique users: []
2024-06-09 00:45:11,471 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:11,471 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:11,476 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-09 00:45:11,514 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:11,514 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:11,520 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-09 00:45:11,557 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-09 00:45:11,564 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7adc252b80> has no local changes
2024-06-09 00:45:11,564 [ 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#90 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/)'
2024-06-09 00:45:11,572 [ scc.git] DEBUG [detached HEAD 4e11c72] merge master -Dorg -Ssuccess-only
2024-06-09 00:45:11,573 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:11,573 [ scc.repo] DEBUG ## PRs found:
2024-06-09 00:45:11,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-06-09 00:45:11,910 [ scc.repo] DEBUG ## Branches found:
2024-06-09 00:45:11,910 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-09 00:45:11,911 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:11,911 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:11,917 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-09 00:45:11,922 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-09 00:45:11,922 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-09 00:45:11,929 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-09 00:45:11,937 [ scc.git] DEBUG Already up to date.
2024-06-09 00:45:11,937 [ scc.git] DEBUG ## Unique users: []
2024-06-09 00:45:11,937 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:11,937 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:11,943 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-09 00:45:11,990 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:11,991 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:11,998 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-09 00:45:12,043 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-09 00:45:12,051 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7adc28ad90> has no local changes
2024-06-09 00:45:12,051 [ 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#90 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/)'
2024-06-09 00:45:12,062 [ scc.git] DEBUG [detached HEAD 0f59c38] merge master -Dorg -Ssuccess-only
2024-06-09 00:45:12,062 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:12,062 [ scc.git] INFO Overriding base-branch from master to main
2024-06-09 00:45:12,063 [ scc.repo] DEBUG ## PRs found:
2024-06-09 00:45:12,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-06-09 00:45:12,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-06-09 00:45:13,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-06-09 00:45:13,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-06-09 00:45:14,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-09 00:45:14,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-09 00:45:15,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-09 00:45:15,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-09 00:45:16,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-06-09 00:45:16,130 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-09 00:45:16,130 [ scc.repo] DEBUG ## Branches found:
2024-06-09 00:45:16,130 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-09 00:45:16,130 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:16,130 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:16,136 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-06-09 00:45:16,141 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-09 00:45:16,141 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-06-09 00:45:16,147 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-06-09 00:45:16,152 [ scc.git] DEBUG Already up to date.
2024-06-09 00:45:16,153 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-06-09 00:45:16,661 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-06-09 00:45:16,661 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-06-09 00:45:16,666 [ scc.git] DEBUG ## Unique users: []
2024-06-09 00:45:16,666 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:16,666 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:16,672 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-09 00:45:16,678 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:16,684 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-09 00:45:16,712 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-06-09 00:45:16,712 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-06-09 00:45:16,712 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-09 00:45:16,713 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-09 00:45:16,719 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-09 00:45:16,728 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-06-09 00:45:16,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:45:16,886 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-09 00:45:16,893 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-09 00:45:16,899 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#90](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-06-09 00:45:16,905 [ scc.config] DEBUG Found github.token
2024-06-09 00:45:16,905 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-06-09 00:45:16,906 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-09 00:45:16,944 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:16,944 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:16,950 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-09 00:45:16,988 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-09 00:45:16,996 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7adc2876a0> has no local changes
2024-06-09 00:45:16,996 [ 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#90 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/)'
2024-06-09 00:45:17,006 [ scc.git] DEBUG [detached HEAD 26ab4b2] merge master -Dorg -Ssuccess-only
2024-06-09 00:45:17,007 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:17,007 [ scc.repo] DEBUG ## PRs found:
2024-06-09 00:45:17,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-06-09 00:45:17,337 [ scc.repo] DEBUG ## Branches found:
2024-06-09 00:45:17,337 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-09 00:45:17,337 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:17,337 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:17,343 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-09 00:45:17,348 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-09 00:45:17,348 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-09 00:45:17,354 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-09 00:45:17,359 [ scc.git] DEBUG Already up to date.
2024-06-09 00:45:17,359 [ scc.git] DEBUG ## Unique users: []
2024-06-09 00:45:17,359 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:17,360 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:17,365 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-09 00:45:17,403 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:17,403 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:17,409 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-09 00:45:17,446 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-09 00:45:17,452 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7adc257e80> has no local changes
2024-06-09 00:45:17,452 [ 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#90 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/)'
2024-06-09 00:45:17,461 [ scc.git] DEBUG [detached HEAD 0ae9dbc] merge master -Dorg -Ssuccess-only
2024-06-09 00:45:17,461 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:17,461 [ scc.repo] DEBUG ## PRs found:
2024-06-09 00:45:17,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-06-09 00:45:17,770 [ scc.repo] DEBUG ## Branches found:
2024-06-09 00:45:17,770 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-09 00:45:17,770 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:17,770 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:17,777 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-09 00:45:17,782 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-09 00:45:17,783 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-09 00:45:17,788 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-09 00:45:17,794 [ scc.git] DEBUG Already up to date.
2024-06-09 00:45:17,794 [ scc.git] DEBUG ## Unique users: []
2024-06-09 00:45:17,794 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:17,794 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:17,799 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-09 00:45:17,837 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:17,838 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:17,843 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-09 00:45:17,884 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-09 00:45:17,891 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7adc1bf400> has no local changes
2024-06-09 00:45:17,891 [ 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#90 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/)'
2024-06-09 00:45:17,899 [ scc.git] DEBUG [detached HEAD 103fb17] merge master -Dorg -Ssuccess-only
2024-06-09 00:45:17,900 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:17,900 [ scc.repo] DEBUG ## PRs found:
2024-06-09 00:45:18,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-06-09 00:45:18,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-06-09 00:45:19,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-06-09 00:45:19,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-09 00:45:20,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-09 00:45:20,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-09 00:45:21,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-06-09 00:45:21,058 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-06-09 00:45:21,058 [ scc.repo] DEBUG ## Branches found:
2024-06-09 00:45:21,058 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-09 00:45:21,058 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:21,059 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:21,064 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-09 00:45:21,069 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-09 00:45:21,069 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-09 00:45:21,075 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-09 00:45:21,080 [ scc.git] DEBUG Already up to date.
2024-06-09 00:45:21,081 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-06-09 00:45:21,481 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-06-09 00:45:21,481 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-06-09 00:45:21,486 [ scc.git] DEBUG ## Unique users: []
2024-06-09 00:45:21,486 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:21,486 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:21,491 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-09 00:45:21,498 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:21,502 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-09 00:45:21,538 [ scc.git] DEBUG Auto-merging Dockerfile
2024-06-09 00:45:21,538 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-06-09 00:45:21,538 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-09 00:45:21,539 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-09 00:45:21,546 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-09 00:45:21,555 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-06-09 00:45:21,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:45:21,720 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-09 00:45:21,726 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-09 00:45:21,732 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#90](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-06-09 00:45:21,736 [ scc.config] DEBUG Found github.token
2024-06-09 00:45:21,737 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-06-09 00:45:21,737 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-09 00:45:21,775 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:21,775 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:21,781 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-09 00:45:21,822 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-09 00:45:21,829 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7adc204b80> has no local changes
2024-06-09 00:45:21,830 [ 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#90 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/)'
2024-06-09 00:45:21,841 [ scc.git] DEBUG [detached HEAD 475acc9] merge master -Dorg -Ssuccess-only
2024-06-09 00:45:21,847 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:21,848 [ scc.git] INFO Overriding base-branch from master to develop
2024-06-09 00:45:21,848 [ scc.repo] DEBUG ## PRs found:
2024-06-09 00:45:22,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-06-09 00:45:22,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-06-09 00:45:23,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-06-09 00:45:23,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-06-09 00:45:24,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-06-09 00:45:24,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-06-09 00:45:25,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-06-09 00:45:25,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-09 00:45:26,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-09 00:45:26,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-09 00:45:26,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-06-09 00:45:26,957 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-09 00:45:27,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-06-09 00:45:27,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-06-09 00:45:28,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-06-09 00:45:28,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-06-09 00:45:28,913 [ scc.repo] DEBUG ## Branches found:
2024-06-09 00:45:28,913 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-09 00:45:28,913 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:28,913 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:28,919 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-06-09 00:45:28,927 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-09 00:45:28,927 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-06-09 00:45:28,934 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-06-09 00:45:28,940 [ scc.git] DEBUG Already up to date.
2024-06-09 00:45:28,940 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-06-09 00:45:29,399 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-06-09 00:45:29,400 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-06-09 00:45:29,404 [ scc.git] DEBUG ## Unique users: []
2024-06-09 00:45:29,404 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:29,404 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:29,411 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-09 00:45:29,419 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:29,425 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-09 00:45:29,505 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-06-09 00:45:29,505 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-06-09 00:45:29,505 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-09 00:45:29,506 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-09 00:45:29,514 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-09 00:45:29,524 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-06-09 00:45:29,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:45:29,687 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-09 00:45:29,696 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-09 00:45:29,704 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#90](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-06-09 00:45:29,711 [ scc.config] DEBUG Found github.token
2024-06-09 00:45:29,712 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-06-09 00:45:29,712 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-09 00:45:29,763 [ scc.git] DEBUG Get sha1 of %s
2024-06-09 00:45:29,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-09 00:45:29,776 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-09 00:45:29,829 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-09 00:45:29,837 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7adc208d60> has no local changes
2024-06-09 00:45:29,837 [ 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#90 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/)'
2024-06-09 00:45:29,849 [ scc.git] DEBUG [detached HEAD aa1a730] merge master -Dorg -Ssuccess-only
2024-06-09 00:45:29,850 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:29,850 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-09 00:45:29,942 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-06-09 00:45:30,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:45:30,116 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-06-09 00:45:30,124 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-06-09 00:45:30,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:45:30,543 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-06-09 00:45:30,553 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-06-09 00:45:30,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:45:30,951 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-06-09 00:45:30,959 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-06-09 00:45:31,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:45:31,359 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-06-09 00:45:31,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:45:31,765 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-06-09 00:45:31,774 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-06-09 00:45:32,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:45:32,179 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-06-09 00:45:32,189 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-06-09 00:45:32,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:45:32,601 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-06-09 00:45:32,609 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-06-09 00:45:32,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:45:33,011 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-06-09 00:45:33,019 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-06-09 00:45:33,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:45:33,430 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-06-09 00:45:33,438 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-06-09 00:45:33,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:45:33,823 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-06-09 00:45:33,829 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-06-09 00:45:34,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:45:34,228 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-06-09 00:45:34,235 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-06-09 00:45:34,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:45:34,656 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-06-09 00:45:34,664 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-06-09 00:45:35,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:45:35,074 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-06-09 00:45:35,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:45:35,485 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-06-09 00:45:35,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:45:35,895 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-06-09 00:45:35,901 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-06-09 00:45:36,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:45:36,317 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-06-09 00:45:36,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:45:36,730 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-06-09 00:45:37,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:45:37,132 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-06-09 00:45:37,138 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-06-09 00:45:37,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:45:37,544 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-06-09 00:45:37,549 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-06-09 00:45:37,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:45:37,943 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-06-09 00:45:37,949 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-06-09 00:45:38,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:45:38,359 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-06-09 00:45:38,364 [ scc.config] DEBUG Found submodule.scripts.url
2024-06-09 00:45:38,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-09 00:45:38,778 [ scc.config] DEBUG Found submodule.scripts.branch
2024-06-09 00:45:38,778 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-09 00:45:38,865 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7addc5d2e0> has local changes
2024-06-09 00:45:38,865 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 373 dependabot[bot] 'Bump omero-test-infra from `7688c54` to `cda3ec6`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 63 sbesson 'Remove python-future dependency'
- PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 560 will-moore 'Max projection bytes' (exclude comment)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 562 will-moore 'Add changelog 7.0.0'
- PR 563 will-moore 'Use path instead of re_path for all URLs'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#90 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/90/)'
2024-06-09 00:45:38,884 [ scc.git] DEBUG [detached HEAD f6c0c85] merge master -Dorg -Ssuccess-only
2024-06-09 00:45:38,884 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-06-09 00:45:38,884 [ scc.merge] INFO Repository: ome/omero-plugins
2024-06-09 00:45:38,884 [ scc.merge] INFO Already up to date.
2024-06-09 00:45:38,884 [ scc.merge] INFO
2024-06-09 00:45:38,885 [ scc.merge] INFO Merged PRs:
2024-06-09 00:45:38,885 [ scc.merge] INFO - PR 373 dependabot[bot] 'Bump omero-test-infra from `7688c54` to `cda3ec6`'
2024-06-09 00:45:38,885 [ scc.merge] INFO
2024-06-09 00:45:38,885 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-06-09 00:45:38,885 [ scc.merge] INFO Already up to date.
2024-06-09 00:45:38,885 [ scc.merge] INFO
2024-06-09 00:45:38,885 [ scc.merge] INFO
2024-06-09 00:45:38,885 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-06-09 00:45:38,885 [ scc.merge] INFO Excluded PRs:
2024-06-09 00:45:38,885 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-06-09 00:45:38,885 [ scc.merge] INFO Already up to date.
2024-06-09 00:45:38,885 [ scc.merge] INFO
2024-06-09 00:45:38,885 [ scc.merge] INFO Merged PRs:
2024-06-09 00:45:38,885 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-06-09 00:45:38,885 [ scc.merge] INFO
2024-06-09 00:45:38,885 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-06-09 00:45:38,885 [ scc.merge] INFO Excluded PRs:
2024-06-09 00:45:38,885 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-06-09 00:45:38,885 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-06-09 00:45:38,885 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-06-09 00:45:38,885 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-06-09 00:45:38,885 [ scc.merge] INFO Already up to date.
2024-06-09 00:45:38,885 [ scc.merge] INFO
2024-06-09 00:45:38,885 [ scc.merge] INFO Merged PRs:
2024-06-09 00:45:38,885 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-06-09 00:45:38,886 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-06-09 00:45:38,886 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-06-09 00:45:38,886 [ scc.merge] INFO
2024-06-09 00:45:38,886 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-06-09 00:45:38,886 [ scc.merge] INFO Excluded PRs:
2024-06-09 00:45:38,886 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-09 00:45:38,886 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-06-09 00:45:38,886 [ scc.merge] INFO Already up to date.
2024-06-09 00:45:38,886 [ scc.merge] INFO
2024-06-09 00:45:38,886 [ scc.merge] INFO Merged PRs:
2024-06-09 00:45:38,886 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-06-09 00:45:38,886 [ scc.merge] INFO
2024-06-09 00:45:38,886 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-09 00:45:38,886 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-06-09 00:45:38,886 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-06-09 00:45:38,886 [ scc.merge] INFO
2024-06-09 00:45:38,886 [ scc.merge] INFO Repository: ome/omero-figure
2024-06-09 00:45:38,886 [ scc.merge] INFO Excluded PRs:
2024-06-09 00:45:38,886 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes' (exclude comment)
2024-06-09 00:45:38,886 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-06-09 00:45:38,886 [ scc.merge] INFO Already up to date.
2024-06-09 00:45:38,886 [ scc.merge] INFO
2024-06-09 00:45:38,886 [ scc.merge] INFO Merged PRs:
2024-06-09 00:45:38,886 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-06-09 00:45:38,886 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-06-09 00:45:38,887 [ scc.merge] INFO - PR 562 will-moore 'Add changelog 7.0.0'
2024-06-09 00:45:38,887 [ scc.merge] INFO - PR 563 will-moore 'Use path instead of re_path for all URLs'
2024-06-09 00:45:38,887 [ scc.merge] INFO
2024-06-09 00:45:38,887 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-06-09 00:45:38,887 [ scc.merge] INFO Already up to date.
2024-06-09 00:45:38,887 [ scc.merge] INFO
2024-06-09 00:45:38,887 [ scc.merge] INFO Merged PRs:
2024-06-09 00:45:38,887 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-06-09 00:45:38,887 [ scc.merge] INFO
2024-06-09 00:45:38,887 [ scc.merge] INFO Repository: ome/omero-gallery
2024-06-09 00:45:38,887 [ scc.merge] INFO Already up to date.
2024-06-09 00:45:38,887 [ scc.merge] INFO
2024-06-09 00:45:38,887 [ scc.merge] INFO Merged PRs:
2024-06-09 00:45:38,887 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-09 00:45:38,887 [ scc.merge] INFO
2024-06-09 00:45:38,887 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-06-09 00:45:38,887 [ scc.merge] INFO Excluded PRs:
2024-06-09 00:45:38,887 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-06-09 00:45:38,887 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-06-09 00:45:38,887 [ scc.merge] INFO Already up to date.
2024-06-09 00:45:38,887 [ scc.merge] INFO
2024-06-09 00:45:38,887 [ scc.merge] INFO Merged PRs:
2024-06-09 00:45:38,887 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-06-09 00:45:38,887 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-06-09 00:45:38,887 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-09 00:45:38,887 [ scc.merge] INFO
2024-06-09 00:45:38,888 [ scc.merge] INFO Repository: ome/omero-mapr
2024-06-09 00:45:38,888 [ scc.merge] INFO Excluded PRs:
2024-06-09 00:45:38,888 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-06-09 00:45:38,888 [ scc.merge] INFO Already up to date.
2024-06-09 00:45:38,888 [ scc.merge] INFO
2024-06-09 00:45:38,888 [ scc.merge] INFO Merged PRs:
2024-06-09 00:45:38,888 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-06-09 00:45:38,888 [ scc.merge] INFO
2024-06-09 00:45:38,888 [ scc.merge] INFO Repository: ome/omero-metadata
2024-06-09 00:45:38,888 [ scc.merge] INFO Already up to date.
2024-06-09 00:45:38,888 [ scc.merge] INFO
2024-06-09 00:45:38,888 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-09 00:45:38,888 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-09 00:45:38,888 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-09 00:45:38,888 [ scc.merge] INFO
2024-06-09 00:45:38,888 [ scc.merge] INFO Repository: ome/omero-parade
2024-06-09 00:45:38,888 [ scc.merge] INFO Excluded PRs:
2024-06-09 00:45:38,888 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-06-09 00:45:38,888 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-06-09 00:45:38,888 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-06-09 00:45:38,888 [ scc.merge] INFO Already up to date.
2024-06-09 00:45:38,888 [ scc.merge] INFO
2024-06-09 00:45:38,888 [ scc.merge] INFO Merged PRs:
2024-06-09 00:45:38,888 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-09 00:45:38,888 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-09 00:45:38,888 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-09 00:45:38,889 [ scc.merge] INFO
2024-06-09 00:45:38,889 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-06-09 00:45:38,889 [ scc.merge] INFO Already up to date.
2024-06-09 00:45:38,889 [ scc.merge] INFO
2024-06-09 00:45:38,889 [ scc.merge] INFO Merged PRs:
2024-06-09 00:45:38,889 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-06-09 00:45:38,889 [ scc.merge] INFO
2024-06-09 00:45:38,889 [ scc.merge] INFO Repository: ome/omero-rois
2024-06-09 00:45:38,889 [ scc.merge] INFO Excluded PRs:
2024-06-09 00:45:38,889 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-09 00:45:38,889 [ scc.merge] INFO Already up to date.
2024-06-09 00:45:38,889 [ scc.merge] INFO
2024-06-09 00:45:38,889 [ scc.merge] INFO Merged PRs:
2024-06-09 00:45:38,889 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-09 00:45:38,889 [ scc.merge] INFO
2024-06-09 00:45:38,889 [ scc.merge] INFO Repository: ome/omero-signup
2024-06-09 00:45:38,889 [ scc.merge] INFO Already up to date.
2024-06-09 00:45:38,889 [ scc.merge] INFO
2024-06-09 00:45:38,889 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-09 00:45:38,889 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-09 00:45:38,889 [ scc.merge] INFO
2024-06-09 00:45:38,889 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-06-09 00:45:38,889 [ scc.merge] INFO Already up to date.
2024-06-09 00:45:38,889 [ scc.merge] INFO
2024-06-09 00:45:38,889 [ scc.merge] INFO Merged PRs:
2024-06-09 00:45:38,890 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-09 00:45:38,890 [ scc.merge] INFO
2024-06-09 00:45:38,890 [ scc.merge] INFO Repository: ome/omero-upload
2024-06-09 00:45:38,890 [ scc.merge] INFO Already up to date.
2024-06-09 00:45:38,890 [ scc.merge] INFO
2024-06-09 00:45:38,890 [ scc.merge] INFO
2024-06-09 00:45:38,890 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-06-09 00:45:38,890 [ scc.merge] INFO Already up to date.
2024-06-09 00:45:38,890 [ scc.merge] INFO
2024-06-09 00:45:38,890 [ scc.merge] INFO
2024-06-09 00:45:38,890 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-06-09 00:45:38,890 [ scc.merge] INFO Excluded PRs:
2024-06-09 00:45:38,890 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-06-09 00:45:38,890 [ scc.merge] INFO Already up to date.
2024-06-09 00:45:38,890 [ scc.merge] INFO
2024-06-09 00:45:38,890 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-09 00:45:38,890 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-09 00:45:38,890 [ scc.merge] INFO
2024-06-09 00:45:38,890 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-06-09 00:45:38,890 [ scc.merge] INFO Already up to date.
2024-06-09 00:45:38,890 [ scc.merge] INFO
2024-06-09 00:45:38,890 [ scc.merge] INFO
2024-06-09 00:45:38,890 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-06-09 00:45:38,890 [ scc.merge] INFO Already up to date.
2024-06-09 00:45:38,890 [ scc.merge] INFO
2024-06-09 00:45:38,890 [ scc.merge] INFO
2024-06-09 00:45:38,891 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-06-09 00:45:38,891 [ scc.merge] INFO Already up to date.
2024-06-09 00:45:38,891 [ scc.merge] INFO
2024-06-09 00:45:38,891 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-09 00:45:38,891 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-06-09 00:45:38,891 [ scc.merge] INFO
2024-06-09 00:45:38,891 [ scc.merge] INFO Repository: ome/scripts
2024-06-09 00:45:38,891 [ scc.merge] INFO Excluded PRs:
2024-06-09 00:45:38,891 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-06-09 00:45:38,891 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-06-09 00:45:38,891 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-06-09 00:45:38,891 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-06-09 00:45:38,891 [ scc.merge] INFO Already up to date.
2024-06-09 00:45:38,891 [ scc.merge] INFO
2024-06-09 00:45:38,891 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-09 00:45:38,891 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-09 00:45:38,891 [ scc.merge] INFO
2024-06-09 00:45:38,891 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-06-09 00:45:38,891 [ scc.git] DEBUG Calling 'git remote'
2024-06-09 00:45:38,898 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-06-09 00:45:38,898 [ scc.git] DEBUG Calling 'git remote'
2024-06-09 00:45:38,903 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:38,903 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-06-09 00:45:38,904 [ scc.git] DEBUG Calling 'git remote'
2024-06-09 00:45:38,909 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:38,909 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-06-09 00:45:38,909 [ scc.git] DEBUG Calling 'git remote'
2024-06-09 00:45:38,914 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:38,915 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-06-09 00:45:38,915 [ scc.git] DEBUG Calling 'git remote'
2024-06-09 00:45:38,920 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:38,920 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-09 00:45:38,920 [ scc.git] DEBUG Calling 'git remote'
2024-06-09 00:45:38,925 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:38,925 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-09 00:45:38,925 [ scc.git] DEBUG Calling 'git remote'
2024-06-09 00:45:38,930 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:38,931 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-09 00:45:38,931 [ scc.git] DEBUG Calling 'git remote'
2024-06-09 00:45:38,936 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:38,936 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-09 00:45:38,936 [ scc.git] DEBUG Calling 'git remote'
2024-06-09 00:45:38,941 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:38,941 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-09 00:45:38,941 [ scc.git] DEBUG Calling 'git remote'
2024-06-09 00:45:38,946 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:38,946 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-09 00:45:38,947 [ scc.git] DEBUG Calling 'git remote'
2024-06-09 00:45:38,952 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:38,952 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-09 00:45:38,953 [ scc.git] DEBUG Calling 'git remote'
2024-06-09 00:45:38,958 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:38,958 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-09 00:45:38,958 [ scc.git] DEBUG Calling 'git remote'
2024-06-09 00:45:38,963 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:38,963 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-09 00:45:38,963 [ scc.git] DEBUG Calling 'git remote'
2024-06-09 00:45:38,969 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:38,969 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-09 00:45:38,969 [ scc.git] DEBUG Calling 'git remote'
2024-06-09 00:45:38,974 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:38,975 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-09 00:45:38,975 [ scc.git] DEBUG Calling 'git remote'
2024-06-09 00:45:38,980 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:38,980 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-09 00:45:38,981 [ scc.git] DEBUG Calling 'git remote'
2024-06-09 00:45:38,986 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:38,986 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-09 00:45:38,986 [ scc.git] DEBUG Calling 'git remote'
2024-06-09 00:45:38,990 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:38,991 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-09 00:45:38,991 [ scc.git] DEBUG Calling 'git remote'
2024-06-09 00:45:38,995 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:38,995 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-09 00:45:38,995 [ scc.git] DEBUG Calling 'git remote'
2024-06-09 00:45:39,002 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:39,003 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-09 00:45:39,003 [ scc.git] DEBUG Calling 'git remote'
2024-06-09 00:45:39,009 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:39,009 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-09 00:45:39,009 [ scc.git] DEBUG Calling 'git remote'
2024-06-09 00:45:39,015 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-09 00:45:39,015 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-09 00:45:39,015 [ scc.git] DEBUG Calling 'git remote'
2024-06-09 00:45:39,021 [ 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 f2c9d2b] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 2ca566b
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from 3d9e3b87
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from 7b7a637
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 5a90893
nothing to commit, working tree clean
[detached HEAD a069559] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-06-09 00:46:26,301 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-06-09 00:46:35,408 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-06-09 00:46:37,782 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-06-09 00:46:42,429 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-06-09 00:47:28,689 [ 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}
