Skipping 117 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-08-15 00:42:51,689 [ scc.git] DEBUG * branch refs/pull/560/head -> FETCH_HEAD
2024-08-15 00:42:51,695 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-08-15 00:42:51,979 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-15 00:42:51,979 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-08-15 00:42:51,985 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-08-15 00:42:52,280 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-08-15 00:42:52,280 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-08-15 00:42:52,285 [ scc.git] DEBUG ## Unique users: []
2024-08-15 00:42:52,285 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:42:52,285 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:42:52,291 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-08-15 00:42:52,300 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:42:52,306 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) f7d26b972bfe9a7105c4f94776748446f2395c77'
2024-08-15 00:42:52,325 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-15 00:42:52,325 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-15 00:42:52,326 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-15 00:42:52,332 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-08-15 00:42:52,332 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-08-15 00:42:52,332 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-08-15 00:42:52,332 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-08-15 00:42:52,332 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-08-15 00:42:52,335 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-08-15 00:42:52,335 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-08-15 00:42:52,335 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-08-15 00:42:52,335 [ scc.git] DEBUG src/templates/rois_form.template.html | 8 ++++
2024-08-15 00:42:52,335 [ scc.git] DEBUG 9 files changed, 271 insertions(+), 5 deletions(-)
2024-08-15 00:42:52,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:42:52,464 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-08-15 00:42:52,474 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:42:52,482 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-08-15 00:42:52,508 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-15 00:42:52,508 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-15 00:42:52,508 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-08-15 00:42:52,508 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-08-15 00:42:52,508 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-15 00:42:52,516 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-08-15 00:42:52,516 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-08-15 00:42:52,516 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-08-15 00:42:52,516 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-08-15 00:42:52,516 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-08-15 00:42:52,516 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-08-15 00:42:52,516 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-08-15 00:42:52,517 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-08-15 00:42:52,517 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-08-15 00:42:52,517 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-08-15 00:42:52,517 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-08-15 00:42:52,517 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-08-15 00:42:52,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:42:52,844 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-08-15 00:42:52,853 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:42:52,858 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) 3d9cfe3235c6041ddc6c16d5f803ab4e8f82c39c'
2024-08-15 00:42:52,890 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-08-15 00:42:52,890 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-15 00:42:52,890 [ scc.git] DEBUG Auto-merging src/index.html
2024-08-15 00:42:52,890 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-08-15 00:42:52,890 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-15 00:42:52,891 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-15 00:42:52,891 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-15 00:42:52,899 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-08-15 00:42:52,899 [ scc.git] DEBUG omero_figure/urls.py | 10 +++-
2024-08-15 00:42:52,899 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-08-15 00:42:52,899 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-08-15 00:42:52,899 [ scc.git] DEBUG src/index.html | 1 +
2024-08-15 00:42:52,899 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-08-15 00:42:52,899 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-08-15 00:42:52,899 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-08-15 00:42:52,899 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-08-15 00:42:52,899 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-08-15 00:42:52,899 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-08-15 00:42:52,899 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-08-15 00:42:52,899 [ scc.git] DEBUG src/templates/image_display_options.template.html | 4 +-
2024-08-15 00:42:52,899 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-08-15 00:42:52,899 [ scc.git] DEBUG 14 files changed, 162 insertions(+), 15 deletions(-)
2024-08-15 00:42:53,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:42:53,234 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-08-15 00:42:53,243 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:42:53,248 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 568 (Remove numpy from tests_require in setup.py) 15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-08-15 00:42:53,264 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-15 00:42:53,267 [ scc.git] DEBUG setup.py | 2 +-
2024-08-15 00:42:53,267 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-15 00:42:53,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:42:53,623 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...84186c0c62398b8ddbbe47dabea7f16cb7913e99'
2024-08-15 00:42:53,633 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:42:53,638 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 576 (Color picker - popup update) 84186c0c62398b8ddbbe47dabea7f16cb7913e99'
2024-08-15 00:42:53,656 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-15 00:42:53,656 [ scc.git] DEBUG Auto-merging src/index.html
2024-08-15 00:42:53,657 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-15 00:42:53,661 [ scc.git] DEBUG src/css/figure.css | 3 +++
2024-08-15 00:42:53,661 [ scc.git] DEBUG src/index.html | 5 ++++-
2024-08-15 00:42:53,661 [ scc.git] DEBUG src/js/views/colorpicker.js | 14 ++++++++++++--
2024-08-15 00:42:53,661 [ scc.git] DEBUG 3 files changed, 19 insertions(+), 3 deletions(-)
2024-08-15 00:42:54,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:42:54,003 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-15 00:42:54,044 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:42:54,045 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:42:54,050 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-15 00:42:54,091 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-15 00:42:54,100 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb33c22c4f0> has no local changes
2024-08-15 00:42:54,100 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 578 Rdornier 'Image outline' (user: Rdornier)
- PR 577 Rdornier 'Fill rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 576 Rdornier 'Color picker - popup update'
Generated by OMERO-plugins-push#154 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/)'
2024-08-15 00:42:54,111 [ scc.git] DEBUG [detached HEAD 845695e8] merge master -Dorg -Ssuccess-only
2024-08-15 00:42:54,112 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:42:54,112 [ scc.repo] DEBUG ## PRs found:
2024-08-15 00:42:54,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-08-15 00:42:54,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-08-15 00:42:55,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-08-15 00:42:55,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-15 00:42:56,285 [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-08-15 00:42:56,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-15 00:42:57,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-08-15 00:42:57,082 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-08-15 00:42:57,083 [ scc.repo] DEBUG ## Branches found:
2024-08-15 00:42:57,083 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-15 00:42:57,083 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:42:57,083 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:42:57,089 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-15 00:42:57,095 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-15 00:42:57,096 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-15 00:42:57,102 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-15 00:42:57,109 [ scc.git] DEBUG Already up to date.
2024-08-15 00:42:57,109 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-08-15 00:42:57,434 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-08-15 00:42:57,434 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-08-15 00:42:57,440 [ scc.git] DEBUG ## Unique users: []
2024-08-15 00:42:57,440 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:42:57,440 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:42:57,446 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-15 00:42:57,453 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:42:57,459 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-15 00:42:57,469 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-08-15 00:42:57,470 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-15 00:42:57,472 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-08-15 00:42:57,472 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-08-15 00:42:57,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:42:57,612 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-15 00:42:57,658 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:42:57,658 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:42:57,664 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-15 00:42:57,705 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-15 00:42:57,712 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb33da8b700> has no local changes
2024-08-15 00:42:57,713 [ 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#154 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/)'
2024-08-15 00:42:57,721 [ scc.git] DEBUG [detached HEAD ba6945f] merge master -Dorg -Ssuccess-only
2024-08-15 00:42:57,722 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:42:57,722 [ scc.repo] DEBUG ## PRs found:
2024-08-15 00:42:58,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-08-15 00:42:58,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-08-15 00:42:58,535 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-15 00:42:59,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-15 00:42:59,582 [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-08-15 00:43:00,051 [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-08-15 00:43:00,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-15 00:43:00,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-08-15 00:43:00,859 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-15 00:43:00,859 [ scc.repo] DEBUG ## Branches found:
2024-08-15 00:43:00,859 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-15 00:43:00,859 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:43:00,859 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:00,865 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-15 00:43:00,871 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-15 00:43:00,871 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-15 00:43:00,877 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-15 00:43:00,884 [ scc.git] DEBUG Already up to date.
2024-08-15 00:43:00,885 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-08-15 00:43:01,221 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-08-15 00:43:01,221 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-08-15 00:43:01,228 [ scc.git] DEBUG ## Unique users: []
2024-08-15 00:43:01,228 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:43:01,228 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:01,236 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-08-15 00:43:01,243 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:01,250 [ 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-08-15 00:43:01,264 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-15 00:43:01,269 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-08-15 00:43:01,269 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-08-15 00:43:01,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:43:01,437 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-15 00:43:01,483 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:43:01,483 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:01,490 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-15 00:43:01,533 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-15 00:43:01,541 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb33dad2b50> has no local changes
2024-08-15 00:43:01,542 [ 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#154 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/)'
2024-08-15 00:43:01,552 [ scc.git] DEBUG [detached HEAD 3e8945a] merge master -Dorg -Ssuccess-only
2024-08-15 00:43:01,553 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:43:01,553 [ scc.repo] DEBUG ## PRs found:
2024-08-15 00:43:01,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-08-15 00:43:02,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-08-15 00:43:02,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-08-15 00:43:02,844 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-15 00:43:03,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-15 00:43:03,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-15 00:43:04,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-15 00:43:04,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-15 00:43:05,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-08-15 00:43:05,321 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-15 00:43:05,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-08-15 00:43:05,760 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-15 00:43:06,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-15 00:43:06,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-15 00:43:07,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-15 00:43:07,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-15 00:43:08,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-08-15 00:43:08,249 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-15 00:43:08,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-08-15 00:43:09,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-08-15 00:43:09,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-15 00:43:10,104 [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-08-15 00:43:10,529 [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-08-15 00:43:11,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-15 00:43:11,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-08-15 00:43:11,407 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-15 00:43:11,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-08-15 00:43:12,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-08-15 00:43:12,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-15 00:43:13,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-15 00:43:13,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-15 00:43:14,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-15 00:43:14,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-08-15 00:43:14,708 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-08-15 00:43:15,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-08-15 00:43:15,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-08-15 00:43:16,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-15 00:43:16,567 [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-08-15 00:43:16,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-15 00:43:17,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-08-15 00:43:17,381 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-08-15 00:43:17,382 [ scc.repo] DEBUG ## Branches found:
2024-08-15 00:43:17,382 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-15 00:43:17,382 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:43:17,382 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:17,389 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-15 00:43:17,394 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-15 00:43:17,395 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-15 00:43:17,401 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-15 00:43:17,408 [ scc.git] DEBUG Already up to date.
2024-08-15 00:43:17,408 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-08-15 00:43:17,730 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-15 00:43:17,730 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-08-15 00:43:17,735 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-08-15 00:43:18,028 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-15 00:43:18,028 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-08-15 00:43:18,034 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-08-15 00:43:18,317 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-15 00:43:18,317 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-08-15 00:43:18,323 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-08-15 00:43:18,607 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-15 00:43:18,607 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-08-15 00:43:18,613 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-08-15 00:43:18,931 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-15 00:43:18,931 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-08-15 00:43:18,937 [ scc.git] DEBUG ## Unique users: []
2024-08-15 00:43:18,937 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:43:18,938 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:18,945 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-15 00:43:18,952 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:18,958 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-15 00:43:18,974 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-08-15 00:43:18,974 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-15 00:43:18,978 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-08-15 00:43:18,978 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-08-15 00:43:18,979 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-08-15 00:43:19,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:43:19,116 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-15 00:43:19,125 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:19,133 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-15 00:43:19,155 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-08-15 00:43:19,156 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-08-15 00:43:19,156 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-08-15 00:43:19,156 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-08-15 00:43:19,156 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-15 00:43:19,161 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-08-15 00:43:19,161 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-08-15 00:43:19,161 [ scc.git] DEBUG src/app/header.html | 5 +
2024-08-15 00:43:19,162 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-08-15 00:43:19,162 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-08-15 00:43:19,162 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-08-15 00:43:19,162 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-08-15 00:43:19,162 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-08-15 00:43:19,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:43:19,508 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-15 00:43:19,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:19,524 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-15 00:43:19,540 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-08-15 00:43:19,541 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-15 00:43:19,546 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-08-15 00:43:19,546 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-08-15 00:43:19,546 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-08-15 00:43:19,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:43:19,895 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-15 00:43:19,903 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:19,908 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-15 00:43:19,924 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-15 00:43:19,933 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-08-15 00:43:19,933 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-08-15 00:43:20,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:43:20,289 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-08-15 00:43:20,297 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:20,303 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 478 (Bump socket.io from 4.6.1 to 4.7.5) 91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-08-15 00:43:20,338 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-15 00:43:20,339 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-15 00:43:20,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:43:20,678 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-15 00:43:20,722 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:43:20,722 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:20,728 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-15 00:43:20,775 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-15 00:43:20,782 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb33da9ad60> has no local changes
2024-08-15 00:43:20,783 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
Generated by OMERO-plugins-push#154 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/)'
2024-08-15 00:43:20,792 [ scc.git] DEBUG [detached HEAD 4376d5a] merge master -Dorg -Ssuccess-only
2024-08-15 00:43:20,792 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:43:20,793 [ scc.repo] DEBUG ## PRs found:
2024-08-15 00:43:21,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-08-15 00:43:21,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/85 HTTP/1.1" 200 None
2024-08-15 00:43:22,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/85/comments HTTP/1.1" 200 None
2024-08-15 00:43:22,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/5166040a15b493631009b9e446f25b6a724289e3 HTTP/1.1" 200 None
2024-08-15 00:43:23,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/5166040a15b493631009b9e446f25b6a724289e3/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-15 00:43:23,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/5166040a15b493631009b9e446f25b6a724289e3/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-15 00:43:23,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-08-15 00:43:24,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-08-15 00:43:25,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-15 00:43:25,577 [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-08-15 00:43:26,028 [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-08-15 00:43:26,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-15 00:43:26,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-08-15 00:43:26,950 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-08-15 00:43:26,950 [ scc.repo] DEBUG ## Branches found:
2024-08-15 00:43:26,950 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-15 00:43:26,950 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:43:26,950 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:26,956 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-15 00:43:26,961 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-15 00:43:26,962 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-15 00:43:26,967 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-15 00:43:26,972 [ scc.git] DEBUG Already up to date.
2024-08-15 00:43:26,973 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-08-15 00:43:27,280 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-08-15 00:43:27,280 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-08-15 00:43:27,285 [ scc.git] DEBUG ## Unique users: []
2024-08-15 00:43:27,285 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:43:27,285 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:27,291 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-15 00:43:27,297 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:27,302 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-15 00:43:27,312 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-15 00:43:27,314 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-08-15 00:43:27,314 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-08-15 00:43:27,314 [ scc.git] DEBUG requirements.txt | 2 +-
2024-08-15 00:43:27,314 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-08-15 00:43:27,314 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-08-15 00:43:27,314 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-08-15 00:43:27,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:43:27,482 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-15 00:43:27,524 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:43:27,525 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:27,530 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-15 00:43:27,572 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-15 00:43:27,580 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb33da9ef10> has no local changes
2024-08-15 00:43:27,580 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- PR 85 sbesson 'Add support for OMERO.web 5.27.0' (status: failure)
- 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#154 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/)'
2024-08-15 00:43:27,589 [ scc.git] DEBUG [detached HEAD dba10c4] merge master -Dorg -Ssuccess-only
2024-08-15 00:43:27,589 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:43:27,589 [ scc.repo] DEBUG ## PRs found:
2024-08-15 00:43:28,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-08-15 00:43:28,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-08-15 00:43:29,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-08-15 00:43:29,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-15 00:43:30,014 [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-08-15 00:43:30,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-15 00:43:30,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-08-15 00:43:30,984 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-15 00:43:31,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-08-15 00:43:31,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-08-15 00:43:32,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-15 00:43:32,799 [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-08-15 00:43:33,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-15 00:43:33,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-08-15 00:43:33,685 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-15 00:43:33,685 [ scc.repo] DEBUG ## Branches found:
2024-08-15 00:43:33,685 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-15 00:43:33,685 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:43:33,685 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:33,692 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-15 00:43:33,697 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-15 00:43:33,698 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-15 00:43:33,703 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-15 00:43:33,712 [ scc.git] DEBUG Already up to date.
2024-08-15 00:43:33,713 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-08-15 00:43:34,033 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-15 00:43:34,033 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-08-15 00:43:34,038 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-08-15 00:43:34,342 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-15 00:43:34,342 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-08-15 00:43:34,347 [ scc.git] DEBUG ## Unique users: []
2024-08-15 00:43:34,347 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:43:34,347 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:34,353 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-15 00:43:34,359 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:34,364 [ 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-08-15 00:43:34,379 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-08-15 00:43:34,379 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-08-15 00:43:34,379 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-15 00:43:34,379 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-15 00:43:34,379 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-15 00:43:34,380 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-15 00:43:34,386 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-15 00:43:34,393 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-15 00:43:34,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:43:34,523 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-15 00:43:34,530 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-15 00:43:34,535 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#154](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-08-15 00:43:34,540 [ scc.config] DEBUG Found github.token
2024-08-15 00:43:34,540 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-08-15 00:43:34,540 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-15 00:43:34,548 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:34,554 [ 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-08-15 00:43:34,571 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-15 00:43:34,572 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-15 00:43:34,572 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-08-15 00:43:34,572 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-15 00:43:34,572 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-15 00:43:34,580 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-15 00:43:34,588 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-15 00:43:34,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:43:34,904 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-15 00:43:34,912 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-15 00:43:34,919 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#154](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/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-08-15 00:43:34,926 [ scc.config] DEBUG Found github.token
2024-08-15 00:43:34,926 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-08-15 00:43:34,927 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-15 00:43:34,970 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:43:34,970 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:34,975 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-15 00:43:35,019 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-15 00:43:35,028 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb33c260f40> has no local changes
2024-08-15 00:43:35,028 [ 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#154 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/)'
2024-08-15 00:43:35,039 [ scc.git] DEBUG [detached HEAD 41b1b4d] merge master -Dorg -Ssuccess-only
2024-08-15 00:43:35,039 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:43:35,039 [ scc.repo] DEBUG ## PRs found:
2024-08-15 00:43:35,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-08-15 00:43:35,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-08-15 00:43:35,943 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-15 00:43:36,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-15 00:43:36,955 [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-08-15 00:43:37,391 [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-08-15 00:43:37,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-15 00:43:38,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-08-15 00:43:38,341 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-15 00:43:38,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-08-15 00:43:38,801 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-15 00:43:39,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-15 00:43:39,905 [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-08-15 00:43:40,337 [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-08-15 00:43:40,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-15 00:43:41,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-08-15 00:43:41,181 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-15 00:43:41,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-08-15 00:43:41,629 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-15 00:43:42,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-15 00:43:42,711 [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-08-15 00:43:43,158 [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-08-15 00:43:43,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-15 00:43:44,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-08-15 00:43:44,014 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-15 00:43:44,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-08-15 00:43:44,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-08-15 00:43:45,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-08-15 00:43:45,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-08-15 00:43:46,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-08-15 00:43:46,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-08-15 00:43:46,747 [ scc.repo] DEBUG ## Branches found:
2024-08-15 00:43:46,747 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-15 00:43:46,747 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:43:46,747 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:46,754 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-15 00:43:46,760 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-15 00:43:46,761 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-15 00:43:46,768 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-15 00:43:46,775 [ scc.git] DEBUG Already up to date.
2024-08-15 00:43:46,776 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-08-15 00:43:47,148 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-15 00:43:47,148 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-08-15 00:43:47,155 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-08-15 00:43:47,459 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-15 00:43:47,459 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-08-15 00:43:47,464 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-08-15 00:43:47,807 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-15 00:43:47,808 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-08-15 00:43:47,816 [ scc.git] DEBUG ## Unique users: []
2024-08-15 00:43:47,817 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:43:47,817 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:47,823 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-08-15 00:43:47,829 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:47,837 [ 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-08-15 00:43:47,849 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-15 00:43:47,852 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-08-15 00:43:47,852 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-08-15 00:43:47,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:43:47,983 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-08-15 00:43:47,990 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:47,995 [ 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-08-15 00:43:48,006 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-15 00:43:48,007 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-15 00:43:48,010 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-08-15 00:43:48,010 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-08-15 00:43:48,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:43:48,376 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-08-15 00:43:48,383 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:48,389 [ 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-08-15 00:43:48,402 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-15 00:43:48,403 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-15 00:43:48,407 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-08-15 00:43:48,407 [ scc.git] DEBUG package.json | 2 +-
2024-08-15 00:43:48,407 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-08-15 00:43:48,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:43:48,767 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-15 00:43:48,814 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:43:48,814 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:48,821 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-15 00:43:48,862 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-15 00:43:48,869 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb33c21c580> has no local changes
2024-08-15 00:43:48,870 [ 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#154 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/)'
2024-08-15 00:43:48,879 [ scc.git] DEBUG [detached HEAD 6ca9658] merge master -Dorg -Ssuccess-only
2024-08-15 00:43:48,880 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:43:48,880 [ scc.repo] DEBUG ## PRs found:
2024-08-15 00:43:49,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-08-15 00:43:49,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-08-15 00:43:50,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-15 00:43:50,616 [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-08-15 00:43:51,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-15 00:43:51,457 [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-08-15 00:43:51,457 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-08-15 00:43:51,458 [ scc.repo] DEBUG ## Branches found:
2024-08-15 00:43:51,458 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-15 00:43:51,458 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:43:51,458 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:51,464 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-15 00:43:51,471 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-15 00:43:51,471 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-15 00:43:51,479 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-15 00:43:51,488 [ scc.git] DEBUG Already up to date.
2024-08-15 00:43:51,488 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-15 00:43:51,852 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-08-15 00:43:51,853 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-15 00:43:51,858 [ scc.git] DEBUG ## Unique users: []
2024-08-15 00:43:51,858 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:43:51,858 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:51,865 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-15 00:43:51,872 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:51,878 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-15 00:43:51,888 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-15 00:43:52,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:43:52,026 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-15 00:43:52,069 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:43:52,069 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:52,075 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-15 00:43:52,115 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-15 00:43:52,122 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb33c266d00> has no local changes
2024-08-15 00:43:52,123 [ 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#154 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/)'
2024-08-15 00:43:52,132 [ scc.git] DEBUG [detached HEAD eb9661b] merge master -Dorg -Ssuccess-only
2024-08-15 00:43:52,132 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:43:52,132 [ scc.repo] DEBUG ## PRs found:
2024-08-15 00:43:52,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-08-15 00:43:52,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-08-15 00:43:53,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-08-15 00:43:53,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-08-15 00:43:54,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-15 00:43:54,889 [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-08-15 00:43:55,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-15 00:43:55,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-08-15 00:43:55,706 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-15 00:43:55,706 [ scc.repo] DEBUG ## Branches found:
2024-08-15 00:43:55,706 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-15 00:43:55,706 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:43:55,706 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:55,713 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-15 00:43:55,719 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-15 00:43:55,719 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-15 00:43:55,725 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-15 00:43:55,731 [ scc.git] DEBUG Already up to date.
2024-08-15 00:43:55,731 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-08-15 00:43:56,045 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-08-15 00:43:56,045 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-08-15 00:43:56,052 [ scc.git] DEBUG ## Unique users: []
2024-08-15 00:43:56,053 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:43:56,053 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:56,064 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-08-15 00:43:56,074 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:56,084 [ 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-08-15 00:43:56,099 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-08-15 00:43:56,100 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-15 00:43:56,105 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-08-15 00:43:56,105 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-08-15 00:43:56,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:43:56,231 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-15 00:43:56,276 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:43:56,276 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:56,284 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-15 00:43:56,373 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-15 00:43:56,382 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb33c1aeb20> has no local changes
2024-08-15 00:43:56,382 [ 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#154 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/)'
2024-08-15 00:43:56,393 [ scc.git] DEBUG [detached HEAD 396faf3] merge master -Dorg -Ssuccess-only
2024-08-15 00:43:56,393 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:43:56,393 [ scc.repo] DEBUG ## PRs found:
2024-08-15 00:43:56,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-08-15 00:43:57,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-08-15 00:43:57,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-08-15 00:43:58,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-15 00:43:58,556 [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-08-15 00:43:59,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-15 00:43:59,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-08-15 00:43:59,434 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-15 00:43:59,434 [ scc.repo] DEBUG ## Branches found:
2024-08-15 00:43:59,434 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-15 00:43:59,434 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:43:59,434 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:59,440 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-15 00:43:59,446 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-15 00:43:59,446 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-15 00:43:59,452 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-15 00:43:59,458 [ scc.git] DEBUG Already up to date.
2024-08-15 00:43:59,459 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-15 00:43:59,771 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-08-15 00:43:59,771 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-15 00:43:59,779 [ scc.git] DEBUG ## Unique users: []
2024-08-15 00:43:59,779 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:43:59,779 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:59,789 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-15 00:43:59,798 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:43:59,806 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-15 00:43:59,821 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-08-15 00:43:59,822 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-08-15 00:43:59,822 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-08-15 00:43:59,822 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-08-15 00:43:59,822 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-08-15 00:43:59,822 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-08-15 00:43:59,822 [ scc.git] DEBUG Auto-merging setup.py
2024-08-15 00:43:59,822 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-08-15 00:43:59,822 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-15 00:43:59,822 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-15 00:43:59,833 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-15 00:43:59,845 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-08-15 00:43:59,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:43:59,976 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-15 00:43:59,983 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-15 00:43:59,991 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#154](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/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-08-15 00:44:00,000 [ scc.config] DEBUG Found github.token
2024-08-15 00:44:00,000 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-08-15 00:44:00,000 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-15 00:44:00,045 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:44:00,046 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:44:00,054 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-15 00:44:00,110 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-15 00:44:00,119 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb33c21c730> has no local changes
2024-08-15 00:44:00,119 [ 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#154 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/)'
2024-08-15 00:44:00,136 [ scc.git] DEBUG [detached HEAD 0529811] merge master -Dorg -Ssuccess-only
2024-08-15 00:44:00,137 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:00,137 [ scc.repo] DEBUG ## PRs found:
2024-08-15 00:44:00,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-08-15 00:44:00,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-08-15 00:44:01,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-08-15 00:44:01,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-15 00:44:02,266 [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-08-15 00:44:02,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-15 00:44:03,150 [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-08-15 00:44:03,151 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-15 00:44:03,151 [ scc.repo] DEBUG ## Branches found:
2024-08-15 00:44:03,151 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-15 00:44:03,151 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:44:03,151 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:44:03,160 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-15 00:44:03,169 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-15 00:44:03,170 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-15 00:44:03,179 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-15 00:44:03,188 [ scc.git] DEBUG Already up to date.
2024-08-15 00:44:03,189 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-08-15 00:44:03,523 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-08-15 00:44:03,524 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-08-15 00:44:03,530 [ scc.git] DEBUG ## Unique users: []
2024-08-15 00:44:03,530 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:44:03,530 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:44:03,536 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-08-15 00:44:03,545 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:44:03,552 [ 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-08-15 00:44:03,571 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-15 00:44:03,575 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-08-15 00:44:03,575 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-08-15 00:44:03,575 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-08-15 00:44:03,575 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-08-15 00:44:03,575 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-08-15 00:44:03,575 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-08-15 00:44:03,575 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-08-15 00:44:03,577 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-08-15 00:44:03,578 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-08-15 00:44:03,578 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-08-15 00:44:03,578 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-08-15 00:44:03,578 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-08-15 00:44:03,578 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-08-15 00:44:03,578 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-08-15 00:44:03,578 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-08-15 00:44:03,578 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-08-15 00:44:03,578 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-08-15 00:44:03,578 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-08-15 00:44:03,578 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-08-15 00:44:03,578 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-08-15 00:44:03,578 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-08-15 00:44:03,578 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-08-15 00:44:03,578 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-08-15 00:44:03,579 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-08-15 00:44:03,579 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-08-15 00:44:03,579 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-08-15 00:44:03,579 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-08-15 00:44:03,579 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-08-15 00:44:03,579 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-08-15 00:44:03,579 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-08-15 00:44:03,579 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-08-15 00:44:03,579 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-08-15 00:44:03,579 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-08-15 00:44:03,579 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-08-15 00:44:03,579 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-08-15 00:44:03,579 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-08-15 00:44:03,579 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-08-15 00:44:03,579 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-08-15 00:44:03,579 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-08-15 00:44:03,579 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-08-15 00:44:03,579 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-08-15 00:44:03,579 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-08-15 00:44:03,579 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-08-15 00:44:03,579 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-08-15 00:44:03,579 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-08-15 00:44:03,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:44:03,716 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-15 00:44:03,758 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:44:03,759 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:44:03,767 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-15 00:44:03,810 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-15 00:44:03,818 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb33c1fbd30> has no local changes
2024-08-15 00:44:03,818 [ 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#154 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/)'
2024-08-15 00:44:03,828 [ scc.git] DEBUG [detached HEAD 6ebd2b3] merge master -Dorg -Ssuccess-only
2024-08-15 00:44:03,829 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:03,829 [ scc.repo] DEBUG ## PRs found:
2024-08-15 00:44:04,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-08-15 00:44:04,124 [ scc.repo] DEBUG ## Branches found:
2024-08-15 00:44:04,124 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-15 00:44:04,124 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:44:04,125 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:44:04,133 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-15 00:44:04,138 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-15 00:44:04,139 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-15 00:44:04,144 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-15 00:44:04,150 [ scc.git] DEBUG Already up to date.
2024-08-15 00:44:04,150 [ scc.git] DEBUG ## Unique users: []
2024-08-15 00:44:04,150 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:44:04,150 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:44:04,155 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-15 00:44:04,196 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:44:04,196 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:44:04,202 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-15 00:44:04,261 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-15 00:44:04,282 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb33c186310> has no local changes
2024-08-15 00:44:04,283 [ 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#154 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/)'
2024-08-15 00:44:04,311 [ scc.git] DEBUG [detached HEAD fd55d0c] merge master -Dorg -Ssuccess-only
2024-08-15 00:44:04,314 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:04,314 [ scc.repo] DEBUG ## PRs found:
2024-08-15 00:44:04,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-08-15 00:44:04,537 [ scc.repo] DEBUG ## Branches found:
2024-08-15 00:44:04,538 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-15 00:44:04,538 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:44:04,538 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:44:04,560 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-15 00:44:04,566 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-15 00:44:04,567 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-15 00:44:04,573 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-15 00:44:04,579 [ scc.git] DEBUG Already up to date.
2024-08-15 00:44:04,579 [ scc.git] DEBUG ## Unique users: []
2024-08-15 00:44:04,579 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:44:04,579 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:44:04,585 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-15 00:44:04,625 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:44:04,625 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:44:04,631 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-15 00:44:04,670 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-15 00:44:04,677 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb33c186ee0> has no local changes
2024-08-15 00:44:04,678 [ 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#154 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/)'
2024-08-15 00:44:04,686 [ scc.git] DEBUG [detached HEAD b354d2a] merge master -Dorg -Ssuccess-only
2024-08-15 00:44:04,687 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:04,687 [ scc.git] INFO Overriding base-branch from master to main
2024-08-15 00:44:04,687 [ scc.repo] DEBUG ## PRs found:
2024-08-15 00:44:05,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-08-15 00:44:05,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-08-15 00:44:05,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-08-15 00:44:06,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-08-15 00:44:06,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-15 00:44:07,337 [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-08-15 00:44:07,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-15 00:44:08,243 [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-08-15 00:44:08,244 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-15 00:44:08,244 [ scc.repo] DEBUG ## Branches found:
2024-08-15 00:44:08,245 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-15 00:44:08,245 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:44:08,245 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:44:08,253 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-08-15 00:44:08,259 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-15 00:44:08,259 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-08-15 00:44:08,266 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-08-15 00:44:08,274 [ scc.git] DEBUG Already up to date.
2024-08-15 00:44:08,275 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-08-15 00:44:08,577 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-08-15 00:44:08,578 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-08-15 00:44:08,583 [ scc.git] DEBUG ## Unique users: []
2024-08-15 00:44:08,583 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:44:08,583 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:44:08,592 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-15 00:44:08,599 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:44:08,605 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-15 00:44:08,615 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-08-15 00:44:08,616 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-08-15 00:44:08,616 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-15 00:44:08,616 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-15 00:44:08,622 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-15 00:44:08,631 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-08-15 00:44:08,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:44:08,772 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-15 00:44:08,778 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-15 00:44:08,785 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#154](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-08-15 00:44:08,790 [ scc.config] DEBUG Found github.token
2024-08-15 00:44:08,790 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-08-15 00:44:08,790 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-15 00:44:08,830 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:44:08,831 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:44:08,837 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-15 00:44:08,877 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-15 00:44:08,884 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb33c18eb50> has no local changes
2024-08-15 00:44:08,884 [ 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#154 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/)'
2024-08-15 00:44:08,893 [ scc.git] DEBUG [detached HEAD 2041e5c] merge master -Dorg -Ssuccess-only
2024-08-15 00:44:08,894 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:08,894 [ scc.repo] DEBUG ## PRs found:
2024-08-15 00:44:09,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-08-15 00:44:09,205 [ scc.repo] DEBUG ## Branches found:
2024-08-15 00:44:09,205 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-15 00:44:09,205 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:44:09,205 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:44:09,211 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-15 00:44:09,216 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-15 00:44:09,217 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-15 00:44:09,223 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-15 00:44:09,229 [ scc.git] DEBUG Already up to date.
2024-08-15 00:44:09,230 [ scc.git] DEBUG ## Unique users: []
2024-08-15 00:44:09,230 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:44:09,230 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:44:09,235 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-15 00:44:09,276 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:44:09,276 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:44:09,282 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-15 00:44:09,344 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-15 00:44:09,350 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb33c186370> has no local changes
2024-08-15 00:44:09,351 [ 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#154 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/)'
2024-08-15 00:44:09,359 [ scc.git] DEBUG [detached HEAD ccb7983] merge master -Dorg -Ssuccess-only
2024-08-15 00:44:09,360 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:09,360 [ scc.repo] DEBUG ## PRs found:
2024-08-15 00:44:09,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-08-15 00:44:09,623 [ scc.repo] DEBUG ## Branches found:
2024-08-15 00:44:09,623 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-15 00:44:09,623 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:44:09,623 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:44:09,629 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-15 00:44:09,634 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-15 00:44:09,635 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-15 00:44:09,641 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-15 00:44:09,647 [ scc.git] DEBUG Already up to date.
2024-08-15 00:44:09,647 [ scc.git] DEBUG ## Unique users: []
2024-08-15 00:44:09,647 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:44:09,647 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:44:09,652 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-15 00:44:09,694 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:44:09,694 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:44:09,701 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-15 00:44:09,741 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-15 00:44:09,748 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb33c12c4f0> has no local changes
2024-08-15 00:44:09,748 [ 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#154 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/)'
2024-08-15 00:44:09,756 [ scc.git] DEBUG [detached HEAD b2d29c0] merge master -Dorg -Ssuccess-only
2024-08-15 00:44:09,757 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:09,757 [ scc.repo] DEBUG ## PRs found:
2024-08-15 00:44:10,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-08-15 00:44:10,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-08-15 00:44:11,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-08-15 00:44:11,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-15 00:44:11,947 [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-08-15 00:44:12,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-15 00:44:12,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-08-15 00:44:12,777 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-08-15 00:44:12,778 [ scc.repo] DEBUG ## Branches found:
2024-08-15 00:44:12,778 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-15 00:44:12,778 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:44:12,778 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:44:12,791 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-15 00:44:12,799 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-15 00:44:12,800 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-15 00:44:12,806 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-15 00:44:12,814 [ scc.git] DEBUG Already up to date.
2024-08-15 00:44:12,814 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-08-15 00:44:13,143 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-08-15 00:44:13,143 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-08-15 00:44:13,148 [ scc.git] DEBUG ## Unique users: []
2024-08-15 00:44:13,148 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:44:13,148 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:44:13,154 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-15 00:44:13,160 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:44:13,166 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-15 00:44:13,177 [ scc.git] DEBUG Auto-merging Dockerfile
2024-08-15 00:44:13,177 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-08-15 00:44:13,178 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-15 00:44:13,178 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-15 00:44:13,185 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-15 00:44:13,194 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-08-15 00:44:13,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:44:13,329 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-15 00:44:13,337 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-15 00:44:13,343 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#154](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-08-15 00:44:13,348 [ scc.config] DEBUG Found github.token
2024-08-15 00:44:13,348 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-08-15 00:44:13,348 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-15 00:44:13,389 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:44:13,389 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:44:13,396 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-15 00:44:13,439 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-15 00:44:13,447 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb33c1a2ca0> has no local changes
2024-08-15 00:44:13,447 [ 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#154 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/)'
2024-08-15 00:44:13,457 [ scc.git] DEBUG [detached HEAD 3b83e4e] merge master -Dorg -Ssuccess-only
2024-08-15 00:44:13,457 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:13,457 [ scc.git] INFO Overriding base-branch from master to develop
2024-08-15 00:44:13,457 [ scc.repo] DEBUG ## PRs found:
2024-08-15 00:44:13,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-08-15 00:44:14,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-08-15 00:44:14,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-08-15 00:44:15,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-08-15 00:44:15,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-08-15 00:44:16,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-08-15 00:44:16,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-08-15 00:44:17,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-15 00:44:17,498 [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-08-15 00:44:17,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-15 00:44:18,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-08-15 00:44:18,373 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-15 00:44:18,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-08-15 00:44:19,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-08-15 00:44:19,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-08-15 00:44:20,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-08-15 00:44:20,230 [ scc.repo] DEBUG ## Branches found:
2024-08-15 00:44:20,231 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-15 00:44:20,231 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:44:20,231 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:44:20,237 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-08-15 00:44:20,243 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-15 00:44:20,243 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-08-15 00:44:20,249 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-08-15 00:44:20,255 [ scc.git] DEBUG Already up to date.
2024-08-15 00:44:20,256 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-08-15 00:44:20,589 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-08-15 00:44:20,589 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-08-15 00:44:20,595 [ scc.git] DEBUG ## Unique users: []
2024-08-15 00:44:20,596 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:44:20,596 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:44:20,602 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-15 00:44:20,609 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:44:20,615 [ 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-08-15 00:44:20,628 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-08-15 00:44:20,628 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-08-15 00:44:20,628 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-15 00:44:20,628 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-15 00:44:20,635 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-15 00:44:20,642 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-08-15 00:44:20,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:44:20,791 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-15 00:44:20,799 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-15 00:44:20,805 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#154](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-08-15 00:44:20,810 [ scc.config] DEBUG Found github.token
2024-08-15 00:44:20,811 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-08-15 00:44:20,811 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-15 00:44:20,850 [ scc.git] DEBUG Get sha1 of %s
2024-08-15 00:44:20,851 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-15 00:44:20,858 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-15 00:44:20,899 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-15 00:44:20,906 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb33c14e970> has no local changes
2024-08-15 00:44:20,906 [ 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#154 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/)'
2024-08-15 00:44:20,915 [ scc.git] DEBUG [detached HEAD db7ca37] merge master -Dorg -Ssuccess-only
2024-08-15 00:44:20,915 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:20,916 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-15 00:44:20,993 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-08-15 00:44:21,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:44:21,178 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-08-15 00:44:21,184 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-08-15 00:44:21,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:44:21,555 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-08-15 00:44:21,560 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-08-15 00:44:21,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:44:21,978 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-08-15 00:44:21,985 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-08-15 00:44:22,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:44:22,378 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-08-15 00:44:22,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:44:22,758 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-08-15 00:44:22,767 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-08-15 00:44:23,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:44:23,144 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-08-15 00:44:23,153 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-08-15 00:44:23,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:44:23,535 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-08-15 00:44:23,545 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-08-15 00:44:23,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:44:23,950 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-08-15 00:44:23,955 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-08-15 00:44:24,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:44:24,341 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-08-15 00:44:24,352 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-08-15 00:44:24,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:44:24,737 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-08-15 00:44:24,743 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-08-15 00:44:25,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:44:25,120 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-08-15 00:44:25,126 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-08-15 00:44:25,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:44:25,521 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-08-15 00:44:25,528 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-08-15 00:44:25,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:44:25,919 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-08-15 00:44:26,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:44:26,296 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-08-15 00:44:26,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:44:26,690 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-08-15 00:44:26,695 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-08-15 00:44:27,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:44:27,075 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-08-15 00:44:27,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:44:27,456 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-08-15 00:44:27,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:44:27,836 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-08-15 00:44:27,840 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-08-15 00:44:28,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:44:28,238 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-08-15 00:44:28,244 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-08-15 00:44:28,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:44:28,621 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-08-15 00:44:28,626 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-08-15 00:44:28,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:44:29,008 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-08-15 00:44:29,013 [ scc.config] DEBUG Found submodule.scripts.url
2024-08-15 00:44:29,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-15 00:44:29,444 [ scc.config] DEBUG Found submodule.scripts.branch
2024-08-15 00:44:29,445 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-15 00:44:29,533 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb33ebdbd30> has local changes
2024-08-15 00:44:29,534 [ 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 384 dependabot[bot] 'Bump omero-figure from `fefe87c` to `430fc3f`'
Repository: ome/minimal-omero-client
Already up to date.
Merged PRs:
- PR 66 jburel 'Gateway 5 9 2'
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 63 sbesson 'Remove python-future dependency'
- PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
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 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 578 Rdornier 'Image outline' (user: Rdornier)
- PR 577 Rdornier 'Fill rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 576 Rdornier 'Color picker - popup update'
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 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
Repository: ome/omero-mapr
Excluded PRs:
- PR 85 sbesson 'Add support for OMERO.web 5.27.0' (status: failure)
- 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#154 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/154/)'
2024-08-15 00:44:29,550 [ scc.git] DEBUG [detached HEAD 5ec769a] merge master -Dorg -Ssuccess-only
2024-08-15 00:44:29,550 [ scc.merge] INFO Repository: ome/omero-plugins
2024-08-15 00:44:29,550 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-08-15 00:44:29,550 [ scc.merge] INFO Already up to date.
2024-08-15 00:44:29,550 [ scc.merge] INFO
2024-08-15 00:44:29,550 [ scc.merge] INFO Merged PRs:
2024-08-15 00:44:29,551 [ scc.merge] INFO - PR 384 dependabot[bot] 'Bump omero-figure from `fefe87c` to `430fc3f`'
2024-08-15 00:44:29,551 [ scc.merge] INFO
2024-08-15 00:44:29,551 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-08-15 00:44:29,551 [ scc.merge] INFO Already up to date.
2024-08-15 00:44:29,551 [ scc.merge] INFO
2024-08-15 00:44:29,551 [ scc.merge] INFO Merged PRs:
2024-08-15 00:44:29,551 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-08-15 00:44:29,551 [ scc.merge] INFO
2024-08-15 00:44:29,551 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-08-15 00:44:29,551 [ scc.merge] INFO Excluded PRs:
2024-08-15 00:44:29,551 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-08-15 00:44:29,551 [ scc.merge] INFO Already up to date.
2024-08-15 00:44:29,551 [ scc.merge] INFO
2024-08-15 00:44:29,551 [ scc.merge] INFO Merged PRs:
2024-08-15 00:44:29,551 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-08-15 00:44:29,551 [ scc.merge] INFO
2024-08-15 00:44:29,551 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-08-15 00:44:29,551 [ scc.merge] INFO Excluded PRs:
2024-08-15 00:44:29,551 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-08-15 00:44:29,551 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-08-15 00:44:29,551 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-08-15 00:44:29,551 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-08-15 00:44:29,551 [ scc.merge] INFO Already up to date.
2024-08-15 00:44:29,551 [ scc.merge] INFO
2024-08-15 00:44:29,551 [ scc.merge] INFO Merged PRs:
2024-08-15 00:44:29,551 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-08-15 00:44:29,551 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-08-15 00:44:29,551 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-08-15 00:44:29,551 [ scc.merge] INFO
2024-08-15 00:44:29,551 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-08-15 00:44:29,551 [ scc.merge] INFO Excluded PRs:
2024-08-15 00:44:29,551 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-15 00:44:29,551 [ scc.merge] INFO Already up to date.
2024-08-15 00:44:29,552 [ scc.merge] INFO
2024-08-15 00:44:29,552 [ scc.merge] INFO Merged PRs:
2024-08-15 00:44:29,552 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-08-15 00:44:29,552 [ scc.merge] INFO
2024-08-15 00:44:29,552 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-15 00:44:29,552 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-08-15 00:44:29,552 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-08-15 00:44:29,552 [ scc.merge] INFO
2024-08-15 00:44:29,552 [ scc.merge] INFO Repository: ome/omero-figure
2024-08-15 00:44:29,552 [ scc.merge] INFO Excluded PRs:
2024-08-15 00:44:29,552 [ scc.merge] INFO - PR 581 Rdornier 'Fix panel & label zoom value' (user: Rdornier)
2024-08-15 00:44:29,552 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-08-15 00:44:29,552 [ scc.merge] INFO - PR 578 Rdornier 'Image outline' (user: Rdornier)
2024-08-15 00:44:29,552 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' (user: Rdornier)
2024-08-15 00:44:29,552 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-08-15 00:44:29,552 [ scc.merge] INFO Already up to date.
2024-08-15 00:44:29,552 [ scc.merge] INFO
2024-08-15 00:44:29,552 [ scc.merge] INFO Merged PRs:
2024-08-15 00:44:29,552 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-08-15 00:44:29,552 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-08-15 00:44:29,552 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-08-15 00:44:29,552 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-08-15 00:44:29,552 [ scc.merge] INFO - PR 576 Rdornier 'Color picker - popup update'
2024-08-15 00:44:29,552 [ scc.merge] INFO
2024-08-15 00:44:29,552 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-08-15 00:44:29,552 [ scc.merge] INFO Already up to date.
2024-08-15 00:44:29,552 [ scc.merge] INFO
2024-08-15 00:44:29,552 [ scc.merge] INFO Merged PRs:
2024-08-15 00:44:29,552 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-08-15 00:44:29,552 [ scc.merge] INFO
2024-08-15 00:44:29,552 [ scc.merge] INFO Repository: ome/omero-gallery
2024-08-15 00:44:29,552 [ scc.merge] INFO Already up to date.
2024-08-15 00:44:29,552 [ scc.merge] INFO
2024-08-15 00:44:29,552 [ scc.merge] INFO Merged PRs:
2024-08-15 00:44:29,552 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-15 00:44:29,553 [ scc.merge] INFO
2024-08-15 00:44:29,553 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-08-15 00:44:29,553 [ scc.merge] INFO Excluded PRs:
2024-08-15 00:44:29,553 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-08-15 00:44:29,553 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-08-15 00:44:29,553 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-08-15 00:44:29,553 [ scc.merge] INFO Already up to date.
2024-08-15 00:44:29,553 [ scc.merge] INFO
2024-08-15 00:44:29,553 [ scc.merge] INFO Merged PRs:
2024-08-15 00:44:29,553 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-08-15 00:44:29,553 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-08-15 00:44:29,553 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-15 00:44:29,553 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-15 00:44:29,553 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-15 00:44:29,553 [ scc.merge] INFO
2024-08-15 00:44:29,553 [ scc.merge] INFO Repository: ome/omero-mapr
2024-08-15 00:44:29,553 [ scc.merge] INFO Excluded PRs:
2024-08-15 00:44:29,553 [ scc.merge] INFO - PR 85 sbesson 'Add support for OMERO.web 5.27.0' (status: failure)
2024-08-15 00:44:29,553 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-08-15 00:44:29,553 [ scc.merge] INFO Already up to date.
2024-08-15 00:44:29,553 [ scc.merge] INFO
2024-08-15 00:44:29,553 [ scc.merge] INFO Merged PRs:
2024-08-15 00:44:29,553 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-08-15 00:44:29,553 [ scc.merge] INFO
2024-08-15 00:44:29,553 [ scc.merge] INFO Repository: ome/omero-metadata
2024-08-15 00:44:29,553 [ scc.merge] INFO Already up to date.
2024-08-15 00:44:29,553 [ scc.merge] INFO
2024-08-15 00:44:29,553 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-15 00:44:29,553 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-15 00:44:29,553 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-15 00:44:29,553 [ scc.merge] INFO
2024-08-15 00:44:29,553 [ scc.merge] INFO Repository: ome/omero-parade
2024-08-15 00:44:29,553 [ scc.merge] INFO Excluded PRs:
2024-08-15 00:44:29,553 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-08-15 00:44:29,553 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-08-15 00:44:29,554 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-08-15 00:44:29,554 [ scc.merge] INFO Already up to date.
2024-08-15 00:44:29,554 [ scc.merge] INFO
2024-08-15 00:44:29,554 [ scc.merge] INFO Merged PRs:
2024-08-15 00:44:29,554 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-15 00:44:29,554 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-15 00:44:29,554 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-15 00:44:29,554 [ scc.merge] INFO
2024-08-15 00:44:29,554 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-08-15 00:44:29,554 [ scc.merge] INFO Already up to date.
2024-08-15 00:44:29,554 [ scc.merge] INFO
2024-08-15 00:44:29,554 [ scc.merge] INFO Merged PRs:
2024-08-15 00:44:29,554 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-08-15 00:44:29,554 [ scc.merge] INFO
2024-08-15 00:44:29,554 [ scc.merge] INFO Repository: ome/omero-rois
2024-08-15 00:44:29,554 [ scc.merge] INFO Excluded PRs:
2024-08-15 00:44:29,554 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-15 00:44:29,554 [ scc.merge] INFO Already up to date.
2024-08-15 00:44:29,554 [ scc.merge] INFO
2024-08-15 00:44:29,554 [ scc.merge] INFO Merged PRs:
2024-08-15 00:44:29,554 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-15 00:44:29,554 [ scc.merge] INFO
2024-08-15 00:44:29,554 [ scc.merge] INFO Repository: ome/omero-signup
2024-08-15 00:44:29,554 [ scc.merge] INFO Already up to date.
2024-08-15 00:44:29,554 [ scc.merge] INFO
2024-08-15 00:44:29,554 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-15 00:44:29,554 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-15 00:44:29,554 [ scc.merge] INFO
2024-08-15 00:44:29,554 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-08-15 00:44:29,554 [ scc.merge] INFO Already up to date.
2024-08-15 00:44:29,554 [ scc.merge] INFO
2024-08-15 00:44:29,554 [ scc.merge] INFO Merged PRs:
2024-08-15 00:44:29,555 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-15 00:44:29,555 [ scc.merge] INFO
2024-08-15 00:44:29,555 [ scc.merge] INFO Repository: ome/omero-upload
2024-08-15 00:44:29,555 [ scc.merge] INFO Already up to date.
2024-08-15 00:44:29,555 [ scc.merge] INFO
2024-08-15 00:44:29,555 [ scc.merge] INFO
2024-08-15 00:44:29,555 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-08-15 00:44:29,555 [ scc.merge] INFO Already up to date.
2024-08-15 00:44:29,555 [ scc.merge] INFO
2024-08-15 00:44:29,555 [ scc.merge] INFO
2024-08-15 00:44:29,555 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-08-15 00:44:29,555 [ scc.merge] INFO Excluded PRs:
2024-08-15 00:44:29,555 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-08-15 00:44:29,555 [ scc.merge] INFO Already up to date.
2024-08-15 00:44:29,555 [ scc.merge] INFO
2024-08-15 00:44:29,555 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-15 00:44:29,555 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-15 00:44:29,555 [ scc.merge] INFO
2024-08-15 00:44:29,555 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-08-15 00:44:29,555 [ scc.merge] INFO Already up to date.
2024-08-15 00:44:29,555 [ scc.merge] INFO
2024-08-15 00:44:29,555 [ scc.merge] INFO
2024-08-15 00:44:29,555 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-08-15 00:44:29,555 [ scc.merge] INFO Already up to date.
2024-08-15 00:44:29,555 [ scc.merge] INFO
2024-08-15 00:44:29,555 [ scc.merge] INFO
2024-08-15 00:44:29,555 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-08-15 00:44:29,555 [ scc.merge] INFO Already up to date.
2024-08-15 00:44:29,555 [ scc.merge] INFO
2024-08-15 00:44:29,555 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-15 00:44:29,555 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-08-15 00:44:29,555 [ scc.merge] INFO
2024-08-15 00:44:29,555 [ scc.merge] INFO Repository: ome/scripts
2024-08-15 00:44:29,555 [ scc.merge] INFO Excluded PRs:
2024-08-15 00:44:29,555 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-08-15 00:44:29,556 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-08-15 00:44:29,556 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-08-15 00:44:29,556 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-08-15 00:44:29,556 [ scc.merge] INFO Already up to date.
2024-08-15 00:44:29,556 [ scc.merge] INFO
2024-08-15 00:44:29,556 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-15 00:44:29,556 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-15 00:44:29,556 [ scc.merge] INFO
2024-08-15 00:44:29,556 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-08-15 00:44:29,556 [ scc.git] DEBUG Calling 'git remote'
2024-08-15 00:44:29,562 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-08-15 00:44:29,562 [ scc.git] DEBUG Calling 'git remote'
2024-08-15 00:44:29,568 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:29,568 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-08-15 00:44:29,568 [ scc.git] DEBUG Calling 'git remote'
2024-08-15 00:44:29,574 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:29,574 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-08-15 00:44:29,574 [ scc.git] DEBUG Calling 'git remote'
2024-08-15 00:44:29,580 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:29,580 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-08-15 00:44:29,580 [ scc.git] DEBUG Calling 'git remote'
2024-08-15 00:44:29,586 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:29,586 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-08-15 00:44:29,586 [ scc.git] DEBUG Calling 'git remote'
2024-08-15 00:44:29,592 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:29,592 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-15 00:44:29,592 [ scc.git] DEBUG Calling 'git remote'
2024-08-15 00:44:29,598 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:29,598 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-15 00:44:29,598 [ scc.git] DEBUG Calling 'git remote'
2024-08-15 00:44:29,604 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:29,604 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-15 00:44:29,604 [ scc.git] DEBUG Calling 'git remote'
2024-08-15 00:44:29,610 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:29,610 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-15 00:44:29,610 [ scc.git] DEBUG Calling 'git remote'
2024-08-15 00:44:29,615 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:29,615 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-15 00:44:29,615 [ scc.git] DEBUG Calling 'git remote'
2024-08-15 00:44:29,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:29,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-15 00:44:29,621 [ scc.git] DEBUG Calling 'git remote'
2024-08-15 00:44:29,626 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:29,626 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-15 00:44:29,626 [ scc.git] DEBUG Calling 'git remote'
2024-08-15 00:44:29,632 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:29,632 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-15 00:44:29,632 [ scc.git] DEBUG Calling 'git remote'
2024-08-15 00:44:29,637 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:29,638 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-15 00:44:29,638 [ scc.git] DEBUG Calling 'git remote'
2024-08-15 00:44:29,643 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:29,643 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-15 00:44:29,643 [ scc.git] DEBUG Calling 'git remote'
2024-08-15 00:44:29,648 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:29,648 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-15 00:44:29,648 [ scc.git] DEBUG Calling 'git remote'
2024-08-15 00:44:29,653 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:29,653 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-15 00:44:29,653 [ scc.git] DEBUG Calling 'git remote'
2024-08-15 00:44:29,658 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:29,659 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-15 00:44:29,659 [ scc.git] DEBUG Calling 'git remote'
2024-08-15 00:44:29,664 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:29,664 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-15 00:44:29,664 [ scc.git] DEBUG Calling 'git remote'
2024-08-15 00:44:29,669 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:29,669 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-15 00:44:29,669 [ scc.git] DEBUG Calling 'git remote'
2024-08-15 00:44:29,674 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:29,675 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-15 00:44:29,675 [ scc.git] DEBUG Calling 'git remote'
2024-08-15 00:44:29,680 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-15 00:44:29,680 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-15 00:44:29,680 [ scc.git] DEBUG Calling 'git remote'
2024-08-15 00:44:29,685 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.9.2 to 5.9.3-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 8febcc6] 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 9b73dd9
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 430fc3f8
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 a8f380f
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 312afbe
nothing to commit, working tree clean
[detached HEAD 3ecf4e1] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-08-15 00:45:15,044 [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-08-15 00:45:23,706 [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-08-15 00:45:26,000 [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-08-15 00:45:30,458 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-08-15 00:46:09,575 [ 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