Console Output
Skipping 87 KB..
Full LogPR 102 (Zarr export tests) f22d4074b7c458ad24320cf5a6f8adb9e686aa44'
2024-06-18 08:43:51,977 [ scc.git] DEBUG Auto-merging src/omero_zarr/cli.py
2024-06-18 08:43:51,977 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-06-18 08:43:51,977 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_zarr/raw_pixels.py
2024-06-18 08:43:51,977 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-18 08:43:51,977 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-18 08:43:51,982 [ scc.git] DEBUG Calling 'git reset --hard 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-18 08:43:51,988 [ scc.git] DEBUG HEAD is now at 2ca566b Merge pull request #160 from ome/pre-commit-ci-update-config
2024-06-18 08:43:52,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:43:52,144 [ scc.git] DEBUG Calling 'git merge-base 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473 f22d4074b7c458ad24320cf5a6f8adb9e686aa44'
2024-06-18 08:43:52,151 [ scc.git] DEBUG Calling 'git diff --name-only 782a1cd0077bcc2871f21e9f0acdc25ae7745243..2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-18 08:43:52,156 [ scc.git] INFO - PR 102 will-moore 'Zarr export tests'
Conflicting PR. Removed from build [OMERO-plugins-push#100](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_zarr/raw_pixels.py
--conflicts
2024-06-18 08:43:52,160 [ scc.config] DEBUG Found github.token
2024-06-18 08:43:52,160 [ scc.git] DEBUG Not adding comment to issue #102, already --conflicts.
2024-06-18 08:43:52,160 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-06-18 08:43:52,166 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:43:52,170 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 123 (Support export of Fileset:ID) 553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-06-18 08:43:52,181 [ scc.git] DEBUG Auto-merging .isort.cfg
2024-06-18 08:43:52,182 [ scc.git] DEBUG CONFLICT (content): Merge conflict in .isort.cfg
2024-06-18 08:43:52,182 [ scc.git] DEBUG Auto-merging setup.py
2024-06-18 08:43:52,182 [ scc.git] DEBUG Auto-merging src/omero_zarr/cli.py
2024-06-18 08:43:52,182 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-06-18 08:43:52,182 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_zarr/raw_pixels.py
2024-06-18 08:43:52,182 [ scc.git] DEBUG Auto-merging src/omero_zarr/util.py
2024-06-18 08:43:52,182 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-18 08:43:52,182 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-18 08:43:52,186 [ scc.git] DEBUG Calling 'git reset --hard 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-18 08:43:52,192 [ scc.git] DEBUG HEAD is now at 2ca566b Merge pull request #160 from ome/pre-commit-ci-update-config
2024-06-18 08:43:52,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:43:52,557 [ scc.git] DEBUG Calling 'git merge-base 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473 553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-06-18 08:43:52,563 [ scc.git] DEBUG Calling 'git diff --name-only eff38d0408f9d50de13b28dfe09e4382965e203f..2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-18 08:43:52,568 [ scc.git] INFO - PR 123 will-moore 'Support export of Fileset:ID'
Conflicting PR. Removed from build [OMERO-plugins-push#100](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/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-18 08:43:52,572 [ scc.config] DEBUG Found github.token
2024-06-18 08:43:52,573 [ scc.git] DEBUG Not adding comment to issue #123, already --conflicts.
2024-06-18 08:43:52,573 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a14f62a940f4974a305b3f5858049ee493b898ef'
2024-06-18 08:43:52,578 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:43:52,583 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 147 (Name option) a14f62a940f4974a305b3f5858049ee493b898ef'
2024-06-18 08:43:52,593 [ scc.git] DEBUG Auto-merging src/omero_zarr/masks.py
2024-06-18 08:43:52,593 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-06-18 08:43:52,594 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 08:43:52,596 [ scc.git] DEBUG README.rst | 30 ++++++++++++++++++------------
2024-06-18 08:43:52,596 [ scc.git] DEBUG src/omero_zarr/cli.py | 9 +++++++++
2024-06-18 08:43:52,596 [ scc.git] DEBUG src/omero_zarr/masks.py | 4 ++--
2024-06-18 08:43:52,596 [ scc.git] DEBUG src/omero_zarr/raw_pixels.py | 28 +++++++++++++++++++++++-----
2024-06-18 08:43:52,596 [ scc.git] DEBUG src/omero_zarr/util.py | 2 +-
2024-06-18 08:43:52,596 [ scc.git] DEBUG 5 files changed, 53 insertions(+), 20 deletions(-)
2024-06-18 08:43:52,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:43:52,959 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 08:43:52,994 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:43:52,994 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:43:52,998 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 08:43:53,034 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 08:43:53,040 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa144f24970> has no local changes
2024-06-18 08:43:53,040 [ 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#100 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/)'
2024-06-18 08:43:53,047 [ scc.git] DEBUG [detached HEAD 9fc6b31] merge master -Dorg -Ssuccess-only
2024-06-18 08:43:53,047 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:43:53,047 [ scc.repo] DEBUG ## PRs found:
2024-06-18 08:43:53,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-06-18 08:43:53,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/568 HTTP/1.1" 200 None
2024-06-18 08:43:54,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/568/comments HTTP/1.1" 200 None
2024-06-18 08:43:54,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6 HTTP/1.1" 200 None
2024-06-18 08:43:55,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-18 08:43:55,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-18 08:43:56,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6 HTTP/1.1" 200 None
2024-06-18 08:43:56,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6?per_page=1 HTTP/1.1" 200 2
2024-06-18 08:43:56,863 [ scc.repo] DEBUG - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-06-18 08:43:57,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-06-18 08:43:57,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-06-18 08:43:58,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-18 08:43:58,812 [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-18 08:43:59,284 [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-18 08:43:59,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-18 08:44:00,127 [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-18 08:44:00,128 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-06-18 08:44:00,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-06-18 08:44:01,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-18 08:44:01,642 [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-18 08:44:02,155 [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-18 08:44:02,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-18 08:44:03,093 [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-18 08:44:03,093 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-06-18 08:44:03,094 [ scc.repo] DEBUG ## Branches found:
2024-06-18 08:44:03,094 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-18 08:44:03,094 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:44:03,094 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:03,100 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 08:44:03,105 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 08:44:03,105 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 08:44:03,110 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 08:44:03,115 [ scc.git] DEBUG Already up to date.
2024-06-18 08:44:03,115 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-06-18 08:44:03,485 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-18 08:44:03,485 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-06-18 08:44:03,489 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-06-18 08:44:03,891 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-18 08:44:03,891 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-06-18 08:44:03,895 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-06-18 08:44:04,313 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-18 08:44:04,314 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-06-18 08:44:04,317 [ scc.git] DEBUG ## Unique users: []
2024-06-18 08:44:04,317 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:44:04,318 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:04,322 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-18 08:44:04,328 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:04,332 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-18 08:44:04,555 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 08:44:04,560 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-06-18 08:44:04,560 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-06-18 08:44:04,560 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-06-18 08:44:04,560 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-06-18 08:44:04,560 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-06-18 08:44:04,560 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-06-18 08:44:04,560 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-06-18 08:44:04,560 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-06-18 08:44:04,562 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-06-18 08:44:04,562 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-06-18 08:44:04,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:44:04,730 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-18 08:44:04,737 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:04,741 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-18 08:44:04,905 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-06-18 08:44:04,905 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-06-18 08:44:04,905 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-06-18 08:44:04,906 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 08:44:04,911 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-06-18 08:44:04,911 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-06-18 08:44:04,911 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-06-18 08:44:04,911 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-06-18 08:44:04,911 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-06-18 08:44:04,911 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-06-18 08:44:04,911 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-06-18 08:44:04,911 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-06-18 08:44:04,911 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-06-18 08:44:04,912 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-06-18 08:44:04,912 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-06-18 08:44:04,912 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-06-18 08:44:05,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:44:05,143 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-06-18 08:44:05,149 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:05,153 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 568 (Remove numpy from tests_require in setup.py) 15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-06-18 08:44:05,167 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 08:44:05,169 [ scc.git] DEBUG setup.py | 2 +-
2024-06-18 08:44:05,170 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-06-18 08:44:05,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:44:05,545 [ scc.git] DEBUG Resolving previous conflict on Pull Request #568.
2024-06-18 08:44:05,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:44:06,936 [urllib3.conn] DEBUG https://api.github.com:443 "PATCH /repos/ome/omero-figure/issues/comments/2174695058 HTTP/1.1" 200 None
2024-06-18 08:44:06,936 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 08:44:06,972 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:44:06,972 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:06,977 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 08:44:07,012 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 08:44:07,019 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa144edfbb0> has no local changes
2024-06-18 08:44:07,019 [ 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 568 will-moore 'Remove numpy from tests_require in setup.py'
Generated by OMERO-plugins-push#100 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/)'
2024-06-18 08:44:07,027 [ scc.git] DEBUG [detached HEAD 2f192b26] merge master -Dorg -Ssuccess-only
2024-06-18 08:44:07,027 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:44:07,028 [ scc.repo] DEBUG ## PRs found:
2024-06-18 08:44:07,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-06-18 08:44:07,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-06-18 08:44:08,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-06-18 08:44:09,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-18 08:44:09,469 [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-18 08:44:10,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-18 08:44:10,486 [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-18 08:44:10,486 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-06-18 08:44:10,486 [ scc.repo] DEBUG ## Branches found:
2024-06-18 08:44:10,486 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-18 08:44:10,486 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:44:10,486 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:10,491 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 08:44:10,495 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 08:44:10,495 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 08:44:10,500 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 08:44:10,505 [ scc.git] DEBUG Already up to date.
2024-06-18 08:44:10,505 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-06-18 08:44:10,888 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-06-18 08:44:10,888 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-06-18 08:44:10,892 [ scc.git] DEBUG ## Unique users: []
2024-06-18 08:44:10,892 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:44:10,892 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:10,897 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-18 08:44:10,902 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:10,906 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-18 08:44:10,914 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-06-18 08:44:10,915 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 08:44:10,917 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-06-18 08:44:10,917 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-06-18 08:44:11,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:44:11,079 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 08:44:11,114 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:44:11,115 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:11,119 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 08:44:11,153 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 08:44:11,158 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa144f1cdf0> has no local changes
2024-06-18 08:44:11,158 [ 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#100 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/)'
2024-06-18 08:44:11,166 [ scc.git] DEBUG [detached HEAD 1623070] merge master -Dorg -Ssuccess-only
2024-06-18 08:44:11,166 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:44:11,166 [ scc.repo] DEBUG ## PRs found:
2024-06-18 08:44:11,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-06-18 08:44:12,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-06-18 08:44:12,062 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-18 08:44:12,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-18 08:44:13,128 [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-18 08:44:13,635 [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-18 08:44:14,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-18 08:44:14,492 [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-18 08:44:14,493 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-18 08:44:14,493 [ scc.repo] DEBUG ## Branches found:
2024-06-18 08:44:14,493 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-18 08:44:14,493 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:44:14,493 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:14,498 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 08:44:14,502 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 08:44:14,502 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 08:44:14,507 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 08:44:14,512 [ scc.git] DEBUG Already up to date.
2024-06-18 08:44:14,512 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-06-18 08:44:14,896 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-06-18 08:44:14,896 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-06-18 08:44:14,900 [ scc.git] DEBUG ## Unique users: []
2024-06-18 08:44:14,900 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:44:14,900 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:14,904 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-06-18 08:44:14,909 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:14,913 [ 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-18 08:44:14,941 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 08:44:14,944 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-06-18 08:44:14,944 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-06-18 08:44:15,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:44:15,103 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 08:44:15,139 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:44:15,139 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:15,143 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 08:44:15,178 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 08:44:15,184 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa144f1c340> has no local changes
2024-06-18 08:44:15,184 [ 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#100 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/)'
2024-06-18 08:44:15,191 [ scc.git] DEBUG [detached HEAD 01ba632] merge master -Dorg -Ssuccess-only
2024-06-18 08:44:15,192 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:44:15,192 [ scc.repo] DEBUG ## PRs found:
2024-06-18 08:44:15,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-06-18 08:44:16,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-06-18 08:44:16,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-06-18 08:44:17,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-18 08:44:17,630 [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-18 08:44:18,147 [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-18 08:44:18,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-18 08:44:19,121 [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-18 08:44:19,121 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-18 08:44:19,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-06-18 08:44:20,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-06-18 08:44:20,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-18 08:44:21,215 [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-18 08:44:21,712 [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-18 08:44:22,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-18 08:44:22,614 [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-18 08:44:22,614 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-06-18 08:44:23,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-06-18 08:44:23,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-06-18 08:44:24,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-18 08:44:24,544 [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-18 08:44:24,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-18 08:44:25,406 [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-18 08:44:25,406 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-06-18 08:44:25,406 [ scc.repo] DEBUG ## Branches found:
2024-06-18 08:44:25,406 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-18 08:44:25,407 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:44:25,407 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:25,412 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 08:44:25,416 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 08:44:25,416 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 08:44:25,421 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 08:44:25,426 [ scc.git] DEBUG Already up to date.
2024-06-18 08:44:25,426 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-06-18 08:44:25,864 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-18 08:44:25,864 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-06-18 08:44:25,868 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-06-18 08:44:26,783 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-18 08:44:26,783 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-06-18 08:44:26,787 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-06-18 08:44:27,149 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-18 08:44:27,149 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-06-18 08:44:27,152 [ scc.git] DEBUG ## Unique users: []
2024-06-18 08:44:27,153 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:44:27,153 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:27,157 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-18 08:44:27,163 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:27,167 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-18 08:44:27,211 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-06-18 08:44:27,211 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 08:44:27,214 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-06-18 08:44:27,214 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-06-18 08:44:27,214 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-06-18 08:44:27,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:44:27,372 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-18 08:44:27,378 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:27,383 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-18 08:44:27,512 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-06-18 08:44:27,512 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-06-18 08:44:27,512 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-06-18 08:44:27,512 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-06-18 08:44:27,513 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 08:44:27,516 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-06-18 08:44:27,516 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-06-18 08:44:27,516 [ scc.git] DEBUG src/app/header.html | 5 +
2024-06-18 08:44:27,516 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-06-18 08:44:27,516 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-06-18 08:44:27,516 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-06-18 08:44:27,516 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-06-18 08:44:27,516 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-06-18 08:44:27,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:44:27,787 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-18 08:44:27,793 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:27,798 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-18 08:44:27,830 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-06-18 08:44:27,830 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 08:44:27,833 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-06-18 08:44:27,833 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-06-18 08:44:27,833 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-06-18 08:44:28,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:44:28,210 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 08:44:28,246 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:44:28,246 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:28,251 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 08:44:28,285 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 08:44:28,292 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa144ef78e0> has no local changes
2024-06-18 08:44:28,292 [ 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#100 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/)'
2024-06-18 08:44:28,301 [ scc.git] DEBUG [detached HEAD 89083f5] merge master -Dorg -Ssuccess-only
2024-06-18 08:44:28,301 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:44:28,302 [ scc.repo] DEBUG ## PRs found:
2024-06-18 08:44:28,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-06-18 08:44:29,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-06-18 08:44:29,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-06-18 08:44:30,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-18 08:44:30,831 [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-18 08:44:31,315 [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-18 08:44:31,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-18 08:44:32,270 [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-18 08:44:32,271 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-06-18 08:44:32,271 [ scc.repo] DEBUG ## Branches found:
2024-06-18 08:44:32,271 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-18 08:44:32,271 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:44:32,271 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:32,276 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 08:44:32,281 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 08:44:32,281 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 08:44:32,286 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 08:44:32,291 [ scc.git] DEBUG Already up to date.
2024-06-18 08:44:32,291 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-06-18 08:44:32,659 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-06-18 08:44:32,659 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-06-18 08:44:32,663 [ scc.git] DEBUG ## Unique users: []
2024-06-18 08:44:32,663 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:44:32,663 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:32,668 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-18 08:44:32,674 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:32,678 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-18 08:44:32,687 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 08:44:32,689 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-06-18 08:44:32,689 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-06-18 08:44:32,689 [ scc.git] DEBUG requirements.txt | 2 +-
2024-06-18 08:44:32,689 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-06-18 08:44:32,690 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-06-18 08:44:32,690 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-06-18 08:44:32,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:44:32,862 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 08:44:32,897 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:44:32,898 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:32,902 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 08:44:32,936 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 08:44:32,941 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa1446abbb0> has no local changes
2024-06-18 08:44:32,941 [ 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#100 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/)'
2024-06-18 08:44:32,949 [ scc.git] DEBUG [detached HEAD 4c7481b] merge master -Dorg -Ssuccess-only
2024-06-18 08:44:32,950 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:44:32,950 [ scc.repo] DEBUG ## PRs found:
2024-06-18 08:44:33,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-06-18 08:44:33,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-06-18 08:44:34,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-06-18 08:44:34,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-18 08:44:35,367 [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-18 08:44:35,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-18 08:44:36,230 [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-18 08:44:36,230 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-18 08:44:36,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-06-18 08:44:37,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-06-18 08:44:37,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-18 08:44:38,225 [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-18 08:44:38,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-18 08:44:39,079 [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-18 08:44:39,079 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-18 08:44:39,079 [ scc.repo] DEBUG ## Branches found:
2024-06-18 08:44:39,079 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-18 08:44:39,080 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:44:39,080 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:39,085 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 08:44:39,089 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 08:44:39,090 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 08:44:39,094 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 08:44:39,099 [ scc.git] DEBUG Already up to date.
2024-06-18 08:44:39,100 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-06-18 08:44:39,591 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-18 08:44:39,591 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-06-18 08:44:39,594 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-06-18 08:44:40,577 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-18 08:44:40,577 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-06-18 08:44:40,582 [ scc.git] DEBUG ## Unique users: []
2024-06-18 08:44:40,582 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:44:40,582 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:40,586 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-18 08:44:40,592 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:40,597 [ 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-18 08:44:40,701 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-06-18 08:44:40,701 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-06-18 08:44:40,701 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-18 08:44:40,701 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-18 08:44:40,701 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-18 08:44:40,701 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-18 08:44:40,706 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-18 08:44:40,712 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-18 08:44:40,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:44:40,872 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-18 08:44:40,878 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-18 08:44:40,883 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#100](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-06-18 08:44:40,887 [ scc.config] DEBUG Found github.token
2024-06-18 08:44:40,887 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-06-18 08:44:40,888 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-18 08:44:40,893 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:40,898 [ 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-18 08:44:40,913 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-18 08:44:40,913 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-18 08:44:40,913 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-06-18 08:44:40,913 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-18 08:44:40,914 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-18 08:44:40,919 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-18 08:44:40,926 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-18 08:44:41,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:44:41,285 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-18 08:44:41,291 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-18 08:44:41,296 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#100](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/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-18 08:44:41,300 [ scc.config] DEBUG Found github.token
2024-06-18 08:44:41,300 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-06-18 08:44:41,300 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 08:44:41,335 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:44:41,335 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:41,340 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 08:44:41,374 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 08:44:41,380 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa144f0af40> has no local changes
2024-06-18 08:44:41,380 [ 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#100 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/)'
2024-06-18 08:44:41,388 [ scc.git] DEBUG [detached HEAD d409ffb] merge master -Dorg -Ssuccess-only
2024-06-18 08:44:41,388 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:44:41,388 [ scc.repo] DEBUG ## PRs found:
2024-06-18 08:44:41,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-06-18 08:44:42,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-06-18 08:44:42,360 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-18 08:44:42,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-18 08:44:43,460 [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-18 08:44:43,961 [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-18 08:44:44,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-18 08:44:44,825 [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-18 08:44:44,825 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-18 08:44:45,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-06-18 08:44:45,315 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-18 08:44:45,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-18 08:44:46,397 [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-18 08:44:46,885 [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-18 08:44:47,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-18 08:44:47,850 [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-18 08:44:47,850 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-18 08:44:48,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-06-18 08:44:48,330 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-18 08:44:48,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-18 08:44:49,391 [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-18 08:44:49,891 [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-18 08:44:50,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-18 08:44:50,787 [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-18 08:44:50,787 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-18 08:44:51,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-06-18 08:44:51,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-06-18 08:44:52,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-06-18 08:44:52,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-06-18 08:44:53,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-06-18 08:44:53,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-06-18 08:44:53,601 [ scc.repo] DEBUG ## Branches found:
2024-06-18 08:44:53,601 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-18 08:44:53,601 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:44:53,601 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:53,607 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 08:44:53,611 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 08:44:53,611 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 08:44:53,616 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 08:44:53,621 [ scc.git] DEBUG Already up to date.
2024-06-18 08:44:53,621 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-06-18 08:44:54,021 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-18 08:44:54,021 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-06-18 08:44:54,025 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-06-18 08:44:54,402 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-18 08:44:54,402 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-06-18 08:44:54,406 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-06-18 08:44:54,781 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-18 08:44:54,782 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-06-18 08:44:54,785 [ scc.git] DEBUG ## Unique users: []
2024-06-18 08:44:54,785 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:44:54,785 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:54,790 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-06-18 08:44:54,795 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:54,799 [ 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-18 08:44:54,808 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 08:44:54,810 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-06-18 08:44:54,810 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-06-18 08:44:54,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:44:54,973 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-06-18 08:44:54,979 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:54,983 [ 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-18 08:44:54,993 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-18 08:44:54,993 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 08:44:54,996 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-06-18 08:44:54,996 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-06-18 08:44:55,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:44:55,378 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-06-18 08:44:55,383 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:55,388 [ 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-18 08:44:55,410 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-18 08:44:55,410 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 08:44:55,413 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-06-18 08:44:55,413 [ scc.git] DEBUG package.json | 2 +-
2024-06-18 08:44:55,413 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-06-18 08:44:55,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:44:55,783 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 08:44:55,818 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:44:55,818 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:55,823 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 08:44:55,857 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 08:44:55,863 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa144663640> has no local changes
2024-06-18 08:44:55,863 [ 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#100 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/)'
2024-06-18 08:44:55,871 [ scc.git] DEBUG [detached HEAD 0795cee] merge master -Dorg -Ssuccess-only
2024-06-18 08:44:55,871 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:44:55,872 [ scc.repo] DEBUG ## PRs found:
2024-06-18 08:44:56,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-06-18 08:44:56,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-06-18 08:44:57,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-18 08:44:57,785 [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-18 08:44:58,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-18 08:44:58,816 [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-18 08:44:58,817 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-06-18 08:44:58,817 [ scc.repo] DEBUG ## Branches found:
2024-06-18 08:44:58,817 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-18 08:44:58,817 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:44:58,817 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:58,823 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 08:44:58,827 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 08:44:58,827 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 08:44:58,832 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 08:44:58,837 [ scc.git] DEBUG Already up to date.
2024-06-18 08:44:58,837 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-18 08:44:59,203 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-06-18 08:44:59,203 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-18 08:44:59,206 [ scc.git] DEBUG ## Unique users: []
2024-06-18 08:44:59,206 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:44:59,206 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:59,211 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-18 08:44:59,216 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:59,221 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-18 08:44:59,229 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 08:44:59,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:44:59,389 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 08:44:59,425 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:44:59,425 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:44:59,429 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 08:44:59,464 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 08:44:59,469 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa144f0bbe0> has no local changes
2024-06-18 08:44:59,469 [ 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#100 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/)'
2024-06-18 08:44:59,476 [ scc.git] DEBUG [detached HEAD 1c3da66] merge master -Dorg -Ssuccess-only
2024-06-18 08:44:59,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:44:59,477 [ scc.repo] DEBUG ## PRs found:
2024-06-18 08:44:59,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-06-18 08:45:00,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-06-18 08:45:00,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-06-18 08:45:01,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-06-18 08:45:01,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-18 08:45:02,385 [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-18 08:45:02,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-18 08:45:03,263 [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-18 08:45:03,264 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-18 08:45:03,264 [ scc.repo] DEBUG ## Branches found:
2024-06-18 08:45:03,264 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-18 08:45:03,264 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:03,264 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:03,269 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 08:45:03,274 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 08:45:03,274 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 08:45:03,279 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 08:45:03,284 [ scc.git] DEBUG Already up to date.
2024-06-18 08:45:03,284 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-06-18 08:45:03,704 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-06-18 08:45:03,704 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-06-18 08:45:03,707 [ scc.git] DEBUG ## Unique users: []
2024-06-18 08:45:03,708 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:03,708 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:03,712 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-06-18 08:45:03,718 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:03,722 [ 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-18 08:45:03,731 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-06-18 08:45:03,732 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 08:45:03,734 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-06-18 08:45:03,734 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-06-18 08:45:03,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:45:03,958 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 08:45:03,994 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:03,995 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:03,999 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 08:45:04,034 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 08:45:04,040 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa14461a550> has no local changes
2024-06-18 08:45:04,040 [ 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#100 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/)'
2024-06-18 08:45:04,048 [ scc.git] DEBUG [detached HEAD 15eb37a] merge master -Dorg -Ssuccess-only
2024-06-18 08:45:04,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:04,048 [ scc.repo] DEBUG ## PRs found:
2024-06-18 08:45:04,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-06-18 08:45:04,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-06-18 08:45:05,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-06-18 08:45:06,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-18 08:45:06,531 [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-18 08:45:07,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-18 08:45:07,557 [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-18 08:45:07,557 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-18 08:45:07,557 [ scc.repo] DEBUG ## Branches found:
2024-06-18 08:45:07,558 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-18 08:45:07,558 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:07,558 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:07,563 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 08:45:07,568 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 08:45:07,568 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 08:45:07,573 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 08:45:07,578 [ scc.git] DEBUG Already up to date.
2024-06-18 08:45:07,578 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-18 08:45:07,993 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-06-18 08:45:07,993 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-18 08:45:07,997 [ scc.git] DEBUG ## Unique users: []
2024-06-18 08:45:07,997 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:07,997 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:08,002 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-18 08:45:08,007 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:08,011 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-18 08:45:08,104 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-06-18 08:45:08,104 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-06-18 08:45:08,104 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-06-18 08:45:08,104 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-06-18 08:45:08,104 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-06-18 08:45:08,104 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-06-18 08:45:08,104 [ scc.git] DEBUG Auto-merging setup.py
2024-06-18 08:45:08,104 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-06-18 08:45:08,104 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-18 08:45:08,104 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-18 08:45:08,109 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-18 08:45:08,115 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-06-18 08:45:08,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:45:08,275 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-18 08:45:08,280 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-18 08:45:08,284 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#100](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/signup_settings.py
- omero_signup/views.py
- setup.py
--conflicts
2024-06-18 08:45:08,289 [ scc.config] DEBUG Found github.token
2024-06-18 08:45:08,289 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-06-18 08:45:08,289 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 08:45:08,324 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:08,324 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:08,329 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 08:45:08,364 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 08:45:08,370 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa14468df40> has no local changes
2024-06-18 08:45:08,370 [ 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#100 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/)'
2024-06-18 08:45:08,377 [ scc.git] DEBUG [detached HEAD b8cd88b] merge master -Dorg -Ssuccess-only
2024-06-18 08:45:08,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:08,378 [ scc.repo] DEBUG ## PRs found:
2024-06-18 08:45:08,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-06-18 08:45:09,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-06-18 08:45:09,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-06-18 08:45:10,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-18 08:45:10,801 [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-18 08:45:11,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-18 08:45:11,657 [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-18 08:45:11,657 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-18 08:45:11,658 [ scc.repo] DEBUG ## Branches found:
2024-06-18 08:45:11,658 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-18 08:45:11,658 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:11,658 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:11,663 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 08:45:11,668 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 08:45:11,668 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 08:45:11,673 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 08:45:11,678 [ scc.git] DEBUG Already up to date.
2024-06-18 08:45:11,678 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-06-18 08:45:12,048 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-06-18 08:45:12,049 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-06-18 08:45:12,052 [ scc.git] DEBUG ## Unique users: []
2024-06-18 08:45:12,052 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:12,052 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:12,057 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-06-18 08:45:12,063 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:12,068 [ 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-18 08:45:12,080 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 08:45:12,082 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-06-18 08:45:12,082 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-06-18 08:45:12,082 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-06-18 08:45:12,082 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-06-18 08:45:12,082 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-06-18 08:45:12,082 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-06-18 08:45:12,082 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-06-18 08:45:12,084 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-06-18 08:45:12,084 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-06-18 08:45:12,084 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-06-18 08:45:12,084 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-06-18 08:45:12,084 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-06-18 08:45:12,084 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-06-18 08:45:12,084 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-06-18 08:45:12,084 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-06-18 08:45:12,084 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-06-18 08:45:12,084 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-06-18 08:45:12,085 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-06-18 08:45:12,085 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-06-18 08:45:12,085 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-06-18 08:45:12,085 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-06-18 08:45:12,085 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-06-18 08:45:12,085 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-06-18 08:45:12,085 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-06-18 08:45:12,085 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-06-18 08:45:12,085 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-06-18 08:45:12,085 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-06-18 08:45:12,085 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-06-18 08:45:12,085 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-06-18 08:45:12,085 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-06-18 08:45:12,085 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-06-18 08:45:12,085 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-06-18 08:45:12,085 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-06-18 08:45:12,085 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-06-18 08:45:12,085 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-06-18 08:45:12,085 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-06-18 08:45:12,085 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-06-18 08:45:12,085 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-06-18 08:45:12,085 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-06-18 08:45:12,085 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-06-18 08:45:12,085 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-06-18 08:45:12,085 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-06-18 08:45:12,085 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-06-18 08:45:12,085 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-06-18 08:45:12,085 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-06-18 08:45:12,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:45:12,248 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 08:45:12,283 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:12,284 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:12,288 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 08:45:12,322 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 08:45:12,328 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa14461a730> has no local changes
2024-06-18 08:45:12,328 [ 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#100 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/)'
2024-06-18 08:45:12,336 [ scc.git] DEBUG [detached HEAD 4d57b99] merge master -Dorg -Ssuccess-only
2024-06-18 08:45:12,337 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:12,337 [ scc.repo] DEBUG ## PRs found:
2024-06-18 08:45:12,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-06-18 08:45:12,688 [ scc.repo] DEBUG ## Branches found:
2024-06-18 08:45:12,688 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-18 08:45:12,688 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:12,688 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:12,692 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 08:45:12,697 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 08:45:12,697 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 08:45:12,702 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 08:45:12,707 [ scc.git] DEBUG Already up to date.
2024-06-18 08:45:12,707 [ scc.git] DEBUG ## Unique users: []
2024-06-18 08:45:12,707 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:12,707 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:12,711 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 08:45:12,746 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:12,746 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:12,750 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 08:45:12,784 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 08:45:12,790 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa14462bb80> has no local changes
2024-06-18 08:45:12,790 [ 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#100 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/)'
2024-06-18 08:45:12,797 [ scc.git] DEBUG [detached HEAD 41a86d9] merge master -Dorg -Ssuccess-only
2024-06-18 08:45:12,797 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:12,798 [ scc.repo] DEBUG ## PRs found:
2024-06-18 08:45:13,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-06-18 08:45:13,125 [ scc.repo] DEBUG ## Branches found:
2024-06-18 08:45:13,125 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-18 08:45:13,125 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:13,125 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:13,129 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 08:45:13,134 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 08:45:13,134 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 08:45:13,138 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 08:45:13,143 [ scc.git] DEBUG Already up to date.
2024-06-18 08:45:13,144 [ scc.git] DEBUG ## Unique users: []
2024-06-18 08:45:13,144 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:13,144 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:13,148 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 08:45:13,182 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:13,182 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:13,187 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 08:45:13,222 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 08:45:13,227 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa144659d90> has no local changes
2024-06-18 08:45:13,227 [ 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#100 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/)'
2024-06-18 08:45:13,234 [ scc.git] DEBUG [detached HEAD 74b1e79] merge master -Dorg -Ssuccess-only
2024-06-18 08:45:13,235 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:13,235 [ scc.git] INFO Overriding base-branch from master to main
2024-06-18 08:45:13,235 [ scc.repo] DEBUG ## PRs found:
2024-06-18 08:45:13,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-06-18 08:45:14,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-06-18 08:45:14,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-06-18 08:45:15,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-06-18 08:45:15,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-18 08:45:16,239 [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-18 08:45:16,690 [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-18 08:45:17,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-18 08:45:17,694 [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-18 08:45:17,694 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-18 08:45:17,694 [ scc.repo] DEBUG ## Branches found:
2024-06-18 08:45:17,694 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-18 08:45:17,695 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:17,695 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:17,700 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-06-18 08:45:17,704 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 08:45:17,704 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-06-18 08:45:17,709 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-06-18 08:45:17,714 [ scc.git] DEBUG Already up to date.
2024-06-18 08:45:17,714 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-06-18 08:45:18,076 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-06-18 08:45:18,076 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-06-18 08:45:18,080 [ scc.git] DEBUG ## Unique users: []
2024-06-18 08:45:18,080 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:18,080 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:18,084 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-18 08:45:18,090 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:18,094 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-18 08:45:18,102 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-06-18 08:45:18,102 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-06-18 08:45:18,102 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-18 08:45:18,103 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-18 08:45:18,108 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-18 08:45:18,113 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-06-18 08:45:18,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:45:18,278 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-18 08:45:18,282 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-18 08:45:18,287 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#100](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-06-18 08:45:18,291 [ scc.config] DEBUG Found github.token
2024-06-18 08:45:18,291 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-06-18 08:45:18,291 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 08:45:18,326 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:18,327 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:18,331 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 08:45:18,365 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 08:45:18,370 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa14465eee0> has no local changes
2024-06-18 08:45:18,370 [ 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#100 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/)'
2024-06-18 08:45:18,378 [ scc.git] DEBUG [detached HEAD 7fe367f] merge master -Dorg -Ssuccess-only
2024-06-18 08:45:18,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:18,378 [ scc.repo] DEBUG ## PRs found:
2024-06-18 08:45:18,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-06-18 08:45:18,717 [ scc.repo] DEBUG ## Branches found:
2024-06-18 08:45:18,717 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-18 08:45:18,717 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:18,717 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:18,721 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 08:45:18,726 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 08:45:18,726 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 08:45:18,730 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 08:45:18,735 [ scc.git] DEBUG Already up to date.
2024-06-18 08:45:18,735 [ scc.git] DEBUG ## Unique users: []
2024-06-18 08:45:18,736 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:18,736 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:18,740 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 08:45:18,774 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:18,775 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:18,779 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 08:45:18,813 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 08:45:18,818 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa144632e80> has no local changes
2024-06-18 08:45:18,818 [ 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#100 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/)'
2024-06-18 08:45:18,826 [ scc.git] DEBUG [detached HEAD d00ad96] merge master -Dorg -Ssuccess-only
2024-06-18 08:45:18,826 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:18,826 [ scc.repo] DEBUG ## PRs found:
2024-06-18 08:45:19,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-06-18 08:45:19,161 [ scc.repo] DEBUG ## Branches found:
2024-06-18 08:45:19,161 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-18 08:45:19,161 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:19,161 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:19,166 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 08:45:19,171 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 08:45:19,171 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 08:45:19,176 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 08:45:19,181 [ scc.git] DEBUG Already up to date.
2024-06-18 08:45:19,181 [ scc.git] DEBUG ## Unique users: []
2024-06-18 08:45:19,181 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:19,181 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:19,185 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 08:45:19,221 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:19,222 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:19,226 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 08:45:19,261 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 08:45:19,266 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa144596400> has no local changes
2024-06-18 08:45:19,266 [ 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#100 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/)'
2024-06-18 08:45:19,273 [ scc.git] DEBUG [detached HEAD 13392c0] merge master -Dorg -Ssuccess-only
2024-06-18 08:45:19,273 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:19,274 [ scc.repo] DEBUG ## PRs found:
2024-06-18 08:45:19,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-06-18 08:45:20,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-06-18 08:45:20,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-06-18 08:45:21,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-18 08:45:21,625 [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-18 08:45:22,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-18 08:45:22,480 [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-18 08:45:22,481 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-06-18 08:45:22,481 [ scc.repo] DEBUG ## Branches found:
2024-06-18 08:45:22,481 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-18 08:45:22,481 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:22,481 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:22,487 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 08:45:22,491 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 08:45:22,491 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 08:45:22,496 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 08:45:22,501 [ scc.git] DEBUG Already up to date.
2024-06-18 08:45:22,501 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-06-18 08:45:22,882 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-06-18 08:45:22,882 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-06-18 08:45:22,886 [ scc.git] DEBUG ## Unique users: []
2024-06-18 08:45:22,886 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:22,886 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:22,891 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-18 08:45:22,896 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:22,901 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-18 08:45:22,910 [ scc.git] DEBUG Auto-merging Dockerfile
2024-06-18 08:45:22,910 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-06-18 08:45:22,910 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-18 08:45:22,911 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-18 08:45:22,915 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-18 08:45:22,922 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-06-18 08:45:23,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:45:23,085 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-18 08:45:23,090 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-18 08:45:23,094 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#100](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-06-18 08:45:23,099 [ scc.config] DEBUG Found github.token
2024-06-18 08:45:23,099 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-06-18 08:45:23,099 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 08:45:23,134 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:23,134 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:23,139 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 08:45:23,175 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 08:45:23,181 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa1445dcb80> has no local changes
2024-06-18 08:45:23,181 [ 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#100 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/)'
2024-06-18 08:45:23,189 [ scc.git] DEBUG [detached HEAD b90f3c3] merge master -Dorg -Ssuccess-only
2024-06-18 08:45:23,189 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:23,189 [ scc.git] INFO Overriding base-branch from master to develop
2024-06-18 08:45:23,190 [ scc.repo] DEBUG ## PRs found:
2024-06-18 08:45:23,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-06-18 08:45:24,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-06-18 08:45:24,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-06-18 08:45:25,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-06-18 08:45:25,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-06-18 08:45:26,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-06-18 08:45:26,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-06-18 08:45:27,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-18 08:45:27,647 [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-18 08:45:28,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-18 08:45:28,594 [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-18 08:45:28,594 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-18 08:45:29,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-06-18 08:45:29,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-06-18 08:45:30,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-06-18 08:45:30,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-06-18 08:45:30,583 [ scc.repo] DEBUG ## Branches found:
2024-06-18 08:45:30,583 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-18 08:45:30,583 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:30,583 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:30,589 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-06-18 08:45:30,593 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 08:45:30,593 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-06-18 08:45:30,598 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-06-18 08:45:30,603 [ scc.git] DEBUG Already up to date.
2024-06-18 08:45:30,603 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-06-18 08:45:30,981 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-06-18 08:45:30,981 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-06-18 08:45:30,984 [ scc.git] DEBUG ## Unique users: []
2024-06-18 08:45:30,985 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:30,985 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:30,990 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-18 08:45:30,996 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:31,001 [ 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-18 08:45:31,048 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-06-18 08:45:31,049 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-06-18 08:45:31,049 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-18 08:45:31,049 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-18 08:45:31,054 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-18 08:45:31,059 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-06-18 08:45:31,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:45:31,223 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-18 08:45:31,229 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-18 08:45:31,234 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#100](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-06-18 08:45:31,238 [ scc.config] DEBUG Found github.token
2024-06-18 08:45:31,238 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-06-18 08:45:31,238 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 08:45:31,274 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 08:45:31,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 08:45:31,278 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 08:45:31,312 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 08:45:31,318 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa144608ee0> has no local changes
2024-06-18 08:45:31,318 [ 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#100 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/)'
2024-06-18 08:45:31,325 [ scc.git] DEBUG [detached HEAD 79647f4] merge master -Dorg -Ssuccess-only
2024-06-18 08:45:31,326 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:31,326 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 08:45:31,396 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-06-18 08:45:31,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:45:31,647 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-06-18 08:45:31,651 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-06-18 08:45:32,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:45:32,062 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-06-18 08:45:32,066 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-06-18 08:45:32,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:45:32,477 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-06-18 08:45:32,482 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-06-18 08:45:32,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:45:32,908 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-06-18 08:45:33,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:45:33,320 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-06-18 08:45:33,325 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-06-18 08:45:33,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:45:33,734 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-06-18 08:45:33,739 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-06-18 08:45:34,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:45:34,151 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-06-18 08:45:34,155 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-06-18 08:45:34,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:45:34,569 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-06-18 08:45:34,573 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-06-18 08:45:34,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:45:34,975 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-06-18 08:45:34,979 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-06-18 08:45:35,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:45:35,388 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-06-18 08:45:35,392 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-06-18 08:45:35,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:45:35,799 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-06-18 08:45:35,803 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-06-18 08:45:36,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:45:36,206 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-06-18 08:45:36,211 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-06-18 08:45:36,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:45:36,632 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-06-18 08:45:37,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:45:37,039 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-06-18 08:45:37,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:45:37,435 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-06-18 08:45:37,439 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-06-18 08:45:37,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:45:37,850 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-06-18 08:45:38,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:45:38,269 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-06-18 08:45:38,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:45:38,680 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-06-18 08:45:38,685 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-06-18 08:45:39,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:45:39,126 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-06-18 08:45:39,130 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-06-18 08:45:39,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:45:39,534 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-06-18 08:45:39,538 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-06-18 08:45:39,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:45:39,947 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-06-18 08:45:39,951 [ scc.config] DEBUG Found submodule.scripts.url
2024-06-18 08:45:40,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 08:45:40,361 [ scc.config] DEBUG Found submodule.scripts.branch
2024-06-18 08:45:40,361 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 08:45:40,432 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa145ffbc40> has local changes
2024-06-18 08:45:40,432 [ 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`'
- PR 375 dependabot[bot] 'Bump omero-figure from `3d9e3b8` to `ffc7e07`'
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'
- PR 65 will-moore 'gateway_required() uses omero_user_token if no username and password'
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 568 will-moore 'Remove numpy from tests_require in setup.py'
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#100 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/100/)'
2024-06-18 08:45:40,445 [ scc.git] DEBUG [detached HEAD c01a653] merge master -Dorg -Ssuccess-only
2024-06-18 08:45:40,445 [ scc.merge] INFO Repository: ome/omero-plugins
2024-06-18 08:45:40,445 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-06-18 08:45:40,445 [ scc.merge] INFO Already up to date.
2024-06-18 08:45:40,445 [ scc.merge] INFO
2024-06-18 08:45:40,445 [ scc.merge] INFO Merged PRs:
2024-06-18 08:45:40,445 [ scc.merge] INFO - PR 373 dependabot[bot] 'Bump omero-test-infra from `7688c54` to `cda3ec6`'
2024-06-18 08:45:40,446 [ scc.merge] INFO - PR 375 dependabot[bot] 'Bump omero-figure from `3d9e3b8` to `ffc7e07`'
2024-06-18 08:45:40,446 [ scc.merge] INFO
2024-06-18 08:45:40,446 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-06-18 08:45:40,446 [ scc.merge] INFO Already up to date.
2024-06-18 08:45:40,446 [ scc.merge] INFO
2024-06-18 08:45:40,446 [ scc.merge] INFO
2024-06-18 08:45:40,446 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-06-18 08:45:40,446 [ scc.merge] INFO Excluded PRs:
2024-06-18 08:45:40,446 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-06-18 08:45:40,446 [ scc.merge] INFO Already up to date.
2024-06-18 08:45:40,446 [ scc.merge] INFO
2024-06-18 08:45:40,446 [ scc.merge] INFO Merged PRs:
2024-06-18 08:45:40,446 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-06-18 08:45:40,446 [ scc.merge] INFO
2024-06-18 08:45:40,446 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-06-18 08:45:40,446 [ scc.merge] INFO Excluded PRs:
2024-06-18 08:45:40,446 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-06-18 08:45:40,446 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-06-18 08:45:40,446 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-06-18 08:45:40,446 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-06-18 08:45:40,446 [ scc.merge] INFO Already up to date.
2024-06-18 08:45:40,446 [ scc.merge] INFO
2024-06-18 08:45:40,446 [ scc.merge] INFO Merged PRs:
2024-06-18 08:45:40,446 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-06-18 08:45:40,446 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-06-18 08:45:40,446 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-06-18 08:45:40,446 [ scc.merge] INFO - PR 65 will-moore 'gateway_required() uses omero_user_token if no username and password'
2024-06-18 08:45:40,446 [ scc.merge] INFO
2024-06-18 08:45:40,446 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-06-18 08:45:40,446 [ scc.merge] INFO Excluded PRs:
2024-06-18 08:45:40,446 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-18 08:45:40,446 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-06-18 08:45:40,446 [ scc.merge] INFO Already up to date.
2024-06-18 08:45:40,446 [ scc.merge] INFO
2024-06-18 08:45:40,446 [ scc.merge] INFO Merged PRs:
2024-06-18 08:45:40,446 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-06-18 08:45:40,446 [ scc.merge] INFO
2024-06-18 08:45:40,447 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-18 08:45:40,447 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-06-18 08:45:40,447 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-06-18 08:45:40,447 [ scc.merge] INFO
2024-06-18 08:45:40,447 [ scc.merge] INFO Repository: ome/omero-figure
2024-06-18 08:45:40,447 [ scc.merge] INFO Excluded PRs:
2024-06-18 08:45:40,447 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes' (exclude comment)
2024-06-18 08:45:40,447 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-06-18 08:45:40,447 [ scc.merge] INFO Already up to date.
2024-06-18 08:45:40,447 [ scc.merge] INFO
2024-06-18 08:45:40,447 [ scc.merge] INFO Merged PRs:
2024-06-18 08:45:40,447 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-06-18 08:45:40,447 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-06-18 08:45:40,447 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-06-18 08:45:40,447 [ scc.merge] INFO
2024-06-18 08:45:40,447 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-06-18 08:45:40,447 [ scc.merge] INFO Already up to date.
2024-06-18 08:45:40,447 [ scc.merge] INFO
2024-06-18 08:45:40,447 [ scc.merge] INFO Merged PRs:
2024-06-18 08:45:40,447 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-06-18 08:45:40,447 [ scc.merge] INFO
2024-06-18 08:45:40,447 [ scc.merge] INFO Repository: ome/omero-gallery
2024-06-18 08:45:40,447 [ scc.merge] INFO Already up to date.
2024-06-18 08:45:40,447 [ scc.merge] INFO
2024-06-18 08:45:40,447 [ scc.merge] INFO Merged PRs:
2024-06-18 08:45:40,447 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-18 08:45:40,447 [ scc.merge] INFO
2024-06-18 08:45:40,447 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-06-18 08:45:40,447 [ scc.merge] INFO Excluded PRs:
2024-06-18 08:45:40,447 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-06-18 08:45:40,447 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-06-18 08:45:40,447 [ scc.merge] INFO Already up to date.
2024-06-18 08:45:40,447 [ scc.merge] INFO
2024-06-18 08:45:40,447 [ scc.merge] INFO Merged PRs:
2024-06-18 08:45:40,447 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-06-18 08:45:40,447 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-06-18 08:45:40,447 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-18 08:45:40,447 [ scc.merge] INFO
2024-06-18 08:45:40,448 [ scc.merge] INFO Repository: ome/omero-mapr
2024-06-18 08:45:40,448 [ scc.merge] INFO Excluded PRs:
2024-06-18 08:45:40,448 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-06-18 08:45:40,448 [ scc.merge] INFO Already up to date.
2024-06-18 08:45:40,448 [ scc.merge] INFO
2024-06-18 08:45:40,448 [ scc.merge] INFO Merged PRs:
2024-06-18 08:45:40,448 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-06-18 08:45:40,448 [ scc.merge] INFO
2024-06-18 08:45:40,448 [ scc.merge] INFO Repository: ome/omero-metadata
2024-06-18 08:45:40,448 [ scc.merge] INFO Already up to date.
2024-06-18 08:45:40,448 [ scc.merge] INFO
2024-06-18 08:45:40,448 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-18 08:45:40,448 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-18 08:45:40,448 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-18 08:45:40,448 [ scc.merge] INFO
2024-06-18 08:45:40,448 [ scc.merge] INFO Repository: ome/omero-parade
2024-06-18 08:45:40,448 [ scc.merge] INFO Excluded PRs:
2024-06-18 08:45:40,448 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-06-18 08:45:40,448 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-06-18 08:45:40,448 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-06-18 08:45:40,448 [ scc.merge] INFO Already up to date.
2024-06-18 08:45:40,448 [ scc.merge] INFO
2024-06-18 08:45:40,448 [ scc.merge] INFO Merged PRs:
2024-06-18 08:45:40,448 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-18 08:45:40,448 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-18 08:45:40,448 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-18 08:45:40,448 [ scc.merge] INFO
2024-06-18 08:45:40,448 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-06-18 08:45:40,448 [ scc.merge] INFO Already up to date.
2024-06-18 08:45:40,448 [ scc.merge] INFO
2024-06-18 08:45:40,448 [ scc.merge] INFO Merged PRs:
2024-06-18 08:45:40,448 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-06-18 08:45:40,448 [ scc.merge] INFO
2024-06-18 08:45:40,448 [ scc.merge] INFO Repository: ome/omero-rois
2024-06-18 08:45:40,448 [ scc.merge] INFO Excluded PRs:
2024-06-18 08:45:40,448 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-18 08:45:40,448 [ scc.merge] INFO Already up to date.
2024-06-18 08:45:40,448 [ scc.merge] INFO
2024-06-18 08:45:40,448 [ scc.merge] INFO Merged PRs:
2024-06-18 08:45:40,449 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-18 08:45:40,449 [ scc.merge] INFO
2024-06-18 08:45:40,449 [ scc.merge] INFO Repository: ome/omero-signup
2024-06-18 08:45:40,449 [ scc.merge] INFO Already up to date.
2024-06-18 08:45:40,449 [ scc.merge] INFO
2024-06-18 08:45:40,449 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-18 08:45:40,449 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-18 08:45:40,449 [ scc.merge] INFO
2024-06-18 08:45:40,449 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-06-18 08:45:40,449 [ scc.merge] INFO Already up to date.
2024-06-18 08:45:40,449 [ scc.merge] INFO
2024-06-18 08:45:40,449 [ scc.merge] INFO Merged PRs:
2024-06-18 08:45:40,449 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-18 08:45:40,449 [ scc.merge] INFO
2024-06-18 08:45:40,449 [ scc.merge] INFO Repository: ome/omero-upload
2024-06-18 08:45:40,449 [ scc.merge] INFO Already up to date.
2024-06-18 08:45:40,449 [ scc.merge] INFO
2024-06-18 08:45:40,449 [ scc.merge] INFO
2024-06-18 08:45:40,449 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-06-18 08:45:40,449 [ scc.merge] INFO Already up to date.
2024-06-18 08:45:40,449 [ scc.merge] INFO
2024-06-18 08:45:40,449 [ scc.merge] INFO
2024-06-18 08:45:40,449 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-06-18 08:45:40,449 [ scc.merge] INFO Excluded PRs:
2024-06-18 08:45:40,449 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-06-18 08:45:40,449 [ scc.merge] INFO Already up to date.
2024-06-18 08:45:40,449 [ scc.merge] INFO
2024-06-18 08:45:40,449 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-18 08:45:40,449 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-18 08:45:40,449 [ scc.merge] INFO
2024-06-18 08:45:40,449 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-06-18 08:45:40,449 [ scc.merge] INFO Already up to date.
2024-06-18 08:45:40,449 [ scc.merge] INFO
2024-06-18 08:45:40,449 [ scc.merge] INFO
2024-06-18 08:45:40,449 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-06-18 08:45:40,450 [ scc.merge] INFO Already up to date.
2024-06-18 08:45:40,450 [ scc.merge] INFO
2024-06-18 08:45:40,450 [ scc.merge] INFO
2024-06-18 08:45:40,450 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-06-18 08:45:40,450 [ scc.merge] INFO Already up to date.
2024-06-18 08:45:40,450 [ scc.merge] INFO
2024-06-18 08:45:40,450 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-18 08:45:40,450 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-06-18 08:45:40,450 [ scc.merge] INFO
2024-06-18 08:45:40,450 [ scc.merge] INFO Repository: ome/scripts
2024-06-18 08:45:40,450 [ scc.merge] INFO Excluded PRs:
2024-06-18 08:45:40,450 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-06-18 08:45:40,450 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-06-18 08:45:40,450 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-06-18 08:45:40,450 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-06-18 08:45:40,450 [ scc.merge] INFO Already up to date.
2024-06-18 08:45:40,450 [ scc.merge] INFO
2024-06-18 08:45:40,450 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-18 08:45:40,450 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-18 08:45:40,450 [ scc.merge] INFO
2024-06-18 08:45:40,450 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-06-18 08:45:40,450 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 08:45:40,455 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-06-18 08:45:40,455 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 08:45:40,459 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:40,460 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-06-18 08:45:40,460 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 08:45:40,464 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:40,464 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-06-18 08:45:40,464 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 08:45:40,469 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:40,469 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-06-18 08:45:40,469 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 08:45:40,473 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:40,473 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-18 08:45:40,473 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 08:45:40,478 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:40,478 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-18 08:45:40,478 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 08:45:40,483 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:40,483 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-18 08:45:40,483 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 08:45:40,487 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:40,487 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-18 08:45:40,487 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 08:45:40,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:40,492 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-18 08:45:40,492 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 08:45:40,496 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:40,496 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-18 08:45:40,496 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 08:45:40,501 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:40,501 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-18 08:45:40,501 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 08:45:40,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:40,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-18 08:45:40,505 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 08:45:40,510 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:40,510 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-18 08:45:40,510 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 08:45:40,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:40,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-18 08:45:40,514 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 08:45:40,519 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:40,519 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-18 08:45:40,519 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 08:45:40,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:40,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-18 08:45:40,523 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 08:45:40,527 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:40,528 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-18 08:45:40,528 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 08:45:40,532 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:40,532 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-18 08:45:40,532 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 08:45:40,537 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:40,537 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-18 08:45:40,537 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 08:45:40,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:40,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-18 08:45:40,541 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 08:45:40,546 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:40,546 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-18 08:45:40,546 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 08:45:40,550 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 08:45:40,550 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-18 08:45:40,550 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 08:45:40,555 [ 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 b59b4e6] 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 ffc7e075
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 7240f73] 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-18 08:46:28,418 [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-18 08:46:37,463 [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-18 08:46:39,869 [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-18 08:46:44,525 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-06-18 08:47:33,192 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/f6f303f9/images/svgs/logo.svg){kind=logo}
