Skipping 107 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-06-30 00:45:48,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/055cbba7ea52b6281065a885bcc1adcfe91636f2?per_page=1 HTTP/1.1" 200 2
2024-06-30 00:45:48,479 [ scc.repo] DEBUG - PR 572 sbesson 'Remove the maximum reportlab version from the readme'
2024-06-30 00:45:48,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/568 HTTP/1.1" 200 None
2024-06-30 00:45:49,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/568/comments HTTP/1.1" 200 None
2024-06-30 00:45:49,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6 HTTP/1.1" 200 None
2024-06-30 00:45:50,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-30 00:45:50,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-30 00:45:51,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6 HTTP/1.1" 200 None
2024-06-30 00:45:51,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6?per_page=1 HTTP/1.1" 200 2
2024-06-30 00:45:51,828 [ scc.repo] DEBUG - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-06-30 00:45:52,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-06-30 00:45:52,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-06-30 00:45:53,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-30 00:45:53,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-30 00:45:54,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-30 00:45:54,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-30 00:45:55,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/3179811fd0a1d65e2dc5f56013cf92e086da24ab?per_page=1 HTTP/1.1" 200 2
2024-06-30 00:45:55,126 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-06-30 00:45:55,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-06-30 00:45:56,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-30 00:45:56,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-30 00:45:57,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-30 00:45:57,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-30 00:45:57,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24?per_page=1 HTTP/1.1" 200 2
2024-06-30 00:45:57,940 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-06-30 00:45:57,940 [ scc.repo] DEBUG ## Branches found:
2024-06-30 00:45:57,940 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-30 00:45:57,940 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:45:57,940 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:45:57,947 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-30 00:45:57,954 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-30 00:45:57,954 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-30 00:45:57,963 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-30 00:45:57,971 [ scc.git] DEBUG Already up to date.
2024-06-30 00:45:57,971 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-06-30 00:45:58,853 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-30 00:45:58,854 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-06-30 00:45:58,860 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-06-30 00:45:59,409 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-30 00:45:59,410 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-06-30 00:45:59,417 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-06-30 00:45:59,786 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-30 00:45:59,787 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-06-30 00:45:59,792 [ scc.git] DEBUG Calling 'git fetch origin pull/572/head'
2024-06-30 00:46:00,252 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-30 00:46:00,252 [ scc.git] DEBUG * branch refs/pull/572/head -> FETCH_HEAD
2024-06-30 00:46:00,257 [ scc.git] DEBUG ## Unique users: []
2024-06-30 00:46:00,257 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:46:00,257 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:00,264 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-30 00:46:00,273 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:00,279 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-30 00:46:00,375 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-30 00:46:00,381 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-06-30 00:46:00,381 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-06-30 00:46:00,381 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-06-30 00:46:00,381 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-06-30 00:46:00,381 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-06-30 00:46:00,381 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-06-30 00:46:00,381 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-06-30 00:46:00,381 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-06-30 00:46:00,381 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-06-30 00:46:00,381 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-06-30 00:46:00,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:46:00,590 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-30 00:46:00,600 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:00,607 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-30 00:46:00,708 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-06-30 00:46:00,708 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-06-30 00:46:00,708 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-06-30 00:46:00,708 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-30 00:46:00,715 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-06-30 00:46:00,715 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-06-30 00:46:00,715 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-06-30 00:46:00,715 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-06-30 00:46:00,715 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-06-30 00:46:00,715 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-06-30 00:46:00,715 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-06-30 00:46:00,715 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-06-30 00:46:00,715 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-06-30 00:46:00,715 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-06-30 00:46:00,715 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-06-30 00:46:00,715 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-06-30 00:46:01,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:46:01,008 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-06-30 00:46:01,016 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:01,022 [ 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-06-30 00:46:01,051 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-30 00:46:01,054 [ scc.git] DEBUG setup.py | 2 +-
2024-06-30 00:46:01,054 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-06-30 00:46:01,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:46:01,422 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...055cbba7ea52b6281065a885bcc1adcfe91636f2'
2024-06-30 00:46:01,430 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:01,435 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 572 (Remove the maximum reportlab version from the readme) 055cbba7ea52b6281065a885bcc1adcfe91636f2'
2024-06-30 00:46:01,471 [ scc.git] DEBUG Auto-merging README.rst
2024-06-30 00:46:01,472 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-30 00:46:01,475 [ scc.git] DEBUG README.rst | 2 +-
2024-06-30 00:46:01,475 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-06-30 00:46:01,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:46:01,852 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-30 00:46:01,895 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:46:01,895 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:01,901 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-30 00:46:01,939 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-30 00:46:01,947 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf6e8582b0> has no local changes
2024-06-30 00:46:01,948 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 560 will-moore 'Max projection bytes' (exclude comment)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 572 sbesson 'Remove the maximum reportlab version from the readme'
Generated by OMERO-plugins-push#111 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/)'
2024-06-30 00:46:01,958 [ scc.git] DEBUG [detached HEAD 11daa4ed] merge master -Dorg -Ssuccess-only
2024-06-30 00:46:01,959 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:46:01,959 [ scc.repo] DEBUG ## PRs found:
2024-06-30 00:46:02,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-06-30 00:46:02,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-06-30 00:46:03,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-06-30 00:46:03,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-30 00:46:04,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-30 00:46:04,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-30 00:46:05,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-06-30 00:46:05,113 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-06-30 00:46:05,113 [ scc.repo] DEBUG ## Branches found:
2024-06-30 00:46:05,113 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-30 00:46:05,113 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:46:05,113 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:05,120 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-30 00:46:05,125 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-30 00:46:05,125 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-30 00:46:05,129 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-30 00:46:05,135 [ scc.git] DEBUG Already up to date.
2024-06-30 00:46:05,135 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-06-30 00:46:05,501 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-06-30 00:46:05,501 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-06-30 00:46:05,505 [ scc.git] DEBUG ## Unique users: []
2024-06-30 00:46:05,505 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:46:05,505 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:05,510 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-30 00:46:05,515 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:05,519 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-30 00:46:05,544 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-06-30 00:46:05,546 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-30 00:46:05,548 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-06-30 00:46:05,548 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-06-30 00:46:05,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:46:05,720 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-30 00:46:05,770 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:46:05,771 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:05,778 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-30 00:46:05,818 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-30 00:46:05,826 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf4f7c0190> has no local changes
2024-06-30 00:46:05,826 [ 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#111 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/)'
2024-06-30 00:46:05,835 [ scc.git] DEBUG [detached HEAD 2292a30] merge master -Dorg -Ssuccess-only
2024-06-30 00:46:05,836 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:46:05,836 [ scc.repo] DEBUG ## PRs found:
2024-06-30 00:46:06,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-06-30 00:46:06,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-06-30 00:46:06,675 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-30 00:46:07,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-30 00:46:07,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-30 00:46:08,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-30 00:46:08,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-30 00:46:09,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-06-30 00:46:09,250 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-30 00:46:09,250 [ scc.repo] DEBUG ## Branches found:
2024-06-30 00:46:09,250 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-30 00:46:09,250 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:46:09,250 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:09,256 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-30 00:46:09,261 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-30 00:46:09,262 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-30 00:46:09,267 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-30 00:46:09,273 [ scc.git] DEBUG Already up to date.
2024-06-30 00:46:09,273 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-06-30 00:46:09,661 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-06-30 00:46:09,661 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-06-30 00:46:09,665 [ scc.git] DEBUG ## Unique users: []
2024-06-30 00:46:09,666 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:46:09,666 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:09,671 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-06-30 00:46:09,676 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:09,681 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-06-30 00:46:09,692 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-30 00:46:09,696 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-06-30 00:46:09,696 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-06-30 00:46:09,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:46:09,868 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-30 00:46:09,905 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:46:09,906 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:09,911 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-30 00:46:09,947 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-30 00:46:09,954 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf6e87f940> has no local changes
2024-06-30 00:46:09,954 [ 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#111 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/)'
2024-06-30 00:46:09,963 [ scc.git] DEBUG [detached HEAD 3f63c7b] merge master -Dorg -Ssuccess-only
2024-06-30 00:46:09,963 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:46:09,963 [ scc.repo] DEBUG ## PRs found:
2024-06-30 00:46:10,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-06-30 00:46:10,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-06-30 00:46:10,908 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-30 00:46:11,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-06-30 00:46:12,011 [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-06-30 00:46:12,554 [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-06-30 00:46:13,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-06-30 00:46:13,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-06-30 00:46:13,496 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-06-30 00:46:13,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-06-30 00:46:13,968 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-30 00:46:14,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-06-30 00:46:15,139 [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-06-30 00:46:15,655 [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-06-30 00:46:16,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-06-30 00:46:16,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-06-30 00:46:16,648 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-06-30 00:46:17,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-06-30 00:46:17,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-06-30 00:46:18,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-30 00:46:18,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-30 00:46:19,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-30 00:46:19,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-30 00:46:20,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-06-30 00:46:20,089 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-30 00:46:20,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-06-30 00:46:21,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-06-30 00:46:21,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-30 00:46:22,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-30 00:46:22,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-30 00:46:22,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-30 00:46:23,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-06-30 00:46:23,412 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-06-30 00:46:23,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-06-30 00:46:24,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-06-30 00:46:24,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-30 00:46:25,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-30 00:46:25,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-30 00:46:26,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-06-30 00:46:26,273 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-06-30 00:46:26,274 [ scc.repo] DEBUG ## Branches found:
2024-06-30 00:46:26,274 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-30 00:46:26,274 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:46:26,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:26,282 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-30 00:46:26,289 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-30 00:46:26,290 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-30 00:46:26,323 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-30 00:46:26,332 [ scc.git] DEBUG Already up to date.
2024-06-30 00:46:26,332 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-06-30 00:46:27,295 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-30 00:46:27,296 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-06-30 00:46:27,301 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-06-30 00:46:28,434 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-30 00:46:28,434 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-06-30 00:46:28,441 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-06-30 00:46:28,873 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-30 00:46:28,873 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-06-30 00:46:28,878 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-06-30 00:46:29,250 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-30 00:46:29,251 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-06-30 00:46:29,256 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-06-30 00:46:29,830 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-30 00:46:29,830 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-06-30 00:46:29,835 [ scc.git] DEBUG ## Unique users: []
2024-06-30 00:46:29,836 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:46:29,836 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:29,843 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-30 00:46:29,851 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:29,856 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-30 00:46:29,918 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-06-30 00:46:29,919 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-30 00:46:29,922 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-06-30 00:46:29,923 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-06-30 00:46:29,923 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-06-30 00:46:30,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:46:30,097 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-30 00:46:30,106 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:30,113 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-30 00:46:30,269 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-06-30 00:46:30,270 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-06-30 00:46:30,270 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-06-30 00:46:30,270 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-06-30 00:46:30,270 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-30 00:46:30,275 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-06-30 00:46:30,275 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-06-30 00:46:30,275 [ scc.git] DEBUG src/app/header.html | 5 +
2024-06-30 00:46:30,275 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-06-30 00:46:30,275 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-06-30 00:46:30,275 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-06-30 00:46:30,275 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-06-30 00:46:30,275 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-06-30 00:46:30,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:46:30,500 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-30 00:46:30,509 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:30,515 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-30 00:46:30,588 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-06-30 00:46:30,590 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-30 00:46:30,593 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-06-30 00:46:30,593 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-06-30 00:46:30,593 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-06-30 00:46:30,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:46:30,927 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-06-30 00:46:30,953 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:30,959 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-06-30 00:46:30,989 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-30 00:46:31,000 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-06-30 00:46:31,000 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-06-30 00:46:31,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:46:31,334 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-06-30 00:46:31,358 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:31,363 [ 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-06-30 00:46:31,452 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-30 00:46:31,452 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-30 00:46:31,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:46:31,761 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-30 00:46:31,803 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:46:31,803 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:31,809 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-30 00:46:31,852 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-30 00:46:31,860 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf4f7cd340> has no local changes
2024-06-30 00:46:31,861 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- 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#111 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/)'
2024-06-30 00:46:31,874 [ scc.git] DEBUG [detached HEAD ec17ddc] merge master -Dorg -Ssuccess-only
2024-06-30 00:46:31,874 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:46:31,875 [ scc.repo] DEBUG ## PRs found:
2024-06-30 00:46:32,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-06-30 00:46:32,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-06-30 00:46:33,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-06-30 00:46:33,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-30 00:46:34,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-30 00:46:34,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-30 00:46:35,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-30 00:46:35,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-06-30 00:46:35,668 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-06-30 00:46:35,668 [ scc.repo] DEBUG ## Branches found:
2024-06-30 00:46:35,668 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-30 00:46:35,669 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:46:35,669 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:35,676 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-30 00:46:35,681 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-30 00:46:35,681 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-30 00:46:35,686 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-30 00:46:35,692 [ scc.git] DEBUG Already up to date.
2024-06-30 00:46:35,692 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-06-30 00:46:36,036 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-06-30 00:46:36,036 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-06-30 00:46:36,041 [ scc.git] DEBUG ## Unique users: []
2024-06-30 00:46:36,041 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:46:36,041 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:36,048 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-30 00:46:36,055 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:36,059 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-30 00:46:36,070 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-30 00:46:36,073 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-06-30 00:46:36,073 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-06-30 00:46:36,073 [ scc.git] DEBUG requirements.txt | 2 +-
2024-06-30 00:46:36,073 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-06-30 00:46:36,073 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-06-30 00:46:36,073 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-06-30 00:46:36,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:46:36,246 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-30 00:46:36,284 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:46:36,284 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:36,290 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-30 00:46:36,327 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-30 00:46:36,334 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf4f7deb80> has no local changes
2024-06-30 00:46:36,334 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Generated by OMERO-plugins-push#111 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/)'
2024-06-30 00:46:36,342 [ scc.git] DEBUG [detached HEAD 15625c0] merge master -Dorg -Ssuccess-only
2024-06-30 00:46:36,343 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:46:36,343 [ scc.repo] DEBUG ## PRs found:
2024-06-30 00:46:36,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-06-30 00:46:37,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-06-30 00:46:37,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-06-30 00:46:38,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-30 00:46:38,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-30 00:46:39,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-30 00:46:39,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-06-30 00:46:39,701 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-30 00:46:40,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-06-30 00:46:40,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-06-30 00:46:41,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-30 00:46:41,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-30 00:46:42,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-30 00:46:42,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-06-30 00:46:42,813 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-30 00:46:42,813 [ scc.repo] DEBUG ## Branches found:
2024-06-30 00:46:42,813 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-30 00:46:42,813 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:46:42,814 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:42,821 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-30 00:46:42,826 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-30 00:46:42,826 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-30 00:46:42,831 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-30 00:46:42,837 [ scc.git] DEBUG Already up to date.
2024-06-30 00:46:42,837 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-06-30 00:46:43,405 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-30 00:46:43,405 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-06-30 00:46:43,410 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-06-30 00:46:43,787 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-30 00:46:43,787 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-06-30 00:46:43,792 [ scc.git] DEBUG ## Unique users: []
2024-06-30 00:46:43,792 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:46:43,792 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:43,799 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-30 00:46:43,806 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:43,812 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-30 00:46:43,977 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-06-30 00:46:43,977 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-06-30 00:46:43,977 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-30 00:46:43,977 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-30 00:46:43,978 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-30 00:46:43,978 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-30 00:46:43,985 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-30 00:46:43,994 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-30 00:46:44,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:46:44,169 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-30 00:46:44,177 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-30 00:46:44,190 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#111](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-06-30 00:46:44,204 [ scc.config] DEBUG Found github.token
2024-06-30 00:46:44,204 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-06-30 00:46:44,204 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-30 00:46:44,212 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:44,217 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-30 00:46:44,281 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-30 00:46:44,282 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-30 00:46:44,282 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-06-30 00:46:44,282 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-30 00:46:44,282 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-30 00:46:44,289 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-30 00:46:44,296 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-30 00:46:44,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:46:44,594 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-30 00:46:44,601 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-30 00:46:44,607 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#111](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-06-30 00:46:44,611 [ scc.config] DEBUG Found github.token
2024-06-30 00:46:44,611 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-06-30 00:46:44,612 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-30 00:46:44,651 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:46:44,652 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:44,657 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-30 00:46:44,699 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-30 00:46:44,707 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf6e80df70> has no local changes
2024-06-30 00:46:44,707 [ 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#111 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/)'
2024-06-30 00:46:44,716 [ scc.git] DEBUG [detached HEAD 0fc517f] merge master -Dorg -Ssuccess-only
2024-06-30 00:46:44,716 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:46:44,716 [ scc.repo] DEBUG ## PRs found:
2024-06-30 00:46:45,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-06-30 00:46:45,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-06-30 00:46:45,646 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-30 00:46:46,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-30 00:46:46,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-30 00:46:47,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-30 00:46:47,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-30 00:46:48,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-06-30 00:46:48,162 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-30 00:46:48,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-06-30 00:46:48,633 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-30 00:46:49,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-30 00:46:49,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-30 00:46:50,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-30 00:46:50,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-30 00:46:51,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-06-30 00:46:51,182 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-30 00:46:51,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-06-30 00:46:51,654 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-30 00:46:52,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-30 00:46:52,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-30 00:46:53,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-30 00:46:53,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-30 00:46:54,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-06-30 00:46:54,076 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-30 00:46:54,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-06-30 00:46:54,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-06-30 00:46:55,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-06-30 00:46:55,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-06-30 00:46:56,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-06-30 00:46:56,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-06-30 00:46:56,908 [ scc.repo] DEBUG ## Branches found:
2024-06-30 00:46:56,908 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-30 00:46:56,908 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:46:56,908 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:56,914 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-30 00:46:56,920 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-30 00:46:56,920 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-30 00:46:56,927 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-30 00:46:56,935 [ scc.git] DEBUG Already up to date.
2024-06-30 00:46:56,935 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-06-30 00:46:57,329 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-30 00:46:57,329 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-06-30 00:46:57,334 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-06-30 00:46:57,696 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-30 00:46:57,696 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-06-30 00:46:57,702 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-06-30 00:46:58,057 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-30 00:46:58,057 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-06-30 00:46:58,062 [ scc.git] DEBUG ## Unique users: []
2024-06-30 00:46:58,062 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:46:58,062 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:58,067 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-06-30 00:46:58,073 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:58,078 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-06-30 00:46:58,088 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-30 00:46:58,091 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-06-30 00:46:58,091 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-06-30 00:46:58,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:46:58,254 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-06-30 00:46:58,261 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:58,266 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 129 (Bump @babel/traverse from 7.21.4 to 7.23.2) 733f52703019d4b6d7e375c121a25c107b64dbec'
2024-06-30 00:46:58,315 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-30 00:46:58,316 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-30 00:46:58,320 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-06-30 00:46:58,320 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-06-30 00:46:58,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:46:58,675 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-06-30 00:46:58,682 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:58,687 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (Bump axios from 1.3.5 to 1.6.0) a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-06-30 00:46:58,719 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-30 00:46:58,720 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-30 00:46:58,723 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-06-30 00:46:58,723 [ scc.git] DEBUG package.json | 2 +-
2024-06-30 00:46:58,724 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-06-30 00:46:59,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:46:59,101 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-30 00:46:59,141 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:46:59,141 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:46:59,148 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-30 00:46:59,186 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-30 00:46:59,194 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf6e825e50> has no local changes
2024-06-30 00:46:59,194 [ 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#111 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/)'
2024-06-30 00:46:59,203 [ scc.git] DEBUG [detached HEAD e8952d8] merge master -Dorg -Ssuccess-only
2024-06-30 00:46:59,203 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:46:59,203 [ scc.repo] DEBUG ## PRs found:
2024-06-30 00:46:59,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-06-30 00:47:00,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-06-30 00:47:00,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-30 00:47:01,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-30 00:47:01,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-30 00:47:02,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-06-30 00:47:02,048 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-06-30 00:47:02,049 [ scc.repo] DEBUG ## Branches found:
2024-06-30 00:47:02,049 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-30 00:47:02,049 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:02,049 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:02,055 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-30 00:47:02,060 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-30 00:47:02,060 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-30 00:47:02,066 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-30 00:47:02,072 [ scc.git] DEBUG Already up to date.
2024-06-30 00:47:02,072 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-30 00:47:02,432 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-06-30 00:47:02,433 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-30 00:47:02,437 [ scc.git] DEBUG ## Unique users: []
2024-06-30 00:47:02,437 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:02,437 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:02,442 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-30 00:47:02,448 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:02,453 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-30 00:47:02,462 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-30 00:47:02,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:47:02,630 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-30 00:47:02,668 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:02,669 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:02,674 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-30 00:47:02,716 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-30 00:47:02,723 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf4c791fd0> has no local changes
2024-06-30 00:47:02,724 [ 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#111 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/)'
2024-06-30 00:47:02,734 [ scc.git] DEBUG [detached HEAD 2043075] merge master -Dorg -Ssuccess-only
2024-06-30 00:47:02,734 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:02,734 [ scc.repo] DEBUG ## PRs found:
2024-06-30 00:47:03,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-06-30 00:47:03,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-06-30 00:47:04,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-06-30 00:47:04,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-06-30 00:47:05,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-30 00:47:05,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-30 00:47:06,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-30 00:47:06,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-06-30 00:47:06,501 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-30 00:47:06,501 [ scc.repo] DEBUG ## Branches found:
2024-06-30 00:47:06,501 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-30 00:47:06,501 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:06,501 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:06,509 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-30 00:47:06,516 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-30 00:47:06,516 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-30 00:47:06,523 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-30 00:47:06,531 [ scc.git] DEBUG Already up to date.
2024-06-30 00:47:06,532 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-06-30 00:47:07,041 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-06-30 00:47:07,042 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-06-30 00:47:07,047 [ scc.git] DEBUG ## Unique users: []
2024-06-30 00:47:07,047 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:07,047 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:07,053 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-06-30 00:47:07,059 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:07,064 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-06-30 00:47:07,074 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-06-30 00:47:07,074 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-30 00:47:07,077 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-06-30 00:47:07,077 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-06-30 00:47:07,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:47:07,255 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-30 00:47:07,301 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:07,301 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:07,307 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-30 00:47:07,351 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-30 00:47:07,359 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf4c74a580> has no local changes
2024-06-30 00:47:07,359 [ 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#111 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/)'
2024-06-30 00:47:07,376 [ scc.git] DEBUG [detached HEAD 73619e5] merge master -Dorg -Ssuccess-only
2024-06-30 00:47:07,377 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:07,377 [ scc.repo] DEBUG ## PRs found:
2024-06-30 00:47:07,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-06-30 00:47:08,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-06-30 00:47:08,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-06-30 00:47:09,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-30 00:47:09,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-30 00:47:10,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-30 00:47:10,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-06-30 00:47:10,733 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-30 00:47:10,733 [ scc.repo] DEBUG ## Branches found:
2024-06-30 00:47:10,734 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-30 00:47:10,734 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:10,734 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:10,741 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-30 00:47:10,748 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-30 00:47:10,749 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-30 00:47:10,756 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-30 00:47:10,763 [ scc.git] DEBUG Already up to date.
2024-06-30 00:47:10,764 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-30 00:47:11,180 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-06-30 00:47:11,181 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-30 00:47:11,185 [ scc.git] DEBUG ## Unique users: []
2024-06-30 00:47:11,185 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:11,185 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:11,192 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-30 00:47:11,201 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:11,207 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-30 00:47:11,248 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-06-30 00:47:11,248 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-06-30 00:47:11,248 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-06-30 00:47:11,248 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-06-30 00:47:11,248 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-06-30 00:47:11,248 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-06-30 00:47:11,248 [ scc.git] DEBUG Auto-merging setup.py
2024-06-30 00:47:11,248 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-06-30 00:47:11,248 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-30 00:47:11,248 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-30 00:47:11,256 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-30 00:47:11,263 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-06-30 00:47:11,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:47:11,420 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-30 00:47:11,428 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-30 00:47:11,435 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#111](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- setup.py
- omero_signup/views.py
- omero_signup/urls.py
--conflicts
2024-06-30 00:47:11,442 [ scc.config] DEBUG Found github.token
2024-06-30 00:47:11,442 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-06-30 00:47:11,442 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-30 00:47:11,482 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:11,482 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:11,489 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-30 00:47:11,528 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-30 00:47:11,537 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf4f7ede80> has no local changes
2024-06-30 00:47:11,537 [ 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#111 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/)'
2024-06-30 00:47:11,546 [ scc.git] DEBUG [detached HEAD a29e218] merge master -Dorg -Ssuccess-only
2024-06-30 00:47:11,547 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:11,547 [ scc.repo] DEBUG ## PRs found:
2024-06-30 00:47:11,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-06-30 00:47:12,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-06-30 00:47:12,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-06-30 00:47:13,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-30 00:47:13,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-30 00:47:14,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-30 00:47:14,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-06-30 00:47:14,713 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-30 00:47:14,713 [ scc.repo] DEBUG ## Branches found:
2024-06-30 00:47:14,713 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-30 00:47:14,713 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:14,713 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:14,720 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-30 00:47:14,726 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-30 00:47:14,727 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-30 00:47:14,733 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-30 00:47:14,739 [ scc.git] DEBUG Already up to date.
2024-06-30 00:47:14,739 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-06-30 00:47:15,207 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-06-30 00:47:15,207 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-06-30 00:47:15,212 [ scc.git] DEBUG ## Unique users: []
2024-06-30 00:47:15,212 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:15,212 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:15,218 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-06-30 00:47:15,226 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:15,231 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-06-30 00:47:15,248 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-30 00:47:15,251 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-06-30 00:47:15,251 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-06-30 00:47:15,251 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-06-30 00:47:15,251 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-06-30 00:47:15,252 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-06-30 00:47:15,252 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-06-30 00:47:15,252 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-06-30 00:47:15,252 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-06-30 00:47:15,254 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-06-30 00:47:15,254 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-06-30 00:47:15,254 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-06-30 00:47:15,254 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-06-30 00:47:15,254 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-06-30 00:47:15,254 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-06-30 00:47:15,254 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-06-30 00:47:15,254 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-06-30 00:47:15,254 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-06-30 00:47:15,254 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-06-30 00:47:15,254 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-06-30 00:47:15,254 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-06-30 00:47:15,254 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-06-30 00:47:15,254 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-06-30 00:47:15,254 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-06-30 00:47:15,254 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-06-30 00:47:15,254 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-06-30 00:47:15,254 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-06-30 00:47:15,254 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-06-30 00:47:15,254 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-06-30 00:47:15,255 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-06-30 00:47:15,255 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-06-30 00:47:15,255 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-06-30 00:47:15,255 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-06-30 00:47:15,255 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-06-30 00:47:15,255 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-06-30 00:47:15,255 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-06-30 00:47:15,255 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-06-30 00:47:15,255 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-06-30 00:47:15,255 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-06-30 00:47:15,255 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-06-30 00:47:15,255 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-06-30 00:47:15,255 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-06-30 00:47:15,255 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-06-30 00:47:15,255 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-06-30 00:47:15,255 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-06-30 00:47:15,255 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-06-30 00:47:15,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:47:15,418 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-30 00:47:15,459 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:15,460 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:15,473 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-30 00:47:15,514 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-30 00:47:15,522 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf4c74a730> has no local changes
2024-06-30 00:47:15,522 [ 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#111 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/)'
2024-06-30 00:47:15,533 [ scc.git] DEBUG [detached HEAD dc85382] merge master -Dorg -Ssuccess-only
2024-06-30 00:47:15,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:15,534 [ scc.repo] DEBUG ## PRs found:
2024-06-30 00:47:15,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-06-30 00:47:15,831 [ scc.repo] DEBUG ## Branches found:
2024-06-30 00:47:15,831 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-30 00:47:15,832 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:15,832 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:15,838 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-30 00:47:15,845 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-30 00:47:15,845 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-30 00:47:15,851 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-30 00:47:15,857 [ scc.git] DEBUG Already up to date.
2024-06-30 00:47:15,858 [ scc.git] DEBUG ## Unique users: []
2024-06-30 00:47:15,858 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:15,858 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:15,863 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-30 00:47:15,910 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:15,910 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:15,916 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-30 00:47:15,957 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-30 00:47:15,964 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf4c75abe0> has no local changes
2024-06-30 00:47:15,965 [ 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#111 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/)'
2024-06-30 00:47:15,974 [ scc.git] DEBUG [detached HEAD 88c822e] merge master -Dorg -Ssuccess-only
2024-06-30 00:47:15,974 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:15,974 [ scc.repo] DEBUG ## PRs found:
2024-06-30 00:47:16,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-06-30 00:47:16,259 [ scc.repo] DEBUG ## Branches found:
2024-06-30 00:47:16,259 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-30 00:47:16,260 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:16,260 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:16,266 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-30 00:47:16,271 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-30 00:47:16,271 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-30 00:47:16,276 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-30 00:47:16,283 [ scc.git] DEBUG Already up to date.
2024-06-30 00:47:16,283 [ scc.git] DEBUG ## Unique users: []
2024-06-30 00:47:16,283 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:16,283 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:16,290 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-30 00:47:16,332 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:16,332 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:16,338 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-30 00:47:16,379 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-30 00:47:16,385 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf4c77c250> has no local changes
2024-06-30 00:47:16,386 [ 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#111 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/)'
2024-06-30 00:47:16,395 [ scc.git] DEBUG [detached HEAD e356bd1] merge master -Dorg -Ssuccess-only
2024-06-30 00:47:16,395 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:16,395 [ scc.git] INFO Overriding base-branch from master to main
2024-06-30 00:47:16,395 [ scc.repo] DEBUG ## PRs found:
2024-06-30 00:47:16,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-06-30 00:47:17,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-06-30 00:47:17,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-06-30 00:47:18,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-06-30 00:47:18,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-30 00:47:19,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-30 00:47:19,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-30 00:47:20,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-30 00:47:20,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-06-30 00:47:20,506 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-30 00:47:20,507 [ scc.repo] DEBUG ## Branches found:
2024-06-30 00:47:20,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-30 00:47:20,507 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:20,507 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:20,513 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-06-30 00:47:20,520 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-30 00:47:20,520 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-06-30 00:47:20,527 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-06-30 00:47:20,535 [ scc.git] DEBUG Already up to date.
2024-06-30 00:47:20,536 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-06-30 00:47:20,937 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-06-30 00:47:20,937 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-06-30 00:47:20,942 [ scc.git] DEBUG ## Unique users: []
2024-06-30 00:47:20,942 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:20,942 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:20,948 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-30 00:47:20,954 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:20,959 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-30 00:47:20,990 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-06-30 00:47:20,991 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-06-30 00:47:20,991 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-30 00:47:20,991 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-30 00:47:20,999 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-30 00:47:21,006 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-06-30 00:47:21,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:47:21,157 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-30 00:47:21,164 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-30 00:47:21,170 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#111](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-06-30 00:47:21,177 [ scc.config] DEBUG Found github.token
2024-06-30 00:47:21,177 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-06-30 00:47:21,177 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-30 00:47:21,219 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:21,219 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:21,224 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-30 00:47:21,262 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-30 00:47:21,269 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf4c7798e0> has no local changes
2024-06-30 00:47:21,269 [ 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#111 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/)'
2024-06-30 00:47:21,278 [ scc.git] DEBUG [detached HEAD 8ed635e] merge master -Dorg -Ssuccess-only
2024-06-30 00:47:21,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:21,278 [ scc.repo] DEBUG ## PRs found:
2024-06-30 00:47:21,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-06-30 00:47:21,603 [ scc.repo] DEBUG ## Branches found:
2024-06-30 00:47:21,603 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-30 00:47:21,603 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:21,604 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:21,609 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-30 00:47:21,614 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-30 00:47:21,614 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-30 00:47:21,619 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-30 00:47:21,625 [ scc.git] DEBUG Already up to date.
2024-06-30 00:47:21,625 [ scc.git] DEBUG ## Unique users: []
2024-06-30 00:47:21,625 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:21,626 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:21,631 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-30 00:47:21,669 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:21,669 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:21,675 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-30 00:47:21,713 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-30 00:47:21,719 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf4c74feb0> has no local changes
2024-06-30 00:47:21,720 [ 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#111 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/)'
2024-06-30 00:47:21,728 [ scc.git] DEBUG [detached HEAD 8a2e54d] merge master -Dorg -Ssuccess-only
2024-06-30 00:47:21,729 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:21,729 [ scc.repo] DEBUG ## PRs found:
2024-06-30 00:47:22,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-06-30 00:47:22,039 [ scc.repo] DEBUG ## Branches found:
2024-06-30 00:47:22,040 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-30 00:47:22,040 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:22,040 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:22,051 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-30 00:47:22,057 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-30 00:47:22,057 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-30 00:47:22,063 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-30 00:47:22,070 [ scc.git] DEBUG Already up to date.
2024-06-30 00:47:22,070 [ scc.git] DEBUG ## Unique users: []
2024-06-30 00:47:22,070 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:22,070 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:22,076 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-30 00:47:22,116 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:22,116 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:22,123 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-30 00:47:22,163 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-30 00:47:22,170 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf4c6c6520> has no local changes
2024-06-30 00:47:22,170 [ 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#111 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/)'
2024-06-30 00:47:22,182 [ scc.git] DEBUG [detached HEAD de42a44] merge master -Dorg -Ssuccess-only
2024-06-30 00:47:22,182 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:22,182 [ scc.repo] DEBUG ## PRs found:
2024-06-30 00:47:22,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-06-30 00:47:23,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-06-30 00:47:23,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-06-30 00:47:23,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-30 00:47:24,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-30 00:47:24,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-30 00:47:25,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-06-30 00:47:25,293 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-06-30 00:47:25,294 [ scc.repo] DEBUG ## Branches found:
2024-06-30 00:47:25,294 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-30 00:47:25,294 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:25,294 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:25,300 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-30 00:47:25,305 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-30 00:47:25,305 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-30 00:47:25,310 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-30 00:47:25,316 [ scc.git] DEBUG Already up to date.
2024-06-30 00:47:25,317 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-06-30 00:47:25,742 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-06-30 00:47:25,742 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-06-30 00:47:25,747 [ scc.git] DEBUG ## Unique users: []
2024-06-30 00:47:25,747 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:25,747 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:25,753 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-30 00:47:25,760 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:25,766 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-30 00:47:25,794 [ scc.git] DEBUG Auto-merging Dockerfile
2024-06-30 00:47:25,794 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-06-30 00:47:25,794 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-30 00:47:25,795 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-30 00:47:25,801 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-30 00:47:25,809 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-06-30 00:47:25,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:47:25,970 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-30 00:47:25,979 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-30 00:47:25,992 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#111](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-06-30 00:47:26,001 [ scc.config] DEBUG Found github.token
2024-06-30 00:47:26,001 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-06-30 00:47:26,001 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-30 00:47:26,042 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:26,042 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:26,048 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-30 00:47:26,088 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-30 00:47:26,096 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf4c70bbe0> has no local changes
2024-06-30 00:47:26,096 [ 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#111 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/)'
2024-06-30 00:47:26,109 [ scc.git] DEBUG [detached HEAD 5f062f2] merge master -Dorg -Ssuccess-only
2024-06-30 00:47:26,109 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:26,109 [ scc.git] INFO Overriding base-branch from master to develop
2024-06-30 00:47:26,110 [ scc.repo] DEBUG ## PRs found:
2024-06-30 00:47:26,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-06-30 00:47:27,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-06-30 00:47:27,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-06-30 00:47:27,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-06-30 00:47:28,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-06-30 00:47:28,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-06-30 00:47:29,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-06-30 00:47:29,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-30 00:47:30,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-30 00:47:30,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-30 00:47:31,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-06-30 00:47:31,106 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-30 00:47:31,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-06-30 00:47:32,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-06-30 00:47:32,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-06-30 00:47:33,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-06-30 00:47:33,051 [ scc.repo] DEBUG ## Branches found:
2024-06-30 00:47:33,051 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-30 00:47:33,051 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:33,051 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:33,058 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-06-30 00:47:33,063 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-30 00:47:33,064 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-06-30 00:47:33,070 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-06-30 00:47:33,078 [ scc.git] DEBUG Already up to date.
2024-06-30 00:47:33,079 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-06-30 00:47:33,547 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-06-30 00:47:33,547 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-06-30 00:47:33,552 [ scc.git] DEBUG ## Unique users: []
2024-06-30 00:47:33,552 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:33,552 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:33,559 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-30 00:47:33,567 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:33,572 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-30 00:47:33,613 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-06-30 00:47:33,614 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-06-30 00:47:33,614 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-30 00:47:33,614 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-30 00:47:33,620 [ scc.git] DEBUG Calling 'git reset --hard c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-06-30 00:47:33,627 [ scc.git] DEBUG HEAD is now at c20d273 Merge pull request #221 from imcf/fix-typechecking
2024-06-30 00:47:33,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:47:33,789 [ scc.git] DEBUG Calling 'git merge-base c20d2734b711c659cecea83db6e2ebd7b7013636 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-30 00:47:33,798 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-06-30 00:47:33,805 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#111](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-06-30 00:47:33,811 [ scc.config] DEBUG Found github.token
2024-06-30 00:47:33,812 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-06-30 00:47:33,812 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-30 00:47:33,851 [ scc.git] DEBUG Get sha1 of %s
2024-06-30 00:47:33,852 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-30 00:47:33,858 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-30 00:47:33,902 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-30 00:47:33,910 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf4c6c63d0> has no local changes
2024-06-30 00:47:33,910 [ 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#111 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/)'
2024-06-30 00:47:33,920 [ scc.git] DEBUG [detached HEAD 3ab92b0] merge master -Dorg -Ssuccess-only
2024-06-30 00:47:33,921 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:33,921 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-30 00:47:34,001 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-06-30 00:47:34,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:47:34,224 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-06-30 00:47:34,229 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-06-30 00:47:34,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:47:34,646 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-06-30 00:47:34,652 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-06-30 00:47:35,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:47:35,058 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-06-30 00:47:35,064 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-06-30 00:47:35,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:47:35,486 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-06-30 00:47:35,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:47:35,879 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-06-30 00:47:35,884 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-06-30 00:47:36,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:47:36,286 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-06-30 00:47:36,293 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-06-30 00:47:36,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:47:36,700 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-06-30 00:47:36,705 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-06-30 00:47:37,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:47:37,113 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-06-30 00:47:37,119 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-06-30 00:47:37,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:47:37,519 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-06-30 00:47:37,524 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-06-30 00:47:37,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:47:37,925 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-06-30 00:47:37,929 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-06-30 00:47:38,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:47:38,340 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-06-30 00:47:38,344 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-06-30 00:47:38,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:47:38,740 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-06-30 00:47:38,745 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-06-30 00:47:39,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:47:39,150 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-06-30 00:47:39,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:47:39,573 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-06-30 00:47:39,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:47:39,977 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-06-30 00:47:39,982 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-06-30 00:47:40,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:47:40,411 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-06-30 00:47:40,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:47:40,820 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-06-30 00:47:41,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:47:41,216 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-06-30 00:47:41,222 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-06-30 00:47:41,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:47:41,638 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-06-30 00:47:41,643 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-06-30 00:47:42,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:47:42,054 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-06-30 00:47:42,059 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-06-30 00:47:42,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:47:42,473 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-06-30 00:47:42,479 [ scc.config] DEBUG Found submodule.scripts.url
2024-06-30 00:47:42,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-30 00:47:42,888 [ scc.config] DEBUG Found submodule.scripts.branch
2024-06-30 00:47:42,888 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-30 00:47:42,988 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf6fb79160> has local changes
2024-06-30 00:47:42,989 [ 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 378 dependabot[bot] 'Bump scripts from `5a90893` to `c20d273`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 63 sbesson 'Remove python-future dependency'
- PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 560 will-moore 'Max projection bytes' (exclude comment)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 572 sbesson 'Remove the maximum reportlab version from the readme'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- 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 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#111 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/111/)'
2024-06-30 00:47:43,012 [ scc.git] DEBUG [detached HEAD da34e11] merge master -Dorg -Ssuccess-only
2024-06-30 00:47:43,012 [ scc.merge] INFO Repository: ome/omero-plugins
2024-06-30 00:47:43,012 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-06-30 00:47:43,012 [ scc.merge] INFO Already up to date.
2024-06-30 00:47:43,012 [ scc.merge] INFO
2024-06-30 00:47:43,012 [ scc.merge] INFO Merged PRs:
2024-06-30 00:47:43,013 [ scc.merge] INFO - PR 378 dependabot[bot] 'Bump scripts from `5a90893` to `c20d273`'
2024-06-30 00:47:43,013 [ scc.merge] INFO
2024-06-30 00:47:43,013 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-06-30 00:47:43,013 [ scc.merge] INFO Already up to date.
2024-06-30 00:47:43,013 [ scc.merge] INFO
2024-06-30 00:47:43,013 [ scc.merge] INFO
2024-06-30 00:47:43,013 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-06-30 00:47:43,013 [ scc.merge] INFO Excluded PRs:
2024-06-30 00:47:43,013 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-06-30 00:47:43,013 [ scc.merge] INFO Already up to date.
2024-06-30 00:47:43,013 [ scc.merge] INFO
2024-06-30 00:47:43,013 [ scc.merge] INFO Merged PRs:
2024-06-30 00:47:43,013 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-06-30 00:47:43,013 [ scc.merge] INFO
2024-06-30 00:47:43,013 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-06-30 00:47:43,013 [ scc.merge] INFO Excluded PRs:
2024-06-30 00:47:43,013 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-06-30 00:47:43,013 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-06-30 00:47:43,013 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-06-30 00:47:43,013 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-06-30 00:47:43,013 [ scc.merge] INFO Already up to date.
2024-06-30 00:47:43,013 [ scc.merge] INFO
2024-06-30 00:47:43,013 [ scc.merge] INFO Merged PRs:
2024-06-30 00:47:43,014 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-06-30 00:47:43,014 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-06-30 00:47:43,014 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-06-30 00:47:43,014 [ scc.merge] INFO
2024-06-30 00:47:43,014 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-06-30 00:47:43,014 [ scc.merge] INFO Excluded PRs:
2024-06-30 00:47:43,014 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-30 00:47:43,014 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-06-30 00:47:43,014 [ scc.merge] INFO Already up to date.
2024-06-30 00:47:43,014 [ scc.merge] INFO
2024-06-30 00:47:43,014 [ scc.merge] INFO Merged PRs:
2024-06-30 00:47:43,014 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-06-30 00:47:43,014 [ scc.merge] INFO
2024-06-30 00:47:43,014 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-30 00:47:43,014 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-06-30 00:47:43,014 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-06-30 00:47:43,014 [ scc.merge] INFO
2024-06-30 00:47:43,014 [ scc.merge] INFO Repository: ome/omero-figure
2024-06-30 00:47:43,014 [ scc.merge] INFO Excluded PRs:
2024-06-30 00:47:43,014 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes' (exclude comment)
2024-06-30 00:47:43,014 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-06-30 00:47:43,014 [ scc.merge] INFO Already up to date.
2024-06-30 00:47:43,014 [ scc.merge] INFO
2024-06-30 00:47:43,014 [ scc.merge] INFO Merged PRs:
2024-06-30 00:47:43,015 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-06-30 00:47:43,015 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-06-30 00:47:43,015 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-06-30 00:47:43,015 [ scc.merge] INFO - PR 572 sbesson 'Remove the maximum reportlab version from the readme'
2024-06-30 00:47:43,015 [ scc.merge] INFO
2024-06-30 00:47:43,015 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-06-30 00:47:43,015 [ scc.merge] INFO Already up to date.
2024-06-30 00:47:43,015 [ scc.merge] INFO
2024-06-30 00:47:43,015 [ scc.merge] INFO Merged PRs:
2024-06-30 00:47:43,015 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-06-30 00:47:43,015 [ scc.merge] INFO
2024-06-30 00:47:43,015 [ scc.merge] INFO Repository: ome/omero-gallery
2024-06-30 00:47:43,015 [ scc.merge] INFO Already up to date.
2024-06-30 00:47:43,015 [ scc.merge] INFO
2024-06-30 00:47:43,015 [ scc.merge] INFO Merged PRs:
2024-06-30 00:47:43,015 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-30 00:47:43,015 [ scc.merge] INFO
2024-06-30 00:47:43,015 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-06-30 00:47:43,015 [ scc.merge] INFO Excluded PRs:
2024-06-30 00:47:43,015 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-06-30 00:47:43,015 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-06-30 00:47:43,015 [ scc.merge] INFO Already up to date.
2024-06-30 00:47:43,015 [ scc.merge] INFO
2024-06-30 00:47:43,016 [ scc.merge] INFO Merged PRs:
2024-06-30 00:47:43,016 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-06-30 00:47:43,016 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-06-30 00:47:43,016 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-30 00:47:43,016 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-06-30 00:47:43,016 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-06-30 00:47:43,016 [ scc.merge] INFO
2024-06-30 00:47:43,016 [ scc.merge] INFO Repository: ome/omero-mapr
2024-06-30 00:47:43,016 [ scc.merge] INFO Excluded PRs:
2024-06-30 00:47:43,016 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-06-30 00:47:43,016 [ scc.merge] INFO Already up to date.
2024-06-30 00:47:43,016 [ scc.merge] INFO
2024-06-30 00:47:43,016 [ scc.merge] INFO Merged PRs:
2024-06-30 00:47:43,016 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-06-30 00:47:43,016 [ scc.merge] INFO
2024-06-30 00:47:43,016 [ scc.merge] INFO Repository: ome/omero-metadata
2024-06-30 00:47:43,016 [ scc.merge] INFO Already up to date.
2024-06-30 00:47:43,016 [ scc.merge] INFO
2024-06-30 00:47:43,016 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-30 00:47:43,016 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-30 00:47:43,016 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-30 00:47:43,016 [ scc.merge] INFO
2024-06-30 00:47:43,016 [ scc.merge] INFO Repository: ome/omero-parade
2024-06-30 00:47:43,017 [ scc.merge] INFO Excluded PRs:
2024-06-30 00:47:43,017 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-06-30 00:47:43,017 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-06-30 00:47:43,017 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-06-30 00:47:43,017 [ scc.merge] INFO Already up to date.
2024-06-30 00:47:43,017 [ scc.merge] INFO
2024-06-30 00:47:43,017 [ scc.merge] INFO Merged PRs:
2024-06-30 00:47:43,017 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-30 00:47:43,017 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-30 00:47:43,017 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-30 00:47:43,017 [ scc.merge] INFO
2024-06-30 00:47:43,017 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-06-30 00:47:43,017 [ scc.merge] INFO Already up to date.
2024-06-30 00:47:43,017 [ scc.merge] INFO
2024-06-30 00:47:43,017 [ scc.merge] INFO Merged PRs:
2024-06-30 00:47:43,017 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-06-30 00:47:43,017 [ scc.merge] INFO
2024-06-30 00:47:43,017 [ scc.merge] INFO Repository: ome/omero-rois
2024-06-30 00:47:43,017 [ scc.merge] INFO Excluded PRs:
2024-06-30 00:47:43,017 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-30 00:47:43,017 [ scc.merge] INFO Already up to date.
2024-06-30 00:47:43,017 [ scc.merge] INFO
2024-06-30 00:47:43,017 [ scc.merge] INFO Merged PRs:
2024-06-30 00:47:43,017 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-30 00:47:43,018 [ scc.merge] INFO
2024-06-30 00:47:43,018 [ scc.merge] INFO Repository: ome/omero-signup
2024-06-30 00:47:43,018 [ scc.merge] INFO Already up to date.
2024-06-30 00:47:43,018 [ scc.merge] INFO
2024-06-30 00:47:43,018 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-30 00:47:43,018 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-30 00:47:43,018 [ scc.merge] INFO
2024-06-30 00:47:43,018 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-06-30 00:47:43,018 [ scc.merge] INFO Already up to date.
2024-06-30 00:47:43,018 [ scc.merge] INFO
2024-06-30 00:47:43,018 [ scc.merge] INFO Merged PRs:
2024-06-30 00:47:43,018 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-30 00:47:43,018 [ scc.merge] INFO
2024-06-30 00:47:43,018 [ scc.merge] INFO Repository: ome/omero-upload
2024-06-30 00:47:43,018 [ scc.merge] INFO Already up to date.
2024-06-30 00:47:43,018 [ scc.merge] INFO
2024-06-30 00:47:43,018 [ scc.merge] INFO
2024-06-30 00:47:43,018 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-06-30 00:47:43,018 [ scc.merge] INFO Already up to date.
2024-06-30 00:47:43,018 [ scc.merge] INFO
2024-06-30 00:47:43,018 [ scc.merge] INFO
2024-06-30 00:47:43,018 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-06-30 00:47:43,018 [ scc.merge] INFO Excluded PRs:
2024-06-30 00:47:43,019 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-06-30 00:47:43,019 [ scc.merge] INFO Already up to date.
2024-06-30 00:47:43,019 [ scc.merge] INFO
2024-06-30 00:47:43,019 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-30 00:47:43,019 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-30 00:47:43,019 [ scc.merge] INFO
2024-06-30 00:47:43,019 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-06-30 00:47:43,019 [ scc.merge] INFO Already up to date.
2024-06-30 00:47:43,019 [ scc.merge] INFO
2024-06-30 00:47:43,019 [ scc.merge] INFO
2024-06-30 00:47:43,019 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-06-30 00:47:43,019 [ scc.merge] INFO Already up to date.
2024-06-30 00:47:43,019 [ scc.merge] INFO
2024-06-30 00:47:43,019 [ scc.merge] INFO
2024-06-30 00:47:43,019 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-06-30 00:47:43,019 [ scc.merge] INFO Already up to date.
2024-06-30 00:47:43,019 [ scc.merge] INFO
2024-06-30 00:47:43,019 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-30 00:47:43,019 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-06-30 00:47:43,019 [ scc.merge] INFO
2024-06-30 00:47:43,019 [ scc.merge] INFO Repository: ome/scripts
2024-06-30 00:47:43,019 [ scc.merge] INFO Excluded PRs:
2024-06-30 00:47:43,019 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-06-30 00:47:43,020 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-06-30 00:47:43,020 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-06-30 00:47:43,020 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-06-30 00:47:43,020 [ scc.merge] INFO Already up to date.
2024-06-30 00:47:43,020 [ scc.merge] INFO
2024-06-30 00:47:43,020 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-30 00:47:43,020 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-30 00:47:43,020 [ scc.merge] INFO
2024-06-30 00:47:43,020 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-06-30 00:47:43,020 [ scc.git] DEBUG Calling 'git remote'
2024-06-30 00:47:43,031 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-06-30 00:47:43,031 [ scc.git] DEBUG Calling 'git remote'
2024-06-30 00:47:43,049 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:43,050 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-06-30 00:47:43,050 [ scc.git] DEBUG Calling 'git remote'
2024-06-30 00:47:43,060 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:43,061 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-06-30 00:47:43,061 [ scc.git] DEBUG Calling 'git remote'
2024-06-30 00:47:43,072 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:43,072 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-06-30 00:47:43,072 [ scc.git] DEBUG Calling 'git remote'
2024-06-30 00:47:43,081 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:43,081 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-30 00:47:43,081 [ scc.git] DEBUG Calling 'git remote'
2024-06-30 00:47:43,091 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:43,091 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-30 00:47:43,092 [ scc.git] DEBUG Calling 'git remote'
2024-06-30 00:47:43,100 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:43,100 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-30 00:47:43,100 [ scc.git] DEBUG Calling 'git remote'
2024-06-30 00:47:43,107 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:43,108 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-30 00:47:43,108 [ scc.git] DEBUG Calling 'git remote'
2024-06-30 00:47:43,115 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:43,115 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-30 00:47:43,115 [ scc.git] DEBUG Calling 'git remote'
2024-06-30 00:47:43,123 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:43,124 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-30 00:47:43,124 [ scc.git] DEBUG Calling 'git remote'
2024-06-30 00:47:43,132 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:43,133 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-30 00:47:43,133 [ scc.git] DEBUG Calling 'git remote'
2024-06-30 00:47:43,140 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:43,140 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-30 00:47:43,140 [ scc.git] DEBUG Calling 'git remote'
2024-06-30 00:47:43,148 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:43,148 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-30 00:47:43,148 [ scc.git] DEBUG Calling 'git remote'
2024-06-30 00:47:43,155 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:43,155 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-30 00:47:43,155 [ scc.git] DEBUG Calling 'git remote'
2024-06-30 00:47:43,161 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:43,161 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-30 00:47:43,161 [ scc.git] DEBUG Calling 'git remote'
2024-06-30 00:47:43,166 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:43,166 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-30 00:47:43,166 [ scc.git] DEBUG Calling 'git remote'
2024-06-30 00:47:43,171 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:43,172 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-30 00:47:43,172 [ scc.git] DEBUG Calling 'git remote'
2024-06-30 00:47:43,177 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:43,177 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-30 00:47:43,177 [ scc.git] DEBUG Calling 'git remote'
2024-06-30 00:47:43,182 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:43,182 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-30 00:47:43,182 [ scc.git] DEBUG Calling 'git remote'
2024-06-30 00:47:43,187 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:43,187 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-30 00:47:43,187 [ scc.git] DEBUG Calling 'git remote'
2024-06-30 00:47:43,192 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:43,192 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-30 00:47:43,192 [ scc.git] DEBUG Calling 'git remote'
2024-06-30 00:47:43,197 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-30 00:47:43,197 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-30 00:47:43,198 [ scc.git] DEBUG Calling 'git remote'
2024-06-30 00:47:43,206 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.9.1 to 5.9.2-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD 5cf9a6d] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 2ca566b
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from 9ffbc8b7
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 c20d273
nothing to commit, working tree clean
[detached HEAD 20d9949] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-06-30 00:48:29,989 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-06-30 00:48:38,913 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-06-30 00:48:41,301 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-06-30 00:48:45,882 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-06-30 00:49:32,606 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/0ce0ee70/images/svgs/logo.svg){kind=logo}
