Skipping 103 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-06-15 00:44:48,954 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-15 00:44:48,956 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-15 00:44:48,977 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-15 00:44:48,995 [ scc.git] DEBUG Already up to date.
2024-06-15 00:44:48,996 [ scc.git] DEBUG Calling 'git fetch origin pull/102/head'
2024-06-15 00:44:49,532 [ scc.git] DEBUG From https://github.com/ome/omero-cli-zarr
2024-06-15 00:44:49,533 [ scc.git] DEBUG * branch refs/pull/102/head -> FETCH_HEAD
2024-06-15 00:44:49,544 [ scc.git] DEBUG Calling 'git fetch origin pull/123/head'
2024-06-15 00:44:50,004 [ scc.git] DEBUG From https://github.com/ome/omero-cli-zarr
2024-06-15 00:44:50,005 [ scc.git] DEBUG * branch refs/pull/123/head -> FETCH_HEAD
2024-06-15 00:44:50,015 [ scc.git] DEBUG Calling 'git fetch origin pull/147/head'
2024-06-15 00:44:50,608 [ scc.git] DEBUG From https://github.com/ome/omero-cli-zarr
2024-06-15 00:44:50,609 [ scc.git] DEBUG * branch refs/pull/147/head -> FETCH_HEAD
2024-06-15 00:44:50,622 [ scc.git] DEBUG ## Unique users: []
2024-06-15 00:44:50,622 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:44:50,622 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:44:50,632 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f22d4074b7c458ad24320cf5a6f8adb9e686aa44'
2024-06-15 00:44:50,643 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:44:50,651 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 102 (Zarr export tests) f22d4074b7c458ad24320cf5a6f8adb9e686aa44'
2024-06-15 00:44:50,666 [ scc.git] DEBUG Auto-merging src/omero_zarr/cli.py
2024-06-15 00:44:50,666 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-06-15 00:44:50,666 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_zarr/raw_pixels.py
2024-06-15 00:44:50,666 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-15 00:44:50,667 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-15 00:44:50,677 [ scc.git] DEBUG Calling 'git reset --hard 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-15 00:44:50,699 [ scc.git] DEBUG HEAD is now at 2ca566b Merge pull request #160 from ome/pre-commit-ci-update-config
2024-06-15 00:44:50,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:44:50,876 [ scc.git] DEBUG Calling 'git merge-base 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473 f22d4074b7c458ad24320cf5a6f8adb9e686aa44'
2024-06-15 00:44:50,887 [ scc.git] DEBUG Calling 'git diff --name-only 782a1cd0077bcc2871f21e9f0acdc25ae7745243..2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-15 00:44:50,898 [ scc.git] INFO - PR 102 will-moore 'Zarr export tests'
Conflicting PR. Removed from build [OMERO-plugins-push#96](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_zarr/raw_pixels.py
--conflicts
2024-06-15 00:44:50,914 [ scc.config] DEBUG Found github.token
2024-06-15 00:44:50,915 [ scc.git] DEBUG Not adding comment to issue #102, already --conflicts.
2024-06-15 00:44:50,916 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-06-15 00:44:50,930 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:44:50,939 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 123 (Support export of Fileset:ID) 553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-06-15 00:44:50,960 [ scc.git] DEBUG Auto-merging .isort.cfg
2024-06-15 00:44:50,961 [ scc.git] DEBUG CONFLICT (content): Merge conflict in .isort.cfg
2024-06-15 00:44:50,961 [ scc.git] DEBUG Auto-merging setup.py
2024-06-15 00:44:50,961 [ scc.git] DEBUG Auto-merging src/omero_zarr/cli.py
2024-06-15 00:44:50,961 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-06-15 00:44:50,961 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_zarr/raw_pixels.py
2024-06-15 00:44:50,961 [ scc.git] DEBUG Auto-merging src/omero_zarr/util.py
2024-06-15 00:44:50,962 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-15 00:44:50,962 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-15 00:44:50,987 [ scc.git] DEBUG Calling 'git reset --hard 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-15 00:44:51,007 [ scc.git] DEBUG HEAD is now at 2ca566b Merge pull request #160 from ome/pre-commit-ci-update-config
2024-06-15 00:44:52,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:44:52,588 [ scc.git] DEBUG Calling 'git merge-base 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473 553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-06-15 00:44:52,599 [ scc.git] DEBUG Calling 'git diff --name-only eff38d0408f9d50de13b28dfe09e4382965e203f..2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-15 00:44:52,606 [ scc.git] INFO - PR 123 will-moore 'Support export of Fileset:ID'
Conflicting PR. Removed from build [OMERO-plugins-push#96](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/consoleText) for more details.
Possible conflicts:
- PR #102 will-moore 'Zarr export tests'
- src/omero_zarr/raw_pixels.py
- Upstream changes
- src/omero_zarr/raw_pixels.py
- .isort.cfg
--conflicts
2024-06-15 00:44:52,612 [ scc.config] DEBUG Found github.token
2024-06-15 00:44:52,612 [ scc.git] DEBUG Not adding comment to issue #123, already --conflicts.
2024-06-15 00:44:52,612 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a14f62a940f4974a305b3f5858049ee493b898ef'
2024-06-15 00:44:52,620 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:44:52,628 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 147 (Name option) a14f62a940f4974a305b3f5858049ee493b898ef'
2024-06-15 00:44:52,644 [ scc.git] DEBUG Auto-merging src/omero_zarr/masks.py
2024-06-15 00:44:52,644 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-06-15 00:44:52,645 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-15 00:44:52,650 [ scc.git] DEBUG README.rst | 30 ++++++++++++++++++------------
2024-06-15 00:44:52,650 [ scc.git] DEBUG src/omero_zarr/cli.py | 9 +++++++++
2024-06-15 00:44:52,650 [ scc.git] DEBUG src/omero_zarr/masks.py | 4 ++--
2024-06-15 00:44:52,650 [ scc.git] DEBUG src/omero_zarr/raw_pixels.py | 28 +++++++++++++++++++++++-----
2024-06-15 00:44:52,650 [ scc.git] DEBUG src/omero_zarr/util.py | 2 +-
2024-06-15 00:44:52,650 [ scc.git] DEBUG 5 files changed, 53 insertions(+), 20 deletions(-)
2024-06-15 00:44:53,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:44:53,029 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-15 00:44:53,078 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:44:53,078 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:44:53,092 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-15 00:44:53,149 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-15 00:44:53,160 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa9469ac970> has no local changes
2024-06-15 00:44:53,160 [ 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#96 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/)'
2024-06-15 00:44:53,173 [ scc.git] DEBUG [detached HEAD 4154da4] merge master -Dorg -Ssuccess-only
2024-06-15 00:44:53,174 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:44:53,174 [ scc.repo] DEBUG ## PRs found:
2024-06-15 00:44:53,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-06-15 00:44:54,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-06-15 00:44:54,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-06-15 00:44:55,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-15 00:44:55,753 [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-15 00:44:56,293 [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-15 00:44:56,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-15 00:44:57,336 [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-15 00:44:57,337 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-06-15 00:44:57,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-06-15 00:44:58,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-15 00:44:58,826 [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-15 00:44:59,299 [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-15 00:44:59,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-15 00:45:00,164 [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-15 00:45:00,165 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-06-15 00:45:00,165 [ scc.repo] DEBUG ## Branches found:
2024-06-15 00:45:00,165 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-15 00:45:00,166 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:45:00,166 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:00,173 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-15 00:45:00,180 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-15 00:45:00,181 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-15 00:45:00,189 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-15 00:45:00,197 [ scc.git] DEBUG Already up to date.
2024-06-15 00:45:00,197 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-06-15 00:45:01,335 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-15 00:45:01,335 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-06-15 00:45:01,342 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-06-15 00:45:01,909 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-15 00:45:01,909 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-06-15 00:45:01,918 [ scc.git] DEBUG ## Unique users: []
2024-06-15 00:45:01,918 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:45:01,918 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:01,923 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-15 00:45:01,933 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:01,942 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-15 00:45:02,073 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-15 00:45:02,079 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-06-15 00:45:02,079 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-06-15 00:45:02,079 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-06-15 00:45:02,080 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-06-15 00:45:02,080 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-06-15 00:45:02,080 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-06-15 00:45:02,080 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-06-15 00:45:02,080 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-06-15 00:45:02,082 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-06-15 00:45:02,082 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-06-15 00:45:02,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:45:02,251 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-15 00:45:02,260 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:02,268 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-15 00:45:02,361 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-06-15 00:45:02,361 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-06-15 00:45:02,361 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-06-15 00:45:02,362 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-15 00:45:02,370 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-06-15 00:45:02,370 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-06-15 00:45:02,370 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-06-15 00:45:02,370 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-06-15 00:45:02,370 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-06-15 00:45:02,370 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-06-15 00:45:02,370 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-06-15 00:45:02,370 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-06-15 00:45:02,370 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-06-15 00:45:02,370 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-06-15 00:45:02,370 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-06-15 00:45:02,370 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-06-15 00:45:02,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:45:02,682 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-15 00:45:02,727 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:45:02,727 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:02,735 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-15 00:45:02,784 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-15 00:45:02,797 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa946967bb0> has no local changes
2024-06-15 00:45:02,797 [ 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#96 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/)'
2024-06-15 00:45:02,812 [ scc.git] DEBUG [detached HEAD 84b4aa9d] merge master -Dorg -Ssuccess-only
2024-06-15 00:45:02,812 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:45:02,813 [ scc.repo] DEBUG ## PRs found:
2024-06-15 00:45:03,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-06-15 00:45:03,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-06-15 00:45:04,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-06-15 00:45:04,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-15 00:45:05,157 [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-15 00:45:05,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-15 00:45:06,043 [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-15 00:45:06,045 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-06-15 00:45:06,045 [ scc.repo] DEBUG ## Branches found:
2024-06-15 00:45:06,045 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-15 00:45:06,045 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:45:06,045 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:06,055 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-15 00:45:06,064 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-15 00:45:06,064 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-15 00:45:06,074 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-15 00:45:06,084 [ scc.git] DEBUG Already up to date.
2024-06-15 00:45:06,085 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-06-15 00:45:06,533 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-06-15 00:45:06,534 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-06-15 00:45:06,541 [ scc.git] DEBUG ## Unique users: []
2024-06-15 00:45:06,541 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:45:06,541 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:06,549 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-15 00:45:06,557 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:06,562 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-15 00:45:06,572 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-06-15 00:45:06,574 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-15 00:45:06,577 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-06-15 00:45:06,577 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-06-15 00:45:06,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:45:06,763 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-15 00:45:06,811 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:45:06,811 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:06,817 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-15 00:45:06,857 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-15 00:45:06,864 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa9469bddf0> has no local changes
2024-06-15 00:45:06,864 [ 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#96 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/)'
2024-06-15 00:45:06,873 [ scc.git] DEBUG [detached HEAD 4e2fe53] merge master -Dorg -Ssuccess-only
2024-06-15 00:45:06,873 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:45:06,873 [ scc.repo] DEBUG ## PRs found:
2024-06-15 00:45:07,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-06-15 00:45:07,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-06-15 00:45:07,778 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-15 00:45:08,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-15 00:45:08,916 [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-15 00:45:09,405 [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-15 00:45:09,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-15 00:45:10,313 [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-15 00:45:10,314 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-15 00:45:10,314 [ scc.repo] DEBUG ## Branches found:
2024-06-15 00:45:10,314 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-15 00:45:10,314 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:45:10,314 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:10,320 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-15 00:45:10,326 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-15 00:45:10,326 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-15 00:45:10,333 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-15 00:45:10,340 [ scc.git] DEBUG Already up to date.
2024-06-15 00:45:10,340 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-06-15 00:45:10,736 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-06-15 00:45:10,737 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-06-15 00:45:10,742 [ scc.git] DEBUG ## Unique users: []
2024-06-15 00:45:10,743 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:45:10,743 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:10,749 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-06-15 00:45:10,755 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:10,761 [ 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-15 00:45:10,774 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-15 00:45:10,779 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-06-15 00:45:10,779 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-06-15 00:45:10,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:45:10,941 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-15 00:45:10,983 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:45:10,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:10,990 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-15 00:45:11,033 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-15 00:45:11,041 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa9469bd340> has no local changes
2024-06-15 00:45:11,042 [ 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#96 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/)'
2024-06-15 00:45:11,053 [ scc.git] DEBUG [detached HEAD ed97823] merge master -Dorg -Ssuccess-only
2024-06-15 00:45:11,054 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:45:11,054 [ scc.repo] DEBUG ## PRs found:
2024-06-15 00:45:11,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-06-15 00:45:11,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-06-15 00:45:12,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-06-15 00:45:13,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-15 00:45:13,654 [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-15 00:45:14,279 [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-15 00:45:14,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-15 00:45:15,225 [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-15 00:45:15,226 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-15 00:45:15,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-06-15 00:45:16,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-06-15 00:45:16,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-15 00:45:17,313 [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-15 00:45:17,808 [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-15 00:45:18,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-15 00:45:18,671 [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-15 00:45:18,672 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-06-15 00:45:19,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-06-15 00:45:19,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-06-15 00:45:20,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-15 00:45:20,651 [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-15 00:45:21,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-15 00:45:21,522 [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-15 00:45:21,523 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-06-15 00:45:21,523 [ scc.repo] DEBUG ## Branches found:
2024-06-15 00:45:21,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-15 00:45:21,524 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:45:21,524 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:21,533 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-15 00:45:21,543 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-15 00:45:21,543 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-15 00:45:21,552 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-15 00:45:21,560 [ scc.git] DEBUG Already up to date.
2024-06-15 00:45:21,561 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-06-15 00:45:22,113 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-15 00:45:22,114 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-06-15 00:45:22,124 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-06-15 00:45:22,640 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-15 00:45:22,640 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-06-15 00:45:22,647 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-06-15 00:45:23,093 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-15 00:45:23,094 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-06-15 00:45:23,101 [ scc.git] DEBUG ## Unique users: []
2024-06-15 00:45:23,101 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:45:23,101 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:23,112 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-15 00:45:23,124 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:23,132 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-15 00:45:23,189 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-06-15 00:45:23,190 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-15 00:45:23,197 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-06-15 00:45:23,197 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-06-15 00:45:23,197 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-06-15 00:45:23,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:45:23,369 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-15 00:45:23,386 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:23,397 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-15 00:45:23,551 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-06-15 00:45:23,552 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-06-15 00:45:23,552 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-06-15 00:45:23,552 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-06-15 00:45:23,552 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-15 00:45:23,559 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-06-15 00:45:23,559 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-06-15 00:45:23,560 [ scc.git] DEBUG src/app/header.html | 5 +
2024-06-15 00:45:23,560 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-06-15 00:45:23,560 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-06-15 00:45:23,560 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-06-15 00:45:23,560 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-06-15 00:45:23,560 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-06-15 00:45:23,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:45:23,793 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-15 00:45:23,811 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:23,823 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-15 00:45:23,891 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-06-15 00:45:23,894 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-15 00:45:23,899 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-06-15 00:45:23,899 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-06-15 00:45:23,899 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-06-15 00:45:24,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:45:24,211 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-15 00:45:24,270 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:45:24,271 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:24,280 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-15 00:45:24,327 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-15 00:45:24,337 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa9469928e0> has no local changes
2024-06-15 00:45:24,337 [ 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#96 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/)'
2024-06-15 00:45:24,348 [ scc.git] DEBUG [detached HEAD 2516488] merge master -Dorg -Ssuccess-only
2024-06-15 00:45:24,349 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:45:24,349 [ scc.repo] DEBUG ## PRs found:
2024-06-15 00:45:24,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-06-15 00:45:25,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-06-15 00:45:25,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-06-15 00:45:26,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-15 00:45:26,752 [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-15 00:45:27,260 [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-15 00:45:27,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-15 00:45:28,214 [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-15 00:45:28,220 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-06-15 00:45:28,225 [ scc.repo] DEBUG ## Branches found:
2024-06-15 00:45:28,225 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-15 00:45:28,225 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:45:28,225 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:28,234 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-15 00:45:28,239 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-15 00:45:28,239 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-15 00:45:28,244 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-15 00:45:28,249 [ scc.git] DEBUG Already up to date.
2024-06-15 00:45:28,249 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-06-15 00:45:28,619 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-06-15 00:45:28,619 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-06-15 00:45:28,627 [ scc.git] DEBUG ## Unique users: []
2024-06-15 00:45:28,628 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:45:28,628 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:28,639 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-15 00:45:28,650 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:28,657 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-15 00:45:28,674 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-15 00:45:28,677 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-06-15 00:45:28,677 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-06-15 00:45:28,677 [ scc.git] DEBUG requirements.txt | 2 +-
2024-06-15 00:45:28,677 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-06-15 00:45:28,677 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-06-15 00:45:28,677 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-06-15 00:45:28,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:45:28,846 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-15 00:45:28,906 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:45:28,906 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:28,915 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-15 00:45:28,968 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-15 00:45:28,980 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa944130bb0> has no local changes
2024-06-15 00:45:28,981 [ 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#96 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/)'
2024-06-15 00:45:28,996 [ scc.git] DEBUG [detached HEAD 032b779] merge master -Dorg -Ssuccess-only
2024-06-15 00:45:28,996 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:45:28,996 [ scc.repo] DEBUG ## PRs found:
2024-06-15 00:45:29,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-06-15 00:45:29,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-06-15 00:45:30,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-06-15 00:45:30,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-15 00:45:31,366 [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-15 00:45:31,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-15 00:45:32,330 [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-15 00:45:32,331 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-15 00:45:32,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-06-15 00:45:33,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-06-15 00:45:33,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-15 00:45:34,349 [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-15 00:45:34,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-15 00:45:35,346 [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-15 00:45:35,348 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-15 00:45:35,348 [ scc.repo] DEBUG ## Branches found:
2024-06-15 00:45:35,348 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-15 00:45:35,349 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:45:35,349 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:35,361 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-15 00:45:35,372 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-15 00:45:35,373 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-15 00:45:35,383 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-15 00:45:35,397 [ scc.git] DEBUG Already up to date.
2024-06-15 00:45:35,398 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-06-15 00:45:35,968 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-15 00:45:35,968 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-06-15 00:45:35,974 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-06-15 00:45:36,492 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-15 00:45:36,493 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-06-15 00:45:36,500 [ scc.git] DEBUG ## Unique users: []
2024-06-15 00:45:36,500 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:45:36,501 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:36,511 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-15 00:45:36,526 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:36,537 [ 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-15 00:45:36,598 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-06-15 00:45:36,598 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-06-15 00:45:36,598 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-15 00:45:36,598 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-15 00:45:36,598 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-15 00:45:36,599 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-15 00:45:36,607 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-15 00:45:36,620 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-15 00:45:36,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:45:36,796 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-15 00:45:36,812 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-15 00:45:36,826 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#96](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-06-15 00:45:36,840 [ scc.config] DEBUG Found github.token
2024-06-15 00:45:36,840 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-06-15 00:45:36,840 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-15 00:45:36,855 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:36,869 [ 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-15 00:45:36,917 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-15 00:45:36,918 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-15 00:45:36,918 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-06-15 00:45:36,918 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-15 00:45:36,919 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-15 00:45:36,931 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-15 00:45:36,947 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-15 00:45:37,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:45:37,220 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-15 00:45:37,233 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-15 00:45:37,243 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#96](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/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-15 00:45:37,251 [ scc.config] DEBUG Found github.token
2024-06-15 00:45:37,252 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-06-15 00:45:37,252 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-15 00:45:37,315 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:45:37,315 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:37,326 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-15 00:45:37,387 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-15 00:45:37,400 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa946976f40> has no local changes
2024-06-15 00:45:37,400 [ 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#96 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/)'
2024-06-15 00:45:37,417 [ scc.git] DEBUG [detached HEAD 943f396] merge master -Dorg -Ssuccess-only
2024-06-15 00:45:37,417 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:45:37,418 [ scc.repo] DEBUG ## PRs found:
2024-06-15 00:45:37,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-06-15 00:45:38,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-06-15 00:45:38,274 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-15 00:45:38,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-15 00:45:39,428 [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-15 00:45:39,911 [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-15 00:45:40,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-15 00:45:40,881 [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-15 00:45:40,882 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-15 00:45:41,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-06-15 00:45:41,378 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-15 00:45:41,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-15 00:45:42,472 [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-15 00:45:43,018 [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-15 00:45:43,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-15 00:45:43,875 [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-15 00:45:43,877 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-15 00:45:44,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-06-15 00:45:44,318 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-15 00:45:44,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-15 00:45:45,465 [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-15 00:45:46,024 [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-15 00:45:46,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-15 00:45:47,128 [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-15 00:45:47,129 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-15 00:45:47,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-06-15 00:45:48,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-06-15 00:45:48,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-06-15 00:45:48,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-06-15 00:45:49,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-06-15 00:45:49,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-06-15 00:45:49,983 [ scc.repo] DEBUG ## Branches found:
2024-06-15 00:45:49,983 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-15 00:45:49,984 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:45:49,984 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:49,989 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-15 00:45:49,995 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-15 00:45:49,995 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-15 00:45:50,002 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-15 00:45:50,009 [ scc.git] DEBUG Already up to date.
2024-06-15 00:45:50,009 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-06-15 00:45:50,407 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-15 00:45:50,408 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-06-15 00:45:50,414 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-06-15 00:45:50,778 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-15 00:45:50,778 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-06-15 00:45:50,786 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-06-15 00:45:51,165 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-15 00:45:51,165 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-06-15 00:45:51,171 [ scc.git] DEBUG ## Unique users: []
2024-06-15 00:45:51,171 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:45:51,171 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:51,178 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-06-15 00:45:51,187 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:51,193 [ 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-15 00:45:51,204 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-15 00:45:51,207 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-06-15 00:45:51,207 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-06-15 00:45:51,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:45:51,375 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-06-15 00:45:51,384 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:51,391 [ 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-15 00:45:51,437 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-15 00:45:51,438 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-15 00:45:51,442 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-06-15 00:45:51,442 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-06-15 00:45:51,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:45:51,784 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-06-15 00:45:51,792 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:51,798 [ 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-15 00:45:51,810 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-15 00:45:51,812 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-15 00:45:51,815 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-06-15 00:45:51,815 [ scc.git] DEBUG package.json | 2 +-
2024-06-15 00:45:51,815 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-06-15 00:45:52,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:45:52,199 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-15 00:45:52,249 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:45:52,249 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:52,257 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-15 00:45:52,306 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-15 00:45:52,316 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa9440e8640> has no local changes
2024-06-15 00:45:52,317 [ 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#96 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/)'
2024-06-15 00:45:52,328 [ scc.git] DEBUG [detached HEAD 5b21aea] merge master -Dorg -Ssuccess-only
2024-06-15 00:45:52,328 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:45:52,329 [ scc.repo] DEBUG ## PRs found:
2024-06-15 00:45:52,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-06-15 00:45:53,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-06-15 00:45:53,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-15 00:45:54,199 [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-15 00:45:54,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-15 00:45:55,188 [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-15 00:45:55,189 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-06-15 00:45:55,189 [ scc.repo] DEBUG ## Branches found:
2024-06-15 00:45:55,189 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-15 00:45:55,189 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:45:55,189 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:55,199 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-15 00:45:55,206 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-15 00:45:55,207 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-15 00:45:55,215 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-15 00:45:55,223 [ scc.git] DEBUG Already up to date.
2024-06-15 00:45:55,224 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-15 00:45:55,561 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-06-15 00:45:55,561 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-15 00:45:55,567 [ scc.git] DEBUG ## Unique users: []
2024-06-15 00:45:55,567 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:45:55,567 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:55,572 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-15 00:45:55,578 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:55,583 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-15 00:45:55,592 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-15 00:45:55,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:45:55,761 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-15 00:45:55,815 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:45:55,815 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:55,824 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-15 00:45:55,873 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-15 00:45:55,883 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa946994be0> has no local changes
2024-06-15 00:45:55,883 [ 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#96 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/)'
2024-06-15 00:45:55,895 [ scc.git] DEBUG [detached HEAD 16516a6] merge master -Dorg -Ssuccess-only
2024-06-15 00:45:55,895 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:45:55,895 [ scc.repo] DEBUG ## PRs found:
2024-06-15 00:45:56,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-06-15 00:45:56,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-06-15 00:45:57,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-06-15 00:45:57,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-06-15 00:45:58,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-15 00:45:58,709 [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-15 00:45:59,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-15 00:45:59,672 [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-15 00:45:59,673 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-15 00:45:59,673 [ scc.repo] DEBUG ## Branches found:
2024-06-15 00:45:59,673 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-15 00:45:59,674 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:45:59,674 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:45:59,686 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-15 00:45:59,698 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-15 00:45:59,698 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-15 00:45:59,709 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-15 00:45:59,721 [ scc.git] DEBUG Already up to date.
2024-06-15 00:45:59,722 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-06-15 00:46:00,122 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-06-15 00:46:00,122 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-06-15 00:46:00,128 [ scc.git] DEBUG ## Unique users: []
2024-06-15 00:46:00,128 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:46:00,128 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:00,136 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-06-15 00:46:00,149 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:00,158 [ 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-15 00:46:00,176 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-06-15 00:46:00,176 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-15 00:46:00,179 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-06-15 00:46:00,179 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-06-15 00:46:00,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:46:00,333 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-15 00:46:00,391 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:46:00,392 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:00,399 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-15 00:46:00,464 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-15 00:46:00,474 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa94409f550> has no local changes
2024-06-15 00:46:00,474 [ 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#96 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/)'
2024-06-15 00:46:00,490 [ scc.git] DEBUG [detached HEAD 6220799] merge master -Dorg -Ssuccess-only
2024-06-15 00:46:00,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:00,491 [ scc.repo] DEBUG ## PRs found:
2024-06-15 00:46:00,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-06-15 00:46:01,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-06-15 00:46:01,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-06-15 00:46:02,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-15 00:46:02,783 [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-15 00:46:03,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-15 00:46:03,655 [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-15 00:46:03,657 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-15 00:46:03,657 [ scc.repo] DEBUG ## Branches found:
2024-06-15 00:46:03,658 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-15 00:46:03,658 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:46:03,658 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:03,673 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-15 00:46:03,687 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-15 00:46:03,688 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-15 00:46:03,704 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-15 00:46:03,719 [ scc.git] DEBUG Already up to date.
2024-06-15 00:46:03,720 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-15 00:46:04,177 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-06-15 00:46:04,177 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-15 00:46:04,183 [ scc.git] DEBUG ## Unique users: []
2024-06-15 00:46:04,183 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:46:04,183 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:04,189 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-15 00:46:04,197 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:04,204 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-15 00:46:04,246 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-06-15 00:46:04,247 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-06-15 00:46:04,247 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-06-15 00:46:04,247 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-06-15 00:46:04,247 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-06-15 00:46:04,247 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-06-15 00:46:04,247 [ scc.git] DEBUG Auto-merging setup.py
2024-06-15 00:46:04,247 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-06-15 00:46:04,247 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-15 00:46:04,247 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-15 00:46:04,255 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-15 00:46:04,262 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-06-15 00:46:04,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:46:04,432 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-15 00:46:04,440 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-15 00:46:04,447 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#96](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/views.py
- omero_signup/signup_settings.py
- setup.py
--conflicts
2024-06-15 00:46:04,453 [ scc.config] DEBUG Found github.token
2024-06-15 00:46:04,454 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-06-15 00:46:04,454 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-15 00:46:04,496 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:46:04,497 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:04,504 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-15 00:46:04,553 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-15 00:46:04,562 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa94413ef40> has no local changes
2024-06-15 00:46:04,562 [ 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#96 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/)'
2024-06-15 00:46:04,573 [ scc.git] DEBUG [detached HEAD 6a69cc0] merge master -Dorg -Ssuccess-only
2024-06-15 00:46:04,574 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:04,574 [ scc.repo] DEBUG ## PRs found:
2024-06-15 00:46:04,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-06-15 00:46:05,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-06-15 00:46:05,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-06-15 00:46:06,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-15 00:46:06,901 [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-15 00:46:07,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-15 00:46:07,838 [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-15 00:46:07,839 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-15 00:46:07,840 [ scc.repo] DEBUG ## Branches found:
2024-06-15 00:46:07,840 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-15 00:46:07,840 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:46:07,840 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:07,847 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-15 00:46:07,853 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-15 00:46:07,853 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-15 00:46:07,859 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-15 00:46:07,866 [ scc.git] DEBUG Already up to date.
2024-06-15 00:46:07,866 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-06-15 00:46:08,376 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-06-15 00:46:08,377 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-06-15 00:46:08,382 [ scc.git] DEBUG ## Unique users: []
2024-06-15 00:46:08,382 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:46:08,382 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:08,390 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-06-15 00:46:08,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:08,404 [ 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-15 00:46:08,432 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-15 00:46:08,436 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-06-15 00:46:08,436 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-06-15 00:46:08,436 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-06-15 00:46:08,436 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-06-15 00:46:08,436 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-06-15 00:46:08,438 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-06-15 00:46:08,438 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-06-15 00:46:08,438 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-06-15 00:46:08,438 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-06-15 00:46:08,438 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-06-15 00:46:08,438 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-06-15 00:46:08,438 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-06-15 00:46:08,438 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-06-15 00:46:08,439 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-06-15 00:46:08,439 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-06-15 00:46:08,439 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-06-15 00:46:08,439 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-06-15 00:46:08,439 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-06-15 00:46:08,439 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-06-15 00:46:08,439 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-06-15 00:46:08,439 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-06-15 00:46:08,439 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-06-15 00:46:08,439 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-06-15 00:46:08,439 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-06-15 00:46:08,439 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-06-15 00:46:08,439 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-06-15 00:46:08,439 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-06-15 00:46:08,439 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-06-15 00:46:08,439 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-06-15 00:46:08,439 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-06-15 00:46:08,439 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-06-15 00:46:08,439 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-06-15 00:46:08,439 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-06-15 00:46:08,439 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-06-15 00:46:08,439 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-06-15 00:46:08,439 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-06-15 00:46:08,440 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-06-15 00:46:08,440 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-06-15 00:46:08,440 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-06-15 00:46:08,440 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-06-15 00:46:08,440 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-06-15 00:46:08,440 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-06-15 00:46:08,440 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-06-15 00:46:08,440 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-06-15 00:46:08,440 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-06-15 00:46:08,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:46:08,596 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-15 00:46:08,640 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:46:08,641 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:08,647 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-15 00:46:08,692 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-15 00:46:08,703 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa94409f730> has no local changes
2024-06-15 00:46:08,703 [ 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#96 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/)'
2024-06-15 00:46:08,715 [ scc.git] DEBUG [detached HEAD f3d00f5] merge master -Dorg -Ssuccess-only
2024-06-15 00:46:08,716 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:08,716 [ scc.repo] DEBUG ## PRs found:
2024-06-15 00:46:09,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-06-15 00:46:09,077 [ scc.repo] DEBUG ## Branches found:
2024-06-15 00:46:09,078 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-15 00:46:09,078 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:46:09,078 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:09,087 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-15 00:46:09,095 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-15 00:46:09,095 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-15 00:46:09,105 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-15 00:46:09,112 [ scc.git] DEBUG Already up to date.
2024-06-15 00:46:09,112 [ scc.git] DEBUG ## Unique users: []
2024-06-15 00:46:09,113 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:46:09,113 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:09,120 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-15 00:46:09,167 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:46:09,167 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:09,174 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-15 00:46:09,218 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-15 00:46:09,225 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa9440afb80> has no local changes
2024-06-15 00:46:09,225 [ 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#96 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/)'
2024-06-15 00:46:09,235 [ scc.git] DEBUG [detached HEAD dafd5cb] merge master -Dorg -Ssuccess-only
2024-06-15 00:46:09,236 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:09,236 [ scc.repo] DEBUG ## PRs found:
2024-06-15 00:46:09,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-06-15 00:46:09,507 [ scc.repo] DEBUG ## Branches found:
2024-06-15 00:46:09,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-15 00:46:09,507 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:46:09,507 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:09,515 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-15 00:46:09,521 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-15 00:46:09,521 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-15 00:46:09,526 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-15 00:46:09,533 [ scc.git] DEBUG Already up to date.
2024-06-15 00:46:09,533 [ scc.git] DEBUG ## Unique users: []
2024-06-15 00:46:09,533 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:46:09,533 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:09,539 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-15 00:46:09,580 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:46:09,580 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:09,588 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-15 00:46:09,633 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-15 00:46:09,640 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa94410ad90> has no local changes
2024-06-15 00:46:09,640 [ 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#96 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/)'
2024-06-15 00:46:09,650 [ scc.git] DEBUG [detached HEAD af5ded4] merge master -Dorg -Ssuccess-only
2024-06-15 00:46:09,651 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:09,651 [ scc.git] INFO Overriding base-branch from master to main
2024-06-15 00:46:09,651 [ scc.repo] DEBUG ## PRs found:
2024-06-15 00:46:10,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-06-15 00:46:10,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-06-15 00:46:10,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-06-15 00:46:11,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-06-15 00:46:12,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-15 00:46:12,556 [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-15 00:46:13,044 [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-15 00:46:13,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-15 00:46:14,044 [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-15 00:46:14,045 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-15 00:46:14,046 [ scc.repo] DEBUG ## Branches found:
2024-06-15 00:46:14,046 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-15 00:46:14,046 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:46:14,046 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:14,054 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-06-15 00:46:14,060 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-15 00:46:14,061 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-06-15 00:46:14,071 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-06-15 00:46:14,079 [ scc.git] DEBUG Already up to date.
2024-06-15 00:46:14,079 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-06-15 00:46:14,638 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-06-15 00:46:14,638 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-06-15 00:46:14,644 [ scc.git] DEBUG ## Unique users: []
2024-06-15 00:46:14,644 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:46:14,644 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:14,652 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-15 00:46:14,660 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:14,667 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-15 00:46:14,695 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-06-15 00:46:14,695 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-06-15 00:46:14,695 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-15 00:46:14,696 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-15 00:46:14,707 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-15 00:46:14,721 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-06-15 00:46:14,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:46:14,894 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-15 00:46:14,902 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-15 00:46:14,912 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#96](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-06-15 00:46:14,921 [ scc.config] DEBUG Found github.token
2024-06-15 00:46:14,921 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-06-15 00:46:14,921 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-15 00:46:14,967 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:46:14,967 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:14,977 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-15 00:46:15,027 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-15 00:46:15,039 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa944103df0> has no local changes
2024-06-15 00:46:15,039 [ 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#96 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/)'
2024-06-15 00:46:15,053 [ scc.git] DEBUG [detached HEAD 5fcdc3b] merge master -Dorg -Ssuccess-only
2024-06-15 00:46:15,054 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:15,054 [ scc.repo] DEBUG ## PRs found:
2024-06-15 00:46:15,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-06-15 00:46:15,361 [ scc.repo] DEBUG ## Branches found:
2024-06-15 00:46:15,361 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-15 00:46:15,361 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:46:15,361 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:15,368 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-15 00:46:15,374 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-15 00:46:15,375 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-15 00:46:15,381 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-15 00:46:15,388 [ scc.git] DEBUG Already up to date.
2024-06-15 00:46:15,388 [ scc.git] DEBUG ## Unique users: []
2024-06-15 00:46:15,389 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:46:15,389 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:15,395 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-15 00:46:15,447 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:46:15,447 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:15,454 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-15 00:46:15,497 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-15 00:46:15,504 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa9440aae80> has no local changes
2024-06-15 00:46:15,504 [ 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#96 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/)'
2024-06-15 00:46:15,513 [ scc.git] DEBUG [detached HEAD f285386] merge master -Dorg -Ssuccess-only
2024-06-15 00:46:15,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:15,514 [ scc.repo] DEBUG ## PRs found:
2024-06-15 00:46:15,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-06-15 00:46:15,833 [ scc.repo] DEBUG ## Branches found:
2024-06-15 00:46:15,834 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-15 00:46:15,834 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:46:15,834 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:15,840 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-15 00:46:15,846 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-15 00:46:15,846 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-15 00:46:15,852 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-15 00:46:15,859 [ scc.git] DEBUG Already up to date.
2024-06-15 00:46:15,859 [ scc.git] DEBUG ## Unique users: []
2024-06-15 00:46:15,859 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:46:15,859 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:15,865 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-15 00:46:15,906 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:46:15,907 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:15,913 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-15 00:46:15,956 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-15 00:46:15,964 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa94401c400> has no local changes
2024-06-15 00:46:15,964 [ 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#96 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/)'
2024-06-15 00:46:15,973 [ scc.git] DEBUG [detached HEAD 7e5d9aa] merge master -Dorg -Ssuccess-only
2024-06-15 00:46:15,974 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:15,974 [ scc.repo] DEBUG ## PRs found:
2024-06-15 00:46:16,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-06-15 00:46:16,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-06-15 00:46:17,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-06-15 00:46:17,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-15 00:46:18,221 [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-15 00:46:18,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-15 00:46:19,173 [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-15 00:46:19,174 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-06-15 00:46:19,175 [ scc.repo] DEBUG ## Branches found:
2024-06-15 00:46:19,175 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-15 00:46:19,175 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:46:19,175 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:19,183 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-15 00:46:19,191 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-15 00:46:19,191 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-15 00:46:19,199 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-15 00:46:19,208 [ scc.git] DEBUG Already up to date.
2024-06-15 00:46:19,209 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-06-15 00:46:19,651 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-06-15 00:46:19,651 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-06-15 00:46:19,657 [ scc.git] DEBUG ## Unique users: []
2024-06-15 00:46:19,658 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:46:19,658 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:19,667 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-15 00:46:19,675 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:19,684 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-15 00:46:19,744 [ scc.git] DEBUG Auto-merging Dockerfile
2024-06-15 00:46:19,744 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-06-15 00:46:19,745 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-15 00:46:19,746 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-15 00:46:19,756 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-15 00:46:19,767 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-06-15 00:46:19,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:46:19,949 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-15 00:46:19,960 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-15 00:46:19,972 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#96](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-06-15 00:46:19,980 [ scc.config] DEBUG Found github.token
2024-06-15 00:46:19,981 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-06-15 00:46:19,981 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-15 00:46:20,026 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:46:20,027 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:20,032 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-15 00:46:20,076 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-15 00:46:20,085 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa944061b80> has no local changes
2024-06-15 00:46:20,085 [ 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#96 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/)'
2024-06-15 00:46:20,097 [ scc.git] DEBUG [detached HEAD 5697597] merge master -Dorg -Ssuccess-only
2024-06-15 00:46:20,098 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:20,098 [ scc.git] INFO Overriding base-branch from master to develop
2024-06-15 00:46:20,098 [ scc.repo] DEBUG ## PRs found:
2024-06-15 00:46:20,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-06-15 00:46:21,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-06-15 00:46:21,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-06-15 00:46:22,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-06-15 00:46:22,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-06-15 00:46:22,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-06-15 00:46:23,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-06-15 00:46:23,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-15 00:46:24,274 [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-15 00:46:24,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-15 00:46:25,153 [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-15 00:46:25,154 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-15 00:46:25,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-06-15 00:46:26,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-06-15 00:46:26,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-06-15 00:46:27,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-06-15 00:46:27,215 [ scc.repo] DEBUG ## Branches found:
2024-06-15 00:46:27,215 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-15 00:46:27,216 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:46:27,216 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:27,225 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-06-15 00:46:27,231 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-15 00:46:27,231 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-06-15 00:46:27,237 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-06-15 00:46:27,244 [ scc.git] DEBUG Already up to date.
2024-06-15 00:46:27,244 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-06-15 00:46:27,616 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-06-15 00:46:27,617 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-06-15 00:46:27,627 [ scc.git] DEBUG ## Unique users: []
2024-06-15 00:46:27,627 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:46:27,628 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:27,636 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-15 00:46:27,646 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:27,658 [ 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-15 00:46:27,680 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-06-15 00:46:27,680 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-06-15 00:46:27,680 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-15 00:46:27,681 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-15 00:46:27,689 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-15 00:46:27,703 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-06-15 00:46:27,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:46:27,862 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-15 00:46:27,875 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-15 00:46:27,889 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#96](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-06-15 00:46:27,900 [ scc.config] DEBUG Found github.token
2024-06-15 00:46:27,900 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-06-15 00:46:27,900 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-15 00:46:27,954 [ scc.git] DEBUG Get sha1 of %s
2024-06-15 00:46:27,955 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-15 00:46:27,964 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-15 00:46:28,013 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-15 00:46:28,025 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa944070d60> has no local changes
2024-06-15 00:46:28,026 [ 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#96 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/)'
2024-06-15 00:46:28,043 [ scc.git] DEBUG [detached HEAD c4c6d1e] merge master -Dorg -Ssuccess-only
2024-06-15 00:46:28,045 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:28,045 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-15 00:46:28,156 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-06-15 00:46:28,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:46:28,327 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-06-15 00:46:28,337 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-06-15 00:46:28,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:46:28,718 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-06-15 00:46:28,724 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-06-15 00:46:29,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:46:29,125 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-06-15 00:46:29,132 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-06-15 00:46:29,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:46:29,577 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-06-15 00:46:29,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:46:29,970 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-06-15 00:46:29,982 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-06-15 00:46:30,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:46:30,384 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-06-15 00:46:30,394 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-06-15 00:46:30,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:46:30,793 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-06-15 00:46:30,816 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-06-15 00:46:31,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:46:31,213 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-06-15 00:46:31,219 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-06-15 00:46:31,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:46:31,615 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-06-15 00:46:31,622 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-06-15 00:46:32,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:46:32,026 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-06-15 00:46:32,033 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-06-15 00:46:32,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:46:32,423 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-06-15 00:46:32,430 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-06-15 00:46:32,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:46:32,856 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-06-15 00:46:32,868 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-06-15 00:46:33,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:46:33,249 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-06-15 00:46:33,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:46:33,666 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-06-15 00:46:34,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:46:34,077 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-06-15 00:46:34,082 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-06-15 00:46:34,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:46:34,527 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-06-15 00:46:34,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:46:34,916 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-06-15 00:46:35,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:46:35,337 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-06-15 00:46:35,347 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-06-15 00:46:35,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:46:35,753 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-06-15 00:46:35,759 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-06-15 00:46:36,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:46:36,164 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-06-15 00:46:36,172 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-06-15 00:46:36,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:46:36,566 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-06-15 00:46:36,571 [ scc.config] DEBUG Found submodule.scripts.url
2024-06-15 00:46:36,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-15 00:46:36,983 [ scc.config] DEBUG Found submodule.scripts.branch
2024-06-15 00:46:36,984 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-15 00:46:37,078 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa947a84c40> has local changes
2024-06-15 00:46:37,078 [ 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#96 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/96/)'
2024-06-15 00:46:37,097 [ scc.git] DEBUG [detached HEAD 2217899] merge master -Dorg -Ssuccess-only
2024-06-15 00:46:37,098 [ scc.merge] INFO Repository: ome/omero-plugins
2024-06-15 00:46:37,098 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-06-15 00:46:37,098 [ scc.merge] INFO Already up to date.
2024-06-15 00:46:37,098 [ scc.merge] INFO
2024-06-15 00:46:37,098 [ scc.merge] INFO Merged PRs:
2024-06-15 00:46:37,098 [ scc.merge] INFO - PR 373 dependabot[bot] 'Bump omero-test-infra from `7688c54` to `cda3ec6`'
2024-06-15 00:46:37,098 [ scc.merge] INFO - PR 375 dependabot[bot] 'Bump omero-figure from `3d9e3b8` to `ffc7e07`'
2024-06-15 00:46:37,098 [ scc.merge] INFO
2024-06-15 00:46:37,098 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-06-15 00:46:37,098 [ scc.merge] INFO Already up to date.
2024-06-15 00:46:37,098 [ scc.merge] INFO
2024-06-15 00:46:37,098 [ scc.merge] INFO
2024-06-15 00:46:37,098 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-06-15 00:46:37,098 [ scc.merge] INFO Excluded PRs:
2024-06-15 00:46:37,099 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-06-15 00:46:37,099 [ scc.merge] INFO Already up to date.
2024-06-15 00:46:37,099 [ scc.merge] INFO
2024-06-15 00:46:37,099 [ scc.merge] INFO Merged PRs:
2024-06-15 00:46:37,099 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-06-15 00:46:37,099 [ scc.merge] INFO
2024-06-15 00:46:37,099 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-06-15 00:46:37,099 [ scc.merge] INFO Excluded PRs:
2024-06-15 00:46:37,099 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-06-15 00:46:37,099 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-06-15 00:46:37,099 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-06-15 00:46:37,099 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-06-15 00:46:37,099 [ scc.merge] INFO Already up to date.
2024-06-15 00:46:37,099 [ scc.merge] INFO
2024-06-15 00:46:37,099 [ scc.merge] INFO Merged PRs:
2024-06-15 00:46:37,099 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-06-15 00:46:37,099 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-06-15 00:46:37,099 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-06-15 00:46:37,099 [ scc.merge] INFO - PR 65 will-moore 'gateway_required() uses omero_user_token if no username and password'
2024-06-15 00:46:37,099 [ scc.merge] INFO
2024-06-15 00:46:37,099 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-06-15 00:46:37,099 [ scc.merge] INFO Excluded PRs:
2024-06-15 00:46:37,099 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-15 00:46:37,100 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-06-15 00:46:37,100 [ scc.merge] INFO Already up to date.
2024-06-15 00:46:37,100 [ scc.merge] INFO
2024-06-15 00:46:37,100 [ scc.merge] INFO Merged PRs:
2024-06-15 00:46:37,100 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-06-15 00:46:37,100 [ scc.merge] INFO
2024-06-15 00:46:37,100 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-15 00:46:37,100 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-06-15 00:46:37,100 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-06-15 00:46:37,100 [ scc.merge] INFO
2024-06-15 00:46:37,100 [ scc.merge] INFO Repository: ome/omero-figure
2024-06-15 00:46:37,100 [ scc.merge] INFO Excluded PRs:
2024-06-15 00:46:37,100 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes' (exclude comment)
2024-06-15 00:46:37,100 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-06-15 00:46:37,100 [ scc.merge] INFO Already up to date.
2024-06-15 00:46:37,100 [ scc.merge] INFO
2024-06-15 00:46:37,100 [ scc.merge] INFO Merged PRs:
2024-06-15 00:46:37,100 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-06-15 00:46:37,100 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-06-15 00:46:37,100 [ scc.merge] INFO
2024-06-15 00:46:37,100 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-06-15 00:46:37,100 [ scc.merge] INFO Already up to date.
2024-06-15 00:46:37,100 [ scc.merge] INFO
2024-06-15 00:46:37,101 [ scc.merge] INFO Merged PRs:
2024-06-15 00:46:37,101 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-06-15 00:46:37,101 [ scc.merge] INFO
2024-06-15 00:46:37,101 [ scc.merge] INFO Repository: ome/omero-gallery
2024-06-15 00:46:37,101 [ scc.merge] INFO Already up to date.
2024-06-15 00:46:37,101 [ scc.merge] INFO
2024-06-15 00:46:37,101 [ scc.merge] INFO Merged PRs:
2024-06-15 00:46:37,101 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-15 00:46:37,101 [ scc.merge] INFO
2024-06-15 00:46:37,101 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-06-15 00:46:37,101 [ scc.merge] INFO Excluded PRs:
2024-06-15 00:46:37,101 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-06-15 00:46:37,101 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-06-15 00:46:37,101 [ scc.merge] INFO Already up to date.
2024-06-15 00:46:37,101 [ scc.merge] INFO
2024-06-15 00:46:37,101 [ scc.merge] INFO Merged PRs:
2024-06-15 00:46:37,101 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-06-15 00:46:37,101 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-06-15 00:46:37,101 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-15 00:46:37,101 [ scc.merge] INFO
2024-06-15 00:46:37,101 [ scc.merge] INFO Repository: ome/omero-mapr
2024-06-15 00:46:37,101 [ scc.merge] INFO Excluded PRs:
2024-06-15 00:46:37,101 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-06-15 00:46:37,102 [ scc.merge] INFO Already up to date.
2024-06-15 00:46:37,102 [ scc.merge] INFO
2024-06-15 00:46:37,102 [ scc.merge] INFO Merged PRs:
2024-06-15 00:46:37,102 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-06-15 00:46:37,102 [ scc.merge] INFO
2024-06-15 00:46:37,102 [ scc.merge] INFO Repository: ome/omero-metadata
2024-06-15 00:46:37,102 [ scc.merge] INFO Already up to date.
2024-06-15 00:46:37,102 [ scc.merge] INFO
2024-06-15 00:46:37,102 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-15 00:46:37,102 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-15 00:46:37,102 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-15 00:46:37,102 [ scc.merge] INFO
2024-06-15 00:46:37,102 [ scc.merge] INFO Repository: ome/omero-parade
2024-06-15 00:46:37,102 [ scc.merge] INFO Excluded PRs:
2024-06-15 00:46:37,102 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-06-15 00:46:37,102 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-06-15 00:46:37,102 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-06-15 00:46:37,102 [ scc.merge] INFO Already up to date.
2024-06-15 00:46:37,102 [ scc.merge] INFO
2024-06-15 00:46:37,102 [ scc.merge] INFO Merged PRs:
2024-06-15 00:46:37,102 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-15 00:46:37,102 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-15 00:46:37,102 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-15 00:46:37,103 [ scc.merge] INFO
2024-06-15 00:46:37,103 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-06-15 00:46:37,103 [ scc.merge] INFO Already up to date.
2024-06-15 00:46:37,103 [ scc.merge] INFO
2024-06-15 00:46:37,103 [ scc.merge] INFO Merged PRs:
2024-06-15 00:46:37,103 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-06-15 00:46:37,103 [ scc.merge] INFO
2024-06-15 00:46:37,103 [ scc.merge] INFO Repository: ome/omero-rois
2024-06-15 00:46:37,103 [ scc.merge] INFO Excluded PRs:
2024-06-15 00:46:37,103 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-15 00:46:37,103 [ scc.merge] INFO Already up to date.
2024-06-15 00:46:37,103 [ scc.merge] INFO
2024-06-15 00:46:37,103 [ scc.merge] INFO Merged PRs:
2024-06-15 00:46:37,103 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-15 00:46:37,103 [ scc.merge] INFO
2024-06-15 00:46:37,103 [ scc.merge] INFO Repository: ome/omero-signup
2024-06-15 00:46:37,103 [ scc.merge] INFO Already up to date.
2024-06-15 00:46:37,103 [ scc.merge] INFO
2024-06-15 00:46:37,103 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-15 00:46:37,103 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-15 00:46:37,103 [ scc.merge] INFO
2024-06-15 00:46:37,103 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-06-15 00:46:37,103 [ scc.merge] INFO Already up to date.
2024-06-15 00:46:37,104 [ scc.merge] INFO
2024-06-15 00:46:37,104 [ scc.merge] INFO Merged PRs:
2024-06-15 00:46:37,104 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-15 00:46:37,104 [ scc.merge] INFO
2024-06-15 00:46:37,104 [ scc.merge] INFO Repository: ome/omero-upload
2024-06-15 00:46:37,104 [ scc.merge] INFO Already up to date.
2024-06-15 00:46:37,104 [ scc.merge] INFO
2024-06-15 00:46:37,104 [ scc.merge] INFO
2024-06-15 00:46:37,104 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-06-15 00:46:37,104 [ scc.merge] INFO Already up to date.
2024-06-15 00:46:37,104 [ scc.merge] INFO
2024-06-15 00:46:37,104 [ scc.merge] INFO
2024-06-15 00:46:37,104 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-06-15 00:46:37,104 [ scc.merge] INFO Excluded PRs:
2024-06-15 00:46:37,104 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-06-15 00:46:37,104 [ scc.merge] INFO Already up to date.
2024-06-15 00:46:37,104 [ scc.merge] INFO
2024-06-15 00:46:37,104 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-15 00:46:37,104 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-15 00:46:37,104 [ scc.merge] INFO
2024-06-15 00:46:37,104 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-06-15 00:46:37,104 [ scc.merge] INFO Already up to date.
2024-06-15 00:46:37,104 [ scc.merge] INFO
2024-06-15 00:46:37,105 [ scc.merge] INFO
2024-06-15 00:46:37,105 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-06-15 00:46:37,105 [ scc.merge] INFO Already up to date.
2024-06-15 00:46:37,105 [ scc.merge] INFO
2024-06-15 00:46:37,105 [ scc.merge] INFO
2024-06-15 00:46:37,105 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-06-15 00:46:37,105 [ scc.merge] INFO Already up to date.
2024-06-15 00:46:37,105 [ scc.merge] INFO
2024-06-15 00:46:37,105 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-15 00:46:37,105 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-06-15 00:46:37,105 [ scc.merge] INFO
2024-06-15 00:46:37,105 [ scc.merge] INFO Repository: ome/scripts
2024-06-15 00:46:37,105 [ scc.merge] INFO Excluded PRs:
2024-06-15 00:46:37,105 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-06-15 00:46:37,105 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-06-15 00:46:37,105 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-06-15 00:46:37,105 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-06-15 00:46:37,105 [ scc.merge] INFO Already up to date.
2024-06-15 00:46:37,105 [ scc.merge] INFO
2024-06-15 00:46:37,105 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-15 00:46:37,105 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-15 00:46:37,105 [ scc.merge] INFO
2024-06-15 00:46:37,106 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-06-15 00:46:37,106 [ scc.git] DEBUG Calling 'git remote'
2024-06-15 00:46:37,114 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-06-15 00:46:37,115 [ scc.git] DEBUG Calling 'git remote'
2024-06-15 00:46:37,122 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:37,123 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-06-15 00:46:37,123 [ scc.git] DEBUG Calling 'git remote'
2024-06-15 00:46:37,130 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:37,131 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-06-15 00:46:37,131 [ scc.git] DEBUG Calling 'git remote'
2024-06-15 00:46:37,138 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:37,139 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-06-15 00:46:37,139 [ scc.git] DEBUG Calling 'git remote'
2024-06-15 00:46:37,147 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:37,147 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-15 00:46:37,147 [ scc.git] DEBUG Calling 'git remote'
2024-06-15 00:46:37,157 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:37,157 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-15 00:46:37,157 [ scc.git] DEBUG Calling 'git remote'
2024-06-15 00:46:37,165 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:37,166 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-15 00:46:37,166 [ scc.git] DEBUG Calling 'git remote'
2024-06-15 00:46:37,173 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:37,173 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-15 00:46:37,173 [ scc.git] DEBUG Calling 'git remote'
2024-06-15 00:46:37,180 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:37,180 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-15 00:46:37,180 [ scc.git] DEBUG Calling 'git remote'
2024-06-15 00:46:37,187 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:37,188 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-15 00:46:37,188 [ scc.git] DEBUG Calling 'git remote'
2024-06-15 00:46:37,195 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:37,195 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-15 00:46:37,195 [ scc.git] DEBUG Calling 'git remote'
2024-06-15 00:46:37,204 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:37,204 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-15 00:46:37,204 [ scc.git] DEBUG Calling 'git remote'
2024-06-15 00:46:37,211 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:37,211 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-15 00:46:37,211 [ scc.git] DEBUG Calling 'git remote'
2024-06-15 00:46:37,219 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:37,220 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-15 00:46:37,220 [ scc.git] DEBUG Calling 'git remote'
2024-06-15 00:46:37,227 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:37,227 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-15 00:46:37,227 [ scc.git] DEBUG Calling 'git remote'
2024-06-15 00:46:37,234 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:37,235 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-15 00:46:37,235 [ scc.git] DEBUG Calling 'git remote'
2024-06-15 00:46:37,243 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:37,244 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-15 00:46:37,244 [ scc.git] DEBUG Calling 'git remote'
2024-06-15 00:46:37,254 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:37,254 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-15 00:46:37,254 [ scc.git] DEBUG Calling 'git remote'
2024-06-15 00:46:37,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:37,264 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-15 00:46:37,264 [ scc.git] DEBUG Calling 'git remote'
2024-06-15 00:46:37,273 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:37,274 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-15 00:46:37,274 [ scc.git] DEBUG Calling 'git remote'
2024-06-15 00:46:37,281 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:37,282 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-15 00:46:37,282 [ scc.git] DEBUG Calling 'git remote'
2024-06-15 00:46:37,292 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-15 00:46:37,292 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-15 00:46:37,293 [ scc.git] DEBUG Calling 'git remote'
2024-06-15 00:46:37,302 [ 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 331c4ad] 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 73b4044] 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-15 00:47:24,415 [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-15 00:47:33,450 [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-15 00:47:35,825 [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-15 00:47:40,374 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-06-15 00:48:31,371 [ 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/f6f303f9/images/svgs/logo.svg){kind=logo}
