Skipping 103 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-06-17 00:45:36,613 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-17 00:45:36,613 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-17 00:45:36,622 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-17 00:45:36,631 [ scc.git] DEBUG Already up to date.
2024-06-17 00:45:36,631 [ scc.git] DEBUG Calling 'git fetch origin pull/102/head'
2024-06-17 00:45:37,045 [ scc.git] DEBUG From https://github.com/ome/omero-cli-zarr
2024-06-17 00:45:37,045 [ scc.git] DEBUG * branch refs/pull/102/head -> FETCH_HEAD
2024-06-17 00:45:37,050 [ scc.git] DEBUG Calling 'git fetch origin pull/123/head'
2024-06-17 00:45:37,434 [ scc.git] DEBUG From https://github.com/ome/omero-cli-zarr
2024-06-17 00:45:37,434 [ scc.git] DEBUG * branch refs/pull/123/head -> FETCH_HEAD
2024-06-17 00:45:37,442 [ scc.git] DEBUG Calling 'git fetch origin pull/147/head'
2024-06-17 00:45:37,812 [ scc.git] DEBUG From https://github.com/ome/omero-cli-zarr
2024-06-17 00:45:37,812 [ scc.git] DEBUG * branch refs/pull/147/head -> FETCH_HEAD
2024-06-17 00:45:37,819 [ scc.git] DEBUG ## Unique users: []
2024-06-17 00:45:37,820 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:45:37,820 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:45:37,829 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f22d4074b7c458ad24320cf5a6f8adb9e686aa44'
2024-06-17 00:45:37,842 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:45:37,850 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 102 (Zarr export tests) f22d4074b7c458ad24320cf5a6f8adb9e686aa44'
2024-06-17 00:45:37,989 [ scc.git] DEBUG Auto-merging src/omero_zarr/cli.py
2024-06-17 00:45:37,989 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-06-17 00:45:37,989 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_zarr/raw_pixels.py
2024-06-17 00:45:37,990 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-17 00:45:37,991 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-17 00:45:38,002 [ scc.git] DEBUG Calling 'git reset --hard 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-17 00:45:38,013 [ scc.git] DEBUG HEAD is now at 2ca566b Merge pull request #160 from ome/pre-commit-ci-update-config
2024-06-17 00:45:38,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:45:38,193 [ scc.git] DEBUG Calling 'git merge-base 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473 f22d4074b7c458ad24320cf5a6f8adb9e686aa44'
2024-06-17 00:45:38,203 [ scc.git] DEBUG Calling 'git diff --name-only 782a1cd0077bcc2871f21e9f0acdc25ae7745243..2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-17 00:45:38,212 [ scc.git] INFO - PR 102 will-moore 'Zarr export tests'
Conflicting PR. Removed from build [OMERO-plugins-push#98](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_zarr/raw_pixels.py
--conflicts
2024-06-17 00:45:38,222 [ scc.config] DEBUG Found github.token
2024-06-17 00:45:38,222 [ scc.git] DEBUG Not adding comment to issue #102, already --conflicts.
2024-06-17 00:45:38,222 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-06-17 00:45:38,233 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:45:38,245 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 123 (Support export of Fileset:ID) 553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-06-17 00:45:38,297 [ scc.git] DEBUG Auto-merging .isort.cfg
2024-06-17 00:45:38,297 [ scc.git] DEBUG CONFLICT (content): Merge conflict in .isort.cfg
2024-06-17 00:45:38,297 [ scc.git] DEBUG Auto-merging setup.py
2024-06-17 00:45:38,297 [ scc.git] DEBUG Auto-merging src/omero_zarr/cli.py
2024-06-17 00:45:38,297 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-06-17 00:45:38,298 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_zarr/raw_pixels.py
2024-06-17 00:45:38,298 [ scc.git] DEBUG Auto-merging src/omero_zarr/util.py
2024-06-17 00:45:38,298 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-17 00:45:38,298 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-17 00:45:38,305 [ scc.git] DEBUG Calling 'git reset --hard 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-17 00:45:38,315 [ scc.git] DEBUG HEAD is now at 2ca566b Merge pull request #160 from ome/pre-commit-ci-update-config
2024-06-17 00:45:38,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:45:38,622 [ scc.git] DEBUG Calling 'git merge-base 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473 553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-06-17 00:45:38,634 [ scc.git] DEBUG Calling 'git diff --name-only eff38d0408f9d50de13b28dfe09e4382965e203f..2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-17 00:45:38,643 [ scc.git] INFO - PR 123 will-moore 'Support export of Fileset:ID'
Conflicting PR. Removed from build [OMERO-plugins-push#98](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/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-17 00:45:38,653 [ scc.config] DEBUG Found github.token
2024-06-17 00:45:38,654 [ scc.git] DEBUG Not adding comment to issue #123, already --conflicts.
2024-06-17 00:45:38,654 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a14f62a940f4974a305b3f5858049ee493b898ef'
2024-06-17 00:45:38,664 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:45:38,674 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 147 (Name option) a14f62a940f4974a305b3f5858049ee493b898ef'
2024-06-17 00:45:38,719 [ scc.git] DEBUG Auto-merging src/omero_zarr/masks.py
2024-06-17 00:45:38,720 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-06-17 00:45:38,721 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-17 00:45:38,726 [ scc.git] DEBUG README.rst | 30 ++++++++++++++++++------------
2024-06-17 00:45:38,726 [ scc.git] DEBUG src/omero_zarr/cli.py | 9 +++++++++
2024-06-17 00:45:38,726 [ scc.git] DEBUG src/omero_zarr/masks.py | 4 ++--
2024-06-17 00:45:38,726 [ scc.git] DEBUG src/omero_zarr/raw_pixels.py | 28 +++++++++++++++++++++++-----
2024-06-17 00:45:38,726 [ scc.git] DEBUG src/omero_zarr/util.py | 2 +-
2024-06-17 00:45:38,726 [ scc.git] DEBUG 5 files changed, 53 insertions(+), 20 deletions(-)
2024-06-17 00:45:39,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:45:39,028 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-17 00:45:39,069 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:45:39,070 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:45:39,075 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-17 00:45:39,118 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-17 00:45:39,124 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f924c033970> has no local changes
2024-06-17 00:45:39,125 [ 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#98 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/)'
2024-06-17 00:45:39,133 [ scc.git] DEBUG [detached HEAD 8945a09] merge master -Dorg -Ssuccess-only
2024-06-17 00:45:39,133 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:45:39,134 [ scc.repo] DEBUG ## PRs found:
2024-06-17 00:45:39,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-06-17 00:45:39,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-06-17 00:45:40,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-06-17 00:45:41,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-17 00:45:41,496 [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-17 00:45:41,975 [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-17 00:45:42,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-17 00:45:42,877 [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-17 00:45:42,879 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-06-17 00:45:43,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-06-17 00:45:43,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-17 00:45:44,378 [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-17 00:45:44,898 [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-17 00:45:45,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-17 00:45:45,827 [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-17 00:45:45,828 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-06-17 00:45:45,829 [ scc.repo] DEBUG ## Branches found:
2024-06-17 00:45:45,829 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-17 00:45:45,830 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:45:45,830 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:45:45,839 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-17 00:45:45,847 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-17 00:45:45,848 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-17 00:45:45,855 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-17 00:45:45,861 [ scc.git] DEBUG Already up to date.
2024-06-17 00:45:45,861 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-06-17 00:45:46,670 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-17 00:45:46,671 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-06-17 00:45:46,680 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-06-17 00:45:47,261 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-17 00:45:47,261 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-06-17 00:45:47,269 [ scc.git] DEBUG ## Unique users: []
2024-06-17 00:45:47,270 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:45:47,270 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:45:47,281 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-17 00:45:47,295 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:45:47,305 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-17 00:45:47,450 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-17 00:45:47,456 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-06-17 00:45:47,456 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-06-17 00:45:47,456 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-06-17 00:45:47,457 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-06-17 00:45:47,457 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-06-17 00:45:47,457 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-06-17 00:45:47,457 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-06-17 00:45:47,457 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-06-17 00:45:47,457 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-06-17 00:45:47,457 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-06-17 00:45:47,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:45:47,632 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-17 00:45:47,642 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:45:47,647 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-17 00:45:47,672 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-06-17 00:45:47,673 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-06-17 00:45:47,673 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-06-17 00:45:47,673 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-17 00:45:47,681 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-06-17 00:45:47,681 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-06-17 00:45:47,681 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-06-17 00:45:47,681 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-06-17 00:45:47,681 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-06-17 00:45:47,681 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-06-17 00:45:47,681 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-06-17 00:45:47,681 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-06-17 00:45:47,681 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-06-17 00:45:47,681 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-06-17 00:45:47,681 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-06-17 00:45:47,681 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-06-17 00:45:48,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:45:48,052 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-17 00:45:48,119 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:45:48,120 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:45:48,128 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-17 00:45:48,177 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-17 00:45:48,193 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9247fd2bb0> has no local changes
2024-06-17 00:45:48,193 [ 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'
Generated by OMERO-plugins-push#98 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/)'
2024-06-17 00:45:48,205 [ scc.git] DEBUG [detached HEAD f93588bf] merge master -Dorg -Ssuccess-only
2024-06-17 00:45:48,205 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:45:48,206 [ scc.repo] DEBUG ## PRs found:
2024-06-17 00:45:48,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-06-17 00:45:49,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-06-17 00:45:49,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-06-17 00:45:49,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-17 00:45:50,475 [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-17 00:45:51,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-17 00:45:51,463 [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-17 00:45:51,464 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-06-17 00:45:51,464 [ scc.repo] DEBUG ## Branches found:
2024-06-17 00:45:51,464 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-17 00:45:51,464 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:45:51,464 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:45:51,470 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-17 00:45:51,475 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-17 00:45:51,475 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-17 00:45:51,481 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-17 00:45:51,486 [ scc.git] DEBUG Already up to date.
2024-06-17 00:45:51,486 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-06-17 00:45:51,885 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-06-17 00:45:51,886 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-06-17 00:45:51,891 [ scc.git] DEBUG ## Unique users: []
2024-06-17 00:45:51,891 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:45:51,891 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:45:51,898 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-17 00:45:51,905 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:45:51,911 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-17 00:45:51,952 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-06-17 00:45:51,953 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-17 00:45:51,956 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-06-17 00:45:51,956 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-06-17 00:45:52,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:45:52,126 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-17 00:45:52,167 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:45:52,168 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:45:52,173 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-17 00:45:52,212 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-17 00:45:52,219 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f924c02bdf0> has no local changes
2024-06-17 00:45:52,219 [ 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#98 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/)'
2024-06-17 00:45:52,228 [ scc.git] DEBUG [detached HEAD 2537471] merge master -Dorg -Ssuccess-only
2024-06-17 00:45:52,228 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:45:52,228 [ scc.repo] DEBUG ## PRs found:
2024-06-17 00:45:52,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-06-17 00:45:53,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-06-17 00:45:53,083 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-17 00:45:53,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-17 00:45:54,137 [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-17 00:45:54,623 [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-17 00:45:55,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-17 00:45:55,568 [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-17 00:45:55,569 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-17 00:45:55,569 [ scc.repo] DEBUG ## Branches found:
2024-06-17 00:45:55,569 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-17 00:45:55,569 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:45:55,569 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:45:55,575 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-17 00:45:55,580 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-17 00:45:55,580 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-17 00:45:55,585 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-17 00:45:55,591 [ scc.git] DEBUG Already up to date.
2024-06-17 00:45:55,592 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-06-17 00:45:55,984 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-06-17 00:45:55,984 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-06-17 00:45:55,989 [ scc.git] DEBUG ## Unique users: []
2024-06-17 00:45:55,990 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:45:55,990 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:45:55,996 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-06-17 00:45:56,002 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:45:56,009 [ 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-17 00:45:56,022 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-17 00:45:56,026 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-06-17 00:45:56,026 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-06-17 00:45:56,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:45:56,184 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-17 00:45:56,226 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:45:56,226 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:45:56,232 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-17 00:45:56,273 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-17 00:45:56,282 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f924c02b340> has no local changes
2024-06-17 00:45:56,282 [ 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#98 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/)'
2024-06-17 00:45:56,294 [ scc.git] DEBUG [detached HEAD 35c6619] merge master -Dorg -Ssuccess-only
2024-06-17 00:45:56,294 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:45:56,295 [ scc.repo] DEBUG ## PRs found:
2024-06-17 00:45:56,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-06-17 00:45:57,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-06-17 00:45:57,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-06-17 00:45:58,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-17 00:45:58,614 [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-17 00:45:59,103 [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-17 00:45:59,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-17 00:46:00,030 [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-17 00:46:00,031 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-17 00:46:00,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-06-17 00:46:01,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-06-17 00:46:01,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-17 00:46:02,014 [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-17 00:46:02,474 [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-17 00:46:02,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-17 00:46:03,447 [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-17 00:46:03,448 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-06-17 00:46:03,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-06-17 00:46:04,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-06-17 00:46:04,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-17 00:46:05,325 [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-17 00:46:05,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-17 00:46:06,308 [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-17 00:46:06,309 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-06-17 00:46:06,309 [ scc.repo] DEBUG ## Branches found:
2024-06-17 00:46:06,309 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-17 00:46:06,309 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:06,309 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:06,315 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-17 00:46:06,320 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-17 00:46:06,320 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-17 00:46:06,326 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-17 00:46:06,332 [ scc.git] DEBUG Already up to date.
2024-06-17 00:46:06,332 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-06-17 00:46:06,689 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-17 00:46:06,689 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-06-17 00:46:06,694 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-06-17 00:46:07,109 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-17 00:46:07,109 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-06-17 00:46:07,114 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-06-17 00:46:07,479 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-17 00:46:07,480 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-06-17 00:46:07,484 [ scc.git] DEBUG ## Unique users: []
2024-06-17 00:46:07,484 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:07,484 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:07,490 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-17 00:46:07,496 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:07,501 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-17 00:46:07,513 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-06-17 00:46:07,513 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-17 00:46:07,516 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-06-17 00:46:07,516 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-06-17 00:46:07,517 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-06-17 00:46:07,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:46:07,684 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-17 00:46:07,691 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:07,696 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-17 00:46:07,852 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-06-17 00:46:07,852 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-06-17 00:46:07,853 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-06-17 00:46:07,853 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-06-17 00:46:07,853 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-17 00:46:07,857 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-06-17 00:46:07,857 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-06-17 00:46:07,858 [ scc.git] DEBUG src/app/header.html | 5 +
2024-06-17 00:46:07,858 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-06-17 00:46:07,858 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-06-17 00:46:07,858 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-06-17 00:46:07,858 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-06-17 00:46:07,858 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-06-17 00:46:08,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:46:08,098 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-17 00:46:08,105 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:08,111 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-17 00:46:08,123 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-06-17 00:46:08,124 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-17 00:46:08,127 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-06-17 00:46:08,127 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-06-17 00:46:08,127 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-06-17 00:46:08,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:46:08,517 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-17 00:46:08,559 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:08,559 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:08,566 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-17 00:46:08,604 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-17 00:46:08,613 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9247fea8e0> has no local changes
2024-06-17 00:46:08,613 [ 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#98 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/)'
2024-06-17 00:46:08,625 [ scc.git] DEBUG [detached HEAD 14c0131] merge master -Dorg -Ssuccess-only
2024-06-17 00:46:08,625 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:46:08,625 [ scc.repo] DEBUG ## PRs found:
2024-06-17 00:46:09,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-06-17 00:46:09,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-06-17 00:46:10,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-06-17 00:46:10,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-17 00:46:11,002 [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-17 00:46:11,473 [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-17 00:46:11,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-17 00:46:12,406 [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-17 00:46:12,407 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-06-17 00:46:12,407 [ scc.repo] DEBUG ## Branches found:
2024-06-17 00:46:12,407 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-17 00:46:12,408 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:12,408 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:12,414 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-17 00:46:12,419 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-17 00:46:12,420 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-17 00:46:12,426 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-17 00:46:12,432 [ scc.git] DEBUG Already up to date.
2024-06-17 00:46:12,433 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-06-17 00:46:12,824 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-06-17 00:46:12,824 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-06-17 00:46:12,829 [ scc.git] DEBUG ## Unique users: []
2024-06-17 00:46:12,829 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:12,829 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:12,835 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-17 00:46:12,842 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:12,849 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-17 00:46:12,860 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-17 00:46:12,863 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-06-17 00:46:12,863 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-06-17 00:46:12,863 [ scc.git] DEBUG requirements.txt | 2 +-
2024-06-17 00:46:12,863 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-06-17 00:46:12,863 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-06-17 00:46:12,863 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-06-17 00:46:13,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:46:13,011 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-17 00:46:13,053 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:13,053 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:13,059 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-17 00:46:13,098 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-17 00:46:13,107 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9244f99bb0> has no local changes
2024-06-17 00:46:13,107 [ 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#98 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/)'
2024-06-17 00:46:13,117 [ scc.git] DEBUG [detached HEAD 9d7a70a] merge master -Dorg -Ssuccess-only
2024-06-17 00:46:13,118 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:46:13,118 [ scc.repo] DEBUG ## PRs found:
2024-06-17 00:46:13,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-06-17 00:46:14,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-06-17 00:46:14,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-06-17 00:46:15,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-17 00:46:15,529 [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-17 00:46:16,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-17 00:46:16,470 [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-17 00:46:16,471 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-17 00:46:16,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-06-17 00:46:17,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-06-17 00:46:17,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-17 00:46:18,392 [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-17 00:46:18,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-17 00:46:19,334 [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-17 00:46:19,335 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-17 00:46:19,335 [ scc.repo] DEBUG ## Branches found:
2024-06-17 00:46:19,335 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-17 00:46:19,336 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:19,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:19,344 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-17 00:46:19,349 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-17 00:46:19,349 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-17 00:46:19,355 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-17 00:46:19,360 [ scc.git] DEBUG Already up to date.
2024-06-17 00:46:19,361 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-06-17 00:46:19,710 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-17 00:46:19,711 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-06-17 00:46:19,717 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-06-17 00:46:20,096 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-17 00:46:20,096 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-06-17 00:46:20,103 [ scc.git] DEBUG ## Unique users: []
2024-06-17 00:46:20,103 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:20,104 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:20,111 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-17 00:46:20,119 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:20,125 [ 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-17 00:46:20,143 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-06-17 00:46:20,143 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-06-17 00:46:20,143 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-17 00:46:20,143 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-17 00:46:20,143 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-17 00:46:20,144 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-17 00:46:20,151 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-17 00:46:20,160 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-17 00:46:20,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:46:20,315 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-17 00:46:20,323 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-17 00:46:20,330 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#98](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-06-17 00:46:20,337 [ scc.config] DEBUG Found github.token
2024-06-17 00:46:20,337 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-06-17 00:46:20,337 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-17 00:46:20,345 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:20,351 [ 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-17 00:46:20,547 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-17 00:46:20,547 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-17 00:46:20,547 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-06-17 00:46:20,547 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-17 00:46:20,548 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-17 00:46:20,557 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-17 00:46:20,565 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-17 00:46:20,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:46:20,737 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-17 00:46:20,744 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-17 00:46:20,751 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#98](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/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-17 00:46:20,756 [ scc.config] DEBUG Found github.token
2024-06-17 00:46:20,756 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-06-17 00:46:20,756 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-17 00:46:20,811 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:20,812 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:20,819 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-17 00:46:20,862 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-17 00:46:20,870 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9247fdbf40> has no local changes
2024-06-17 00:46:20,871 [ 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#98 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/)'
2024-06-17 00:46:20,883 [ scc.git] DEBUG [detached HEAD 5666026] merge master -Dorg -Ssuccess-only
2024-06-17 00:46:20,884 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:46:20,884 [ scc.repo] DEBUG ## PRs found:
2024-06-17 00:46:21,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-06-17 00:46:21,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-06-17 00:46:21,770 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-17 00:46:22,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-17 00:46:22,861 [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-17 00:46:23,325 [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-17 00:46:23,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-17 00:46:24,214 [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-17 00:46:24,215 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-17 00:46:24,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-06-17 00:46:24,695 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-17 00:46:25,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-17 00:46:25,736 [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-17 00:46:26,239 [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-17 00:46:26,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-17 00:46:27,191 [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-17 00:46:27,192 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-17 00:46:27,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-06-17 00:46:27,649 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-17 00:46:28,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-17 00:46:28,743 [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-17 00:46:29,206 [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-17 00:46:29,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-17 00:46:30,088 [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-17 00:46:30,089 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-17 00:46:30,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-06-17 00:46:31,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-06-17 00:46:31,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-06-17 00:46:31,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-06-17 00:46:32,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-06-17 00:46:32,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-06-17 00:46:32,998 [ scc.repo] DEBUG ## Branches found:
2024-06-17 00:46:32,998 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-17 00:46:32,998 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:32,998 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:33,004 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-17 00:46:33,010 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-17 00:46:33,010 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-17 00:46:33,016 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-17 00:46:33,022 [ scc.git] DEBUG Already up to date.
2024-06-17 00:46:33,023 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-06-17 00:46:33,405 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-17 00:46:33,405 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-06-17 00:46:33,410 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-06-17 00:46:33,749 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-17 00:46:33,750 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-06-17 00:46:33,754 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-06-17 00:46:34,109 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-17 00:46:34,109 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-06-17 00:46:34,116 [ scc.git] DEBUG ## Unique users: []
2024-06-17 00:46:34,116 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:34,116 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:34,125 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-06-17 00:46:34,133 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:34,140 [ 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-17 00:46:34,152 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-17 00:46:34,155 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-06-17 00:46:34,155 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-06-17 00:46:34,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:46:34,317 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-06-17 00:46:34,325 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:34,330 [ 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-17 00:46:34,342 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-17 00:46:34,343 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-17 00:46:34,346 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-06-17 00:46:34,346 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-06-17 00:46:34,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:46:34,732 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-06-17 00:46:34,739 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:34,746 [ 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-17 00:46:34,769 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-17 00:46:34,769 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-17 00:46:34,773 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-06-17 00:46:34,773 [ scc.git] DEBUG package.json | 2 +-
2024-06-17 00:46:34,773 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-06-17 00:46:35,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:46:35,138 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-17 00:46:35,180 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:35,180 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:35,185 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-17 00:46:35,222 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-17 00:46:35,229 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9244750640> has no local changes
2024-06-17 00:46:35,230 [ 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#98 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/)'
2024-06-17 00:46:35,238 [ scc.git] DEBUG [detached HEAD ecfa53e] merge master -Dorg -Ssuccess-only
2024-06-17 00:46:35,238 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:46:35,238 [ scc.repo] DEBUG ## PRs found:
2024-06-17 00:46:35,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-06-17 00:46:36,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-06-17 00:46:36,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-17 00:46:37,200 [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-17 00:46:37,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-17 00:46:38,143 [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-17 00:46:38,143 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-06-17 00:46:38,143 [ scc.repo] DEBUG ## Branches found:
2024-06-17 00:46:38,144 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-17 00:46:38,144 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:38,144 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:38,150 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-17 00:46:38,154 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-17 00:46:38,155 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-17 00:46:38,160 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-17 00:46:38,166 [ scc.git] DEBUG Already up to date.
2024-06-17 00:46:38,166 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-17 00:46:38,596 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-06-17 00:46:38,596 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-17 00:46:38,602 [ scc.git] DEBUG ## Unique users: []
2024-06-17 00:46:38,602 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:38,602 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:38,608 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-17 00:46:38,613 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:38,618 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-17 00:46:38,628 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-17 00:46:38,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:46:38,804 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-17 00:46:38,846 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:38,846 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:38,852 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-17 00:46:38,891 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-17 00:46:38,898 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9247fcbbe0> has no local changes
2024-06-17 00:46:38,898 [ 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#98 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/)'
2024-06-17 00:46:38,907 [ scc.git] DEBUG [detached HEAD 602d269] merge master -Dorg -Ssuccess-only
2024-06-17 00:46:38,908 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:46:38,908 [ scc.repo] DEBUG ## PRs found:
2024-06-17 00:46:39,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-06-17 00:46:39,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-06-17 00:46:40,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-06-17 00:46:40,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-06-17 00:46:41,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-17 00:46:41,910 [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-17 00:46:42,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-17 00:46:42,852 [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-17 00:46:42,853 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-17 00:46:42,853 [ scc.repo] DEBUG ## Branches found:
2024-06-17 00:46:42,853 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-17 00:46:42,853 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:42,853 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:42,860 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-17 00:46:42,865 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-17 00:46:42,865 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-17 00:46:42,870 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-17 00:46:42,876 [ scc.git] DEBUG Already up to date.
2024-06-17 00:46:42,877 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-06-17 00:46:43,258 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-06-17 00:46:43,258 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-06-17 00:46:43,263 [ scc.git] DEBUG ## Unique users: []
2024-06-17 00:46:43,263 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:43,263 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:43,269 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-06-17 00:46:43,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:43,280 [ 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-17 00:46:43,298 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-06-17 00:46:43,299 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-17 00:46:43,302 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-06-17 00:46:43,302 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-06-17 00:46:43,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:46:43,466 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-17 00:46:43,510 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:43,510 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:43,518 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-17 00:46:43,560 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-17 00:46:43,567 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9244707550> has no local changes
2024-06-17 00:46:43,567 [ 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#98 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/)'
2024-06-17 00:46:43,576 [ scc.git] DEBUG [detached HEAD 2776fa9] merge master -Dorg -Ssuccess-only
2024-06-17 00:46:43,577 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:46:43,577 [ scc.repo] DEBUG ## PRs found:
2024-06-17 00:46:44,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-06-17 00:46:44,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-06-17 00:46:44,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-06-17 00:46:45,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-17 00:46:46,003 [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-17 00:46:46,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-17 00:46:46,951 [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-17 00:46:46,952 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-17 00:46:46,952 [ scc.repo] DEBUG ## Branches found:
2024-06-17 00:46:46,952 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-17 00:46:46,952 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:46,952 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:46,959 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-17 00:46:46,965 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-17 00:46:46,965 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-17 00:46:46,972 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-17 00:46:46,978 [ scc.git] DEBUG Already up to date.
2024-06-17 00:46:46,978 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-17 00:46:47,512 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-06-17 00:46:47,512 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-17 00:46:47,517 [ scc.git] DEBUG ## Unique users: []
2024-06-17 00:46:47,517 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:47,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:47,523 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-17 00:46:47,529 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:47,534 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-17 00:46:47,564 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-06-17 00:46:47,564 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-06-17 00:46:47,565 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-06-17 00:46:47,565 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-06-17 00:46:47,565 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-06-17 00:46:47,565 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-06-17 00:46:47,565 [ scc.git] DEBUG Auto-merging setup.py
2024-06-17 00:46:47,565 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-06-17 00:46:47,565 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-17 00:46:47,565 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-17 00:46:47,571 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-17 00:46:47,579 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-06-17 00:46:47,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:46:47,742 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-17 00:46:47,748 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-17 00:46:47,754 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#98](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/views.py
- omero_signup/urls.py
- omero_signup/signup_settings.py
--conflicts
2024-06-17 00:46:47,759 [ scc.config] DEBUG Found github.token
2024-06-17 00:46:47,759 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-06-17 00:46:47,759 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-17 00:46:47,801 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:47,801 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:47,807 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-17 00:46:47,846 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-17 00:46:47,853 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9244f83f40> has no local changes
2024-06-17 00:46:47,854 [ 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#98 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/)'
2024-06-17 00:46:47,862 [ scc.git] DEBUG [detached HEAD 7a90ff3] merge master -Dorg -Ssuccess-only
2024-06-17 00:46:47,863 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:46:47,863 [ scc.repo] DEBUG ## PRs found:
2024-06-17 00:46:48,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-06-17 00:46:48,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-06-17 00:46:49,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-06-17 00:46:49,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-17 00:46:50,144 [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-17 00:46:50,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-17 00:46:51,064 [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-17 00:46:51,064 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-17 00:46:51,065 [ scc.repo] DEBUG ## Branches found:
2024-06-17 00:46:51,065 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-17 00:46:51,065 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:51,065 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:51,071 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-17 00:46:51,077 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-17 00:46:51,078 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-17 00:46:51,084 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-17 00:46:51,091 [ scc.git] DEBUG Already up to date.
2024-06-17 00:46:51,091 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-06-17 00:46:51,509 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-06-17 00:46:51,509 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-06-17 00:46:51,515 [ scc.git] DEBUG ## Unique users: []
2024-06-17 00:46:51,516 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:51,516 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:51,522 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-06-17 00:46:51,530 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:51,536 [ 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-17 00:46:51,569 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-17 00:46:51,572 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-06-17 00:46:51,572 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-06-17 00:46:51,572 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-06-17 00:46:51,572 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-06-17 00:46:51,572 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-06-17 00:46:51,572 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-06-17 00:46:51,572 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-06-17 00:46:51,572 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-06-17 00:46:51,572 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-06-17 00:46:51,572 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-06-17 00:46:51,574 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-06-17 00:46:51,574 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-06-17 00:46:51,574 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-06-17 00:46:51,574 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-06-17 00:46:51,575 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-06-17 00:46:51,575 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-06-17 00:46:51,575 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-06-17 00:46:51,575 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-06-17 00:46:51,575 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-06-17 00:46:51,575 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-06-17 00:46:51,575 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-06-17 00:46:51,575 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-06-17 00:46:51,575 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-06-17 00:46:51,575 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-06-17 00:46:51,575 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-06-17 00:46:51,575 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-06-17 00:46:51,575 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-06-17 00:46:51,575 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-06-17 00:46:51,575 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-06-17 00:46:51,575 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-06-17 00:46:51,575 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-06-17 00:46:51,575 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-06-17 00:46:51,575 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-06-17 00:46:51,575 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-06-17 00:46:51,575 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-06-17 00:46:51,575 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-06-17 00:46:51,575 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-06-17 00:46:51,575 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-06-17 00:46:51,575 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-06-17 00:46:51,575 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-06-17 00:46:51,575 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-06-17 00:46:51,575 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-06-17 00:46:51,575 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-06-17 00:46:51,575 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-06-17 00:46:51,575 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-06-17 00:46:51,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:46:51,746 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-17 00:46:51,812 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:51,812 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:51,820 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-17 00:46:51,863 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-17 00:46:51,870 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9244707730> has no local changes
2024-06-17 00:46:51,870 [ 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#98 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/)'
2024-06-17 00:46:51,881 [ scc.git] DEBUG [detached HEAD d54e7fb] merge master -Dorg -Ssuccess-only
2024-06-17 00:46:51,882 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:46:51,882 [ scc.repo] DEBUG ## PRs found:
2024-06-17 00:46:52,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-06-17 00:46:52,168 [ scc.repo] DEBUG ## Branches found:
2024-06-17 00:46:52,168 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-17 00:46:52,168 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:52,168 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:52,174 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-17 00:46:52,179 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-17 00:46:52,179 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-17 00:46:52,185 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-17 00:46:52,191 [ scc.git] DEBUG Already up to date.
2024-06-17 00:46:52,191 [ scc.git] DEBUG ## Unique users: []
2024-06-17 00:46:52,191 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:52,191 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:52,197 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-17 00:46:52,236 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:52,237 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:52,242 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-17 00:46:52,282 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-17 00:46:52,289 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9244718b80> has no local changes
2024-06-17 00:46:52,289 [ 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#98 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/)'
2024-06-17 00:46:52,298 [ scc.git] DEBUG [detached HEAD f4fe5d1] merge master -Dorg -Ssuccess-only
2024-06-17 00:46:52,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:46:52,298 [ scc.repo] DEBUG ## PRs found:
2024-06-17 00:46:52,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-06-17 00:46:52,602 [ scc.repo] DEBUG ## Branches found:
2024-06-17 00:46:52,602 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-17 00:46:52,602 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:52,603 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:52,608 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-17 00:46:52,613 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-17 00:46:52,613 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-17 00:46:52,620 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-17 00:46:52,626 [ scc.git] DEBUG Already up to date.
2024-06-17 00:46:52,626 [ scc.git] DEBUG ## Unique users: []
2024-06-17 00:46:52,626 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:52,626 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:52,631 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-17 00:46:52,673 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:52,673 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:52,680 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-17 00:46:52,723 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-17 00:46:52,737 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f924473bd90> has no local changes
2024-06-17 00:46:52,737 [ 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#98 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/)'
2024-06-17 00:46:52,747 [ scc.git] DEBUG [detached HEAD dbd0e3e] merge master -Dorg -Ssuccess-only
2024-06-17 00:46:52,748 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:46:52,748 [ scc.git] INFO Overriding base-branch from master to main
2024-06-17 00:46:52,748 [ scc.repo] DEBUG ## PRs found:
2024-06-17 00:46:53,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-06-17 00:46:53,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-06-17 00:46:54,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-06-17 00:46:54,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-06-17 00:46:55,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-17 00:46:55,537 [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-17 00:46:56,020 [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-17 00:46:56,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-17 00:46:56,965 [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-17 00:46:56,965 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-17 00:46:56,966 [ scc.repo] DEBUG ## Branches found:
2024-06-17 00:46:56,966 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-17 00:46:56,966 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:56,966 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:56,973 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-06-17 00:46:56,978 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-17 00:46:56,979 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-06-17 00:46:56,984 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-06-17 00:46:56,989 [ scc.git] DEBUG Already up to date.
2024-06-17 00:46:56,989 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-06-17 00:46:57,463 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-06-17 00:46:57,463 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-06-17 00:46:57,468 [ scc.git] DEBUG ## Unique users: []
2024-06-17 00:46:57,468 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:57,468 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:57,474 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-17 00:46:57,481 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:57,487 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-17 00:46:57,509 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-06-17 00:46:57,509 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-06-17 00:46:57,509 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-17 00:46:57,510 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-17 00:46:57,517 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-17 00:46:57,523 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-06-17 00:46:57,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:46:57,679 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-17 00:46:57,687 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-17 00:46:57,693 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#98](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-06-17 00:46:57,698 [ scc.config] DEBUG Found github.token
2024-06-17 00:46:57,698 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-06-17 00:46:57,698 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-17 00:46:57,741 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:57,741 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:57,747 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-17 00:46:57,789 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-17 00:46:57,797 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9244754ee0> has no local changes
2024-06-17 00:46:57,797 [ 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#98 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/)'
2024-06-17 00:46:57,806 [ scc.git] DEBUG [detached HEAD 40caf47] merge master -Dorg -Ssuccess-only
2024-06-17 00:46:57,806 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:46:57,806 [ scc.repo] DEBUG ## PRs found:
2024-06-17 00:46:58,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-06-17 00:46:58,094 [ scc.repo] DEBUG ## Branches found:
2024-06-17 00:46:58,094 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-17 00:46:58,094 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:58,094 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:58,101 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-17 00:46:58,106 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-17 00:46:58,106 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-17 00:46:58,111 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-17 00:46:58,117 [ scc.git] DEBUG Already up to date.
2024-06-17 00:46:58,117 [ scc.git] DEBUG ## Unique users: []
2024-06-17 00:46:58,117 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:58,117 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:58,122 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-17 00:46:58,164 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:58,164 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:58,170 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-17 00:46:58,212 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-17 00:46:58,218 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f924471fe80> has no local changes
2024-06-17 00:46:58,218 [ 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#98 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/)'
2024-06-17 00:46:58,228 [ scc.git] DEBUG [detached HEAD f72544d] merge master -Dorg -Ssuccess-only
2024-06-17 00:46:58,228 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:46:58,229 [ scc.repo] DEBUG ## PRs found:
2024-06-17 00:46:58,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-06-17 00:46:58,544 [ scc.repo] DEBUG ## Branches found:
2024-06-17 00:46:58,544 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-17 00:46:58,545 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:58,545 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:58,550 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-17 00:46:58,556 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-17 00:46:58,556 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-17 00:46:58,563 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-17 00:46:58,570 [ scc.git] DEBUG Already up to date.
2024-06-17 00:46:58,570 [ scc.git] DEBUG ## Unique users: []
2024-06-17 00:46:58,570 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:58,570 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:58,576 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-17 00:46:58,618 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:46:58,618 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:46:58,624 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-17 00:46:58,665 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-17 00:46:58,673 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9244683400> has no local changes
2024-06-17 00:46:58,673 [ 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#98 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/)'
2024-06-17 00:46:58,683 [ scc.git] DEBUG [detached HEAD 408c49b] merge master -Dorg -Ssuccess-only
2024-06-17 00:46:58,683 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:46:58,683 [ scc.repo] DEBUG ## PRs found:
2024-06-17 00:46:59,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-06-17 00:46:59,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-06-17 00:47:00,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-06-17 00:47:00,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-17 00:47:00,983 [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-17 00:47:01,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-17 00:47:01,882 [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-17 00:47:01,883 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-06-17 00:47:01,883 [ scc.repo] DEBUG ## Branches found:
2024-06-17 00:47:01,884 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-17 00:47:01,884 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:47:01,884 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:47:01,891 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-17 00:47:01,898 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-17 00:47:01,898 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-17 00:47:01,908 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-17 00:47:01,917 [ scc.git] DEBUG Already up to date.
2024-06-17 00:47:01,917 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-06-17 00:47:02,348 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-06-17 00:47:02,349 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-06-17 00:47:02,355 [ scc.git] DEBUG ## Unique users: []
2024-06-17 00:47:02,355 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:47:02,356 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:47:02,363 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-17 00:47:02,370 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:47:02,377 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-17 00:47:02,411 [ scc.git] DEBUG Auto-merging Dockerfile
2024-06-17 00:47:02,412 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-06-17 00:47:02,412 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-17 00:47:02,412 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-17 00:47:02,420 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-17 00:47:02,429 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-06-17 00:47:02,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:47:02,600 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-17 00:47:02,609 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-17 00:47:02,617 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#98](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-06-17 00:47:02,625 [ scc.config] DEBUG Found github.token
2024-06-17 00:47:02,626 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-06-17 00:47:02,626 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-17 00:47:02,686 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:47:02,687 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:47:02,696 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-17 00:47:02,748 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-17 00:47:02,757 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f92446c9b80> has no local changes
2024-06-17 00:47:02,758 [ 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#98 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/)'
2024-06-17 00:47:02,771 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:47:02,771 [ scc.git] INFO Overriding base-branch from master to develop
2024-06-17 00:47:02,771 [ scc.repo] DEBUG ## PRs found:
2024-06-17 00:47:02,772 [ scc.git] DEBUG [detached HEAD ca1408d] merge master -Dorg -Ssuccess-only
2024-06-17 00:47:03,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-06-17 00:47:03,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-06-17 00:47:04,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-06-17 00:47:04,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-06-17 00:47:05,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-06-17 00:47:05,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-06-17 00:47:06,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-06-17 00:47:06,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-17 00:47:07,044 [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-17 00:47:07,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-17 00:47:07,919 [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-17 00:47:07,920 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-17 00:47:08,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-06-17 00:47:08,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-06-17 00:47:09,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-06-17 00:47:09,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-06-17 00:47:09,864 [ scc.repo] DEBUG ## Branches found:
2024-06-17 00:47:09,864 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-17 00:47:09,864 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:47:09,864 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:47:09,870 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-06-17 00:47:09,874 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-17 00:47:09,874 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-06-17 00:47:09,881 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-06-17 00:47:09,887 [ scc.git] DEBUG Already up to date.
2024-06-17 00:47:09,887 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-06-17 00:47:10,327 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-06-17 00:47:10,328 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-06-17 00:47:10,333 [ scc.git] DEBUG ## Unique users: []
2024-06-17 00:47:10,333 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:47:10,333 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:47:10,340 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-17 00:47:10,347 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:47:10,353 [ 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-17 00:47:10,379 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-06-17 00:47:10,380 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-06-17 00:47:10,380 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-17 00:47:10,380 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-17 00:47:10,386 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-17 00:47:10,393 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-06-17 00:47:10,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:47:10,560 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-17 00:47:10,568 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-17 00:47:10,577 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#98](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-06-17 00:47:10,582 [ scc.config] DEBUG Found github.token
2024-06-17 00:47:10,583 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-06-17 00:47:10,583 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-17 00:47:10,624 [ scc.git] DEBUG Get sha1 of %s
2024-06-17 00:47:10,625 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-17 00:47:10,630 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-17 00:47:10,672 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-17 00:47:10,679 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f92446ecd60> has no local changes
2024-06-17 00:47:10,680 [ 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#98 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/)'
2024-06-17 00:47:10,690 [ scc.git] DEBUG [detached HEAD fc7136d] merge master -Dorg -Ssuccess-only
2024-06-17 00:47:10,691 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:47:10,691 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-17 00:47:10,774 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-06-17 00:47:10,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:47:10,985 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-06-17 00:47:10,991 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-06-17 00:47:11,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:47:11,401 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-06-17 00:47:11,406 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-06-17 00:47:11,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:47:11,827 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-06-17 00:47:11,832 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-06-17 00:47:12,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:47:12,242 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-06-17 00:47:12,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:47:12,643 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-06-17 00:47:12,649 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-06-17 00:47:13,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:47:13,060 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-06-17 00:47:13,066 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-06-17 00:47:13,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:47:13,461 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-06-17 00:47:13,466 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-06-17 00:47:13,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:47:13,865 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-06-17 00:47:13,869 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-06-17 00:47:14,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:47:14,280 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-06-17 00:47:14,285 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-06-17 00:47:14,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:47:14,703 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-06-17 00:47:14,709 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-06-17 00:47:15,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:47:15,109 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-06-17 00:47:15,115 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-06-17 00:47:15,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:47:15,566 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-06-17 00:47:15,570 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-06-17 00:47:15,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:47:15,985 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-06-17 00:47:16,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:47:16,390 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-06-17 00:47:16,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:47:16,790 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-06-17 00:47:16,796 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-06-17 00:47:17,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:47:17,224 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-06-17 00:47:17,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:47:17,600 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-06-17 00:47:17,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:47:18,017 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-06-17 00:47:18,026 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-06-17 00:47:18,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:47:18,420 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-06-17 00:47:18,434 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-06-17 00:47:18,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:47:18,824 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-06-17 00:47:18,830 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-06-17 00:47:19,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:47:19,228 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-06-17 00:47:19,232 [ scc.config] DEBUG Found submodule.scripts.url
2024-06-17 00:47:19,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-17 00:47:19,640 [ scc.config] DEBUG Found submodule.scripts.branch
2024-06-17 00:47:19,640 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-17 00:47:19,727 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f924d1442e0> has local changes
2024-06-17 00:47:19,727 [ 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'
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#98 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/98/)'
2024-06-17 00:47:19,743 [ scc.git] DEBUG [detached HEAD 132e097] merge master -Dorg -Ssuccess-only
2024-06-17 00:47:19,744 [ scc.merge] INFO Repository: ome/omero-plugins
2024-06-17 00:47:19,744 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-06-17 00:47:19,744 [ scc.merge] INFO Already up to date.
2024-06-17 00:47:19,744 [ scc.merge] INFO
2024-06-17 00:47:19,744 [ scc.merge] INFO Merged PRs:
2024-06-17 00:47:19,744 [ scc.merge] INFO - PR 373 dependabot[bot] 'Bump omero-test-infra from `7688c54` to `cda3ec6`'
2024-06-17 00:47:19,744 [ scc.merge] INFO - PR 375 dependabot[bot] 'Bump omero-figure from `3d9e3b8` to `ffc7e07`'
2024-06-17 00:47:19,744 [ scc.merge] INFO
2024-06-17 00:47:19,744 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-06-17 00:47:19,744 [ scc.merge] INFO Already up to date.
2024-06-17 00:47:19,744 [ scc.merge] INFO
2024-06-17 00:47:19,744 [ scc.merge] INFO
2024-06-17 00:47:19,744 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-06-17 00:47:19,744 [ scc.merge] INFO Excluded PRs:
2024-06-17 00:47:19,744 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-06-17 00:47:19,744 [ scc.merge] INFO Already up to date.
2024-06-17 00:47:19,744 [ scc.merge] INFO
2024-06-17 00:47:19,744 [ scc.merge] INFO Merged PRs:
2024-06-17 00:47:19,744 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-06-17 00:47:19,744 [ scc.merge] INFO
2024-06-17 00:47:19,744 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-06-17 00:47:19,745 [ scc.merge] INFO Excluded PRs:
2024-06-17 00:47:19,745 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-06-17 00:47:19,745 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-06-17 00:47:19,745 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-06-17 00:47:19,745 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-06-17 00:47:19,745 [ scc.merge] INFO Already up to date.
2024-06-17 00:47:19,745 [ scc.merge] INFO
2024-06-17 00:47:19,745 [ scc.merge] INFO Merged PRs:
2024-06-17 00:47:19,745 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-06-17 00:47:19,745 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-06-17 00:47:19,745 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-06-17 00:47:19,745 [ scc.merge] INFO - PR 65 will-moore 'gateway_required() uses omero_user_token if no username and password'
2024-06-17 00:47:19,745 [ scc.merge] INFO
2024-06-17 00:47:19,745 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-06-17 00:47:19,745 [ scc.merge] INFO Excluded PRs:
2024-06-17 00:47:19,745 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-17 00:47:19,745 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-06-17 00:47:19,745 [ scc.merge] INFO Already up to date.
2024-06-17 00:47:19,745 [ scc.merge] INFO
2024-06-17 00:47:19,745 [ scc.merge] INFO Merged PRs:
2024-06-17 00:47:19,745 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-06-17 00:47:19,745 [ scc.merge] INFO
2024-06-17 00:47:19,745 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-17 00:47:19,745 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-06-17 00:47:19,745 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-06-17 00:47:19,745 [ scc.merge] INFO
2024-06-17 00:47:19,745 [ scc.merge] INFO Repository: ome/omero-figure
2024-06-17 00:47:19,745 [ scc.merge] INFO Excluded PRs:
2024-06-17 00:47:19,745 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes' (exclude comment)
2024-06-17 00:47:19,745 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-06-17 00:47:19,745 [ scc.merge] INFO Already up to date.
2024-06-17 00:47:19,745 [ scc.merge] INFO
2024-06-17 00:47:19,745 [ scc.merge] INFO Merged PRs:
2024-06-17 00:47:19,745 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-06-17 00:47:19,745 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-06-17 00:47:19,746 [ scc.merge] INFO
2024-06-17 00:47:19,746 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-06-17 00:47:19,746 [ scc.merge] INFO Already up to date.
2024-06-17 00:47:19,746 [ scc.merge] INFO
2024-06-17 00:47:19,746 [ scc.merge] INFO Merged PRs:
2024-06-17 00:47:19,746 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-06-17 00:47:19,746 [ scc.merge] INFO
2024-06-17 00:47:19,746 [ scc.merge] INFO Repository: ome/omero-gallery
2024-06-17 00:47:19,746 [ scc.merge] INFO Already up to date.
2024-06-17 00:47:19,746 [ scc.merge] INFO
2024-06-17 00:47:19,746 [ scc.merge] INFO Merged PRs:
2024-06-17 00:47:19,746 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-17 00:47:19,746 [ scc.merge] INFO
2024-06-17 00:47:19,746 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-06-17 00:47:19,746 [ scc.merge] INFO Excluded PRs:
2024-06-17 00:47:19,746 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-06-17 00:47:19,746 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-06-17 00:47:19,746 [ scc.merge] INFO Already up to date.
2024-06-17 00:47:19,746 [ scc.merge] INFO
2024-06-17 00:47:19,746 [ scc.merge] INFO Merged PRs:
2024-06-17 00:47:19,746 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-06-17 00:47:19,746 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-06-17 00:47:19,746 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-17 00:47:19,746 [ scc.merge] INFO
2024-06-17 00:47:19,746 [ scc.merge] INFO Repository: ome/omero-mapr
2024-06-17 00:47:19,746 [ scc.merge] INFO Excluded PRs:
2024-06-17 00:47:19,746 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-06-17 00:47:19,747 [ scc.merge] INFO Already up to date.
2024-06-17 00:47:19,747 [ scc.merge] INFO
2024-06-17 00:47:19,747 [ scc.merge] INFO Merged PRs:
2024-06-17 00:47:19,747 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-06-17 00:47:19,747 [ scc.merge] INFO
2024-06-17 00:47:19,747 [ scc.merge] INFO Repository: ome/omero-metadata
2024-06-17 00:47:19,747 [ scc.merge] INFO Already up to date.
2024-06-17 00:47:19,747 [ scc.merge] INFO
2024-06-17 00:47:19,747 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-17 00:47:19,747 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-17 00:47:19,747 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-17 00:47:19,747 [ scc.merge] INFO
2024-06-17 00:47:19,747 [ scc.merge] INFO Repository: ome/omero-parade
2024-06-17 00:47:19,747 [ scc.merge] INFO Excluded PRs:
2024-06-17 00:47:19,747 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-06-17 00:47:19,747 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-06-17 00:47:19,747 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-06-17 00:47:19,747 [ scc.merge] INFO Already up to date.
2024-06-17 00:47:19,747 [ scc.merge] INFO
2024-06-17 00:47:19,747 [ scc.merge] INFO Merged PRs:
2024-06-17 00:47:19,747 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-17 00:47:19,747 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-17 00:47:19,747 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-17 00:47:19,747 [ scc.merge] INFO
2024-06-17 00:47:19,747 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-06-17 00:47:19,747 [ scc.merge] INFO Already up to date.
2024-06-17 00:47:19,747 [ scc.merge] INFO
2024-06-17 00:47:19,747 [ scc.merge] INFO Merged PRs:
2024-06-17 00:47:19,747 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-06-17 00:47:19,747 [ scc.merge] INFO
2024-06-17 00:47:19,747 [ scc.merge] INFO Repository: ome/omero-rois
2024-06-17 00:47:19,747 [ scc.merge] INFO Excluded PRs:
2024-06-17 00:47:19,747 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-17 00:47:19,747 [ scc.merge] INFO Already up to date.
2024-06-17 00:47:19,748 [ scc.merge] INFO
2024-06-17 00:47:19,748 [ scc.merge] INFO Merged PRs:
2024-06-17 00:47:19,748 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-17 00:47:19,748 [ scc.merge] INFO
2024-06-17 00:47:19,748 [ scc.merge] INFO Repository: ome/omero-signup
2024-06-17 00:47:19,748 [ scc.merge] INFO Already up to date.
2024-06-17 00:47:19,748 [ scc.merge] INFO
2024-06-17 00:47:19,748 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-17 00:47:19,748 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-17 00:47:19,748 [ scc.merge] INFO
2024-06-17 00:47:19,748 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-06-17 00:47:19,748 [ scc.merge] INFO Already up to date.
2024-06-17 00:47:19,748 [ scc.merge] INFO
2024-06-17 00:47:19,748 [ scc.merge] INFO Merged PRs:
2024-06-17 00:47:19,748 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-17 00:47:19,748 [ scc.merge] INFO
2024-06-17 00:47:19,748 [ scc.merge] INFO Repository: ome/omero-upload
2024-06-17 00:47:19,748 [ scc.merge] INFO Already up to date.
2024-06-17 00:47:19,748 [ scc.merge] INFO
2024-06-17 00:47:19,748 [ scc.merge] INFO
2024-06-17 00:47:19,748 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-06-17 00:47:19,748 [ scc.merge] INFO Already up to date.
2024-06-17 00:47:19,748 [ scc.merge] INFO
2024-06-17 00:47:19,748 [ scc.merge] INFO
2024-06-17 00:47:19,748 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-06-17 00:47:19,748 [ scc.merge] INFO Excluded PRs:
2024-06-17 00:47:19,748 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-06-17 00:47:19,748 [ scc.merge] INFO Already up to date.
2024-06-17 00:47:19,748 [ scc.merge] INFO
2024-06-17 00:47:19,748 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-17 00:47:19,748 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-17 00:47:19,748 [ scc.merge] INFO
2024-06-17 00:47:19,748 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-06-17 00:47:19,748 [ scc.merge] INFO Already up to date.
2024-06-17 00:47:19,748 [ scc.merge] INFO
2024-06-17 00:47:19,748 [ scc.merge] INFO
2024-06-17 00:47:19,749 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-06-17 00:47:19,749 [ scc.merge] INFO Already up to date.
2024-06-17 00:47:19,749 [ scc.merge] INFO
2024-06-17 00:47:19,749 [ scc.merge] INFO
2024-06-17 00:47:19,749 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-06-17 00:47:19,749 [ scc.merge] INFO Already up to date.
2024-06-17 00:47:19,749 [ scc.merge] INFO
2024-06-17 00:47:19,749 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-17 00:47:19,749 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-06-17 00:47:19,749 [ scc.merge] INFO
2024-06-17 00:47:19,749 [ scc.merge] INFO Repository: ome/scripts
2024-06-17 00:47:19,749 [ scc.merge] INFO Excluded PRs:
2024-06-17 00:47:19,749 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-06-17 00:47:19,749 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-06-17 00:47:19,749 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-06-17 00:47:19,749 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-06-17 00:47:19,749 [ scc.merge] INFO Already up to date.
2024-06-17 00:47:19,749 [ scc.merge] INFO
2024-06-17 00:47:19,749 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-17 00:47:19,749 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-17 00:47:19,749 [ scc.merge] INFO
2024-06-17 00:47:19,749 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-06-17 00:47:19,749 [ scc.git] DEBUG Calling 'git remote'
2024-06-17 00:47:19,756 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-06-17 00:47:19,756 [ scc.git] DEBUG Calling 'git remote'
2024-06-17 00:47:19,762 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:47:19,762 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-06-17 00:47:19,762 [ scc.git] DEBUG Calling 'git remote'
2024-06-17 00:47:19,768 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:47:19,768 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-06-17 00:47:19,769 [ scc.git] DEBUG Calling 'git remote'
2024-06-17 00:47:19,774 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:47:19,775 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-06-17 00:47:19,775 [ scc.git] DEBUG Calling 'git remote'
2024-06-17 00:47:19,780 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:47:19,780 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-17 00:47:19,780 [ scc.git] DEBUG Calling 'git remote'
2024-06-17 00:47:19,786 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:47:19,787 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-17 00:47:19,787 [ scc.git] DEBUG Calling 'git remote'
2024-06-17 00:47:19,793 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:47:19,793 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-17 00:47:19,793 [ scc.git] DEBUG Calling 'git remote'
2024-06-17 00:47:19,799 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:47:19,799 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-17 00:47:19,799 [ scc.git] DEBUG Calling 'git remote'
2024-06-17 00:47:19,805 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:47:19,805 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-17 00:47:19,805 [ scc.git] DEBUG Calling 'git remote'
2024-06-17 00:47:19,811 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:47:19,812 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-17 00:47:19,812 [ scc.git] DEBUG Calling 'git remote'
2024-06-17 00:47:19,819 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:47:19,820 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-17 00:47:19,820 [ scc.git] DEBUG Calling 'git remote'
2024-06-17 00:47:19,827 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:47:19,827 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-17 00:47:19,827 [ scc.git] DEBUG Calling 'git remote'
2024-06-17 00:47:19,834 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:47:19,834 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-17 00:47:19,834 [ scc.git] DEBUG Calling 'git remote'
2024-06-17 00:47:19,841 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:47:19,841 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-17 00:47:19,841 [ scc.git] DEBUG Calling 'git remote'
2024-06-17 00:47:19,849 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:47:19,849 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-17 00:47:19,849 [ scc.git] DEBUG Calling 'git remote'
2024-06-17 00:47:19,857 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:47:19,857 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-17 00:47:19,857 [ scc.git] DEBUG Calling 'git remote'
2024-06-17 00:47:19,865 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:47:19,865 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-17 00:47:19,865 [ scc.git] DEBUG Calling 'git remote'
2024-06-17 00:47:19,875 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:47:19,875 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-17 00:47:19,875 [ scc.git] DEBUG Calling 'git remote'
2024-06-17 00:47:19,883 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:47:19,883 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-17 00:47:19,883 [ scc.git] DEBUG Calling 'git remote'
2024-06-17 00:47:19,889 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:47:19,890 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-17 00:47:19,890 [ scc.git] DEBUG Calling 'git remote'
2024-06-17 00:47:19,895 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:47:19,896 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-17 00:47:19,896 [ scc.git] DEBUG Calling 'git remote'
2024-06-17 00:47:19,901 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-17 00:47:19,901 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-17 00:47:19,902 [ scc.git] DEBUG Calling 'git remote'
2024-06-17 00:47:19,907 [ 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 5a8aecc] 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 c01cf6f] 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-17 00:48:07,114 [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-17 00:48:16,191 [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-17 00:48:18,595 [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-17 00:48:23,358 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-06-17 00:49:10,075 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/d0200910/images/svgs/logo.svg){kind=logo}
