Skipping 101 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-06-06 09:45:40,354 [ scc.git] DEBUG HEAD is now at 2ca566b Merge pull request #160 from ome/pre-commit-ci-update-config
2024-06-06 09:45:40,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:45:40,739 [ scc.git] DEBUG Calling 'git merge-base 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473 553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-06-06 09:45:40,745 [ scc.git] DEBUG Calling 'git diff --name-only eff38d0408f9d50de13b28dfe09e4382965e203f..2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-06 09:45:40,750 [ scc.git] INFO - PR 123 will-moore 'Support export of Fileset:ID'
Conflicting PR. Removed from build [OMERO-plugins-push#87](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/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-06 09:45:40,755 [ scc.config] DEBUG Found github.token
2024-06-06 09:45:40,755 [ scc.git] DEBUG Not adding comment to issue #123, already --conflicts.
2024-06-06 09:45:40,755 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a14f62a940f4974a305b3f5858049ee493b898ef'
2024-06-06 09:45:40,761 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:45:40,765 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 147 (Name option) a14f62a940f4974a305b3f5858049ee493b898ef'
2024-06-06 09:45:40,775 [ scc.git] DEBUG Auto-merging src/omero_zarr/masks.py
2024-06-06 09:45:40,775 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-06-06 09:45:40,776 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 09:45:40,779 [ scc.git] DEBUG README.rst | 30 ++++++++++++++++++------------
2024-06-06 09:45:40,779 [ scc.git] DEBUG src/omero_zarr/cli.py | 9 +++++++++
2024-06-06 09:45:40,779 [ scc.git] DEBUG src/omero_zarr/masks.py | 4 ++--
2024-06-06 09:45:40,779 [ scc.git] DEBUG src/omero_zarr/raw_pixels.py | 28 +++++++++++++++++++++++-----
2024-06-06 09:45:40,779 [ scc.git] DEBUG src/omero_zarr/util.py | 2 +-
2024-06-06 09:45:40,779 [ scc.git] DEBUG 5 files changed, 53 insertions(+), 20 deletions(-)
2024-06-06 09:45:41,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:45:41,138 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 09:45:41,177 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:45:41,177 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:45:41,182 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 09:45:41,218 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 09:45:41,225 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bf5a9bee0> has no local changes
2024-06-06 09:45:41,226 [ 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#87 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/)'
2024-06-06 09:45:41,234 [ scc.git] DEBUG [detached HEAD e03a088] merge master -Dorg -Ssuccess-only
2024-06-06 09:45:41,234 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:45:41,234 [ scc.repo] DEBUG ## PRs found:
2024-06-06 09:45:41,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-06-06 09:45:42,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/563 HTTP/1.1" 200 None
2024-06-06 09:45:42,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/563/comments HTTP/1.1" 200 None
2024-06-06 09:45:43,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/acd328badf4723b6ad334eeff22205a726b61043 HTTP/1.1" 200 None
2024-06-06 09:45:43,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/acd328badf4723b6ad334eeff22205a726b61043/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-06 09:45:44,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/acd328badf4723b6ad334eeff22205a726b61043/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-06 09:45:44,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/acd328badf4723b6ad334eeff22205a726b61043 HTTP/1.1" 200 None
2024-06-06 09:45:44,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/acd328badf4723b6ad334eeff22205a726b61043?per_page=1 HTTP/1.1" 200 2
2024-06-06 09:45:44,870 [ scc.repo] DEBUG - PR 563 will-moore 'Use path instead of re_path for all URLs'
2024-06-06 09:45:45,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562 HTTP/1.1" 200 None
2024-06-06 09:45:45,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/562/comments HTTP/1.1" 200 None
2024-06-06 09:45:46,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/5750e2b744e687c5064df1b3ee304bfe7b5e6573 HTTP/1.1" 200 None
2024-06-06 09:45:46,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/5750e2b744e687c5064df1b3ee304bfe7b5e6573/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-06 09:45:47,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/5750e2b744e687c5064df1b3ee304bfe7b5e6573/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-06 09:45:47,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/5750e2b744e687c5064df1b3ee304bfe7b5e6573 HTTP/1.1" 200 None
2024-06-06 09:45:48,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/5750e2b744e687c5064df1b3ee304bfe7b5e6573?per_page=1 HTTP/1.1" 200 2
2024-06-06 09:45:48,030 [ scc.repo] DEBUG - PR 562 will-moore 'Add changelog 7.0.0'
2024-06-06 09:45:48,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-06-06 09:45:48,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-06-06 09:45:49,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-06 09:45:49,844 [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-06 09:45:50,285 [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-06 09:45:50,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-06 09:45:51,161 [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-06 09:45:51,161 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-06-06 09:45:51,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-06-06 09:45:52,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-06 09:45:52,614 [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-06 09:45:53,090 [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-06 09:45:53,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-06 09:45:53,935 [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-06 09:45:53,936 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-06-06 09:45:53,936 [ scc.repo] DEBUG ## Branches found:
2024-06-06 09:45:53,936 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-06 09:45:53,936 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:45:53,936 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:45:53,943 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 09:45:53,949 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 09:45:53,949 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 09:45:53,955 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 09:45:53,960 [ scc.git] DEBUG Already up to date.
2024-06-06 09:45:53,960 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-06-06 09:45:54,404 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-06 09:45:54,404 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-06-06 09:45:54,409 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-06-06 09:45:55,009 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-06 09:45:55,009 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-06-06 09:45:55,014 [ scc.git] DEBUG Calling 'git fetch origin pull/562/head'
2024-06-06 09:45:55,395 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-06 09:45:55,395 [ scc.git] DEBUG * branch refs/pull/562/head -> FETCH_HEAD
2024-06-06 09:45:55,400 [ scc.git] DEBUG Calling 'git fetch origin pull/563/head'
2024-06-06 09:45:55,769 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-06 09:45:55,769 [ scc.git] DEBUG * branch refs/pull/563/head -> FETCH_HEAD
2024-06-06 09:45:55,774 [ scc.git] DEBUG ## Unique users: []
2024-06-06 09:45:55,774 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:45:55,774 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:45:55,779 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-06 09:45:55,786 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:45:55,791 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-06 09:45:55,805 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 09:45:55,811 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-06-06 09:45:55,811 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-06-06 09:45:55,811 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-06-06 09:45:55,811 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-06-06 09:45:55,811 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-06-06 09:45:55,811 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-06-06 09:45:55,811 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-06-06 09:45:55,811 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-06-06 09:45:55,811 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-06-06 09:45:55,813 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-06-06 09:45:55,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:45:55,963 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-06 09:45:55,971 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:45:55,975 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-06 09:45:55,993 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-06-06 09:45:55,993 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-06-06 09:45:55,993 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-06-06 09:45:55,994 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 09:45:56,000 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-06-06 09:45:56,000 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-06-06 09:45:56,000 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-06-06 09:45:56,000 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-06-06 09:45:56,000 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-06-06 09:45:56,000 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-06-06 09:45:56,000 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-06-06 09:45:56,000 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-06-06 09:45:56,000 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-06-06 09:45:56,000 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-06-06 09:45:56,000 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-06-06 09:45:56,000 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-06-06 09:45:56,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:45:56,393 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5750e2b744e687c5064df1b3ee304bfe7b5e6573'
2024-06-06 09:45:56,401 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:45:56,405 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 562 (Add changelog 7.0.0) 5750e2b744e687c5064df1b3ee304bfe7b5e6573'
2024-06-06 09:45:56,419 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 09:45:56,422 [ scc.git] DEBUG CHANGELOG.md | 10 ++++++++++
2024-06-06 09:45:56,422 [ scc.git] DEBUG README.rst | 2 +-
2024-06-06 09:45:56,422 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 1 deletion(-)
2024-06-06 09:45:56,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:45:56,799 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...acd328badf4723b6ad334eeff22205a726b61043'
2024-06-06 09:45:56,807 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:45:56,811 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 563 (Use path instead of re_path for all URLs) acd328badf4723b6ad334eeff22205a726b61043'
2024-06-06 09:45:56,841 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 09:45:56,844 [ scc.git] DEBUG omero_figure/urls.py | 68 +++++++++++++++++++++++++---------------------------
2024-06-06 09:45:56,844 [ scc.git] DEBUG 1 file changed, 32 insertions(+), 36 deletions(-)
2024-06-06 09:45:57,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:45:57,201 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 09:45:57,240 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:45:57,240 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:45:57,244 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 09:45:57,282 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 09:45:57,289 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bf49eebb0> has no local changes
2024-06-06 09:45:57,290 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 560 will-moore 'Max projection bytes' (exclude comment)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 562 will-moore 'Add changelog 7.0.0'
- PR 563 will-moore 'Use path instead of re_path for all URLs'
Generated by OMERO-plugins-push#87 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/)'
2024-06-06 09:45:57,298 [ scc.git] DEBUG [detached HEAD 7e15f518] merge master -Dorg -Ssuccess-only
2024-06-06 09:45:57,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:45:57,299 [ scc.repo] DEBUG ## PRs found:
2024-06-06 09:45:57,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-06-06 09:45:58,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-06-06 09:45:58,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-06-06 09:45:59,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-06 09:45:59,602 [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-06 09:46:00,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-06 09:46:00,488 [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-06 09:46:00,488 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-06-06 09:46:00,488 [ scc.repo] DEBUG ## Branches found:
2024-06-06 09:46:00,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-06 09:46:00,488 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:00,488 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:00,494 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 09:46:00,499 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 09:46:00,499 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 09:46:00,504 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 09:46:00,509 [ scc.git] DEBUG Already up to date.
2024-06-06 09:46:00,509 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-06-06 09:46:00,895 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-06-06 09:46:00,895 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-06-06 09:46:00,900 [ scc.git] DEBUG ## Unique users: []
2024-06-06 09:46:00,900 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:00,900 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:00,905 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-06 09:46:00,910 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:00,915 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-06 09:46:00,923 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-06-06 09:46:00,924 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 09:46:00,926 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-06-06 09:46:00,926 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-06-06 09:46:01,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:46:01,076 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 09:46:01,113 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:01,113 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:01,118 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 09:46:01,156 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 09:46:01,162 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bf419f490> has no local changes
2024-06-06 09:46:01,162 [ 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#87 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/)'
2024-06-06 09:46:01,169 [ scc.git] DEBUG [detached HEAD cd3d603] merge master -Dorg -Ssuccess-only
2024-06-06 09:46:01,170 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:46:01,170 [ scc.repo] DEBUG ## PRs found:
2024-06-06 09:46:01,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-06-06 09:46:02,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-06-06 09:46:02,069 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-06 09:46:02,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-06 09:46:03,174 [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-06 09:46:03,707 [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-06 09:46:04,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-06 09:46:04,652 [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-06 09:46:04,652 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-06 09:46:04,653 [ scc.repo] DEBUG ## Branches found:
2024-06-06 09:46:04,653 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-06 09:46:04,653 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:04,653 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:04,658 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 09:46:04,663 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 09:46:04,663 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 09:46:04,668 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 09:46:04,673 [ scc.git] DEBUG Already up to date.
2024-06-06 09:46:04,673 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-06-06 09:46:05,051 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-06-06 09:46:05,051 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-06-06 09:46:05,056 [ scc.git] DEBUG ## Unique users: []
2024-06-06 09:46:05,056 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:05,056 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:05,061 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-06-06 09:46:05,066 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:05,071 [ 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-06 09:46:05,080 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 09:46:05,084 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-06-06 09:46:05,084 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-06-06 09:46:05,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:46:05,251 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 09:46:05,288 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:05,288 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:05,292 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 09:46:05,328 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 09:46:05,335 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bf4a4afd0> has no local changes
2024-06-06 09:46:05,336 [ 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#87 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/)'
2024-06-06 09:46:05,345 [ scc.git] DEBUG [detached HEAD 6b11fa8] merge master -Dorg -Ssuccess-only
2024-06-06 09:46:05,345 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:46:05,346 [ scc.repo] DEBUG ## PRs found:
2024-06-06 09:46:05,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-06-06 09:46:06,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-06-06 09:46:06,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-06-06 09:46:07,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-06 09:46:07,618 [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-06 09:46:08,087 [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-06 09:46:08,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-06 09:46:08,950 [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-06 09:46:08,951 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-06 09:46:09,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-06-06 09:46:09,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-06-06 09:46:10,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-06 09:46:10,898 [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-06 09:46:11,447 [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-06 09:46:11,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-06 09:46:12,341 [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-06 09:46:12,342 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-06-06 09:46:12,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-06-06 09:46:13,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-06-06 09:46:13,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-06 09:46:14,330 [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-06 09:46:14,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-06 09:46:15,161 [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-06 09:46:15,161 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-06-06 09:46:15,162 [ scc.repo] DEBUG ## Branches found:
2024-06-06 09:46:15,162 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-06 09:46:15,162 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:15,162 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:15,167 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 09:46:15,172 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 09:46:15,172 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 09:46:15,177 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 09:46:15,182 [ scc.git] DEBUG Already up to date.
2024-06-06 09:46:15,182 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-06-06 09:46:15,568 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-06 09:46:15,568 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-06-06 09:46:15,573 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-06-06 09:46:15,958 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-06 09:46:15,959 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-06-06 09:46:15,963 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-06-06 09:46:16,318 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-06 09:46:16,319 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-06-06 09:46:16,323 [ scc.git] DEBUG ## Unique users: []
2024-06-06 09:46:16,323 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:16,323 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:16,328 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-06 09:46:16,334 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:16,339 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-06 09:46:16,349 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-06-06 09:46:16,350 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 09:46:16,353 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-06-06 09:46:16,353 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-06-06 09:46:16,353 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-06-06 09:46:16,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:46:16,555 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-06 09:46:16,561 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:16,566 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-06 09:46:16,584 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-06-06 09:46:16,584 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-06-06 09:46:16,584 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-06-06 09:46:16,584 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-06-06 09:46:16,585 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 09:46:16,589 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-06-06 09:46:16,589 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-06-06 09:46:16,589 [ scc.git] DEBUG src/app/header.html | 5 +
2024-06-06 09:46:16,589 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-06-06 09:46:16,589 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-06-06 09:46:16,589 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-06-06 09:46:16,590 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-06-06 09:46:16,590 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-06-06 09:46:16,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:46:16,966 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-06 09:46:16,973 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:16,977 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-06 09:46:16,990 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-06-06 09:46:16,990 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 09:46:16,993 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-06-06 09:46:16,993 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-06-06 09:46:16,993 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-06-06 09:46:17,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:46:17,373 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 09:46:17,410 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:17,410 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:17,415 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 09:46:17,455 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 09:46:17,464 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bf41a7280> has no local changes
2024-06-06 09:46:17,464 [ 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#87 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/)'
2024-06-06 09:46:17,473 [ scc.git] DEBUG [detached HEAD 720cfd0] merge master -Dorg -Ssuccess-only
2024-06-06 09:46:17,474 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:46:17,474 [ scc.repo] DEBUG ## PRs found:
2024-06-06 09:46:17,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-06-06 09:46:18,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-06-06 09:46:18,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-06-06 09:46:19,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-06 09:46:19,870 [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-06 09:46:20,345 [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-06 09:46:20,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-06 09:46:21,236 [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-06 09:46:21,236 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-06-06 09:46:21,237 [ scc.repo] DEBUG ## Branches found:
2024-06-06 09:46:21,237 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-06 09:46:21,237 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:21,237 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:21,242 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 09:46:21,247 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 09:46:21,247 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 09:46:21,252 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 09:46:21,257 [ scc.git] DEBUG Already up to date.
2024-06-06 09:46:21,257 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-06-06 09:46:21,616 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-06-06 09:46:21,616 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-06-06 09:46:21,620 [ scc.git] DEBUG ## Unique users: []
2024-06-06 09:46:21,620 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:21,620 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:21,625 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-06 09:46:21,631 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:21,635 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-06 09:46:21,644 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 09:46:21,647 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-06-06 09:46:21,647 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-06-06 09:46:21,647 [ scc.git] DEBUG requirements.txt | 2 +-
2024-06-06 09:46:21,647 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-06-06 09:46:21,647 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-06-06 09:46:21,647 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-06-06 09:46:21,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:46:21,802 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 09:46:21,840 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:21,840 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:21,844 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 09:46:21,885 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 09:46:21,892 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bf41bb460> has no local changes
2024-06-06 09:46:21,892 [ 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#87 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/)'
2024-06-06 09:46:21,901 [ scc.git] DEBUG [detached HEAD b2106c8] merge master -Dorg -Ssuccess-only
2024-06-06 09:46:21,901 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:46:21,901 [ scc.repo] DEBUG ## PRs found:
2024-06-06 09:46:22,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-06-06 09:46:22,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-06-06 09:46:23,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-06-06 09:46:23,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-06 09:46:24,312 [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-06 09:46:24,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-06 09:46:25,204 [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-06 09:46:25,204 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-06 09:46:25,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-06-06 09:46:26,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-06-06 09:46:26,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-06 09:46:27,089 [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-06 09:46:27,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-06 09:46:28,007 [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-06 09:46:28,008 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-06 09:46:28,008 [ scc.repo] DEBUG ## Branches found:
2024-06-06 09:46:28,008 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-06 09:46:28,008 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:28,008 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:28,015 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 09:46:28,020 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 09:46:28,021 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 09:46:28,027 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 09:46:28,032 [ scc.git] DEBUG Already up to date.
2024-06-06 09:46:28,033 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-06-06 09:46:28,426 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-06 09:46:28,426 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-06-06 09:46:28,431 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-06-06 09:46:28,985 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-06 09:46:28,985 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-06-06 09:46:28,990 [ scc.git] DEBUG ## Unique users: []
2024-06-06 09:46:28,990 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:28,990 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:28,996 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-06 09:46:29,002 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:29,007 [ 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-06 09:46:29,021 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-06-06 09:46:29,021 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-06-06 09:46:29,021 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-06 09:46:29,021 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-06 09:46:29,021 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-06 09:46:29,022 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-06 09:46:29,026 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-06 09:46:29,033 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-06 09:46:29,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:46:29,194 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-06 09:46:29,201 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-06 09:46:29,207 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#87](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-06-06 09:46:29,211 [ scc.config] DEBUG Found github.token
2024-06-06 09:46:29,211 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-06-06 09:46:29,211 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-06 09:46:29,217 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:29,222 [ 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-06 09:46:29,237 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-06 09:46:29,237 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-06 09:46:29,237 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-06-06 09:46:29,237 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-06 09:46:29,237 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-06 09:46:29,242 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-06 09:46:29,249 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-06 09:46:29,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:46:29,613 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-06 09:46:29,620 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-06 09:46:29,625 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#87](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/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-06 09:46:29,629 [ scc.config] DEBUG Found github.token
2024-06-06 09:46:29,630 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-06-06 09:46:29,630 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 09:46:29,668 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:29,668 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:29,673 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 09:46:29,707 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 09:46:29,714 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bf4161640> has no local changes
2024-06-06 09:46:29,714 [ 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#87 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/)'
2024-06-06 09:46:29,722 [ scc.git] DEBUG [detached HEAD ad9488f] merge master -Dorg -Ssuccess-only
2024-06-06 09:46:29,722 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:46:29,723 [ scc.repo] DEBUG ## PRs found:
2024-06-06 09:46:30,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-06-06 09:46:30,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-06-06 09:46:30,654 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-06 09:46:31,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-06 09:46:31,620 [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-06 09:46:32,150 [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-06 09:46:32,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-06 09:46:33,190 [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-06 09:46:33,191 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-06 09:46:33,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-06-06 09:46:33,645 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-06 09:46:34,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-06 09:46:34,625 [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-06 09:46:35,110 [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-06 09:46:35,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-06 09:46:35,974 [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-06 09:46:35,974 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-06 09:46:36,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-06-06 09:46:36,448 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-06 09:46:36,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-06 09:46:37,399 [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-06 09:46:37,870 [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-06 09:46:38,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-06 09:46:38,869 [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-06 09:46:38,870 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-06 09:46:39,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-06-06 09:46:39,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-06-06 09:46:40,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-06-06 09:46:40,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-06-06 09:46:41,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-06-06 09:46:41,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-06-06 09:46:41,720 [ scc.repo] DEBUG ## Branches found:
2024-06-06 09:46:41,720 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-06 09:46:41,720 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:41,720 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:41,725 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 09:46:41,730 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 09:46:41,730 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 09:46:41,735 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 09:46:41,740 [ scc.git] DEBUG Already up to date.
2024-06-06 09:46:41,740 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-06-06 09:46:42,109 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-06 09:46:42,109 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-06-06 09:46:42,114 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-06-06 09:46:42,496 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-06 09:46:42,496 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-06-06 09:46:42,501 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-06-06 09:46:42,899 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-06 09:46:42,899 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-06-06 09:46:42,903 [ scc.git] DEBUG ## Unique users: []
2024-06-06 09:46:42,903 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:42,903 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:42,908 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-06-06 09:46:42,914 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:42,919 [ 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-06 09:46:42,928 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 09:46:42,931 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-06-06 09:46:42,931 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-06-06 09:46:43,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:46:43,082 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-06-06 09:46:43,089 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:43,093 [ 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-06 09:46:43,104 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-06 09:46:43,104 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 09:46:43,107 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-06-06 09:46:43,107 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-06-06 09:46:43,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:46:43,475 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-06-06 09:46:43,480 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:43,485 [ 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-06 09:46:43,496 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-06 09:46:43,496 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 09:46:43,499 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-06-06 09:46:43,500 [ scc.git] DEBUG package.json | 2 +-
2024-06-06 09:46:43,500 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-06-06 09:46:43,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:46:43,883 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 09:46:43,921 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:43,921 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:43,926 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 09:46:43,961 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 09:46:43,967 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bf4161580> has no local changes
2024-06-06 09:46:43,967 [ 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#87 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/)'
2024-06-06 09:46:43,975 [ scc.git] DEBUG [detached HEAD e69c69d] merge master -Dorg -Ssuccess-only
2024-06-06 09:46:43,975 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:46:43,975 [ scc.repo] DEBUG ## PRs found:
2024-06-06 09:46:44,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-06-06 09:46:44,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-06-06 09:46:45,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-06 09:46:45,759 [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-06 09:46:46,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-06 09:46:46,696 [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-06 09:46:46,696 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-06-06 09:46:46,696 [ scc.repo] DEBUG ## Branches found:
2024-06-06 09:46:46,696 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-06 09:46:46,697 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:46,697 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:46,702 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 09:46:46,707 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 09:46:46,707 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 09:46:46,712 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 09:46:46,717 [ scc.git] DEBUG Already up to date.
2024-06-06 09:46:46,717 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-06 09:46:47,092 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-06-06 09:46:47,092 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-06 09:46:47,096 [ scc.git] DEBUG ## Unique users: []
2024-06-06 09:46:47,096 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:47,097 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:47,102 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-06 09:46:47,107 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:47,111 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-06 09:46:47,121 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 09:46:47,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:46:47,286 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 09:46:47,325 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:47,325 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:47,331 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 09:46:47,367 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 09:46:47,373 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bf4172c10> has no local changes
2024-06-06 09:46:47,373 [ 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#87 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/)'
2024-06-06 09:46:47,380 [ scc.git] DEBUG [detached HEAD ba68d50] merge master -Dorg -Ssuccess-only
2024-06-06 09:46:47,381 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:46:47,381 [ scc.repo] DEBUG ## PRs found:
2024-06-06 09:46:47,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-06-06 09:46:48,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-06-06 09:46:48,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-06-06 09:46:49,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-06-06 09:46:49,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-06 09:46:50,127 [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-06 09:46:50,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-06 09:46:51,102 [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-06 09:46:51,103 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-06 09:46:51,103 [ scc.repo] DEBUG ## Branches found:
2024-06-06 09:46:51,103 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-06 09:46:51,103 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:51,103 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:51,110 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 09:46:51,115 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 09:46:51,116 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 09:46:51,122 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 09:46:51,128 [ scc.git] DEBUG Already up to date.
2024-06-06 09:46:51,129 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-06-06 09:46:51,521 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-06-06 09:46:51,522 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-06-06 09:46:51,526 [ scc.git] DEBUG ## Unique users: []
2024-06-06 09:46:51,526 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:51,526 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:51,532 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-06-06 09:46:51,538 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:51,542 [ 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-06 09:46:51,551 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-06-06 09:46:51,551 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 09:46:51,553 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-06-06 09:46:51,553 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-06-06 09:46:51,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:46:51,709 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 09:46:51,746 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:51,746 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:51,752 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 09:46:51,787 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 09:46:51,794 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bf41285b0> has no local changes
2024-06-06 09:46:51,794 [ 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#87 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/)'
2024-06-06 09:46:51,803 [ scc.git] DEBUG [detached HEAD 04b9a88] merge master -Dorg -Ssuccess-only
2024-06-06 09:46:51,803 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:46:51,804 [ scc.repo] DEBUG ## PRs found:
2024-06-06 09:46:52,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-06-06 09:46:52,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-06-06 09:46:53,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-06-06 09:46:53,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-06 09:46:54,170 [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-06 09:46:54,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-06 09:46:55,080 [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-06 09:46:55,081 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-06 09:46:55,081 [ scc.repo] DEBUG ## Branches found:
2024-06-06 09:46:55,081 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-06 09:46:55,081 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:55,081 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:55,087 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 09:46:55,092 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 09:46:55,092 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 09:46:55,097 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 09:46:55,102 [ scc.git] DEBUG Already up to date.
2024-06-06 09:46:55,102 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-06 09:46:55,456 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-06-06 09:46:55,456 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-06 09:46:55,460 [ scc.git] DEBUG ## Unique users: []
2024-06-06 09:46:55,460 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:55,460 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:55,466 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-06 09:46:55,471 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:55,476 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-06 09:46:55,485 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-06-06 09:46:55,485 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-06-06 09:46:55,485 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-06-06 09:46:55,485 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-06-06 09:46:55,486 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-06-06 09:46:55,486 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-06-06 09:46:55,486 [ scc.git] DEBUG Auto-merging setup.py
2024-06-06 09:46:55,486 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-06-06 09:46:55,486 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-06 09:46:55,486 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-06 09:46:55,491 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-06 09:46:55,497 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-06-06 09:46:55,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:46:55,654 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-06 09:46:55,661 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-06 09:46:55,666 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#87](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/views.py
- setup.py
- omero_signup/signup_settings.py
--conflicts
2024-06-06 09:46:55,670 [ scc.config] DEBUG Found github.token
2024-06-06 09:46:55,670 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-06-06 09:46:55,670 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 09:46:55,708 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:55,708 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:55,714 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 09:46:55,749 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 09:46:55,755 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bf41d2eb0> has no local changes
2024-06-06 09:46:55,756 [ 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#87 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/)'
2024-06-06 09:46:55,763 [ scc.git] DEBUG [detached HEAD 3bfd9e9] merge master -Dorg -Ssuccess-only
2024-06-06 09:46:55,764 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:46:55,764 [ scc.repo] DEBUG ## PRs found:
2024-06-06 09:46:56,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-06-06 09:46:56,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-06-06 09:46:57,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-06-06 09:46:57,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-06 09:46:57,984 [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-06 09:46:58,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-06 09:46:58,915 [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-06 09:46:58,916 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-06 09:46:58,916 [ scc.repo] DEBUG ## Branches found:
2024-06-06 09:46:58,916 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-06 09:46:58,916 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:58,916 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:58,922 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 09:46:58,927 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 09:46:58,927 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 09:46:58,933 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 09:46:58,938 [ scc.git] DEBUG Already up to date.
2024-06-06 09:46:58,939 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-06-06 09:46:59,305 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-06-06 09:46:59,305 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-06-06 09:46:59,309 [ scc.git] DEBUG ## Unique users: []
2024-06-06 09:46:59,309 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:59,309 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:59,316 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-06-06 09:46:59,322 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:59,328 [ 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-06 09:46:59,341 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 09:46:59,344 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-06-06 09:46:59,344 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-06-06 09:46:59,344 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-06-06 09:46:59,344 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-06-06 09:46:59,344 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-06-06 09:46:59,344 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-06-06 09:46:59,344 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-06-06 09:46:59,344 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-06-06 09:46:59,346 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-06-06 09:46:59,347 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-06-06 09:46:59,347 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-06-06 09:46:59,347 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-06-06 09:46:59,347 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-06-06 09:46:59,347 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-06-06 09:46:59,347 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-06-06 09:46:59,347 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-06-06 09:46:59,347 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-06-06 09:46:59,347 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-06-06 09:46:59,347 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-06-06 09:46:59,347 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-06-06 09:46:59,347 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-06-06 09:46:59,347 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-06-06 09:46:59,347 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-06-06 09:46:59,347 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-06-06 09:46:59,347 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-06-06 09:46:59,347 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-06-06 09:46:59,347 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-06-06 09:46:59,347 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-06-06 09:46:59,347 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-06-06 09:46:59,347 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-06-06 09:46:59,347 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-06-06 09:46:59,347 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-06-06 09:46:59,347 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-06-06 09:46:59,347 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-06-06 09:46:59,347 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-06-06 09:46:59,347 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-06-06 09:46:59,347 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-06-06 09:46:59,347 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-06-06 09:46:59,348 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-06-06 09:46:59,348 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-06-06 09:46:59,348 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-06-06 09:46:59,348 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-06-06 09:46:59,348 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-06-06 09:46:59,348 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-06-06 09:46:59,348 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-06-06 09:46:59,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:46:59,502 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 09:46:59,545 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:59,545 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:59,551 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 09:46:59,589 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 09:46:59,596 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bf41287f0> has no local changes
2024-06-06 09:46:59,596 [ 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#87 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/)'
2024-06-06 09:46:59,604 [ scc.git] DEBUG [detached HEAD c84eecd] merge master -Dorg -Ssuccess-only
2024-06-06 09:46:59,605 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:46:59,605 [ scc.repo] DEBUG ## PRs found:
2024-06-06 09:46:59,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-06-06 09:46:59,916 [ scc.repo] DEBUG ## Branches found:
2024-06-06 09:46:59,916 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-06 09:46:59,916 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:59,916 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:59,921 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 09:46:59,926 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 09:46:59,926 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 09:46:59,931 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 09:46:59,936 [ scc.git] DEBUG Already up to date.
2024-06-06 09:46:59,936 [ scc.git] DEBUG ## Unique users: []
2024-06-06 09:46:59,936 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:59,936 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:59,940 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 09:46:59,978 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:46:59,978 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:46:59,982 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 09:47:00,020 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 09:47:00,026 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bf4139b80> has no local changes
2024-06-06 09:47:00,026 [ 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#87 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/)'
2024-06-06 09:47:00,033 [ scc.git] DEBUG [detached HEAD 832f682] merge master -Dorg -Ssuccess-only
2024-06-06 09:47:00,033 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:47:00,033 [ scc.repo] DEBUG ## PRs found:
2024-06-06 09:47:00,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-06-06 09:47:00,411 [ scc.repo] DEBUG ## Branches found:
2024-06-06 09:47:00,411 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-06 09:47:00,412 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:47:00,412 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:47:00,417 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 09:47:00,422 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 09:47:00,422 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 09:47:00,426 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 09:47:00,431 [ scc.git] DEBUG Already up to date.
2024-06-06 09:47:00,432 [ scc.git] DEBUG ## Unique users: []
2024-06-06 09:47:00,432 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:47:00,432 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:47:00,436 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 09:47:00,473 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:47:00,473 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:47:00,478 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 09:47:00,516 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 09:47:00,521 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bf418cdf0> has no local changes
2024-06-06 09:47:00,522 [ 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#87 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/)'
2024-06-06 09:47:00,529 [ scc.git] DEBUG [detached HEAD fc0b9c2] merge master -Dorg -Ssuccess-only
2024-06-06 09:47:00,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:47:00,529 [ scc.git] INFO Overriding base-branch from master to main
2024-06-06 09:47:00,529 [ scc.repo] DEBUG ## PRs found:
2024-06-06 09:47:00,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-06-06 09:47:01,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-06-06 09:47:01,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-06-06 09:47:02,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-06-06 09:47:02,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-06 09:47:03,369 [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-06 09:47:03,878 [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-06 09:47:04,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-06 09:47:04,753 [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-06 09:47:04,754 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-06 09:47:04,754 [ scc.repo] DEBUG ## Branches found:
2024-06-06 09:47:04,754 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-06 09:47:04,754 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:47:04,754 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:47:04,760 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-06-06 09:47:04,764 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 09:47:04,764 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-06-06 09:47:04,769 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-06-06 09:47:04,774 [ scc.git] DEBUG Already up to date.
2024-06-06 09:47:04,775 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-06-06 09:47:05,180 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-06-06 09:47:05,181 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-06-06 09:47:05,185 [ scc.git] DEBUG ## Unique users: []
2024-06-06 09:47:05,185 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:47:05,185 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:47:05,191 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-06 09:47:05,196 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:47:05,200 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-06 09:47:05,209 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-06-06 09:47:05,209 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-06-06 09:47:05,209 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-06 09:47:05,210 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-06 09:47:05,215 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-06 09:47:05,220 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-06-06 09:47:05,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:47:05,465 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-06 09:47:05,470 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-06 09:47:05,475 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#87](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-06-06 09:47:05,480 [ scc.config] DEBUG Found github.token
2024-06-06 09:47:05,480 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-06-06 09:47:05,480 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 09:47:05,518 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:47:05,518 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:47:05,522 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 09:47:05,559 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 09:47:05,564 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bf4176f40> has no local changes
2024-06-06 09:47:05,564 [ 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#87 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/)'
2024-06-06 09:47:05,572 [ scc.git] DEBUG [detached HEAD 2981d29] merge master -Dorg -Ssuccess-only
2024-06-06 09:47:05,572 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:47:05,572 [ scc.repo] DEBUG ## PRs found:
2024-06-06 09:47:05,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-06-06 09:47:05,893 [ scc.repo] DEBUG ## Branches found:
2024-06-06 09:47:05,893 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-06 09:47:05,893 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:47:05,893 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:47:05,898 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 09:47:05,903 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 09:47:05,903 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 09:47:05,909 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 09:47:05,915 [ scc.git] DEBUG Already up to date.
2024-06-06 09:47:05,915 [ scc.git] DEBUG ## Unique users: []
2024-06-06 09:47:05,915 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:47:05,915 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:47:05,921 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 09:47:05,960 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:47:05,960 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:47:05,965 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 09:47:06,001 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 09:47:06,008 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bf4133ee0> has no local changes
2024-06-06 09:47:06,008 [ 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#87 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/)'
2024-06-06 09:47:06,016 [ scc.git] DEBUG [detached HEAD d840f2a] merge master -Dorg -Ssuccess-only
2024-06-06 09:47:06,017 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:47:06,017 [ scc.repo] DEBUG ## PRs found:
2024-06-06 09:47:06,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-06-06 09:47:06,328 [ scc.repo] DEBUG ## Branches found:
2024-06-06 09:47:06,328 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-06 09:47:06,328 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:47:06,329 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:47:06,335 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 09:47:06,339 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 09:47:06,339 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 09:47:06,344 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 09:47:06,349 [ scc.git] DEBUG Already up to date.
2024-06-06 09:47:06,349 [ scc.git] DEBUG ## Unique users: []
2024-06-06 09:47:06,349 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:47:06,349 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:47:06,354 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 09:47:06,393 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:47:06,393 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:47:06,399 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 09:47:06,436 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 09:47:06,441 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bf40a65b0> has no local changes
2024-06-06 09:47:06,441 [ 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#87 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/)'
2024-06-06 09:47:06,449 [ scc.git] DEBUG [detached HEAD afddbb5] merge master -Dorg -Ssuccess-only
2024-06-06 09:47:06,449 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:47:06,449 [ scc.repo] DEBUG ## PRs found:
2024-06-06 09:47:06,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-06-06 09:47:07,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-06-06 09:47:07,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-06-06 09:47:08,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-06 09:47:08,664 [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-06 09:47:09,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-06 09:47:09,533 [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-06 09:47:09,534 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-06-06 09:47:09,534 [ scc.repo] DEBUG ## Branches found:
2024-06-06 09:47:09,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-06 09:47:09,534 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:47:09,534 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:47:09,541 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 09:47:09,546 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 09:47:09,546 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 09:47:09,551 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 09:47:09,556 [ scc.git] DEBUG Already up to date.
2024-06-06 09:47:09,556 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-06-06 09:47:09,920 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-06-06 09:47:09,920 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-06-06 09:47:09,925 [ scc.git] DEBUG ## Unique users: []
2024-06-06 09:47:09,925 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:47:09,925 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:47:09,930 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-06 09:47:09,935 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:47:09,940 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-06 09:47:09,949 [ scc.git] DEBUG Auto-merging Dockerfile
2024-06-06 09:47:09,949 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-06-06 09:47:09,949 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-06 09:47:09,950 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-06 09:47:09,955 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-06 09:47:09,961 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-06-06 09:47:10,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:47:10,120 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-06 09:47:10,126 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-06 09:47:10,131 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#87](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-06-06 09:47:10,135 [ scc.config] DEBUG Found github.token
2024-06-06 09:47:10,135 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-06-06 09:47:10,136 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 09:47:10,173 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:47:10,174 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:47:10,178 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 09:47:10,214 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 09:47:10,220 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bf40eabb0> has no local changes
2024-06-06 09:47:10,220 [ 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#87 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/)'
2024-06-06 09:47:10,228 [ scc.git] DEBUG [detached HEAD 78cfe8a] merge master -Dorg -Ssuccess-only
2024-06-06 09:47:10,228 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:47:10,229 [ scc.git] INFO Overriding base-branch from master to develop
2024-06-06 09:47:10,229 [ scc.repo] DEBUG ## PRs found:
2024-06-06 09:47:10,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-06-06 09:47:11,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-06-06 09:47:11,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-06-06 09:47:12,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-06-06 09:47:12,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-06-06 09:47:13,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-06-06 09:47:13,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-06-06 09:47:14,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-06 09:47:14,551 [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-06 09:47:14,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-06 09:47:15,406 [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-06 09:47:15,406 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-06 09:47:15,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-06-06 09:47:16,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-06-06 09:47:16,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-06-06 09:47:17,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-06-06 09:47:17,459 [ scc.repo] DEBUG ## Branches found:
2024-06-06 09:47:17,459 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-06 09:47:17,459 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:47:17,459 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:47:17,464 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-06-06 09:47:17,469 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 09:47:17,469 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-06-06 09:47:17,474 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-06-06 09:47:17,479 [ scc.git] DEBUG Already up to date.
2024-06-06 09:47:17,479 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-06-06 09:47:17,861 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-06-06 09:47:17,861 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-06-06 09:47:17,866 [ scc.git] DEBUG ## Unique users: []
2024-06-06 09:47:17,866 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:47:17,866 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:47:17,872 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-06 09:47:17,878 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:47:17,882 [ 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-06 09:47:17,892 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-06-06 09:47:17,893 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-06-06 09:47:17,893 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-06 09:47:17,893 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-06 09:47:17,898 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-06 09:47:17,905 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-06-06 09:47:18,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:47:18,059 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-06 09:47:18,066 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-06 09:47:18,072 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#87](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-06-06 09:47:18,077 [ scc.config] DEBUG Found github.token
2024-06-06 09:47:18,078 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-06-06 09:47:18,078 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 09:47:18,116 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 09:47:18,116 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 09:47:18,123 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 09:47:18,159 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 09:47:18,165 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bf40a6280> has no local changes
2024-06-06 09:47:18,165 [ 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#87 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/)'
2024-06-06 09:47:18,172 [ scc.git] DEBUG [detached HEAD 070eb8a] merge master -Dorg -Ssuccess-only
2024-06-06 09:47:18,173 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:47:18,173 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 09:47:18,242 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-06-06 09:47:18,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:47:18,477 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-06-06 09:47:18,481 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-06-06 09:47:18,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:47:18,924 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-06-06 09:47:18,930 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-06-06 09:47:19,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:47:19,351 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-06-06 09:47:19,355 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-06-06 09:47:19,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:47:19,769 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-06-06 09:47:20,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:47:20,168 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-06-06 09:47:20,172 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-06-06 09:47:20,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:47:20,609 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-06-06 09:47:20,614 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-06-06 09:47:20,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:47:21,007 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-06-06 09:47:21,012 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-06-06 09:47:21,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:47:21,417 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-06-06 09:47:21,422 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-06-06 09:47:21,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:47:21,818 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-06-06 09:47:21,822 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-06-06 09:47:22,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:47:22,223 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-06-06 09:47:22,229 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-06-06 09:47:22,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:47:22,650 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-06-06 09:47:22,654 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-06-06 09:47:23,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:47:23,063 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-06-06 09:47:23,068 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-06-06 09:47:23,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:47:23,526 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-06-06 09:47:23,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:47:23,927 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-06-06 09:47:24,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:47:24,334 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-06-06 09:47:24,338 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-06-06 09:47:24,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:47:24,743 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-06-06 09:47:25,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:47:25,151 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-06-06 09:47:25,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:47:25,561 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-06-06 09:47:25,565 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-06-06 09:47:25,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:47:25,976 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-06-06 09:47:25,981 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-06-06 09:47:26,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:47:26,378 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-06-06 09:47:26,382 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-06-06 09:47:26,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:47:26,780 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-06-06 09:47:26,784 [ scc.config] DEBUG Found submodule.scripts.url
2024-06-06 09:47:27,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 09:47:27,193 [ scc.config] DEBUG Found submodule.scripts.branch
2024-06-06 09:47:27,193 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 09:47:27,269 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bf5b0ad90> has local changes
2024-06-06 09:47:27,269 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 373 dependabot[bot] 'Bump omero-test-infra from `7688c54` to `cda3ec6`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 63 sbesson 'Remove python-future dependency'
- PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 560 will-moore 'Max projection bytes' (exclude comment)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 562 will-moore 'Add changelog 7.0.0'
- PR 563 will-moore 'Use path instead of re_path for all URLs'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#87 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/87/)'
2024-06-06 09:47:27,282 [ scc.git] DEBUG [detached HEAD c2b6fb2] merge master -Dorg -Ssuccess-only
2024-06-06 09:47:27,283 [ scc.merge] INFO Repository: ome/omero-plugins
2024-06-06 09:47:27,283 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-06-06 09:47:27,283 [ scc.merge] INFO Already up to date.
2024-06-06 09:47:27,283 [ scc.merge] INFO
2024-06-06 09:47:27,283 [ scc.merge] INFO Merged PRs:
2024-06-06 09:47:27,283 [ scc.merge] INFO - PR 373 dependabot[bot] 'Bump omero-test-infra from `7688c54` to `cda3ec6`'
2024-06-06 09:47:27,283 [ scc.merge] INFO
2024-06-06 09:47:27,283 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-06-06 09:47:27,283 [ scc.merge] INFO Already up to date.
2024-06-06 09:47:27,283 [ scc.merge] INFO
2024-06-06 09:47:27,283 [ scc.merge] INFO
2024-06-06 09:47:27,283 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-06-06 09:47:27,283 [ scc.merge] INFO Excluded PRs:
2024-06-06 09:47:27,283 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-06-06 09:47:27,283 [ scc.merge] INFO Already up to date.
2024-06-06 09:47:27,283 [ scc.merge] INFO
2024-06-06 09:47:27,283 [ scc.merge] INFO Merged PRs:
2024-06-06 09:47:27,283 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-06-06 09:47:27,283 [ scc.merge] INFO
2024-06-06 09:47:27,283 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-06-06 09:47:27,283 [ scc.merge] INFO Excluded PRs:
2024-06-06 09:47:27,283 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-06-06 09:47:27,283 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-06-06 09:47:27,283 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-06-06 09:47:27,283 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-06-06 09:47:27,283 [ scc.merge] INFO Already up to date.
2024-06-06 09:47:27,283 [ scc.merge] INFO
2024-06-06 09:47:27,284 [ scc.merge] INFO Merged PRs:
2024-06-06 09:47:27,284 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-06-06 09:47:27,284 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-06-06 09:47:27,284 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-06-06 09:47:27,284 [ scc.merge] INFO
2024-06-06 09:47:27,284 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-06-06 09:47:27,284 [ scc.merge] INFO Excluded PRs:
2024-06-06 09:47:27,284 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-06 09:47:27,284 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-06-06 09:47:27,284 [ scc.merge] INFO Already up to date.
2024-06-06 09:47:27,284 [ scc.merge] INFO
2024-06-06 09:47:27,284 [ scc.merge] INFO Merged PRs:
2024-06-06 09:47:27,284 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-06-06 09:47:27,284 [ scc.merge] INFO
2024-06-06 09:47:27,284 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-06 09:47:27,284 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-06-06 09:47:27,284 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-06-06 09:47:27,284 [ scc.merge] INFO
2024-06-06 09:47:27,284 [ scc.merge] INFO Repository: ome/omero-figure
2024-06-06 09:47:27,284 [ scc.merge] INFO Excluded PRs:
2024-06-06 09:47:27,284 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes' (exclude comment)
2024-06-06 09:47:27,284 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-06-06 09:47:27,284 [ scc.merge] INFO Already up to date.
2024-06-06 09:47:27,284 [ scc.merge] INFO
2024-06-06 09:47:27,284 [ scc.merge] INFO Merged PRs:
2024-06-06 09:47:27,284 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-06-06 09:47:27,284 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-06-06 09:47:27,284 [ scc.merge] INFO - PR 562 will-moore 'Add changelog 7.0.0'
2024-06-06 09:47:27,284 [ scc.merge] INFO - PR 563 will-moore 'Use path instead of re_path for all URLs'
2024-06-06 09:47:27,284 [ scc.merge] INFO
2024-06-06 09:47:27,284 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-06-06 09:47:27,284 [ scc.merge] INFO Already up to date.
2024-06-06 09:47:27,284 [ scc.merge] INFO
2024-06-06 09:47:27,284 [ scc.merge] INFO Merged PRs:
2024-06-06 09:47:27,284 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-06-06 09:47:27,284 [ scc.merge] INFO
2024-06-06 09:47:27,284 [ scc.merge] INFO Repository: ome/omero-gallery
2024-06-06 09:47:27,284 [ scc.merge] INFO Already up to date.
2024-06-06 09:47:27,284 [ scc.merge] INFO
2024-06-06 09:47:27,284 [ scc.merge] INFO Merged PRs:
2024-06-06 09:47:27,285 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-06 09:47:27,285 [ scc.merge] INFO
2024-06-06 09:47:27,285 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-06-06 09:47:27,285 [ scc.merge] INFO Excluded PRs:
2024-06-06 09:47:27,285 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-06-06 09:47:27,285 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-06-06 09:47:27,285 [ scc.merge] INFO Already up to date.
2024-06-06 09:47:27,285 [ scc.merge] INFO
2024-06-06 09:47:27,285 [ scc.merge] INFO Merged PRs:
2024-06-06 09:47:27,285 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-06-06 09:47:27,285 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-06-06 09:47:27,285 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-06 09:47:27,285 [ scc.merge] INFO
2024-06-06 09:47:27,285 [ scc.merge] INFO Repository: ome/omero-mapr
2024-06-06 09:47:27,285 [ scc.merge] INFO Excluded PRs:
2024-06-06 09:47:27,285 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-06-06 09:47:27,285 [ scc.merge] INFO Already up to date.
2024-06-06 09:47:27,285 [ scc.merge] INFO
2024-06-06 09:47:27,285 [ scc.merge] INFO Merged PRs:
2024-06-06 09:47:27,285 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-06-06 09:47:27,285 [ scc.merge] INFO
2024-06-06 09:47:27,285 [ scc.merge] INFO Repository: ome/omero-metadata
2024-06-06 09:47:27,285 [ scc.merge] INFO Already up to date.
2024-06-06 09:47:27,285 [ scc.merge] INFO
2024-06-06 09:47:27,285 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-06 09:47:27,285 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-06 09:47:27,285 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-06 09:47:27,285 [ scc.merge] INFO
2024-06-06 09:47:27,285 [ scc.merge] INFO Repository: ome/omero-parade
2024-06-06 09:47:27,285 [ scc.merge] INFO Excluded PRs:
2024-06-06 09:47:27,285 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-06-06 09:47:27,285 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-06-06 09:47:27,285 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-06-06 09:47:27,285 [ scc.merge] INFO Already up to date.
2024-06-06 09:47:27,285 [ scc.merge] INFO
2024-06-06 09:47:27,285 [ scc.merge] INFO Merged PRs:
2024-06-06 09:47:27,285 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-06 09:47:27,286 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-06 09:47:27,286 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-06 09:47:27,286 [ scc.merge] INFO
2024-06-06 09:47:27,286 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-06-06 09:47:27,286 [ scc.merge] INFO Already up to date.
2024-06-06 09:47:27,286 [ scc.merge] INFO
2024-06-06 09:47:27,286 [ scc.merge] INFO Merged PRs:
2024-06-06 09:47:27,286 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-06-06 09:47:27,286 [ scc.merge] INFO
2024-06-06 09:47:27,286 [ scc.merge] INFO Repository: ome/omero-rois
2024-06-06 09:47:27,286 [ scc.merge] INFO Excluded PRs:
2024-06-06 09:47:27,286 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-06 09:47:27,286 [ scc.merge] INFO Already up to date.
2024-06-06 09:47:27,286 [ scc.merge] INFO
2024-06-06 09:47:27,286 [ scc.merge] INFO Merged PRs:
2024-06-06 09:47:27,286 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-06 09:47:27,286 [ scc.merge] INFO
2024-06-06 09:47:27,286 [ scc.merge] INFO Repository: ome/omero-signup
2024-06-06 09:47:27,286 [ scc.merge] INFO Already up to date.
2024-06-06 09:47:27,286 [ scc.merge] INFO
2024-06-06 09:47:27,286 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-06 09:47:27,286 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-06 09:47:27,286 [ scc.merge] INFO
2024-06-06 09:47:27,286 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-06-06 09:47:27,286 [ scc.merge] INFO Already up to date.
2024-06-06 09:47:27,286 [ scc.merge] INFO
2024-06-06 09:47:27,286 [ scc.merge] INFO Merged PRs:
2024-06-06 09:47:27,286 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-06 09:47:27,286 [ scc.merge] INFO
2024-06-06 09:47:27,286 [ scc.merge] INFO Repository: ome/omero-upload
2024-06-06 09:47:27,286 [ scc.merge] INFO Already up to date.
2024-06-06 09:47:27,286 [ scc.merge] INFO
2024-06-06 09:47:27,286 [ scc.merge] INFO
2024-06-06 09:47:27,286 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-06-06 09:47:27,286 [ scc.merge] INFO Already up to date.
2024-06-06 09:47:27,286 [ scc.merge] INFO
2024-06-06 09:47:27,286 [ scc.merge] INFO
2024-06-06 09:47:27,286 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-06-06 09:47:27,286 [ scc.merge] INFO Excluded PRs:
2024-06-06 09:47:27,286 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-06-06 09:47:27,287 [ scc.merge] INFO Already up to date.
2024-06-06 09:47:27,287 [ scc.merge] INFO
2024-06-06 09:47:27,287 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-06 09:47:27,287 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-06 09:47:27,287 [ scc.merge] INFO
2024-06-06 09:47:27,287 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-06-06 09:47:27,287 [ scc.merge] INFO Already up to date.
2024-06-06 09:47:27,287 [ scc.merge] INFO
2024-06-06 09:47:27,287 [ scc.merge] INFO
2024-06-06 09:47:27,287 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-06-06 09:47:27,287 [ scc.merge] INFO Already up to date.
2024-06-06 09:47:27,287 [ scc.merge] INFO
2024-06-06 09:47:27,287 [ scc.merge] INFO
2024-06-06 09:47:27,287 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-06-06 09:47:27,287 [ scc.merge] INFO Already up to date.
2024-06-06 09:47:27,287 [ scc.merge] INFO
2024-06-06 09:47:27,287 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-06 09:47:27,287 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-06-06 09:47:27,287 [ scc.merge] INFO
2024-06-06 09:47:27,287 [ scc.merge] INFO Repository: ome/scripts
2024-06-06 09:47:27,287 [ scc.merge] INFO Excluded PRs:
2024-06-06 09:47:27,287 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-06-06 09:47:27,287 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-06-06 09:47:27,287 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-06-06 09:47:27,287 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-06-06 09:47:27,287 [ scc.merge] INFO Already up to date.
2024-06-06 09:47:27,287 [ scc.merge] INFO
2024-06-06 09:47:27,287 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-06 09:47:27,287 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-06 09:47:27,287 [ scc.merge] INFO
2024-06-06 09:47:27,287 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-06-06 09:47:27,287 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 09:47:27,292 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-06-06 09:47:27,292 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 09:47:27,296 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:47:27,297 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-06-06 09:47:27,297 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 09:47:27,301 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:47:27,301 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-06-06 09:47:27,301 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 09:47:27,305 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:47:27,305 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-06-06 09:47:27,306 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 09:47:27,310 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:47:27,310 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-06 09:47:27,310 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 09:47:27,314 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:47:27,315 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-06 09:47:27,315 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 09:47:27,319 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:47:27,319 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-06 09:47:27,319 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 09:47:27,324 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:47:27,324 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-06 09:47:27,324 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 09:47:27,328 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:47:27,328 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-06 09:47:27,328 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 09:47:27,333 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:47:27,333 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-06 09:47:27,333 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 09:47:27,337 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:47:27,338 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-06 09:47:27,338 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 09:47:27,342 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:47:27,342 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-06 09:47:27,342 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 09:47:27,348 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:47:27,348 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-06 09:47:27,348 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 09:47:27,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:47:27,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-06 09:47:27,354 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 09:47:27,358 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:47:27,358 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-06 09:47:27,358 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 09:47:27,363 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:47:27,363 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-06 09:47:27,363 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 09:47:27,367 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:47:27,367 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-06 09:47:27,367 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 09:47:27,372 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:47:27,372 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-06 09:47:27,372 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 09:47:27,376 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:47:27,376 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-06 09:47:27,376 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 09:47:27,380 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:47:27,381 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-06 09:47:27,381 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 09:47:27,385 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:47:27,385 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-06 09:47:27,385 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 09:47:27,390 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-06 09:47:27,390 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-06 09:47:27,390 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 09:47:27,394 [ 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 42cf190] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 2ca566b
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from 3d9e3b87
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from 7b7a637
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 5a90893
nothing to commit, working tree clean
[detached HEAD cc573ac] 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-06 09:48:13,319 [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-06 09:48:22,467 [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-06 09:48:24,953 [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-06 09:48:29,520 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-06-06 09:49:17,772 [ 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