Skipping 107 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-04-30 00:45:03,661 [ scc.repo] DEBUG - PR 554 jburel 'Update publish'
2024-04-30 00:45:04,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-04-30 00:45:04,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f44ffd667bff4dedef00b9ea4a21d3e1a51f2df5 HTTP/1.1" 200 None
2024-04-30 00:45:05,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f44ffd667bff4dedef00b9ea4a21d3e1a51f2df5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-30 00:45:05,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f44ffd667bff4dedef00b9ea4a21d3e1a51f2df5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-30 00:45:06,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/f44ffd667bff4dedef00b9ea4a21d3e1a51f2df5 HTTP/1.1" 200 None
2024-04-30 00:45:06,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/f44ffd667bff4dedef00b9ea4a21d3e1a51f2df5?per_page=1 HTTP/1.1" 200 2
2024-04-30 00:45:06,521 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-04-30 00:45:06,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543 HTTP/1.1" 200 None
2024-04-30 00:45:07,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/543/comments HTTP/1.1" 200 None
2024-04-30 00:45:07,461 [ scc.repo] DEBUG ## Branches found:
2024-04-30 00:45:07,462 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-04-30 00:45:07,462 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:45:07,462 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:07,484 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-30 00:45:07,498 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-30 00:45:07,498 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-30 00:45:07,530 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-30 00:45:07,622 [ scc.git] DEBUG Updating e5a45d60..6bdf72cb
2024-04-30 00:45:08,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls/557 HTTP/1.1" 200 None
2024-04-30 00:45:08,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls/558 HTTP/1.1" 200 None
2024-04-30 00:45:09,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls/477 HTTP/1.1" 200 None
2024-04-30 00:45:09,739 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-04-30 00:45:10,422 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-04-30 00:45:10,422 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-04-30 00:45:10,425 [ scc.git] DEBUG Calling 'git fetch origin pull/554/head'
2024-04-30 00:45:11,068 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-04-30 00:45:11,069 [ scc.git] DEBUG * branch refs/pull/554/head -> FETCH_HEAD
2024-04-30 00:45:11,086 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-04-30 00:45:11,775 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-04-30 00:45:11,776 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-04-30 00:45:11,780 [ scc.git] DEBUG ## Unique users: []
2024-04-30 00:45:11,781 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:45:11,781 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:11,790 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f44ffd667bff4dedef00b9ea4a21d3e1a51f2df5'
2024-04-30 00:45:11,802 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:11,815 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) f44ffd667bff4dedef00b9ea4a21d3e1a51f2df5'
2024-04-30 00:45:11,899 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:45:11,906 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-04-30 00:45:11,907 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-04-30 00:45:11,907 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-04-30 00:45:11,907 [ scc.git] DEBUG src/js/shape_editor/rect.js | 11 ++++-
2024-04-30 00:45:11,907 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-04-30 00:45:11,907 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-04-30 00:45:11,907 [ scc.git] DEBUG src/js/views/right_panel_view.js | 69 +++++++++++++++++++++++++++-
2024-04-30 00:45:11,907 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-04-30 00:45:11,907 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-04-30 00:45:11,907 [ scc.git] DEBUG 9 files changed, 243 insertions(+), 5 deletions(-)
2024-04-30 00:45:12,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:45:12,082 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...902c4461b9479c4681e6bf71114616299e2adde5'
2024-04-30 00:45:12,097 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:12,103 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 554 (Update publish) 902c4461b9479c4681e6bf71114616299e2adde5'
2024-04-30 00:45:12,136 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:45:12,140 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++---
2024-04-30 00:45:12,140 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-04-30 00:45:12,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:45:12,492 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8b004a5892615a104e0151c17620e96e2c72d81c'
2024-04-30 00:45:12,503 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:12,512 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 8b004a5892615a104e0151c17620e96e2c72d81c'
2024-04-30 00:45:12,542 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-04-30 00:45:12,543 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-04-30 00:45:12,544 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:45:12,554 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-04-30 00:45:12,554 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-04-30 00:45:12,554 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-04-30 00:45:12,554 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-04-30 00:45:12,554 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 479 ++++++++++++++++++++-
2024-04-30 00:45:12,554 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-04-30 00:45:12,554 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-04-30 00:45:12,554 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-04-30 00:45:12,554 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-04-30 00:45:12,554 [ scc.git] DEBUG 9 files changed, 506 insertions(+), 10 deletions(-)
2024-04-30 00:45:12,554 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-04-30 00:45:12,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:45:12,907 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-30 00:45:12,964 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:45:12,964 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:12,974 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:45:13,022 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-30 00:45:13,035 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08be19cbe0> has no local changes
2024-04-30 00:45:13,035 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 543 will-moore 'Plate well labels' (stage: draft)
Updating e5a45d60..6bdf72cb
Previously merged:
- PR 557 dependabot[bot] 'Bump vite from 3.0.4 to 3.2.10'
- PR 558 dependabot[bot] 'Bump postcss from 8.4.14 to 8.4.38'
- PR 477 will-moore 'Vite'
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 554 jburel 'Update publish'
- PR 555 will-moore 'Points in shape editor'
Generated by OMERO-plugins-push#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/)'
2024-04-30 00:45:13,054 [ scc.git] DEBUG [detached HEAD fa03129a] merge master -Dorg -Ssuccess-only
2024-04-30 00:45:13,055 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:45:13,055 [ scc.repo] DEBUG ## PRs found:
2024-04-30 00:45:13,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-04-30 00:45:13,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-04-30 00:45:14,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-04-30 00:45:14,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-30 00:45:15,315 [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-04-30 00:45:15,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-30 00:45:16,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-04-30 00:45:16,259 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-04-30 00:45:16,259 [ scc.repo] DEBUG ## Branches found:
2024-04-30 00:45:16,260 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-30 00:45:16,260 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:45:16,260 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:16,266 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-30 00:45:16,271 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-30 00:45:16,271 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-30 00:45:16,277 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-30 00:45:16,284 [ scc.git] DEBUG Already up to date.
2024-04-30 00:45:16,284 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-04-30 00:45:16,719 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-04-30 00:45:16,720 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-04-30 00:45:16,731 [ scc.git] DEBUG ## Unique users: []
2024-04-30 00:45:16,732 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:45:16,732 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:16,746 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-30 00:45:16,758 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:16,766 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-30 00:45:16,802 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-04-30 00:45:16,803 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:45:16,806 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-04-30 00:45:16,806 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-04-30 00:45:16,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:45:16,977 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-30 00:45:17,022 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:45:17,023 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:17,029 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:45:17,073 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-30 00:45:17,081 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08be16c550> has no local changes
2024-04-30 00:45:17,081 [ 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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/)'
2024-04-30 00:45:17,092 [ scc.git] DEBUG [detached HEAD 0c8a686] merge master -Dorg -Ssuccess-only
2024-04-30 00:45:17,093 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:45:17,093 [ scc.repo] DEBUG ## PRs found:
2024-04-30 00:45:17,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-04-30 00:45:17,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-04-30 00:45:17,963 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-30 00:45:18,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-30 00:45:18,996 [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-04-30 00:45:19,527 [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-04-30 00:45:20,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-30 00:45:20,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-04-30 00:45:20,469 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-30 00:45:20,469 [ scc.repo] DEBUG ## Branches found:
2024-04-30 00:45:20,469 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-30 00:45:20,470 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:45:20,470 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:20,477 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-30 00:45:20,482 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-30 00:45:20,482 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-30 00:45:20,488 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-30 00:45:20,493 [ scc.git] DEBUG Already up to date.
2024-04-30 00:45:20,493 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-04-30 00:45:20,869 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-04-30 00:45:20,869 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-04-30 00:45:20,873 [ scc.git] DEBUG ## Unique users: []
2024-04-30 00:45:20,873 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:45:20,873 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:20,879 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-04-30 00:45:20,884 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:20,889 [ 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-04-30 00:45:20,900 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:45:20,903 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-04-30 00:45:20,904 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-04-30 00:45:21,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:45:21,074 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-30 00:45:21,115 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:45:21,116 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:21,122 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:45:21,161 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-30 00:45:21,169 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08be174820> has no local changes
2024-04-30 00:45:21,169 [ 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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/)'
2024-04-30 00:45:21,178 [ scc.git] DEBUG [detached HEAD 15f5d87] merge master -Dorg -Ssuccess-only
2024-04-30 00:45:21,178 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:45:21,178 [ scc.repo] DEBUG ## PRs found:
2024-04-30 00:45:21,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-04-30 00:45:22,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/474 HTTP/1.1" 200 None
2024-04-30 00:45:22,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/474/comments HTTP/1.1" 200 None
2024-04-30 00:45:23,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7710c19f6e074a925dff029aabee13555cd3e600 HTTP/1.1" 200 None
2024-04-30 00:45:23,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7710c19f6e074a925dff029aabee13555cd3e600/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-30 00:45:23,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7710c19f6e074a925dff029aabee13555cd3e600/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-30 00:45:24,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7710c19f6e074a925dff029aabee13555cd3e600 HTTP/1.1" 200 None
2024-04-30 00:45:24,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/7710c19f6e074a925dff029aabee13555cd3e600?per_page=1 HTTP/1.1" 200 2
2024-04-30 00:45:24,907 [ scc.repo] DEBUG - PR 474 will-moore 'Img data error handling'
2024-04-30 00:45:25,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-04-30 00:45:25,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-04-30 00:45:26,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-04-30 00:45:26,775 [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-04-30 00:45:27,268 [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-04-30 00:45:27,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-04-30 00:45:28,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-04-30 00:45:28,181 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-04-30 00:45:28,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470 HTTP/1.1" 200 None
2024-04-30 00:45:29,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470/comments HTTP/1.1" 200 None
2024-04-30 00:45:29,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99 HTTP/1.1" 200 None
2024-04-30 00:45:30,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-30 00:45:30,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-30 00:45:31,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99 HTTP/1.1" 200 None
2024-04-30 00:45:31,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99?per_page=1 HTTP/1.1" 200 2
2024-04-30 00:45:31,525 [ scc.repo] DEBUG - PR 470 will-moore 'Movie playing waits for planes'
2024-04-30 00:45:31,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469 HTTP/1.1" 200 None
2024-04-30 00:45:32,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-30 00:45:32,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-30 00:45:33,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-30 00:45:33,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-30 00:45:34,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/ca8b5aabef9a5358f93add750f4cbb51c864b7fe?per_page=1 HTTP/1.1" 200 2
2024-04-30 00:45:34,289 [ scc.repo] DEBUG - PR 469 will-moore 'changelog 0.14.0'
2024-04-30 00:45:34,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-04-30 00:45:35,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-04-30 00:45:35,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-04-30 00:45:36,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-30 00:45:36,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-30 00:45:37,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-04-30 00:45:37,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/409c3429dd72d05fef895dcca6d133f8340eabf4?per_page=1 HTTP/1.1" 200 2
2024-04-30 00:45:37,614 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-04-30 00:45:38,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-04-30 00:45:38,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-04-30 00:45:39,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-30 00:45:39,493 [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-04-30 00:45:39,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-30 00:45:40,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-04-30 00:45:40,341 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-04-30 00:45:40,341 [ scc.repo] DEBUG ## Branches found:
2024-04-30 00:45:40,342 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-30 00:45:40,342 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:45:40,342 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:40,351 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-30 00:45:40,357 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-30 00:45:40,357 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-30 00:45:40,364 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-30 00:45:40,370 [ scc.git] DEBUG Already up to date.
2024-04-30 00:45:40,370 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-04-30 00:45:40,838 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-30 00:45:40,838 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-04-30 00:45:40,844 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-04-30 00:45:41,934 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-30 00:45:41,934 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-04-30 00:45:41,939 [ scc.git] DEBUG Calling 'git fetch origin pull/469/head'
2024-04-30 00:45:42,337 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-30 00:45:42,337 [ scc.git] DEBUG * branch refs/pull/469/head -> FETCH_HEAD
2024-04-30 00:45:42,343 [ scc.git] DEBUG Calling 'git fetch origin pull/470/head'
2024-04-30 00:45:43,153 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-30 00:45:43,154 [ scc.git] DEBUG * branch refs/pull/470/head -> FETCH_HEAD
2024-04-30 00:45:43,159 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-04-30 00:45:43,655 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-30 00:45:43,655 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-04-30 00:45:43,660 [ scc.git] DEBUG Calling 'git fetch origin pull/474/head'
2024-04-30 00:45:44,373 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-30 00:45:44,373 [ scc.git] DEBUG * branch refs/pull/474/head -> FETCH_HEAD
2024-04-30 00:45:44,375 [ scc.git] DEBUG ## Unique users: []
2024-04-30 00:45:44,376 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:45:44,376 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:44,381 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-30 00:45:44,386 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:44,391 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-30 00:45:44,415 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:45:44,420 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-04-30 00:45:44,421 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-04-30 00:45:44,421 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-04-30 00:45:44,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:45:44,580 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-04-30 00:45:44,589 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:44,597 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-04-30 00:45:44,691 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:45:44,696 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-04-30 00:45:44,697 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-04-30 00:45:44,697 [ scc.git] DEBUG src/app/header.html | 5 +
2024-04-30 00:45:44,697 [ scc.git] DEBUG src/app/header.js | 46 ++++++++-
2024-04-30 00:45:44,697 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-04-30 00:45:44,698 [ scc.git] DEBUG src/utils/figure.js | 220 ++++++++++++++++++++++++++++++++++++++++++
2024-04-30 00:45:44,698 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 1 -
2024-04-30 00:45:44,698 [ scc.git] DEBUG 7 files changed, 294 insertions(+), 7 deletions(-)
2024-04-30 00:45:44,698 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-04-30 00:45:44,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:45:45,001 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-30 00:45:45,008 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:45,015 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 469 (changelog 0.14.0) ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-30 00:45:45,053 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:45:45,056 [ scc.git] DEBUG CHANGELOG.md | 9 ++++++++-
2024-04-30 00:45:45,056 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-04-30 00:45:45,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:45:45,410 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99'
2024-04-30 00:45:45,418 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:45,425 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 470 (Movie playing waits for planes) 6e2c77257b4c0568b8c59ee9f9a1cff21d96ab99'
2024-04-30 00:45:45,596 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-04-30 00:45:45,597 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:45:45,605 [ scc.git] DEBUG css/app.css | 30 +++++++
2024-04-30 00:45:45,605 [ scc.git] DEBUG src/controls/dimension-slider.js | 6 +-
2024-04-30 00:45:45,605 [ scc.git] DEBUG src/events/events.js | 4 +
2024-04-30 00:45:45,605 [ scc.git] DEBUG src/index-dev.html | 6 +-
2024-04-30 00:45:45,605 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 4 +-
2024-04-30 00:45:45,605 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 165 +++++++++++++++++++++++++------------
2024-04-30 00:45:45,605 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 61 +++++++++++++-
2024-04-30 00:45:45,605 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 15 +++-
2024-04-30 00:45:45,605 [ scc.git] DEBUG 8 files changed, 228 insertions(+), 63 deletions(-)
2024-04-30 00:45:45,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:45:45,822 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-04-30 00:45:45,833 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:45,842 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-04-30 00:45:45,978 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-04-30 00:45:45,979 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:45:45,983 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-04-30 00:45:45,983 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-04-30 00:45:45,983 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-04-30 00:45:46,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:45:46,233 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7710c19f6e074a925dff029aabee13555cd3e600'
2024-04-30 00:45:46,247 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:46,256 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 474 (Img data error handling) 7710c19f6e074a925dff029aabee13555cd3e600'
2024-04-30 00:45:46,315 [ scc.git] DEBUG Auto-merging css/app.css
2024-04-30 00:45:46,315 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-04-30 00:45:46,315 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-04-30 00:45:46,315 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-04-30 00:45:46,315 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-04-30 00:45:46,316 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:45:46,323 [ scc.git] DEBUG css/app.css | 4 ++++
2024-04-30 00:45:46,323 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 18 +++++++++++-----
2024-04-30 00:45:46,323 [ scc.git] DEBUG src/app/context.js | 3 +++
2024-04-30 00:45:46,323 [ scc.git] DEBUG src/model/image_info.js | 50 +++++++++++++++++++++++++++++++++++++++++++
2024-04-30 00:45:46,323 [ scc.git] DEBUG src/utils/constants.js | 1 +
2024-04-30 00:45:46,323 [ scc.git] DEBUG 5 files changed, 71 insertions(+), 5 deletions(-)
2024-04-30 00:45:46,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:45:46,666 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-30 00:45:46,716 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:45:46,716 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:46,722 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:45:46,774 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-30 00:45:46,786 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08be14b5b0> has no local changes
2024-04-30 00:45:46,786 [ 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 469 will-moore 'changelog 0.14.0'
- PR 470 will-moore 'Movie playing waits for planes'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 474 will-moore 'Img data error handling'
Generated by OMERO-plugins-push#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/)'
2024-04-30 00:45:46,800 [ scc.git] DEBUG [detached HEAD f9eeb6e] merge master -Dorg -Ssuccess-only
2024-04-30 00:45:46,801 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:45:46,801 [ scc.repo] DEBUG ## PRs found:
2024-04-30 00:45:47,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-04-30 00:45:47,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-04-30 00:45:48,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-04-30 00:45:48,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-30 00:45:49,137 [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-04-30 00:45:49,657 [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-04-30 00:45:50,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-30 00:45:50,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-04-30 00:45:50,592 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-04-30 00:45:50,593 [ scc.repo] DEBUG ## Branches found:
2024-04-30 00:45:50,593 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-30 00:45:50,593 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:45:50,593 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:50,604 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-30 00:45:50,613 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-30 00:45:50,614 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-30 00:45:50,623 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-30 00:45:50,631 [ scc.git] DEBUG Already up to date.
2024-04-30 00:45:50,632 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-04-30 00:45:51,017 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-04-30 00:45:51,017 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-04-30 00:45:51,022 [ scc.git] DEBUG ## Unique users: []
2024-04-30 00:45:51,022 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:45:51,023 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:51,029 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-30 00:45:51,035 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:51,043 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-30 00:45:51,060 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:45:51,066 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-04-30 00:45:51,066 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-04-30 00:45:51,066 [ scc.git] DEBUG requirements.txt | 2 +-
2024-04-30 00:45:51,066 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-04-30 00:45:51,066 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-04-30 00:45:51,066 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-04-30 00:45:51,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:45:51,224 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-30 00:45:51,275 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:45:51,275 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:51,283 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:45:51,332 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-30 00:45:51,341 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08be147160> has no local changes
2024-04-30 00:45:51,341 [ 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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/)'
2024-04-30 00:45:51,353 [ scc.git] DEBUG [detached HEAD 514b33e] merge master -Dorg -Ssuccess-only
2024-04-30 00:45:51,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:45:51,354 [ scc.repo] DEBUG ## PRs found:
2024-04-30 00:45:51,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-04-30 00:45:52,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-04-30 00:45:52,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-04-30 00:45:53,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-30 00:45:53,731 [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-04-30 00:45:54,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-30 00:45:54,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-04-30 00:45:54,647 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-30 00:45:55,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-04-30 00:45:55,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-04-30 00:45:56,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-30 00:45:56,561 [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-04-30 00:45:57,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-30 00:45:57,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-04-30 00:45:57,506 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-30 00:45:57,507 [ scc.repo] DEBUG ## Branches found:
2024-04-30 00:45:57,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-30 00:45:57,507 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:45:57,507 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:57,516 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-30 00:45:57,523 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-30 00:45:57,523 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-30 00:45:57,530 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-30 00:45:57,538 [ scc.git] DEBUG Already up to date.
2024-04-30 00:45:57,538 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-04-30 00:45:58,046 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-30 00:45:58,046 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-04-30 00:45:58,053 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-04-30 00:45:58,583 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-30 00:45:58,584 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-04-30 00:45:58,588 [ scc.git] DEBUG ## Unique users: []
2024-04-30 00:45:58,589 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:45:58,589 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:58,594 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-30 00:45:58,602 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:58,608 [ 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-04-30 00:45:58,671 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-04-30 00:45:58,671 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-04-30 00:45:58,671 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-30 00:45:58,671 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-30 00:45:58,672 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-30 00:45:58,672 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-30 00:45:58,679 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-30 00:45:58,686 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-30 00:45:58,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:45:58,858 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-30 00:45:58,866 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-30 00:45:58,872 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#47](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-04-30 00:45:58,878 [ scc.config] DEBUG Found github.token
2024-04-30 00:45:58,879 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-04-30 00:45:58,879 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-30 00:45:58,889 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:58,895 [ 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-04-30 00:45:58,915 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-30 00:45:58,916 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-30 00:45:58,916 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-04-30 00:45:58,916 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-30 00:45:58,916 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-30 00:45:58,924 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-30 00:45:58,932 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-30 00:45:59,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:45:59,273 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-30 00:45:59,284 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-30 00:45:59,291 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#47](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/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-04-30 00:45:59,299 [ scc.config] DEBUG Found github.token
2024-04-30 00:45:59,299 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-04-30 00:45:59,299 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-30 00:45:59,348 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:45:59,348 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:45:59,358 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:45:59,413 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-30 00:45:59,425 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08be14b550> has no local changes
2024-04-30 00:45:59,425 [ 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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/)'
2024-04-30 00:45:59,437 [ scc.git] DEBUG [detached HEAD 34c253e] merge master -Dorg -Ssuccess-only
2024-04-30 00:45:59,438 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:45:59,438 [ scc.repo] DEBUG ## PRs found:
2024-04-30 00:45:59,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-04-30 00:46:00,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-04-30 00:46:00,325 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-30 00:46:00,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-30 00:46:01,378 [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-04-30 00:46:01,876 [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-04-30 00:46:02,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-30 00:46:02,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-04-30 00:46:02,815 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-30 00:46:03,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-04-30 00:46:03,297 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-30 00:46:03,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-30 00:46:04,382 [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-04-30 00:46:04,897 [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-04-30 00:46:05,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-30 00:46:05,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-04-30 00:46:05,767 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-30 00:46:06,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-04-30 00:46:06,231 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-30 00:46:06,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-30 00:46:07,264 [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-04-30 00:46:07,763 [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-04-30 00:46:08,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-30 00:46:08,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-04-30 00:46:08,748 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-30 00:46:09,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-04-30 00:46:09,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-04-30 00:46:10,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-04-30 00:46:10,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-04-30 00:46:11,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-04-30 00:46:11,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-04-30 00:46:11,660 [ scc.repo] DEBUG ## Branches found:
2024-04-30 00:46:11,660 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-30 00:46:11,660 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:11,660 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:11,666 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-30 00:46:11,671 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-30 00:46:11,671 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-30 00:46:11,676 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-30 00:46:11,682 [ scc.git] DEBUG Already up to date.
2024-04-30 00:46:11,682 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-04-30 00:46:12,062 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-30 00:46:12,062 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-04-30 00:46:12,067 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-04-30 00:46:12,470 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-30 00:46:12,471 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-04-30 00:46:12,476 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-04-30 00:46:12,867 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-30 00:46:12,867 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-04-30 00:46:12,872 [ scc.git] DEBUG ## Unique users: []
2024-04-30 00:46:12,872 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:12,872 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:12,877 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-04-30 00:46:12,884 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:12,890 [ 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-04-30 00:46:12,902 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:46:12,905 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-04-30 00:46:12,905 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-04-30 00:46:13,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:13,057 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-04-30 00:46:13,064 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:13,070 [ 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-04-30 00:46:13,112 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-30 00:46:13,113 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:46:13,117 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-04-30 00:46:13,117 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-04-30 00:46:13,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:13,483 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-04-30 00:46:13,495 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:13,503 [ 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-04-30 00:46:13,534 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-30 00:46:13,535 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:46:13,539 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-04-30 00:46:13,539 [ scc.git] DEBUG package.json | 2 +-
2024-04-30 00:46:13,539 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-04-30 00:46:13,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:13,909 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-30 00:46:13,956 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:13,956 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:13,963 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:46:14,005 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-30 00:46:14,014 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08be156fd0> has no local changes
2024-04-30 00:46:14,014 [ 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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/)'
2024-04-30 00:46:14,024 [ scc.git] DEBUG [detached HEAD 8a4f161] merge master -Dorg -Ssuccess-only
2024-04-30 00:46:14,025 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:14,025 [ scc.repo] DEBUG ## PRs found:
2024-04-30 00:46:14,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-04-30 00:46:14,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-04-30 00:46:15,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-30 00:46:15,968 [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-04-30 00:46:16,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-30 00:46:16,815 [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-04-30 00:46:16,816 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-04-30 00:46:16,816 [ scc.repo] DEBUG ## Branches found:
2024-04-30 00:46:16,816 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-30 00:46:16,816 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:16,816 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:16,824 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-30 00:46:16,830 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-30 00:46:16,830 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-30 00:46:16,836 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-30 00:46:16,842 [ scc.git] DEBUG Already up to date.
2024-04-30 00:46:16,843 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-30 00:46:17,253 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-04-30 00:46:17,253 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-30 00:46:17,259 [ scc.git] DEBUG ## Unique users: []
2024-04-30 00:46:17,260 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:17,260 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:17,270 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-30 00:46:17,282 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:17,293 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-30 00:46:17,310 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:46:17,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:17,481 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-30 00:46:17,531 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:17,532 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:17,540 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:46:17,607 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-30 00:46:17,617 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08bc0da340> has no local changes
2024-04-30 00:46:17,618 [ 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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/)'
2024-04-30 00:46:17,631 [ scc.git] DEBUG [detached HEAD 5e022f4] merge master -Dorg -Ssuccess-only
2024-04-30 00:46:17,631 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:17,632 [ scc.repo] DEBUG ## PRs found:
2024-04-30 00:46:17,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-04-30 00:46:18,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-04-30 00:46:18,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-04-30 00:46:19,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-04-30 00:46:19,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-30 00:46:20,338 [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-04-30 00:46:20,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-30 00:46:21,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-04-30 00:46:21,259 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-30 00:46:21,259 [ scc.repo] DEBUG ## Branches found:
2024-04-30 00:46:21,259 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-30 00:46:21,260 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:21,260 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:21,265 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-30 00:46:21,270 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-30 00:46:21,270 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-30 00:46:21,275 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-30 00:46:21,281 [ scc.git] DEBUG Already up to date.
2024-04-30 00:46:21,282 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-04-30 00:46:21,773 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-04-30 00:46:21,773 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-04-30 00:46:21,779 [ scc.git] DEBUG ## Unique users: []
2024-04-30 00:46:21,779 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:21,779 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:21,785 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-04-30 00:46:21,794 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:21,800 [ 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-04-30 00:46:21,812 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-04-30 00:46:21,813 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:46:21,816 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-04-30 00:46:21,816 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-04-30 00:46:21,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:21,983 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-30 00:46:22,024 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:22,025 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:22,030 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:46:22,071 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-30 00:46:22,078 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08bc1255b0> has no local changes
2024-04-30 00:46:22,079 [ 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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/)'
2024-04-30 00:46:22,088 [ scc.git] DEBUG [detached HEAD 0e48775] merge master -Dorg -Ssuccess-only
2024-04-30 00:46:22,088 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:22,088 [ scc.repo] DEBUG ## PRs found:
2024-04-30 00:46:22,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-04-30 00:46:22,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-04-30 00:46:23,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-04-30 00:46:23,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-30 00:46:24,426 [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-04-30 00:46:24,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-30 00:46:25,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-04-30 00:46:25,269 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-30 00:46:25,269 [ scc.repo] DEBUG ## Branches found:
2024-04-30 00:46:25,269 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-30 00:46:25,269 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:25,269 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:25,276 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-30 00:46:25,282 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-30 00:46:25,282 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-30 00:46:25,288 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-30 00:46:25,295 [ scc.git] DEBUG Already up to date.
2024-04-30 00:46:25,295 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-30 00:46:25,710 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-04-30 00:46:25,710 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-30 00:46:25,715 [ scc.git] DEBUG ## Unique users: []
2024-04-30 00:46:25,715 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:25,716 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:25,721 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-30 00:46:25,728 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:25,733 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-30 00:46:25,786 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-04-30 00:46:25,786 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-04-30 00:46:25,786 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-04-30 00:46:25,786 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-04-30 00:46:25,786 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-04-30 00:46:25,786 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-04-30 00:46:25,786 [ scc.git] DEBUG Auto-merging setup.py
2024-04-30 00:46:25,786 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-04-30 00:46:25,786 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-30 00:46:25,787 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-30 00:46:25,793 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-30 00:46:25,801 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-04-30 00:46:25,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:25,958 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-30 00:46:25,964 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-30 00:46:25,972 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#47](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/views.py
- omero_signup/urls.py
- setup.py
--conflicts
2024-04-30 00:46:25,978 [ scc.config] DEBUG Found github.token
2024-04-30 00:46:25,978 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-04-30 00:46:25,978 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-30 00:46:26,022 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:26,022 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:26,028 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:46:26,076 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-30 00:46:26,083 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08be174df0> has no local changes
2024-04-30 00:46:26,083 [ 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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/)'
2024-04-30 00:46:26,092 [ scc.git] DEBUG [detached HEAD f5143f3] merge master -Dorg -Ssuccess-only
2024-04-30 00:46:26,093 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:26,093 [ scc.repo] DEBUG ## PRs found:
2024-04-30 00:46:26,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-04-30 00:46:26,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-04-30 00:46:27,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-04-30 00:46:27,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-30 00:46:28,384 [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-04-30 00:46:28,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-30 00:46:29,316 [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-04-30 00:46:29,317 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-30 00:46:29,317 [ scc.repo] DEBUG ## Branches found:
2024-04-30 00:46:29,317 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-30 00:46:29,318 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:29,318 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:29,325 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-30 00:46:29,331 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-30 00:46:29,331 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-30 00:46:29,337 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-30 00:46:29,344 [ scc.git] DEBUG Already up to date.
2024-04-30 00:46:29,344 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-04-30 00:46:29,834 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-04-30 00:46:29,835 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-04-30 00:46:29,839 [ scc.git] DEBUG ## Unique users: []
2024-04-30 00:46:29,839 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:29,839 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:29,844 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-04-30 00:46:29,851 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:29,856 [ 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-04-30 00:46:29,896 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:46:29,899 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-04-30 00:46:29,899 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-04-30 00:46:29,899 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-04-30 00:46:29,899 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-04-30 00:46:29,901 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-04-30 00:46:29,902 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-04-30 00:46:29,902 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-04-30 00:46:29,902 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-04-30 00:46:29,903 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-04-30 00:46:29,903 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-04-30 00:46:29,903 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-04-30 00:46:29,903 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-04-30 00:46:29,903 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-04-30 00:46:29,903 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-04-30 00:46:29,903 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-04-30 00:46:29,903 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-04-30 00:46:29,903 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-04-30 00:46:29,903 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-04-30 00:46:29,903 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-04-30 00:46:29,903 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-04-30 00:46:29,903 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-04-30 00:46:29,903 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-04-30 00:46:29,904 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-04-30 00:46:29,904 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-04-30 00:46:29,904 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-04-30 00:46:29,904 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-04-30 00:46:29,904 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-04-30 00:46:29,904 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-04-30 00:46:29,904 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-04-30 00:46:29,904 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-04-30 00:46:29,904 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-04-30 00:46:29,904 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-04-30 00:46:29,904 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-04-30 00:46:29,904 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-04-30 00:46:29,904 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-04-30 00:46:29,904 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-04-30 00:46:29,904 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-04-30 00:46:29,904 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-04-30 00:46:29,904 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-04-30 00:46:29,904 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-04-30 00:46:29,904 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-04-30 00:46:29,904 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-04-30 00:46:29,904 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-04-30 00:46:29,904 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-04-30 00:46:29,904 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-04-30 00:46:30,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:30,069 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-30 00:46:30,113 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:30,114 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:30,121 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:46:30,162 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-30 00:46:30,170 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08be156df0> has no local changes
2024-04-30 00:46:30,170 [ 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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/)'
2024-04-30 00:46:30,192 [ scc.git] DEBUG [detached HEAD 51b658a] merge master -Dorg -Ssuccess-only
2024-04-30 00:46:30,192 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:30,193 [ scc.repo] DEBUG ## PRs found:
2024-04-30 00:46:30,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-04-30 00:46:30,515 [ scc.repo] DEBUG ## Branches found:
2024-04-30 00:46:30,516 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-30 00:46:30,516 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:30,516 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:30,526 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-30 00:46:30,534 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-30 00:46:30,535 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-30 00:46:30,545 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-30 00:46:30,553 [ scc.git] DEBUG Already up to date.
2024-04-30 00:46:30,553 [ scc.git] DEBUG ## Unique users: []
2024-04-30 00:46:30,553 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:30,553 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:30,559 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-30 00:46:30,598 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:30,598 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:30,604 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:46:30,642 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-30 00:46:30,649 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08bc104fa0> has no local changes
2024-04-30 00:46:30,649 [ 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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/)'
2024-04-30 00:46:30,659 [ scc.git] DEBUG [detached HEAD 31e3e48] merge master -Dorg -Ssuccess-only
2024-04-30 00:46:30,660 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:30,660 [ scc.repo] DEBUG ## PRs found:
2024-04-30 00:46:30,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-04-30 00:46:30,959 [ scc.repo] DEBUG ## Branches found:
2024-04-30 00:46:30,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-30 00:46:30,960 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:30,960 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:30,967 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-30 00:46:30,974 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-30 00:46:30,975 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-30 00:46:30,982 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-30 00:46:30,990 [ scc.git] DEBUG Already up to date.
2024-04-30 00:46:30,990 [ scc.git] DEBUG ## Unique users: []
2024-04-30 00:46:30,990 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:30,990 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:30,998 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-30 00:46:31,043 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:31,043 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:31,051 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:46:31,097 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-30 00:46:31,106 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08bc0e2f70> has no local changes
2024-04-30 00:46:31,106 [ 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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/)'
2024-04-30 00:46:31,116 [ scc.git] DEBUG [detached HEAD 331519c] merge master -Dorg -Ssuccess-only
2024-04-30 00:46:31,116 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:31,116 [ scc.git] INFO Overriding base-branch from master to main
2024-04-30 00:46:31,117 [ scc.repo] DEBUG ## PRs found:
2024-04-30 00:46:31,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-04-30 00:46:31,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-04-30 00:46:32,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-04-30 00:46:32,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-04-30 00:46:33,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-30 00:46:33,877 [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-04-30 00:46:34,328 [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-04-30 00:46:34,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-30 00:46:35,179 [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-04-30 00:46:35,180 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-30 00:46:35,180 [ scc.repo] DEBUG ## Branches found:
2024-04-30 00:46:35,181 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-30 00:46:35,181 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:35,181 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:35,187 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-04-30 00:46:35,193 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-30 00:46:35,194 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-04-30 00:46:35,200 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-04-30 00:46:35,207 [ scc.git] DEBUG Already up to date.
2024-04-30 00:46:35,207 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-04-30 00:46:35,623 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-04-30 00:46:35,623 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-04-30 00:46:35,628 [ scc.git] DEBUG ## Unique users: []
2024-04-30 00:46:35,628 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:35,628 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:35,634 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-30 00:46:35,639 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:35,644 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-30 00:46:35,668 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-04-30 00:46:35,669 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-04-30 00:46:35,669 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-30 00:46:35,669 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-30 00:46:35,675 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-30 00:46:35,683 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-04-30 00:46:35,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:35,845 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-30 00:46:35,852 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-30 00:46:35,859 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#47](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-04-30 00:46:35,865 [ scc.config] DEBUG Found github.token
2024-04-30 00:46:35,865 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-04-30 00:46:35,865 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-30 00:46:35,909 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:35,910 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:35,917 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:46:35,965 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-30 00:46:35,981 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08bc0b2430> has no local changes
2024-04-30 00:46:35,982 [ 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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/)'
2024-04-30 00:46:35,996 [ scc.git] DEBUG [detached HEAD 1111489] merge master -Dorg -Ssuccess-only
2024-04-30 00:46:35,996 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:35,996 [ scc.repo] DEBUG ## PRs found:
2024-04-30 00:46:36,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-04-30 00:46:36,269 [ scc.repo] DEBUG ## Branches found:
2024-04-30 00:46:36,269 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-30 00:46:36,269 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:36,269 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:36,276 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-30 00:46:36,283 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-30 00:46:36,283 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-30 00:46:36,292 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-30 00:46:36,299 [ scc.git] DEBUG Already up to date.
2024-04-30 00:46:36,299 [ scc.git] DEBUG ## Unique users: []
2024-04-30 00:46:36,299 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:36,299 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:36,305 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-30 00:46:36,351 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:36,351 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:36,362 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:46:36,405 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-30 00:46:36,412 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08bc0d7e50> has no local changes
2024-04-30 00:46:36,412 [ 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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/)'
2024-04-30 00:46:36,421 [ scc.git] DEBUG [detached HEAD d106b06] merge master -Dorg -Ssuccess-only
2024-04-30 00:46:36,422 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:36,422 [ scc.repo] DEBUG ## PRs found:
2024-04-30 00:46:36,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-04-30 00:46:36,717 [ scc.repo] DEBUG ## Branches found:
2024-04-30 00:46:36,717 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-30 00:46:36,717 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:36,717 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:36,727 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-30 00:46:36,734 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-30 00:46:36,734 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-30 00:46:36,742 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-30 00:46:36,750 [ scc.git] DEBUG Already up to date.
2024-04-30 00:46:36,750 [ scc.git] DEBUG ## Unique users: []
2024-04-30 00:46:36,750 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:36,750 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:36,756 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-30 00:46:36,798 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:36,798 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:36,804 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:46:36,848 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-30 00:46:36,856 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08a47bd940> has no local changes
2024-04-30 00:46:36,856 [ 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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/)'
2024-04-30 00:46:36,866 [ scc.git] DEBUG [detached HEAD d860a18] merge master -Dorg -Ssuccess-only
2024-04-30 00:46:36,866 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:36,867 [ scc.repo] DEBUG ## PRs found:
2024-04-30 00:46:37,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-04-30 00:46:37,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-04-30 00:46:38,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-04-30 00:46:38,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-30 00:46:39,137 [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-04-30 00:46:39,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-30 00:46:39,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-04-30 00:46:39,973 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-04-30 00:46:39,973 [ scc.repo] DEBUG ## Branches found:
2024-04-30 00:46:39,974 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-30 00:46:39,974 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:39,974 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:39,980 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-30 00:46:39,985 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-30 00:46:39,985 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-30 00:46:39,990 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-30 00:46:39,996 [ scc.git] DEBUG Already up to date.
2024-04-30 00:46:39,996 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-04-30 00:46:40,417 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-04-30 00:46:40,417 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-04-30 00:46:40,423 [ scc.git] DEBUG ## Unique users: []
2024-04-30 00:46:40,423 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:40,423 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:40,428 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-30 00:46:40,434 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:40,439 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-30 00:46:40,493 [ scc.git] DEBUG Auto-merging Dockerfile
2024-04-30 00:46:40,493 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-04-30 00:46:40,494 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-30 00:46:40,494 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-30 00:46:40,500 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-30 00:46:40,509 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-04-30 00:46:40,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:40,676 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-30 00:46:40,683 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-30 00:46:40,689 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#47](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-04-30 00:46:40,695 [ scc.config] DEBUG Found github.token
2024-04-30 00:46:40,695 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-04-30 00:46:40,696 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-30 00:46:40,740 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:40,740 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:40,746 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:46:40,794 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-30 00:46:40,803 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08bc0429d0> has no local changes
2024-04-30 00:46:40,803 [ 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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/)'
2024-04-30 00:46:40,814 [ scc.git] DEBUG [detached HEAD 2993498] merge master -Dorg -Ssuccess-only
2024-04-30 00:46:40,814 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:40,815 [ scc.git] INFO Overriding base-branch from master to develop
2024-04-30 00:46:40,815 [ scc.repo] DEBUG ## PRs found:
2024-04-30 00:46:41,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-04-30 00:46:41,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-04-30 00:46:42,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-04-30 00:46:42,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-04-30 00:46:43,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-04-30 00:46:43,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-04-30 00:46:43,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-04-30 00:46:44,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-30 00:46:44,860 [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-04-30 00:46:45,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-30 00:46:45,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-04-30 00:46:45,728 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-30 00:46:46,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-04-30 00:46:46,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-04-30 00:46:47,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-04-30 00:46:47,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-04-30 00:46:47,675 [ scc.repo] DEBUG ## Branches found:
2024-04-30 00:46:47,675 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-30 00:46:47,675 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:47,676 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:47,681 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-04-30 00:46:47,686 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-30 00:46:47,686 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-04-30 00:46:47,692 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-04-30 00:46:47,699 [ scc.git] DEBUG Already up to date.
2024-04-30 00:46:47,699 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-04-30 00:46:48,185 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-04-30 00:46:48,185 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-04-30 00:46:48,191 [ scc.git] DEBUG ## Unique users: []
2024-04-30 00:46:48,192 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:48,192 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:48,198 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-30 00:46:48,205 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:48,211 [ 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-04-30 00:46:48,258 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-04-30 00:46:48,259 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-04-30 00:46:48,259 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-30 00:46:48,259 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-30 00:46:48,266 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-30 00:46:48,273 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-04-30 00:46:48,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:48,439 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-30 00:46:48,449 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-30 00:46:48,458 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#47](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-04-30 00:46:48,464 [ scc.config] DEBUG Found github.token
2024-04-30 00:46:48,464 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-04-30 00:46:48,465 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-30 00:46:48,508 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:46:48,508 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:46:48,514 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:46:48,561 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-30 00:46:48,569 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08a47bdbb0> has no local changes
2024-04-30 00:46:48,570 [ 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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/)'
2024-04-30 00:46:48,590 [ scc.git] DEBUG [detached HEAD a3458ab] merge master -Dorg -Ssuccess-only
2024-04-30 00:46:48,591 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:48,591 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:46:48,682 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-04-30 00:46:48,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:48,859 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-04-30 00:46:48,866 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-04-30 00:46:49,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:49,277 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-04-30 00:46:49,283 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-04-30 00:46:49,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:49,698 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-04-30 00:46:49,705 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-04-30 00:46:50,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:50,125 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-04-30 00:46:50,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:50,517 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-04-30 00:46:50,524 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-04-30 00:46:50,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:50,931 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-04-30 00:46:50,940 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-04-30 00:46:51,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:51,345 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-04-30 00:46:51,351 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-04-30 00:46:51,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:51,755 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-04-30 00:46:51,762 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-04-30 00:46:52,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:52,179 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-04-30 00:46:52,186 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-04-30 00:46:52,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:52,591 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-04-30 00:46:52,597 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-04-30 00:46:52,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:53,005 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-04-30 00:46:53,010 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-04-30 00:46:53,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:53,420 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-04-30 00:46:53,426 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-04-30 00:46:53,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:53,836 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-04-30 00:46:54,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:54,257 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-04-30 00:46:54,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:54,668 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-04-30 00:46:54,674 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-04-30 00:46:55,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:55,084 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-04-30 00:46:55,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:55,507 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-04-30 00:46:55,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:55,906 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-04-30 00:46:55,912 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-04-30 00:46:56,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:56,306 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-04-30 00:46:56,311 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-04-30 00:46:56,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:56,725 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-04-30 00:46:56,733 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-04-30 00:46:57,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:57,148 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-04-30 00:46:57,154 [ scc.config] DEBUG Found submodule.scripts.url
2024-04-30 00:46:57,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:46:57,574 [ scc.config] DEBUG Found submodule.scripts.branch
2024-04-30 00:46:57,574 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-30 00:46:57,692 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08bf2f9ac0> has local changes
2024-04-30 00:46:57,693 [ 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 362 dependabot[bot] 'Bump scripts from `2078ac7` to `5a90893`'
- PR 364 dependabot[bot] 'Bump omero-figure from `ded0caa` to `e5a45d6`'
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'
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 543 will-moore 'Plate well labels' (stage: draft)
Updating e5a45d60..6bdf72cb
Previously merged:
- PR 557 dependabot[bot] 'Bump vite from 3.0.4 to 3.2.10'
- PR 558 dependabot[bot] 'Bump postcss from 8.4.14 to 8.4.38'
- PR 477 will-moore 'Vite'
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 554 jburel 'Update publish'
- 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 469 will-moore 'changelog 0.14.0'
- PR 470 will-moore 'Movie playing waits for planes'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 474 will-moore 'Img data error handling'
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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/47/)'
2024-04-30 00:46:57,712 [ scc.git] DEBUG [detached HEAD 01305a8] merge master -Dorg -Ssuccess-only
2024-04-30 00:46:57,712 [ scc.merge] INFO Repository: ome/omero-plugins
2024-04-30 00:46:57,712 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-04-30 00:46:57,712 [ scc.merge] INFO Already up to date.
2024-04-30 00:46:57,713 [ scc.merge] INFO
2024-04-30 00:46:57,713 [ scc.merge] INFO Merged PRs:
2024-04-30 00:46:57,713 [ scc.merge] INFO - PR 362 dependabot[bot] 'Bump scripts from `2078ac7` to `5a90893`'
2024-04-30 00:46:57,713 [ scc.merge] INFO - PR 364 dependabot[bot] 'Bump omero-figure from `ded0caa` to `e5a45d6`'
2024-04-30 00:46:57,713 [ scc.merge] INFO
2024-04-30 00:46:57,713 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-04-30 00:46:57,713 [ scc.merge] INFO Already up to date.
2024-04-30 00:46:57,713 [ scc.merge] INFO
2024-04-30 00:46:57,713 [ scc.merge] INFO
2024-04-30 00:46:57,713 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-04-30 00:46:57,713 [ scc.merge] INFO Excluded PRs:
2024-04-30 00:46:57,713 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-04-30 00:46:57,713 [ scc.merge] INFO Already up to date.
2024-04-30 00:46:57,713 [ scc.merge] INFO
2024-04-30 00:46:57,713 [ scc.merge] INFO Merged PRs:
2024-04-30 00:46:57,713 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-04-30 00:46:57,713 [ scc.merge] INFO
2024-04-30 00:46:57,713 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-04-30 00:46:57,713 [ scc.merge] INFO Excluded PRs:
2024-04-30 00:46:57,713 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-04-30 00:46:57,713 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-04-30 00:46:57,713 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-04-30 00:46:57,713 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-04-30 00:46:57,713 [ scc.merge] INFO Already up to date.
2024-04-30 00:46:57,713 [ scc.merge] INFO
2024-04-30 00:46:57,713 [ scc.merge] INFO Merged PRs:
2024-04-30 00:46:57,713 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-04-30 00:46:57,713 [ scc.merge] INFO
2024-04-30 00:46:57,713 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-04-30 00:46:57,713 [ scc.merge] INFO Excluded PRs:
2024-04-30 00:46:57,713 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-30 00:46:57,713 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-04-30 00:46:57,714 [ scc.merge] INFO Already up to date.
2024-04-30 00:46:57,714 [ scc.merge] INFO
2024-04-30 00:46:57,714 [ scc.merge] INFO Merged PRs:
2024-04-30 00:46:57,714 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-04-30 00:46:57,714 [ scc.merge] INFO
2024-04-30 00:46:57,714 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-30 00:46:57,714 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-04-30 00:46:57,714 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-04-30 00:46:57,714 [ scc.merge] INFO
2024-04-30 00:46:57,714 [ scc.merge] INFO Repository: ome/omero-figure
2024-04-30 00:46:57,714 [ scc.merge] INFO Excluded PRs:
2024-04-30 00:46:57,714 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-04-30 00:46:57,714 [ scc.merge] INFO Updating e5a45d60..6bdf72cb
2024-04-30 00:46:57,714 [ scc.merge] INFO Previously merged:
2024-04-30 00:46:57,714 [ scc.merge] INFO - PR 557 dependabot[bot] 'Bump vite from 3.0.4 to 3.2.10'
2024-04-30 00:46:57,714 [ scc.merge] INFO - PR 558 dependabot[bot] 'Bump postcss from 8.4.14 to 8.4.38'
2024-04-30 00:46:57,714 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-04-30 00:46:57,714 [ scc.merge] INFO
2024-04-30 00:46:57,714 [ scc.merge] INFO Merged PRs:
2024-04-30 00:46:57,714 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-04-30 00:46:57,714 [ scc.merge] INFO - PR 554 jburel 'Update publish'
2024-04-30 00:46:57,714 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-04-30 00:46:57,714 [ scc.merge] INFO
2024-04-30 00:46:57,714 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-04-30 00:46:57,714 [ scc.merge] INFO Already up to date.
2024-04-30 00:46:57,714 [ scc.merge] INFO
2024-04-30 00:46:57,714 [ scc.merge] INFO Merged PRs:
2024-04-30 00:46:57,714 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-04-30 00:46:57,714 [ scc.merge] INFO
2024-04-30 00:46:57,714 [ scc.merge] INFO Repository: ome/omero-gallery
2024-04-30 00:46:57,714 [ scc.merge] INFO Already up to date.
2024-04-30 00:46:57,714 [ scc.merge] INFO
2024-04-30 00:46:57,714 [ scc.merge] INFO Merged PRs:
2024-04-30 00:46:57,714 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-30 00:46:57,714 [ scc.merge] INFO
2024-04-30 00:46:57,714 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-04-30 00:46:57,714 [ scc.merge] INFO Excluded PRs:
2024-04-30 00:46:57,715 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-04-30 00:46:57,715 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-04-30 00:46:57,715 [ scc.merge] INFO Already up to date.
2024-04-30 00:46:57,715 [ scc.merge] INFO
2024-04-30 00:46:57,715 [ scc.merge] INFO Merged PRs:
2024-04-30 00:46:57,715 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-04-30 00:46:57,715 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-04-30 00:46:57,715 [ scc.merge] INFO - PR 469 will-moore 'changelog 0.14.0'
2024-04-30 00:46:57,715 [ scc.merge] INFO - PR 470 will-moore 'Movie playing waits for planes'
2024-04-30 00:46:57,715 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-04-30 00:46:57,715 [ scc.merge] INFO - PR 474 will-moore 'Img data error handling'
2024-04-30 00:46:57,715 [ scc.merge] INFO
2024-04-30 00:46:57,715 [ scc.merge] INFO Repository: ome/omero-mapr
2024-04-30 00:46:57,715 [ scc.merge] INFO Excluded PRs:
2024-04-30 00:46:57,715 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-04-30 00:46:57,715 [ scc.merge] INFO Already up to date.
2024-04-30 00:46:57,715 [ scc.merge] INFO
2024-04-30 00:46:57,715 [ scc.merge] INFO Merged PRs:
2024-04-30 00:46:57,715 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-04-30 00:46:57,715 [ scc.merge] INFO
2024-04-30 00:46:57,715 [ scc.merge] INFO Repository: ome/omero-metadata
2024-04-30 00:46:57,715 [ scc.merge] INFO Already up to date.
2024-04-30 00:46:57,715 [ scc.merge] INFO
2024-04-30 00:46:57,715 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-30 00:46:57,715 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-30 00:46:57,715 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-30 00:46:57,715 [ scc.merge] INFO
2024-04-30 00:46:57,715 [ scc.merge] INFO Repository: ome/omero-parade
2024-04-30 00:46:57,715 [ scc.merge] INFO Excluded PRs:
2024-04-30 00:46:57,715 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-04-30 00:46:57,715 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-04-30 00:46:57,715 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-04-30 00:46:57,715 [ scc.merge] INFO Already up to date.
2024-04-30 00:46:57,715 [ scc.merge] INFO
2024-04-30 00:46:57,715 [ scc.merge] INFO Merged PRs:
2024-04-30 00:46:57,715 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-30 00:46:57,715 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-30 00:46:57,716 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-30 00:46:57,716 [ scc.merge] INFO
2024-04-30 00:46:57,716 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-04-30 00:46:57,716 [ scc.merge] INFO Already up to date.
2024-04-30 00:46:57,716 [ scc.merge] INFO
2024-04-30 00:46:57,716 [ scc.merge] INFO Merged PRs:
2024-04-30 00:46:57,716 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-04-30 00:46:57,716 [ scc.merge] INFO
2024-04-30 00:46:57,716 [ scc.merge] INFO Repository: ome/omero-rois
2024-04-30 00:46:57,716 [ scc.merge] INFO Excluded PRs:
2024-04-30 00:46:57,716 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-30 00:46:57,716 [ scc.merge] INFO Already up to date.
2024-04-30 00:46:57,716 [ scc.merge] INFO
2024-04-30 00:46:57,716 [ scc.merge] INFO Merged PRs:
2024-04-30 00:46:57,716 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-30 00:46:57,716 [ scc.merge] INFO
2024-04-30 00:46:57,716 [ scc.merge] INFO Repository: ome/omero-signup
2024-04-30 00:46:57,716 [ scc.merge] INFO Already up to date.
2024-04-30 00:46:57,716 [ scc.merge] INFO
2024-04-30 00:46:57,716 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-30 00:46:57,716 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-30 00:46:57,716 [ scc.merge] INFO
2024-04-30 00:46:57,716 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-04-30 00:46:57,716 [ scc.merge] INFO Already up to date.
2024-04-30 00:46:57,716 [ scc.merge] INFO
2024-04-30 00:46:57,716 [ scc.merge] INFO Merged PRs:
2024-04-30 00:46:57,716 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-30 00:46:57,716 [ scc.merge] INFO
2024-04-30 00:46:57,716 [ scc.merge] INFO Repository: ome/omero-upload
2024-04-30 00:46:57,716 [ scc.merge] INFO Already up to date.
2024-04-30 00:46:57,716 [ scc.merge] INFO
2024-04-30 00:46:57,716 [ scc.merge] INFO
2024-04-30 00:46:57,716 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-04-30 00:46:57,716 [ scc.merge] INFO Already up to date.
2024-04-30 00:46:57,716 [ scc.merge] INFO
2024-04-30 00:46:57,716 [ scc.merge] INFO
2024-04-30 00:46:57,716 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-04-30 00:46:57,717 [ scc.merge] INFO Excluded PRs:
2024-04-30 00:46:57,717 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-04-30 00:46:57,717 [ scc.merge] INFO Already up to date.
2024-04-30 00:46:57,717 [ scc.merge] INFO
2024-04-30 00:46:57,717 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-30 00:46:57,717 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-30 00:46:57,717 [ scc.merge] INFO
2024-04-30 00:46:57,717 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-04-30 00:46:57,717 [ scc.merge] INFO Already up to date.
2024-04-30 00:46:57,717 [ scc.merge] INFO
2024-04-30 00:46:57,717 [ scc.merge] INFO
2024-04-30 00:46:57,717 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-04-30 00:46:57,717 [ scc.merge] INFO Already up to date.
2024-04-30 00:46:57,717 [ scc.merge] INFO
2024-04-30 00:46:57,717 [ scc.merge] INFO
2024-04-30 00:46:57,717 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-04-30 00:46:57,717 [ scc.merge] INFO Already up to date.
2024-04-30 00:46:57,717 [ scc.merge] INFO
2024-04-30 00:46:57,717 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-30 00:46:57,717 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-04-30 00:46:57,717 [ scc.merge] INFO
2024-04-30 00:46:57,717 [ scc.merge] INFO Repository: ome/scripts
2024-04-30 00:46:57,717 [ scc.merge] INFO Excluded PRs:
2024-04-30 00:46:57,717 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-04-30 00:46:57,717 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-04-30 00:46:57,717 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-04-30 00:46:57,717 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-04-30 00:46:57,717 [ scc.merge] INFO Already up to date.
2024-04-30 00:46:57,717 [ scc.merge] INFO
2024-04-30 00:46:57,717 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-30 00:46:57,717 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-30 00:46:57,717 [ scc.merge] INFO
2024-04-30 00:46:57,717 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-30 00:46:57,718 [ scc.git] DEBUG Calling 'git remote'
2024-04-30 00:46:57,724 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-04-30 00:46:57,724 [ scc.git] DEBUG Calling 'git remote'
2024-04-30 00:46:57,730 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:57,731 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-04-30 00:46:57,731 [ scc.git] DEBUG Calling 'git remote'
2024-04-30 00:46:57,739 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:57,739 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-04-30 00:46:57,739 [ scc.git] DEBUG Calling 'git remote'
2024-04-30 00:46:57,746 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:57,746 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-04-30 00:46:57,746 [ scc.git] DEBUG Calling 'git remote'
2024-04-30 00:46:57,753 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:57,753 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-04-30 00:46:57,753 [ scc.git] DEBUG Calling 'git remote'
2024-04-30 00:46:57,760 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:57,760 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-30 00:46:57,760 [ scc.git] DEBUG Calling 'git remote'
2024-04-30 00:46:57,767 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:57,767 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-30 00:46:57,767 [ scc.git] DEBUG Calling 'git remote'
2024-04-30 00:46:57,773 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:57,774 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-30 00:46:57,774 [ scc.git] DEBUG Calling 'git remote'
2024-04-30 00:46:57,782 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:57,782 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-30 00:46:57,782 [ scc.git] DEBUG Calling 'git remote'
2024-04-30 00:46:57,790 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:57,790 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-30 00:46:57,790 [ scc.git] DEBUG Calling 'git remote'
2024-04-30 00:46:57,798 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:57,798 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-30 00:46:57,798 [ scc.git] DEBUG Calling 'git remote'
2024-04-30 00:46:57,805 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:57,805 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-30 00:46:57,806 [ scc.git] DEBUG Calling 'git remote'
2024-04-30 00:46:57,813 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:57,813 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-30 00:46:57,813 [ scc.git] DEBUG Calling 'git remote'
2024-04-30 00:46:57,822 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:57,823 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-30 00:46:57,823 [ scc.git] DEBUG Calling 'git remote'
2024-04-30 00:46:57,830 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:57,831 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-30 00:46:57,831 [ scc.git] DEBUG Calling 'git remote'
2024-04-30 00:46:57,836 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:57,837 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-30 00:46:57,837 [ scc.git] DEBUG Calling 'git remote'
2024-04-30 00:46:57,842 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:57,842 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-30 00:46:57,842 [ scc.git] DEBUG Calling 'git remote'
2024-04-30 00:46:57,848 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:57,848 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-30 00:46:57,848 [ scc.git] DEBUG Calling 'git remote'
2024-04-30 00:46:57,854 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:57,854 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-30 00:46:57,854 [ scc.git] DEBUG Calling 'git remote'
2024-04-30 00:46:57,860 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:57,861 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-30 00:46:57,861 [ scc.git] DEBUG Calling 'git remote'
2024-04-30 00:46:57,867 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:57,868 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-30 00:46:57,868 [ scc.git] DEBUG Calling 'git remote'
2024-04-30 00:46:57,876 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-30 00:46:57,876 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-30 00:46:57,876 [ scc.git] DEBUG Calling 'git remote'
2024-04-30 00:46:57,882 [ 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.8.2 to 5.9.1-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 aac7e76] 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 e5a45d60
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 9d8d147
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 a0148a6
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 f501ddc] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-04-30 00:47:44,920 [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-04-30 00:47:53,979 [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-04-30 00:47:56,393 [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-04-30 00:48:01,079 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-04-30 00:48:49,332 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/b864b239/images/svgs/logo.svg){kind=logo}
