Skipping 103 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-06-14 00:43:50,399 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-14 00:43:50,399 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-14 00:43:50,408 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-14 00:43:50,416 [ scc.git] DEBUG Already up to date.
2024-06-14 00:43:50,417 [ scc.git] DEBUG Calling 'git fetch origin pull/102/head'
2024-06-14 00:43:50,811 [ scc.git] DEBUG From https://github.com/ome/omero-cli-zarr
2024-06-14 00:43:50,812 [ scc.git] DEBUG * branch refs/pull/102/head -> FETCH_HEAD
2024-06-14 00:43:50,820 [ scc.git] DEBUG Calling 'git fetch origin pull/123/head'
2024-06-14 00:43:51,262 [ scc.git] DEBUG From https://github.com/ome/omero-cli-zarr
2024-06-14 00:43:51,262 [ scc.git] DEBUG * branch refs/pull/123/head -> FETCH_HEAD
2024-06-14 00:43:51,267 [ scc.git] DEBUG Calling 'git fetch origin pull/147/head'
2024-06-14 00:43:51,716 [ scc.git] DEBUG From https://github.com/ome/omero-cli-zarr
2024-06-14 00:43:51,716 [ scc.git] DEBUG * branch refs/pull/147/head -> FETCH_HEAD
2024-06-14 00:43:51,722 [ scc.git] DEBUG ## Unique users: []
2024-06-14 00:43:51,722 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:43:51,722 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:43:51,728 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f22d4074b7c458ad24320cf5a6f8adb9e686aa44'
2024-06-14 00:43:51,737 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:43:51,744 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 102 (Zarr export tests) f22d4074b7c458ad24320cf5a6f8adb9e686aa44'
2024-06-14 00:43:51,760 [ scc.git] DEBUG Auto-merging src/omero_zarr/cli.py
2024-06-14 00:43:51,760 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-06-14 00:43:51,760 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_zarr/raw_pixels.py
2024-06-14 00:43:51,760 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-14 00:43:51,761 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-14 00:43:51,768 [ scc.git] DEBUG Calling 'git reset --hard 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-14 00:43:51,774 [ scc.git] DEBUG HEAD is now at 2ca566b Merge pull request #160 from ome/pre-commit-ci-update-config
2024-06-14 00:43:51,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:43:51,934 [ scc.git] DEBUG Calling 'git merge-base 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473 f22d4074b7c458ad24320cf5a6f8adb9e686aa44'
2024-06-14 00:43:51,944 [ scc.git] DEBUG Calling 'git diff --name-only 782a1cd0077bcc2871f21e9f0acdc25ae7745243..2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-14 00:43:51,953 [ scc.git] INFO - PR 102 will-moore 'Zarr export tests'
Conflicting PR. Removed from build [OMERO-plugins-push#95](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_zarr/raw_pixels.py
--conflicts
2024-06-14 00:43:51,959 [ scc.config] DEBUG Found github.token
2024-06-14 00:43:51,960 [ scc.git] DEBUG Not adding comment to issue #102, already --conflicts.
2024-06-14 00:43:51,960 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-06-14 00:43:51,970 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:43:51,976 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 123 (Support export of Fileset:ID) 553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-06-14 00:43:51,993 [ scc.git] DEBUG Auto-merging .isort.cfg
2024-06-14 00:43:51,993 [ scc.git] DEBUG CONFLICT (content): Merge conflict in .isort.cfg
2024-06-14 00:43:51,993 [ scc.git] DEBUG Auto-merging setup.py
2024-06-14 00:43:51,993 [ scc.git] DEBUG Auto-merging src/omero_zarr/cli.py
2024-06-14 00:43:51,993 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-06-14 00:43:51,993 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_zarr/raw_pixels.py
2024-06-14 00:43:51,993 [ scc.git] DEBUG Auto-merging src/omero_zarr/util.py
2024-06-14 00:43:51,993 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-14 00:43:51,994 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-14 00:43:52,003 [ scc.git] DEBUG Calling 'git reset --hard 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-14 00:43:52,013 [ scc.git] DEBUG HEAD is now at 2ca566b Merge pull request #160 from ome/pre-commit-ci-update-config
2024-06-14 00:43:52,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:43:52,346 [ scc.git] DEBUG Calling 'git merge-base 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473 553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-06-14 00:43:52,356 [ scc.git] DEBUG Calling 'git diff --name-only eff38d0408f9d50de13b28dfe09e4382965e203f..2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-14 00:43:52,364 [ scc.git] INFO - PR 123 will-moore 'Support export of Fileset:ID'
Conflicting PR. Removed from build [OMERO-plugins-push#95](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/consoleText) for more details.
Possible conflicts:
- PR #102 will-moore 'Zarr export tests'
- src/omero_zarr/raw_pixels.py
- Upstream changes
- .isort.cfg
- src/omero_zarr/raw_pixels.py
--conflicts
2024-06-14 00:43:52,371 [ scc.config] DEBUG Found github.token
2024-06-14 00:43:52,372 [ scc.git] DEBUG Not adding comment to issue #123, already --conflicts.
2024-06-14 00:43:52,372 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a14f62a940f4974a305b3f5858049ee493b898ef'
2024-06-14 00:43:52,379 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:43:52,387 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 147 (Name option) a14f62a940f4974a305b3f5858049ee493b898ef'
2024-06-14 00:43:52,404 [ scc.git] DEBUG Auto-merging src/omero_zarr/masks.py
2024-06-14 00:43:52,404 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-06-14 00:43:52,406 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-14 00:43:52,409 [ scc.git] DEBUG README.rst | 30 ++++++++++++++++++------------
2024-06-14 00:43:52,410 [ scc.git] DEBUG src/omero_zarr/cli.py | 9 +++++++++
2024-06-14 00:43:52,410 [ scc.git] DEBUG src/omero_zarr/masks.py | 4 ++--
2024-06-14 00:43:52,410 [ scc.git] DEBUG src/omero_zarr/raw_pixels.py | 28 +++++++++++++++++++++++-----
2024-06-14 00:43:52,410 [ scc.git] DEBUG src/omero_zarr/util.py | 2 +-
2024-06-14 00:43:52,410 [ scc.git] DEBUG 5 files changed, 53 insertions(+), 20 deletions(-)
2024-06-14 00:43:52,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:43:52,753 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-14 00:43:52,818 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:43:52,819 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:43:52,827 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-14 00:43:52,888 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-14 00:43:52,899 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd9aedd2970> has no local changes
2024-06-14 00:43:52,899 [ 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#95 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/)'
2024-06-14 00:43:53,807 [ scc.git] DEBUG [detached HEAD cf1b52e] merge master -Dorg -Ssuccess-only
2024-06-14 00:43:53,808 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:43:53,808 [ scc.repo] DEBUG ## PRs found:
2024-06-14 00:43:54,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-06-14 00:43:54,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-06-14 00:43:54,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-06-14 00:43:55,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-14 00:43:55,984 [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-14 00:43:56,583 [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-14 00:43:57,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-14 00:43:57,596 [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-14 00:43:57,597 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-06-14 00:43:58,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-06-14 00:43:58,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-14 00:43:59,106 [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-14 00:43:59,577 [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-14 00:44:00,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-14 00:44:00,680 [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-14 00:44:00,680 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-06-14 00:44:00,681 [ scc.repo] DEBUG ## Branches found:
2024-06-14 00:44:00,681 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-14 00:44:00,681 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:44:00,681 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:00,687 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-14 00:44:00,692 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-14 00:44:00,693 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-14 00:44:00,698 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-14 00:44:00,704 [ scc.git] DEBUG Already up to date.
2024-06-14 00:44:00,705 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-06-14 00:44:01,650 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-14 00:44:01,650 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-06-14 00:44:01,656 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-06-14 00:44:02,273 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-14 00:44:02,274 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-06-14 00:44:02,279 [ scc.git] DEBUG ## Unique users: []
2024-06-14 00:44:02,279 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:44:02,279 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:02,285 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-14 00:44:02,293 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:02,299 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-14 00:44:02,437 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-14 00:44:02,445 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-06-14 00:44:02,446 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-06-14 00:44:02,446 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-06-14 00:44:02,446 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-06-14 00:44:02,446 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-06-14 00:44:02,446 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-06-14 00:44:02,446 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-06-14 00:44:02,446 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-06-14 00:44:02,446 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-06-14 00:44:02,446 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-06-14 00:44:02,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:44:02,602 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-14 00:44:02,612 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:02,620 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-14 00:44:02,732 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-06-14 00:44:02,732 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-06-14 00:44:02,732 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-06-14 00:44:02,733 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-14 00:44:02,740 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-06-14 00:44:02,740 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-06-14 00:44:02,740 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-06-14 00:44:02,740 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-06-14 00:44:02,740 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-06-14 00:44:02,740 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-06-14 00:44:02,740 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-06-14 00:44:02,740 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-06-14 00:44:02,740 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-06-14 00:44:02,740 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-06-14 00:44:02,740 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-06-14 00:44:02,740 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-06-14 00:44:03,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:44:03,019 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-14 00:44:03,058 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:44:03,058 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:03,064 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-14 00:44:03,118 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-14 00:44:03,130 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd9aed8dbb0> has no local changes
2024-06-14 00:44:03,131 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 560 will-moore 'Max projection bytes' (exclude comment)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
Generated by OMERO-plugins-push#95 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/)'
2024-06-14 00:44:03,143 [ scc.git] DEBUG [detached HEAD 974308bb] merge master -Dorg -Ssuccess-only
2024-06-14 00:44:03,143 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:44:03,144 [ scc.repo] DEBUG ## PRs found:
2024-06-14 00:44:03,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-06-14 00:44:04,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-06-14 00:44:04,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-06-14 00:44:05,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-14 00:44:05,457 [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-14 00:44:05,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-14 00:44:06,339 [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-14 00:44:06,340 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-06-14 00:44:06,340 [ scc.repo] DEBUG ## Branches found:
2024-06-14 00:44:06,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-14 00:44:06,340 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:44:06,340 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:06,347 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-14 00:44:06,353 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-14 00:44:06,353 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-14 00:44:06,361 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-14 00:44:06,371 [ scc.git] DEBUG Already up to date.
2024-06-14 00:44:06,371 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-06-14 00:44:06,799 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-06-14 00:44:06,800 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-06-14 00:44:06,805 [ scc.git] DEBUG ## Unique users: []
2024-06-14 00:44:06,805 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:44:06,805 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:06,811 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-14 00:44:06,816 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:06,820 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-14 00:44:06,854 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-06-14 00:44:06,855 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-14 00:44:06,857 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-06-14 00:44:06,857 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-06-14 00:44:07,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:44:07,025 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-14 00:44:07,063 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:44:07,063 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:07,069 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-14 00:44:07,106 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-14 00:44:07,113 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd9aedfadf0> has no local changes
2024-06-14 00:44:07,113 [ 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#95 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/)'
2024-06-14 00:44:07,121 [ scc.git] DEBUG [detached HEAD a81a6b8] merge master -Dorg -Ssuccess-only
2024-06-14 00:44:07,121 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:44:07,121 [ scc.repo] DEBUG ## PRs found:
2024-06-14 00:44:07,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-06-14 00:44:07,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-06-14 00:44:07,961 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-14 00:44:08,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-14 00:44:09,006 [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-14 00:44:09,509 [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-14 00:44:10,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-14 00:44:10,493 [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-14 00:44:10,497 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-14 00:44:10,498 [ scc.repo] DEBUG ## Branches found:
2024-06-14 00:44:10,498 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-14 00:44:10,499 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:44:10,499 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:10,529 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-14 00:44:10,560 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-14 00:44:10,561 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-14 00:44:10,579 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-14 00:44:10,595 [ scc.git] DEBUG Already up to date.
2024-06-14 00:44:10,595 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-06-14 00:44:10,987 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-06-14 00:44:10,987 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-06-14 00:44:10,992 [ scc.git] DEBUG ## Unique users: []
2024-06-14 00:44:10,992 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:44:10,992 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:10,998 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-06-14 00:44:11,004 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:11,009 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-06-14 00:44:11,020 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-14 00:44:11,024 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-06-14 00:44:11,024 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-06-14 00:44:11,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:44:11,178 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-14 00:44:11,222 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:44:11,222 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:11,228 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-14 00:44:11,273 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-14 00:44:11,282 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd9aedfa340> has no local changes
2024-06-14 00:44:11,282 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Generated by OMERO-plugins-push#95 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/)'
2024-06-14 00:44:11,293 [ scc.git] DEBUG [detached HEAD d288a36] merge master -Dorg -Ssuccess-only
2024-06-14 00:44:11,294 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:44:11,294 [ scc.repo] DEBUG ## PRs found:
2024-06-14 00:44:11,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-06-14 00:44:12,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-06-14 00:44:12,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-06-14 00:44:13,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-14 00:44:13,721 [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-14 00:44:14,190 [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-14 00:44:14,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-14 00:44:15,037 [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-14 00:44:15,037 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-14 00:44:15,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-06-14 00:44:15,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-06-14 00:44:16,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-14 00:44:16,957 [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-14 00:44:17,470 [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-14 00:44:17,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-14 00:44:18,402 [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-14 00:44:18,403 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-06-14 00:44:18,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-06-14 00:44:19,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-06-14 00:44:19,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-14 00:44:20,306 [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-14 00:44:20,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-14 00:44:21,167 [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-14 00:44:21,168 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-06-14 00:44:21,169 [ scc.repo] DEBUG ## Branches found:
2024-06-14 00:44:21,169 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-14 00:44:21,169 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:44:21,169 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:21,175 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-14 00:44:21,181 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-14 00:44:21,181 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-14 00:44:21,186 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-14 00:44:21,192 [ scc.git] DEBUG Already up to date.
2024-06-14 00:44:21,193 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-06-14 00:44:21,735 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-14 00:44:21,735 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-06-14 00:44:21,742 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-06-14 00:44:22,311 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-14 00:44:22,311 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-06-14 00:44:22,318 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-06-14 00:44:22,762 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-14 00:44:22,762 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-06-14 00:44:22,767 [ scc.git] DEBUG ## Unique users: []
2024-06-14 00:44:22,768 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:44:22,768 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:22,774 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-14 00:44:22,780 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:22,785 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-14 00:44:22,838 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-06-14 00:44:22,839 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-14 00:44:22,842 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-06-14 00:44:22,842 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-06-14 00:44:22,843 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-06-14 00:44:23,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:44:23,011 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-14 00:44:23,019 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:23,025 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-14 00:44:23,167 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-06-14 00:44:23,167 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-06-14 00:44:23,167 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-06-14 00:44:23,167 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-06-14 00:44:23,168 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-14 00:44:23,172 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-06-14 00:44:23,172 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-06-14 00:44:23,172 [ scc.git] DEBUG src/app/header.html | 5 +
2024-06-14 00:44:23,172 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-06-14 00:44:23,172 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-06-14 00:44:23,172 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-06-14 00:44:23,172 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-06-14 00:44:23,172 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-06-14 00:44:23,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:44:23,412 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-14 00:44:23,419 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:23,425 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-14 00:44:23,470 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-06-14 00:44:23,471 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-14 00:44:23,474 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-06-14 00:44:23,474 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-06-14 00:44:23,474 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-06-14 00:44:23,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:44:23,830 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-14 00:44:23,870 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:44:23,870 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:23,876 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-14 00:44:23,920 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-14 00:44:23,928 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd9aedb98e0> has no local changes
2024-06-14 00:44:23,928 [ 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#95 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/)'
2024-06-14 00:44:23,939 [ scc.git] DEBUG [detached HEAD 16b5db1] merge master -Dorg -Ssuccess-only
2024-06-14 00:44:23,939 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:44:23,939 [ scc.repo] DEBUG ## PRs found:
2024-06-14 00:44:24,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-06-14 00:44:24,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-06-14 00:44:25,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-06-14 00:44:25,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-14 00:44:26,331 [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-14 00:44:26,796 [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-14 00:44:27,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-14 00:44:27,684 [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-14 00:44:27,685 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-06-14 00:44:27,685 [ scc.repo] DEBUG ## Branches found:
2024-06-14 00:44:27,686 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-14 00:44:27,686 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:44:27,686 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:27,693 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-14 00:44:27,699 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-14 00:44:27,699 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-14 00:44:27,706 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-14 00:44:27,713 [ scc.git] DEBUG Already up to date.
2024-06-14 00:44:27,714 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-06-14 00:44:28,092 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-06-14 00:44:28,092 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-06-14 00:44:28,100 [ scc.git] DEBUG ## Unique users: []
2024-06-14 00:44:28,101 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:44:28,101 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:28,108 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-14 00:44:28,118 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:28,126 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-14 00:44:28,138 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-14 00:44:28,141 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-06-14 00:44:28,141 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-06-14 00:44:28,141 [ scc.git] DEBUG requirements.txt | 2 +-
2024-06-14 00:44:28,141 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-06-14 00:44:28,141 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-06-14 00:44:28,141 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-06-14 00:44:28,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:44:28,318 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-14 00:44:28,361 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:44:28,361 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:28,366 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-14 00:44:28,407 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-14 00:44:28,414 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd9ac555bb0> has no local changes
2024-06-14 00:44:28,414 [ 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#95 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/)'
2024-06-14 00:44:28,423 [ scc.git] DEBUG [detached HEAD 8617ab3] merge master -Dorg -Ssuccess-only
2024-06-14 00:44:28,424 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:44:28,424 [ scc.repo] DEBUG ## PRs found:
2024-06-14 00:44:28,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-06-14 00:44:29,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-06-14 00:44:29,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-06-14 00:44:30,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-14 00:44:30,777 [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-14 00:44:31,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-14 00:44:31,841 [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-14 00:44:31,842 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-14 00:44:32,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-06-14 00:44:32,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-06-14 00:44:33,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-14 00:44:33,797 [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-14 00:44:34,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-14 00:44:34,684 [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-14 00:44:34,685 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-14 00:44:34,685 [ scc.repo] DEBUG ## Branches found:
2024-06-14 00:44:34,685 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-14 00:44:34,686 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:44:34,686 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:34,692 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-14 00:44:34,697 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-14 00:44:34,697 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-14 00:44:34,703 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-14 00:44:34,709 [ scc.git] DEBUG Already up to date.
2024-06-14 00:44:34,710 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-06-14 00:44:35,225 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-14 00:44:35,225 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-06-14 00:44:35,230 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-06-14 00:44:35,772 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-14 00:44:35,773 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-06-14 00:44:35,777 [ scc.git] DEBUG ## Unique users: []
2024-06-14 00:44:35,777 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:44:35,777 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:35,784 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-14 00:44:35,791 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:35,796 [ 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-14 00:44:35,842 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-06-14 00:44:35,843 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-06-14 00:44:35,843 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-14 00:44:35,843 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-14 00:44:35,843 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-14 00:44:35,843 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-14 00:44:35,850 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-14 00:44:35,857 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-14 00:44:36,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:44:36,017 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-14 00:44:36,025 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-14 00:44:36,031 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#95](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-06-14 00:44:36,036 [ scc.config] DEBUG Found github.token
2024-06-14 00:44:36,037 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-06-14 00:44:36,037 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-14 00:44:36,044 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:36,050 [ 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-14 00:44:36,080 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-14 00:44:36,080 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-14 00:44:36,080 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-06-14 00:44:36,081 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-14 00:44:36,081 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-14 00:44:36,088 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-14 00:44:36,096 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-14 00:44:36,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:44:36,431 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-14 00:44:36,439 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-14 00:44:36,444 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#95](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/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-14 00:44:36,448 [ scc.config] DEBUG Found github.token
2024-06-14 00:44:36,449 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-06-14 00:44:36,449 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-14 00:44:36,489 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:44:36,489 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:36,495 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-14 00:44:36,538 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-14 00:44:36,547 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd9aedaff40> has no local changes
2024-06-14 00:44:36,548 [ 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#95 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/)'
2024-06-14 00:44:36,560 [ scc.git] DEBUG [detached HEAD ca4ce03] merge master -Dorg -Ssuccess-only
2024-06-14 00:44:36,560 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:44:36,561 [ scc.repo] DEBUG ## PRs found:
2024-06-14 00:44:36,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-06-14 00:44:37,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-06-14 00:44:37,481 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-14 00:44:38,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-14 00:44:38,513 [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-14 00:44:38,985 [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-14 00:44:39,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-14 00:44:39,990 [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-14 00:44:39,991 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-14 00:44:40,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-06-14 00:44:40,448 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-14 00:44:40,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-14 00:44:41,481 [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-14 00:44:41,954 [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-14 00:44:42,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-14 00:44:42,920 [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-14 00:44:42,920 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-14 00:44:43,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-06-14 00:44:43,385 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-14 00:44:43,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-14 00:44:44,441 [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-14 00:44:44,958 [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-14 00:44:45,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-14 00:44:45,902 [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-14 00:44:45,903 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-14 00:44:46,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-06-14 00:44:46,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-06-14 00:44:47,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-06-14 00:44:47,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-06-14 00:44:48,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-06-14 00:44:48,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-06-14 00:44:48,882 [ scc.repo] DEBUG ## Branches found:
2024-06-14 00:44:48,882 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-14 00:44:48,882 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:44:48,883 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:48,890 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-14 00:44:48,895 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-14 00:44:48,895 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-14 00:44:48,901 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-14 00:44:48,908 [ scc.git] DEBUG Already up to date.
2024-06-14 00:44:48,909 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-06-14 00:44:49,294 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-14 00:44:49,294 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-06-14 00:44:49,299 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-06-14 00:44:49,711 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-14 00:44:49,711 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-06-14 00:44:49,717 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-06-14 00:44:50,110 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-14 00:44:50,111 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-06-14 00:44:50,117 [ scc.git] DEBUG ## Unique users: []
2024-06-14 00:44:50,118 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:44:50,118 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:50,125 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-06-14 00:44:50,130 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:50,138 [ 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-14 00:44:50,147 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-14 00:44:50,151 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-06-14 00:44:50,151 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-06-14 00:44:50,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:44:50,360 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-06-14 00:44:50,367 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:50,372 [ 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-14 00:44:50,424 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-14 00:44:50,425 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-14 00:44:50,428 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-06-14 00:44:50,428 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-06-14 00:44:50,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:44:50,790 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-06-14 00:44:50,797 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:50,803 [ 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-14 00:44:50,826 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-14 00:44:50,827 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-14 00:44:50,830 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-06-14 00:44:50,830 [ scc.git] DEBUG package.json | 2 +-
2024-06-14 00:44:50,830 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-06-14 00:44:51,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:44:51,296 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-14 00:44:51,338 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:44:51,339 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:51,344 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-14 00:44:51,383 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-14 00:44:51,390 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd9ac50c640> has no local changes
2024-06-14 00:44:51,390 [ 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#95 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/)'
2024-06-14 00:44:51,399 [ scc.git] DEBUG [detached HEAD 41256c6] merge master -Dorg -Ssuccess-only
2024-06-14 00:44:51,400 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:44:51,400 [ scc.repo] DEBUG ## PRs found:
2024-06-14 00:44:51,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-06-14 00:44:52,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-06-14 00:44:52,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-14 00:44:53,336 [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-14 00:44:53,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-14 00:44:54,318 [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-14 00:44:54,320 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-06-14 00:44:54,320 [ scc.repo] DEBUG ## Branches found:
2024-06-14 00:44:54,320 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-14 00:44:54,320 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:44:54,320 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:54,333 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-14 00:44:54,343 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-14 00:44:54,343 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-14 00:44:54,353 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-14 00:44:54,362 [ scc.git] DEBUG Already up to date.
2024-06-14 00:44:54,362 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-14 00:44:54,750 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-06-14 00:44:54,750 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-14 00:44:54,755 [ scc.git] DEBUG ## Unique users: []
2024-06-14 00:44:54,756 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:44:54,756 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:54,762 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-14 00:44:54,767 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:54,773 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-14 00:44:54,783 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-14 00:44:54,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:44:54,953 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-14 00:44:54,993 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:44:54,993 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:54,999 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-14 00:44:55,040 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-14 00:44:55,047 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd9aed99be0> has no local changes
2024-06-14 00:44:55,047 [ 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#95 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/)'
2024-06-14 00:44:55,056 [ scc.git] DEBUG [detached HEAD c7fea78] merge master -Dorg -Ssuccess-only
2024-06-14 00:44:55,057 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:44:55,057 [ scc.repo] DEBUG ## PRs found:
2024-06-14 00:44:55,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-06-14 00:44:56,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-06-14 00:44:56,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-06-14 00:44:57,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-06-14 00:44:57,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-14 00:44:58,075 [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-14 00:44:58,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-14 00:44:59,050 [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-14 00:44:59,052 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-14 00:44:59,053 [ scc.repo] DEBUG ## Branches found:
2024-06-14 00:44:59,053 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-14 00:44:59,053 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:44:59,053 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:59,065 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-14 00:44:59,072 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-14 00:44:59,073 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-14 00:44:59,081 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-14 00:44:59,089 [ scc.git] DEBUG Already up to date.
2024-06-14 00:44:59,089 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-06-14 00:44:59,755 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-06-14 00:44:59,755 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-06-14 00:44:59,761 [ scc.git] DEBUG ## Unique users: []
2024-06-14 00:44:59,761 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:44:59,762 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:59,768 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-06-14 00:44:59,774 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:44:59,780 [ 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-14 00:44:59,790 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-06-14 00:44:59,791 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-14 00:44:59,793 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-06-14 00:44:59,794 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-06-14 00:44:59,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:44:59,959 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-14 00:44:59,999 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:44:59,999 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:00,006 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-14 00:45:00,045 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-14 00:45:00,052 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd9ac4c6550> has no local changes
2024-06-14 00:45:00,052 [ 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#95 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/)'
2024-06-14 00:45:00,061 [ scc.git] DEBUG [detached HEAD 07a0e18] merge master -Dorg -Ssuccess-only
2024-06-14 00:45:00,062 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:00,062 [ scc.repo] DEBUG ## PRs found:
2024-06-14 00:45:00,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-06-14 00:45:00,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-06-14 00:45:01,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-06-14 00:45:01,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-14 00:45:02,430 [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-14 00:45:02,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-14 00:45:03,390 [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-14 00:45:03,393 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-14 00:45:03,394 [ scc.repo] DEBUG ## Branches found:
2024-06-14 00:45:03,394 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-14 00:45:03,394 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:45:03,395 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:03,414 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-14 00:45:03,434 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-14 00:45:03,434 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-14 00:45:03,447 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-14 00:45:03,462 [ scc.git] DEBUG Already up to date.
2024-06-14 00:45:03,462 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-14 00:45:03,957 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-06-14 00:45:03,958 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-14 00:45:03,969 [ scc.git] DEBUG ## Unique users: []
2024-06-14 00:45:03,969 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:45:03,969 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:03,982 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-14 00:45:03,997 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:04,009 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-14 00:45:04,114 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-06-14 00:45:04,114 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-06-14 00:45:04,114 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-06-14 00:45:04,114 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-06-14 00:45:04,114 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-06-14 00:45:04,114 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-06-14 00:45:04,114 [ scc.git] DEBUG Auto-merging setup.py
2024-06-14 00:45:04,114 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-06-14 00:45:04,114 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-14 00:45:04,114 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-14 00:45:04,124 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-14 00:45:04,141 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-06-14 00:45:04,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:45:04,298 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-14 00:45:04,308 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-14 00:45:04,317 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#95](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- setup.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
--conflicts
2024-06-14 00:45:04,325 [ scc.config] DEBUG Found github.token
2024-06-14 00:45:04,326 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-06-14 00:45:04,326 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-14 00:45:04,392 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:45:04,393 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:04,404 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-14 00:45:04,462 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-14 00:45:04,474 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd9ac54bdf0> has no local changes
2024-06-14 00:45:04,475 [ 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#95 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/)'
2024-06-14 00:45:04,486 [ scc.git] DEBUG [detached HEAD fa9ca9e] merge master -Dorg -Ssuccess-only
2024-06-14 00:45:04,487 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:04,487 [ scc.repo] DEBUG ## PRs found:
2024-06-14 00:45:04,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-06-14 00:45:05,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-06-14 00:45:05,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-06-14 00:45:06,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-14 00:45:06,845 [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-14 00:45:07,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-14 00:45:07,708 [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-14 00:45:07,709 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-14 00:45:07,709 [ scc.repo] DEBUG ## Branches found:
2024-06-14 00:45:07,709 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-14 00:45:07,709 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:45:07,709 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:07,719 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-14 00:45:07,727 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-14 00:45:07,727 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-14 00:45:07,735 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-14 00:45:07,745 [ scc.git] DEBUG Already up to date.
2024-06-14 00:45:07,745 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-06-14 00:45:08,282 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-06-14 00:45:08,283 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-06-14 00:45:08,289 [ scc.git] DEBUG ## Unique users: []
2024-06-14 00:45:08,289 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:45:08,289 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:08,306 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-06-14 00:45:08,330 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:08,356 [ 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-14 00:45:08,395 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-14 00:45:08,399 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-06-14 00:45:08,399 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-06-14 00:45:08,399 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-06-14 00:45:08,399 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-06-14 00:45:08,399 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-06-14 00:45:08,399 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-06-14 00:45:08,399 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-06-14 00:45:08,399 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-06-14 00:45:08,399 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-06-14 00:45:08,399 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-06-14 00:45:08,399 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-06-14 00:45:08,399 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-06-14 00:45:08,399 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-06-14 00:45:08,399 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-06-14 00:45:08,399 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-06-14 00:45:08,399 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-06-14 00:45:08,399 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-06-14 00:45:08,399 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-06-14 00:45:08,399 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-06-14 00:45:08,399 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-06-14 00:45:08,400 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-06-14 00:45:08,400 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-06-14 00:45:08,400 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-06-14 00:45:08,400 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-06-14 00:45:08,400 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-06-14 00:45:08,400 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-06-14 00:45:08,400 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-06-14 00:45:08,400 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-06-14 00:45:08,400 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-06-14 00:45:08,400 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-06-14 00:45:08,400 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-06-14 00:45:08,400 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-06-14 00:45:08,400 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-06-14 00:45:08,400 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-06-14 00:45:08,400 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-06-14 00:45:08,400 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-06-14 00:45:08,400 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-06-14 00:45:08,400 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-06-14 00:45:08,400 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-06-14 00:45:08,400 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-06-14 00:45:08,400 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-06-14 00:45:08,400 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-06-14 00:45:08,400 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-06-14 00:45:08,403 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-06-14 00:45:08,403 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-06-14 00:45:08,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:45:08,565 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-14 00:45:08,610 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:45:08,610 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:08,618 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-14 00:45:08,659 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-14 00:45:08,667 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd9ac4c6730> has no local changes
2024-06-14 00:45:08,667 [ 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#95 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/)'
2024-06-14 00:45:08,679 [ scc.git] DEBUG [detached HEAD 0ed5229] merge master -Dorg -Ssuccess-only
2024-06-14 00:45:08,680 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:08,680 [ scc.repo] DEBUG ## PRs found:
2024-06-14 00:45:09,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-06-14 00:45:09,002 [ scc.repo] DEBUG ## Branches found:
2024-06-14 00:45:09,002 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-14 00:45:09,002 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:45:09,002 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:09,010 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-14 00:45:09,015 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-14 00:45:09,015 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-14 00:45:09,021 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-14 00:45:09,027 [ scc.git] DEBUG Already up to date.
2024-06-14 00:45:09,028 [ scc.git] DEBUG ## Unique users: []
2024-06-14 00:45:09,028 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:45:09,028 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:09,033 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-14 00:45:09,077 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:45:09,077 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:09,083 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-14 00:45:09,124 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-14 00:45:09,131 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd9ac4d8b80> has no local changes
2024-06-14 00:45:09,131 [ 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#95 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/)'
2024-06-14 00:45:09,139 [ scc.git] DEBUG [detached HEAD 6b76bcb] merge master -Dorg -Ssuccess-only
2024-06-14 00:45:09,140 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:09,140 [ scc.repo] DEBUG ## PRs found:
2024-06-14 00:45:09,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-06-14 00:45:09,434 [ scc.repo] DEBUG ## Branches found:
2024-06-14 00:45:09,434 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-14 00:45:09,434 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:45:09,434 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:09,441 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-14 00:45:09,446 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-14 00:45:09,447 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-14 00:45:09,453 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-14 00:45:09,458 [ scc.git] DEBUG Already up to date.
2024-06-14 00:45:09,459 [ scc.git] DEBUG ## Unique users: []
2024-06-14 00:45:09,459 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:45:09,459 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:09,463 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-14 00:45:09,531 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:45:09,532 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:09,549 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-14 00:45:09,628 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-14 00:45:09,638 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd9ac4f7d90> has no local changes
2024-06-14 00:45:09,639 [ 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#95 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/)'
2024-06-14 00:45:09,655 [ scc.git] DEBUG [detached HEAD a1336fa] merge master -Dorg -Ssuccess-only
2024-06-14 00:45:09,656 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:09,656 [ scc.git] INFO Overriding base-branch from master to main
2024-06-14 00:45:09,656 [ scc.repo] DEBUG ## PRs found:
2024-06-14 00:45:09,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-06-14 00:45:10,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-06-14 00:45:10,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-06-14 00:45:11,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-06-14 00:45:11,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-14 00:45:12,336 [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-14 00:45:12,866 [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-14 00:45:13,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-14 00:45:13,730 [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-14 00:45:13,731 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-14 00:45:13,731 [ scc.repo] DEBUG ## Branches found:
2024-06-14 00:45:13,732 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-14 00:45:13,732 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:45:13,732 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:13,741 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-06-14 00:45:13,748 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-14 00:45:13,748 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-06-14 00:45:13,758 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-06-14 00:45:13,769 [ scc.git] DEBUG Already up to date.
2024-06-14 00:45:13,769 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-06-14 00:45:14,226 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-06-14 00:45:14,226 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-06-14 00:45:14,233 [ scc.git] DEBUG ## Unique users: []
2024-06-14 00:45:14,233 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:45:14,234 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:14,245 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-14 00:45:14,254 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:14,263 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-14 00:45:14,292 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-06-14 00:45:14,292 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-06-14 00:45:14,292 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-14 00:45:14,293 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-14 00:45:14,303 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-14 00:45:14,312 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-06-14 00:45:14,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:45:14,482 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-14 00:45:14,497 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-14 00:45:14,511 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#95](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-06-14 00:45:14,524 [ scc.config] DEBUG Found github.token
2024-06-14 00:45:14,524 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-06-14 00:45:14,525 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-14 00:45:14,600 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:45:14,601 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:14,608 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-14 00:45:14,653 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-14 00:45:14,664 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd9ac52ab50> has no local changes
2024-06-14 00:45:14,664 [ 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#95 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/)'
2024-06-14 00:45:14,677 [ scc.git] DEBUG [detached HEAD ef8b260] merge master -Dorg -Ssuccess-only
2024-06-14 00:45:14,678 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:14,678 [ scc.repo] DEBUG ## PRs found:
2024-06-14 00:45:14,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-06-14 00:45:14,912 [ scc.repo] DEBUG ## Branches found:
2024-06-14 00:45:14,912 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-14 00:45:14,912 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:45:14,913 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:14,921 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-14 00:45:14,928 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-14 00:45:14,929 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-14 00:45:14,938 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-14 00:45:14,948 [ scc.git] DEBUG Already up to date.
2024-06-14 00:45:14,948 [ scc.git] DEBUG ## Unique users: []
2024-06-14 00:45:14,948 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:45:14,948 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:14,955 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-14 00:45:15,007 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:45:15,008 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:15,034 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-14 00:45:15,118 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-14 00:45:15,128 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd9ac4f5e80> has no local changes
2024-06-14 00:45:15,128 [ 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#95 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/)'
2024-06-14 00:45:15,140 [ scc.git] DEBUG [detached HEAD 3336bbc] merge master -Dorg -Ssuccess-only
2024-06-14 00:45:15,141 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:15,141 [ scc.repo] DEBUG ## PRs found:
2024-06-14 00:45:15,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-06-14 00:45:15,333 [ scc.repo] DEBUG ## Branches found:
2024-06-14 00:45:15,333 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-14 00:45:15,333 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:45:15,333 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:15,340 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-14 00:45:15,346 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-14 00:45:15,346 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-14 00:45:15,352 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-14 00:45:15,360 [ scc.git] DEBUG Already up to date.
2024-06-14 00:45:15,360 [ scc.git] DEBUG ## Unique users: []
2024-06-14 00:45:15,360 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:45:15,360 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:15,366 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-14 00:45:15,412 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:45:15,412 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:15,418 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-14 00:45:15,462 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-14 00:45:15,469 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd9ac441400> has no local changes
2024-06-14 00:45:15,470 [ 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#95 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/)'
2024-06-14 00:45:15,480 [ scc.git] DEBUG [detached HEAD a5d7be4] merge master -Dorg -Ssuccess-only
2024-06-14 00:45:15,480 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:15,481 [ scc.repo] DEBUG ## PRs found:
2024-06-14 00:45:15,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-06-14 00:45:16,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-06-14 00:45:16,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-06-14 00:45:17,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-14 00:45:17,771 [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-14 00:45:18,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-14 00:45:18,682 [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-14 00:45:18,683 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-06-14 00:45:18,683 [ scc.repo] DEBUG ## Branches found:
2024-06-14 00:45:18,683 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-14 00:45:18,683 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:45:18,683 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:18,691 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-14 00:45:18,698 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-14 00:45:18,698 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-14 00:45:18,705 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-14 00:45:18,712 [ scc.git] DEBUG Already up to date.
2024-06-14 00:45:18,712 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-06-14 00:45:19,179 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-06-14 00:45:19,179 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-06-14 00:45:19,184 [ scc.git] DEBUG ## Unique users: []
2024-06-14 00:45:19,184 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:45:19,184 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:19,190 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-14 00:45:19,196 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:19,202 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-14 00:45:19,236 [ scc.git] DEBUG Auto-merging Dockerfile
2024-06-14 00:45:19,236 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-06-14 00:45:19,237 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-14 00:45:19,237 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-14 00:45:19,244 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-14 00:45:19,251 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-06-14 00:45:19,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:45:19,400 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-14 00:45:19,407 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-14 00:45:19,413 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#95](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-06-14 00:45:19,419 [ scc.config] DEBUG Found github.token
2024-06-14 00:45:19,419 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-06-14 00:45:19,419 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-14 00:45:19,463 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:45:19,464 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:19,469 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-14 00:45:19,517 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-14 00:45:19,525 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd9ac486b80> has no local changes
2024-06-14 00:45:19,525 [ 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#95 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/)'
2024-06-14 00:45:19,535 [ scc.git] DEBUG [detached HEAD 6d8e792] merge master -Dorg -Ssuccess-only
2024-06-14 00:45:19,536 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:19,536 [ scc.git] INFO Overriding base-branch from master to develop
2024-06-14 00:45:19,536 [ scc.repo] DEBUG ## PRs found:
2024-06-14 00:45:19,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-06-14 00:45:20,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-06-14 00:45:20,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-06-14 00:45:21,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-06-14 00:45:21,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-06-14 00:45:22,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-06-14 00:45:22,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-06-14 00:45:23,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-14 00:45:23,768 [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-14 00:45:24,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-14 00:45:24,625 [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-14 00:45:24,626 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-14 00:45:25,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-06-14 00:45:25,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-06-14 00:45:26,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-06-14 00:45:26,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-06-14 00:45:26,538 [ scc.repo] DEBUG ## Branches found:
2024-06-14 00:45:26,538 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-14 00:45:26,538 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:45:26,538 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:26,544 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-06-14 00:45:26,549 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-14 00:45:26,549 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-06-14 00:45:26,555 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-06-14 00:45:26,561 [ scc.git] DEBUG Already up to date.
2024-06-14 00:45:26,562 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-06-14 00:45:27,009 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-06-14 00:45:27,009 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-06-14 00:45:27,015 [ scc.git] DEBUG ## Unique users: []
2024-06-14 00:45:27,015 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:45:27,015 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:27,022 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-14 00:45:27,030 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:27,036 [ 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-14 00:45:27,106 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-06-14 00:45:27,106 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-06-14 00:45:27,106 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-14 00:45:27,107 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-14 00:45:27,114 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-14 00:45:27,120 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-06-14 00:45:27,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:45:27,283 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-14 00:45:27,290 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-14 00:45:27,297 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#95](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-06-14 00:45:27,305 [ scc.config] DEBUG Found github.token
2024-06-14 00:45:27,305 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-06-14 00:45:27,305 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-14 00:45:27,354 [ scc.git] DEBUG Get sha1 of %s
2024-06-14 00:45:27,354 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-14 00:45:27,359 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-14 00:45:27,399 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-14 00:45:27,405 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd9ac49bd60> has no local changes
2024-06-14 00:45:27,405 [ 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#95 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/)'
2024-06-14 00:45:27,414 [ scc.git] DEBUG [detached HEAD fbf9125] merge master -Dorg -Ssuccess-only
2024-06-14 00:45:27,415 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:27,415 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-14 00:45:27,498 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-06-14 00:45:27,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:45:27,709 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-06-14 00:45:27,714 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-06-14 00:45:28,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:45:28,121 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-06-14 00:45:28,127 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-06-14 00:45:28,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:45:28,531 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-06-14 00:45:28,536 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-06-14 00:45:28,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:45:28,981 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-06-14 00:45:29,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:45:29,436 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-06-14 00:45:29,442 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-06-14 00:45:29,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:45:29,850 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-06-14 00:45:29,854 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-06-14 00:45:30,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:45:30,253 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-06-14 00:45:30,260 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-06-14 00:45:30,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:45:30,656 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-06-14 00:45:30,660 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-06-14 00:45:31,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:45:31,060 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-06-14 00:45:31,065 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-06-14 00:45:31,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:45:31,529 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-06-14 00:45:31,536 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-06-14 00:45:31,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:45:31,941 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-06-14 00:45:31,947 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-06-14 00:45:32,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:45:32,353 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-06-14 00:45:32,359 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-06-14 00:45:32,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:45:32,773 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-06-14 00:45:33,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:45:33,177 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-06-14 00:45:33,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:45:33,603 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-06-14 00:45:33,609 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-06-14 00:45:33,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:45:34,004 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-06-14 00:45:34,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:45:34,406 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-06-14 00:45:34,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:45:34,827 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-06-14 00:45:34,834 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-06-14 00:45:35,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:45:35,247 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-06-14 00:45:35,251 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-06-14 00:45:35,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:45:35,662 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-06-14 00:45:35,668 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-06-14 00:45:36,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:45:36,080 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-06-14 00:45:36,087 [ scc.config] DEBUG Found submodule.scripts.url
2024-06-14 00:45:36,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-14 00:45:36,491 [ scc.config] DEBUG Found submodule.scripts.branch
2024-06-14 00:45:36,491 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-14 00:45:36,579 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd9afee32e0> has local changes
2024-06-14 00:45:36,579 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 373 dependabot[bot] 'Bump omero-test-infra from `7688c54` to `cda3ec6`'
- PR 375 dependabot[bot] 'Bump omero-figure from `3d9e3b8` to `ffc7e07`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 63 sbesson 'Remove python-future dependency'
- PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
- PR 65 will-moore 'gateway_required() uses omero_user_token if no username and password'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 560 will-moore 'Max projection bytes' (exclude comment)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#95 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/95/)'
2024-06-14 00:45:36,595 [ scc.git] DEBUG [detached HEAD a6ace35] merge master -Dorg -Ssuccess-only
2024-06-14 00:45:36,595 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-06-14 00:45:36,595 [ scc.merge] INFO Repository: ome/omero-plugins
2024-06-14 00:45:36,595 [ scc.merge] INFO Already up to date.
2024-06-14 00:45:36,595 [ scc.merge] INFO
2024-06-14 00:45:36,596 [ scc.merge] INFO Merged PRs:
2024-06-14 00:45:36,596 [ scc.merge] INFO - PR 373 dependabot[bot] 'Bump omero-test-infra from `7688c54` to `cda3ec6`'
2024-06-14 00:45:36,596 [ scc.merge] INFO - PR 375 dependabot[bot] 'Bump omero-figure from `3d9e3b8` to `ffc7e07`'
2024-06-14 00:45:36,596 [ scc.merge] INFO
2024-06-14 00:45:36,596 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-06-14 00:45:36,596 [ scc.merge] INFO Already up to date.
2024-06-14 00:45:36,596 [ scc.merge] INFO
2024-06-14 00:45:36,596 [ scc.merge] INFO
2024-06-14 00:45:36,596 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-06-14 00:45:36,596 [ scc.merge] INFO Excluded PRs:
2024-06-14 00:45:36,596 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-06-14 00:45:36,596 [ scc.merge] INFO Already up to date.
2024-06-14 00:45:36,596 [ scc.merge] INFO
2024-06-14 00:45:36,596 [ scc.merge] INFO Merged PRs:
2024-06-14 00:45:36,596 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-06-14 00:45:36,596 [ scc.merge] INFO
2024-06-14 00:45:36,596 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-06-14 00:45:36,596 [ scc.merge] INFO Excluded PRs:
2024-06-14 00:45:36,596 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-06-14 00:45:36,597 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-06-14 00:45:36,597 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-06-14 00:45:36,597 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-06-14 00:45:36,597 [ scc.merge] INFO Already up to date.
2024-06-14 00:45:36,597 [ scc.merge] INFO
2024-06-14 00:45:36,597 [ scc.merge] INFO Merged PRs:
2024-06-14 00:45:36,597 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-06-14 00:45:36,597 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-06-14 00:45:36,597 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-06-14 00:45:36,597 [ scc.merge] INFO - PR 65 will-moore 'gateway_required() uses omero_user_token if no username and password'
2024-06-14 00:45:36,597 [ scc.merge] INFO
2024-06-14 00:45:36,597 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-06-14 00:45:36,597 [ scc.merge] INFO Excluded PRs:
2024-06-14 00:45:36,597 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-14 00:45:36,597 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-06-14 00:45:36,597 [ scc.merge] INFO Already up to date.
2024-06-14 00:45:36,597 [ scc.merge] INFO
2024-06-14 00:45:36,597 [ scc.merge] INFO Merged PRs:
2024-06-14 00:45:36,598 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-06-14 00:45:36,598 [ scc.merge] INFO
2024-06-14 00:45:36,598 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-14 00:45:36,598 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-06-14 00:45:36,598 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-06-14 00:45:36,598 [ scc.merge] INFO
2024-06-14 00:45:36,598 [ scc.merge] INFO Repository: ome/omero-figure
2024-06-14 00:45:36,598 [ scc.merge] INFO Excluded PRs:
2024-06-14 00:45:36,598 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes' (exclude comment)
2024-06-14 00:45:36,598 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-06-14 00:45:36,598 [ scc.merge] INFO Already up to date.
2024-06-14 00:45:36,598 [ scc.merge] INFO
2024-06-14 00:45:36,598 [ scc.merge] INFO Merged PRs:
2024-06-14 00:45:36,598 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-06-14 00:45:36,598 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-06-14 00:45:36,598 [ scc.merge] INFO
2024-06-14 00:45:36,598 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-06-14 00:45:36,598 [ scc.merge] INFO Already up to date.
2024-06-14 00:45:36,599 [ scc.merge] INFO
2024-06-14 00:45:36,599 [ scc.merge] INFO Merged PRs:
2024-06-14 00:45:36,599 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-06-14 00:45:36,599 [ scc.merge] INFO
2024-06-14 00:45:36,599 [ scc.merge] INFO Repository: ome/omero-gallery
2024-06-14 00:45:36,599 [ scc.merge] INFO Already up to date.
2024-06-14 00:45:36,599 [ scc.merge] INFO
2024-06-14 00:45:36,599 [ scc.merge] INFO Merged PRs:
2024-06-14 00:45:36,599 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-14 00:45:36,599 [ scc.merge] INFO
2024-06-14 00:45:36,599 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-06-14 00:45:36,599 [ scc.merge] INFO Excluded PRs:
2024-06-14 00:45:36,599 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-06-14 00:45:36,599 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-06-14 00:45:36,599 [ scc.merge] INFO Already up to date.
2024-06-14 00:45:36,599 [ scc.merge] INFO
2024-06-14 00:45:36,599 [ scc.merge] INFO Merged PRs:
2024-06-14 00:45:36,599 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-06-14 00:45:36,600 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-06-14 00:45:36,600 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-14 00:45:36,600 [ scc.merge] INFO
2024-06-14 00:45:36,600 [ scc.merge] INFO Repository: ome/omero-mapr
2024-06-14 00:45:36,600 [ scc.merge] INFO Excluded PRs:
2024-06-14 00:45:36,600 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-06-14 00:45:36,600 [ scc.merge] INFO Already up to date.
2024-06-14 00:45:36,600 [ scc.merge] INFO
2024-06-14 00:45:36,600 [ scc.merge] INFO Merged PRs:
2024-06-14 00:45:36,600 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-06-14 00:45:36,600 [ scc.merge] INFO
2024-06-14 00:45:36,600 [ scc.merge] INFO Repository: ome/omero-metadata
2024-06-14 00:45:36,600 [ scc.merge] INFO Already up to date.
2024-06-14 00:45:36,600 [ scc.merge] INFO
2024-06-14 00:45:36,600 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-14 00:45:36,600 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-14 00:45:36,600 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-14 00:45:36,600 [ scc.merge] INFO
2024-06-14 00:45:36,601 [ scc.merge] INFO Repository: ome/omero-parade
2024-06-14 00:45:36,601 [ scc.merge] INFO Excluded PRs:
2024-06-14 00:45:36,601 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-06-14 00:45:36,601 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-06-14 00:45:36,601 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-06-14 00:45:36,601 [ scc.merge] INFO Already up to date.
2024-06-14 00:45:36,601 [ scc.merge] INFO
2024-06-14 00:45:36,601 [ scc.merge] INFO Merged PRs:
2024-06-14 00:45:36,601 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-14 00:45:36,601 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-14 00:45:36,601 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-14 00:45:36,601 [ scc.merge] INFO
2024-06-14 00:45:36,601 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-06-14 00:45:36,601 [ scc.merge] INFO Already up to date.
2024-06-14 00:45:36,601 [ scc.merge] INFO
2024-06-14 00:45:36,601 [ scc.merge] INFO Merged PRs:
2024-06-14 00:45:36,601 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-06-14 00:45:36,601 [ scc.merge] INFO
2024-06-14 00:45:36,602 [ scc.merge] INFO Repository: ome/omero-rois
2024-06-14 00:45:36,602 [ scc.merge] INFO Excluded PRs:
2024-06-14 00:45:36,602 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-14 00:45:36,602 [ scc.merge] INFO Already up to date.
2024-06-14 00:45:36,602 [ scc.merge] INFO
2024-06-14 00:45:36,602 [ scc.merge] INFO Merged PRs:
2024-06-14 00:45:36,602 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-14 00:45:36,602 [ scc.merge] INFO
2024-06-14 00:45:36,602 [ scc.merge] INFO Repository: ome/omero-signup
2024-06-14 00:45:36,602 [ scc.merge] INFO Already up to date.
2024-06-14 00:45:36,602 [ scc.merge] INFO
2024-06-14 00:45:36,602 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-14 00:45:36,602 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-14 00:45:36,602 [ scc.merge] INFO
2024-06-14 00:45:36,602 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-06-14 00:45:36,602 [ scc.merge] INFO Already up to date.
2024-06-14 00:45:36,602 [ scc.merge] INFO
2024-06-14 00:45:36,602 [ scc.merge] INFO Merged PRs:
2024-06-14 00:45:36,602 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-14 00:45:36,603 [ scc.merge] INFO
2024-06-14 00:45:36,603 [ scc.merge] INFO Repository: ome/omero-upload
2024-06-14 00:45:36,603 [ scc.merge] INFO Already up to date.
2024-06-14 00:45:36,603 [ scc.merge] INFO
2024-06-14 00:45:36,603 [ scc.merge] INFO
2024-06-14 00:45:36,603 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-06-14 00:45:36,603 [ scc.merge] INFO Already up to date.
2024-06-14 00:45:36,603 [ scc.merge] INFO
2024-06-14 00:45:36,603 [ scc.merge] INFO
2024-06-14 00:45:36,603 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-06-14 00:45:36,603 [ scc.merge] INFO Excluded PRs:
2024-06-14 00:45:36,603 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-06-14 00:45:36,603 [ scc.merge] INFO Already up to date.
2024-06-14 00:45:36,603 [ scc.merge] INFO
2024-06-14 00:45:36,603 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-14 00:45:36,603 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-14 00:45:36,603 [ scc.merge] INFO
2024-06-14 00:45:36,603 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-06-14 00:45:36,604 [ scc.merge] INFO Already up to date.
2024-06-14 00:45:36,604 [ scc.merge] INFO
2024-06-14 00:45:36,604 [ scc.merge] INFO
2024-06-14 00:45:36,604 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-06-14 00:45:36,604 [ scc.merge] INFO Already up to date.
2024-06-14 00:45:36,604 [ scc.merge] INFO
2024-06-14 00:45:36,604 [ scc.merge] INFO
2024-06-14 00:45:36,604 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-06-14 00:45:36,604 [ scc.merge] INFO Already up to date.
2024-06-14 00:45:36,604 [ scc.merge] INFO
2024-06-14 00:45:36,604 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-14 00:45:36,604 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-06-14 00:45:36,604 [ scc.merge] INFO
2024-06-14 00:45:36,604 [ scc.merge] INFO Repository: ome/scripts
2024-06-14 00:45:36,604 [ scc.merge] INFO Excluded PRs:
2024-06-14 00:45:36,604 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-06-14 00:45:36,604 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-06-14 00:45:36,604 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-06-14 00:45:36,605 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-06-14 00:45:36,605 [ scc.merge] INFO Already up to date.
2024-06-14 00:45:36,605 [ scc.merge] INFO
2024-06-14 00:45:36,605 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-14 00:45:36,605 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-14 00:45:36,605 [ scc.merge] INFO
2024-06-14 00:45:36,605 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-06-14 00:45:36,605 [ scc.git] DEBUG Calling 'git remote'
2024-06-14 00:45:36,613 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-06-14 00:45:36,613 [ scc.git] DEBUG Calling 'git remote'
2024-06-14 00:45:36,620 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:36,620 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-06-14 00:45:36,621 [ scc.git] DEBUG Calling 'git remote'
2024-06-14 00:45:36,627 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:36,628 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-06-14 00:45:36,628 [ scc.git] DEBUG Calling 'git remote'
2024-06-14 00:45:36,635 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:36,635 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-06-14 00:45:36,635 [ scc.git] DEBUG Calling 'git remote'
2024-06-14 00:45:36,641 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:36,642 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-14 00:45:36,642 [ scc.git] DEBUG Calling 'git remote'
2024-06-14 00:45:36,647 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:36,648 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-14 00:45:36,648 [ scc.git] DEBUG Calling 'git remote'
2024-06-14 00:45:36,662 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:36,663 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-14 00:45:36,663 [ scc.git] DEBUG Calling 'git remote'
2024-06-14 00:45:36,669 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:36,669 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-14 00:45:36,669 [ scc.git] DEBUG Calling 'git remote'
2024-06-14 00:45:36,676 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:36,676 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-14 00:45:36,676 [ scc.git] DEBUG Calling 'git remote'
2024-06-14 00:45:36,681 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:36,681 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-14 00:45:36,681 [ scc.git] DEBUG Calling 'git remote'
2024-06-14 00:45:36,687 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:36,687 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-14 00:45:36,687 [ scc.git] DEBUG Calling 'git remote'
2024-06-14 00:45:36,692 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:36,693 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-14 00:45:36,693 [ scc.git] DEBUG Calling 'git remote'
2024-06-14 00:45:36,699 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:36,699 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-14 00:45:36,699 [ scc.git] DEBUG Calling 'git remote'
2024-06-14 00:45:36,704 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:36,704 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-14 00:45:36,704 [ scc.git] DEBUG Calling 'git remote'
2024-06-14 00:45:36,710 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:36,710 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-14 00:45:36,710 [ scc.git] DEBUG Calling 'git remote'
2024-06-14 00:45:36,716 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:36,717 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-14 00:45:36,717 [ scc.git] DEBUG Calling 'git remote'
2024-06-14 00:45:36,722 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:36,723 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-14 00:45:36,723 [ scc.git] DEBUG Calling 'git remote'
2024-06-14 00:45:36,728 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:36,728 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-14 00:45:36,728 [ scc.git] DEBUG Calling 'git remote'
2024-06-14 00:45:36,734 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:36,734 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-14 00:45:36,734 [ scc.git] DEBUG Calling 'git remote'
2024-06-14 00:45:36,740 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:36,741 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-14 00:45:36,741 [ scc.git] DEBUG Calling 'git remote'
2024-06-14 00:45:36,747 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:36,747 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-14 00:45:36,747 [ scc.git] DEBUG Calling 'git remote'
2024-06-14 00:45:36,753 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-14 00:45:36,753 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-14 00:45:36,753 [ scc.git] DEBUG Calling 'git remote'
2024-06-14 00:45:36,759 [ 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 83476f4] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 2ca566b
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from ffc7e075
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from 7b7a637
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 5a90893
nothing to commit, working tree clean
[detached HEAD e00b93b] 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-14 00:46:24,586 [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-14 00:46:33,683 [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-14 00:46:36,385 [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-14 00:46:41,032 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-06-14 00:47:34,057 [ 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