Console Output
Skipping 105 KB..
Full Log42:01,677 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/js/shape_editor/rect.js
2024-08-31 00:42:01,677 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-08-31 00:42:01,677 [ scc.git] DEBUG Auto-merging src/templates/shapes/shape_toolbar.template.html
2024-08-31 00:42:01,677 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-31 00:42:01,678 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-31 00:42:01,686 [ scc.git] DEBUG Calling 'git reset --hard adacfca19b7323347bb674f8cbd1d30bc4aa7ccc'
2024-08-31 00:42:01,700 [ scc.git] DEBUG HEAD is now at adacfca1 merge master -Dorg -Ssuccess-only: PR 568 (Remove numpy from tests_require in setup.py)
2024-08-31 00:42:01,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:42:01,980 [ scc.git] DEBUG Calling 'git merge-base cbdd365756caa80353d6b3ffd66259efbda098ee cde38a507d291b03c4b821a8d4d110985ed17164'
2024-08-31 00:42:01,987 [ scc.git] DEBUG Calling 'git diff --name-only cbdd365756caa80353d6b3ffd66259efbda098ee..cbdd365756caa80353d6b3ffd66259efbda098ee'
2024-08-31 00:42:01,993 [ scc.git] INFO - PR 577 Rdornier 'Fill rois'
Conflicting PR. Removed from build [OMERO-plugins-push#170](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/consoleText) for more details.
Possible conflicts:
- PR #549 will-moore 'Inset feature'
- src/js/shape_editor/rect.js
- PR #555 will-moore 'Points in shape editor'
- omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
- PR #560 will-moore 'Max projection bytes'
- omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
--conflicts
2024-08-31 00:42:01,998 [ scc.config] DEBUG Found github.token
2024-08-31 00:42:01,999 [ scc.git] DEBUG Adding comment to issue #577.
2024-08-31 00:42:02,769 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-figure/issues/577/comments HTTP/1.1" 201 2212
2024-08-31 00:42:02,771 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b47792851e0427c1d5fc7ba778783b8e09e21f47'
2024-08-31 00:42:02,786 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:02,792 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 583 (Add Hilo Checkbox for LUT Toggling in Channel Slider View) b47792851e0427c1d5fc7ba778783b8e09e21f47'
2024-08-31 00:42:02,810 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-31 00:42:02,810 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:42:02,814 [ scc.git] DEBUG src/js/models/panel_model.js | 10 +++++++++
2024-08-31 00:42:02,814 [ scc.git] DEBUG src/js/models/undo.js | 3 ++-
2024-08-31 00:42:02,814 [ scc.git] DEBUG src/js/views/channel_slider_view.js | 42 +++++++++++++++++++++++++++++++++---
2024-08-31 00:42:02,814 [ scc.git] DEBUG src/templates/checkbox_template.html | 4 ++++
2024-08-31 00:42:02,814 [ scc.git] DEBUG 4 files changed, 55 insertions(+), 4 deletions(-)
2024-08-31 00:42:02,814 [ scc.git] DEBUG create mode 100644 src/templates/checkbox_template.html
2024-08-31 00:42:03,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:42:03,150 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:42:03,191 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:42:03,192 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:03,197 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:42:03,235 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:42:03,242 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe5b1301b50> has no local changes
2024-08-31 00:42:03,243 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 584 Rdornier 'Link url to image' (user: Rdornier)
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 578 Rdornier 'Image outline' (status: failure)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
Conflicting PRs (not included):
- PR 577 Rdornier 'Fill rois'
Generated by OMERO-plugins-push#170 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/)'
2024-08-31 00:42:03,252 [ scc.git] DEBUG [detached HEAD b1793448] merge master -Dorg -Ssuccess-only
2024-08-31 00:42:03,252 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:42:03,253 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:42:03,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-08-31 00:42:04,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-08-31 00:42:04,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-08-31 00:42:05,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-31 00:42:05,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:42:06,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-31 00:42:06,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:42:06,528 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-08-31 00:42:06,528 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:42:06,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-31 00:42:06,529 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:42:06,529 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:06,535 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:42:06,541 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:42:06,541 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:42:06,547 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:42:06,553 [ scc.git] DEBUG Already up to date.
2024-08-31 00:42:06,554 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-08-31 00:42:06,853 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-08-31 00:42:06,853 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-08-31 00:42:06,858 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:42:06,858 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:42:06,859 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:06,864 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-31 00:42:06,869 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:06,874 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-31 00:42:06,883 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-08-31 00:42:06,884 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:42:06,886 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-08-31 00:42:06,886 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-08-31 00:42:07,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:42:07,025 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:42:07,070 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:42:07,071 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:07,076 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:42:07,114 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:42:07,120 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe5b3358ee0> has no local changes
2024-08-31 00:42:07,121 [ 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#170 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/)'
2024-08-31 00:42:07,129 [ scc.git] DEBUG [detached HEAD 62db085] merge master -Dorg -Ssuccess-only
2024-08-31 00:42:07,130 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:42:07,130 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:42:07,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-08-31 00:42:07,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-08-31 00:42:07,988 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-31 00:42:08,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-31 00:42:09,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:42:09,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-31 00:42:10,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-31 00:42:10,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:42:10,437 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-31 00:42:10,437 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:42:10,437 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-31 00:42:10,437 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:42:10,437 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:10,445 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:42:10,451 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:42:10,451 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:42:10,457 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:42:10,463 [ scc.git] DEBUG Already up to date.
2024-08-31 00:42:10,463 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-08-31 00:42:10,787 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-08-31 00:42:10,787 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-08-31 00:42:10,793 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:42:10,793 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:42:10,794 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:10,803 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-08-31 00:42:10,811 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:10,820 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-08-31 00:42:10,833 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:42:10,838 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-08-31 00:42:10,838 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-08-31 00:42:10,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:42:10,975 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:42:11,023 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:42:11,023 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:11,030 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:42:11,082 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:42:11,090 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe5b1301be0> has no local changes
2024-08-31 00:42:11,091 [ 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#170 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/)'
2024-08-31 00:42:11,099 [ scc.git] DEBUG [detached HEAD 83b2b62] merge master -Dorg -Ssuccess-only
2024-08-31 00:42:11,099 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:42:11,099 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:42:11,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-08-31 00:42:11,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/483 HTTP/1.1" 200 None
2024-08-31 00:42:11,981 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-31 00:42:12,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-08-31 00:42:12,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:42:13,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-31 00:42:14,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-08-31 00:42:14,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/384771c9fd794e2b472a35dca65e6ed96be98c4d?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:42:14,462 [ scc.repo] DEBUG - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-08-31 00:42:14,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482 HTTP/1.1" 200 None
2024-08-31 00:42:15,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482/comments HTTP/1.1" 200 None
2024-08-31 00:42:15,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-08-31 00:42:16,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:42:16,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-31 00:42:17,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-08-31 00:42:17,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:42:17,551 [ scc.repo] DEBUG - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-08-31 00:42:18,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-08-31 00:42:18,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-08-31 00:42:18,478 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-31 00:42:19,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-31 00:42:19,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:42:20,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-31 00:42:20,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-31 00:42:20,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:42:20,898 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-31 00:42:21,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-08-31 00:42:21,334 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-31 00:42:21,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-31 00:42:22,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:42:22,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-31 00:42:23,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-31 00:42:23,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:42:23,800 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-31 00:42:24,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-08-31 00:42:24,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-08-31 00:42:25,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-31 00:42:25,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:42:26,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-31 00:42:26,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-31 00:42:27,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:42:27,045 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-31 00:42:27,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-08-31 00:42:27,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-08-31 00:42:28,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-31 00:42:28,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:42:29,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-31 00:42:29,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-31 00:42:30,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:42:30,278 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-08-31 00:42:30,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-08-31 00:42:31,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-08-31 00:42:31,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-31 00:42:32,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:42:32,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-31 00:42:32,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:42:32,912 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-08-31 00:42:32,913 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:42:32,913 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-31 00:42:32,914 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:42:32,914 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:32,922 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:42:32,931 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:42:32,931 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:42:32,940 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:42:32,950 [ scc.git] DEBUG Already up to date.
2024-08-31 00:42:32,951 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-08-31 00:42:33,335 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-31 00:42:33,336 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-08-31 00:42:33,342 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-08-31 00:42:34,229 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-31 00:42:34,230 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-08-31 00:42:34,235 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-08-31 00:42:34,574 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-31 00:42:34,574 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-08-31 00:42:34,581 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-08-31 00:42:34,902 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-31 00:42:34,902 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-08-31 00:42:34,908 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-08-31 00:42:35,228 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-31 00:42:35,229 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-08-31 00:42:35,235 [ scc.git] DEBUG Calling 'git fetch origin pull/482/head'
2024-08-31 00:42:35,525 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-31 00:42:35,525 [ scc.git] DEBUG * branch refs/pull/482/head -> FETCH_HEAD
2024-08-31 00:42:35,531 [ scc.git] DEBUG Calling 'git fetch origin pull/483/head'
2024-08-31 00:42:35,815 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-31 00:42:35,815 [ scc.git] DEBUG * branch refs/pull/483/head -> FETCH_HEAD
2024-08-31 00:42:35,821 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:42:35,821 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:42:35,821 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:35,830 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-31 00:42:35,838 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:35,845 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-31 00:42:35,859 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-08-31 00:42:35,859 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:42:35,863 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-08-31 00:42:35,863 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-08-31 00:42:35,863 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-08-31 00:42:36,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:42:36,044 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-31 00:42:36,052 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:36,058 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-31 00:42:36,089 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-08-31 00:42:36,090 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-08-31 00:42:36,090 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-08-31 00:42:36,090 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-08-31 00:42:36,090 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:42:36,095 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-08-31 00:42:36,095 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-08-31 00:42:36,095 [ scc.git] DEBUG src/app/header.html | 5 +
2024-08-31 00:42:36,095 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-08-31 00:42:36,095 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-08-31 00:42:36,095 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-08-31 00:42:36,095 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-08-31 00:42:36,095 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-08-31 00:42:36,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:42:36,468 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-31 00:42:36,475 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:36,480 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-31 00:42:36,492 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-08-31 00:42:36,493 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:42:36,496 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-08-31 00:42:36,496 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-08-31 00:42:36,496 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-08-31 00:42:36,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:42:36,855 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-31 00:42:36,862 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:36,867 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-31 00:42:36,883 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:42:36,893 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-08-31 00:42:36,893 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-08-31 00:42:37,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:42:37,234 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-08-31 00:42:37,241 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:37,246 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 478 (Bump socket.io from 4.6.1 to 4.7.5) 91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-08-31 00:42:37,278 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-31 00:42:37,279 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:42:37,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:42:37,620 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-08-31 00:42:37,627 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:37,633 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 482 (Support ?collapse_left/right and ?full_page=true) 7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-08-31 00:42:37,649 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-08-31 00:42:37,649 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-08-31 00:42:37,649 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-08-31 00:42:37,649 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:42:37,654 [ scc.git] DEBUG src/app/context.js | 12 +++++++++++
2024-08-31 00:42:37,654 [ scc.git] DEBUG src/app/index.js | 5 +----
2024-08-31 00:42:37,654 [ scc.git] DEBUG src/model/image_info.js | 1 -
2024-08-31 00:42:37,654 [ scc.git] DEBUG src/utils/constants.js | 5 ++++-
2024-08-31 00:42:37,654 [ scc.git] DEBUG src/utils/ui.js | 44 ++++++++++++++++++++++----------------
2024-08-31 00:42:37,654 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 1 -
2024-08-31 00:42:37,655 [ scc.git] DEBUG 6 files changed, 42 insertions(+), 26 deletions(-)
2024-08-31 00:42:38,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:42:38,012 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...384771c9fd794e2b472a35dca65e6ed96be98c4d'
2024-08-31 00:42:38,020 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:38,025 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 483 (Bump webpack from 5.82.0 to 5.94.0) 384771c9fd794e2b472a35dca65e6ed96be98c4d'
2024-08-31 00:42:38,069 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-31 00:42:38,070 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:42:38,080 [ scc.git] DEBUG package-lock.json | 686 ++++++++++++++++++++++++++----------------------------
2024-08-31 00:42:38,081 [ scc.git] DEBUG package.json | 2 +-
2024-08-31 00:42:38,081 [ scc.git] DEBUG 2 files changed, 329 insertions(+), 359 deletions(-)
2024-08-31 00:42:38,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:42:38,403 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:42:38,443 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:42:38,444 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:38,449 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:42:38,487 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:42:38,497 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe5b1324be0> has no local changes
2024-08-31 00:42:38,498 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
- PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
- PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
Generated by OMERO-plugins-push#170 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/)'
2024-08-31 00:42:38,510 [ scc.git] DEBUG [detached HEAD 78e102e] merge master -Dorg -Ssuccess-only
2024-08-31 00:42:38,510 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:42:38,510 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:42:38,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-08-31 00:42:39,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-08-31 00:42:39,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-08-31 00:42:40,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-31 00:42:40,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:42:41,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-31 00:42:41,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-31 00:42:42,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:42:42,219 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-08-31 00:42:42,219 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:42:42,219 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-31 00:42:42,219 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:42:42,219 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:42,226 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:42:42,232 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:42:42,232 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:42:42,237 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:42:42,243 [ scc.git] DEBUG Already up to date.
2024-08-31 00:42:42,244 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-08-31 00:42:42,575 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-08-31 00:42:42,575 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-08-31 00:42:42,580 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:42:42,580 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:42:42,581 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:42,586 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-31 00:42:42,592 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:42,597 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-31 00:42:42,607 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:42:42,610 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-08-31 00:42:42,610 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-08-31 00:42:42,610 [ scc.git] DEBUG requirements.txt | 2 +-
2024-08-31 00:42:42,610 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-08-31 00:42:42,610 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-08-31 00:42:42,610 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-08-31 00:42:42,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:42:42,833 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:42:42,877 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:42:42,878 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:42,884 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:42:42,925 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:42:42,932 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe5b02cb7f0> has no local changes
2024-08-31 00:42:42,932 [ 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#170 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/)'
2024-08-31 00:42:42,941 [ scc.git] DEBUG [detached HEAD 9c8e5ed] merge master -Dorg -Ssuccess-only
2024-08-31 00:42:42,942 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:42:42,942 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:42:43,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-08-31 00:42:43,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/86 HTTP/1.1" 200 None
2024-08-31 00:42:44,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/86/comments HTTP/1.1" 200 None
2024-08-31 00:42:44,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-08-31 00:42:45,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:42:45,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-08-31 00:42:46,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/d222577494040c63f4ce3c1a266d43257c9f1c61?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:42:46,035 [ scc.repo] DEBUG - PR 86 dominikl 'Add tablename option'
2024-08-31 00:42:46,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-08-31 00:42:46,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-08-31 00:42:47,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-31 00:42:47,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:42:48,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-31 00:42:48,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:42:48,807 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-31 00:42:49,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-08-31 00:42:49,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-08-31 00:42:50,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-31 00:42:50,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:42:51,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-31 00:42:51,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:42:51,595 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-31 00:42:51,595 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:42:51,595 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-31 00:42:51,595 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:42:51,595 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:51,601 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:42:51,607 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:42:51,607 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:42:51,613 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:42:51,620 [ scc.git] DEBUG Already up to date.
2024-08-31 00:42:51,620 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-08-31 00:42:52,038 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-31 00:42:52,038 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-08-31 00:42:52,044 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-08-31 00:42:52,634 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-31 00:42:52,634 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-08-31 00:42:52,639 [ scc.git] DEBUG Calling 'git fetch origin pull/86/head'
2024-08-31 00:42:52,910 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-31 00:42:52,910 [ scc.git] DEBUG * branch refs/pull/86/head -> FETCH_HEAD
2024-08-31 00:42:52,915 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:42:52,915 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:42:52,915 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:52,921 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-31 00:42:52,927 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:52,932 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-31 00:42:52,947 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-08-31 00:42:52,947 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-08-31 00:42:52,947 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-31 00:42:52,947 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-31 00:42:52,947 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-31 00:42:52,947 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-31 00:42:52,953 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-31 00:42:52,960 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-31 00:42:53,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:42:53,095 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-31 00:42:53,103 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-31 00:42:53,110 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#170](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-08-31 00:42:53,115 [ scc.config] DEBUG Found github.token
2024-08-31 00:42:53,116 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-08-31 00:42:53,116 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-31 00:42:53,122 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:53,127 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-31 00:42:53,144 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-31 00:42:53,145 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-31 00:42:53,145 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-08-31 00:42:53,145 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-31 00:42:53,145 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-31 00:42:53,153 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-31 00:42:53,161 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-31 00:42:53,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:42:53,518 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-31 00:42:53,541 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-31 00:42:53,550 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#170](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-08-31 00:42:53,556 [ scc.config] DEBUG Found github.token
2024-08-31 00:42:53,557 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-08-31 00:42:53,557 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-08-31 00:42:53,564 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:53,570 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 86 (Add tablename option) d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-08-31 00:42:53,594 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:42:53,597 [ scc.git] DEBUG src/omero_metadata/cli.py | 10 ++++++++--
2024-08-31 00:42:53,597 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 2 deletions(-)
2024-08-31 00:42:53,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:42:53,892 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:42:53,933 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:42:53,933 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:42:53,941 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:42:53,980 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:42:53,987 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe5b02cb580> has no local changes
2024-08-31 00:42:53,987 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-metadata
Already up to date.
Merged PRs:
- PR 86 dominikl 'Add tablename option'
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#170 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/)'
2024-08-31 00:42:53,997 [ scc.git] DEBUG [detached HEAD f9dc672] merge master -Dorg -Ssuccess-only
2024-08-31 00:42:53,997 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:42:53,997 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:42:54,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-08-31 00:42:54,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-08-31 00:42:54,912 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-31 00:42:55,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-31 00:42:55,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:42:56,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-31 00:42:57,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-31 00:42:57,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:42:57,402 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-31 00:42:57,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-08-31 00:42:57,844 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-31 00:42:58,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-31 00:42:58,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:42:59,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-31 00:42:59,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-31 00:43:00,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:43:00,158 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-31 00:43:00,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-08-31 00:43:00,646 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-31 00:43:01,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-31 00:43:01,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:43:02,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-31 00:43:02,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-31 00:43:03,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:43:03,202 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-31 00:43:03,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-08-31 00:43:04,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-08-31 00:43:04,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-08-31 00:43:05,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-08-31 00:43:05,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-08-31 00:43:05,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-08-31 00:43:05,982 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:43:05,982 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-31 00:43:05,983 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:05,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:05,990 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:43:05,998 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:43:05,998 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:43:06,007 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:43:06,015 [ scc.git] DEBUG Already up to date.
2024-08-31 00:43:06,015 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-08-31 00:43:06,332 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-31 00:43:06,332 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-08-31 00:43:06,337 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-08-31 00:43:06,658 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-31 00:43:06,658 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-08-31 00:43:06,664 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-08-31 00:43:06,995 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-31 00:43:06,995 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-08-31 00:43:07,000 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:43:07,000 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:07,000 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:07,007 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-08-31 00:43:07,013 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:07,018 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-08-31 00:43:07,029 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:43:07,032 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-08-31 00:43:07,032 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-08-31 00:43:07,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:07,178 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-08-31 00:43:07,185 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:07,193 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 129 (Bump @babel/traverse from 7.21.4 to 7.23.2) 733f52703019d4b6d7e375c121a25c107b64dbec'
2024-08-31 00:43:07,206 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-31 00:43:07,206 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:43:07,209 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-08-31 00:43:07,209 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-08-31 00:43:07,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:07,559 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-08-31 00:43:07,567 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:07,572 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (Bump axios from 1.3.5 to 1.6.0) a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-08-31 00:43:07,587 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-31 00:43:07,588 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:43:07,591 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-08-31 00:43:07,591 [ scc.git] DEBUG package.json | 2 +-
2024-08-31 00:43:07,591 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-08-31 00:43:07,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:07,963 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:43:08,003 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:08,004 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:08,010 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:43:08,051 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:43:08,058 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe5b1304c70> has no local changes
2024-08-31 00:43:08,059 [ 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#170 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/)'
2024-08-31 00:43:08,068 [ scc.git] DEBUG [detached HEAD 830b02c] merge master -Dorg -Ssuccess-only
2024-08-31 00:43:08,068 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:08,069 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:43:08,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-08-31 00:43:08,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-08-31 00:43:09,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-31 00:43:09,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:43:10,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-31 00:43:10,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:43:10,734 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-08-31 00:43:10,735 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:43:10,735 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-31 00:43:10,735 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:10,735 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:10,741 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:43:10,746 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:43:10,746 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:43:10,752 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:43:10,758 [ scc.git] DEBUG Already up to date.
2024-08-31 00:43:10,758 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-31 00:43:11,059 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-08-31 00:43:11,059 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-31 00:43:11,065 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:43:11,066 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:11,066 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:11,072 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-31 00:43:11,078 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:11,084 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-31 00:43:11,093 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:43:11,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:11,225 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:43:11,268 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:11,269 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:11,277 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:43:11,316 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:43:11,323 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe5b1322ca0> has no local changes
2024-08-31 00:43:11,324 [ 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#170 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/)'
2024-08-31 00:43:11,339 [ scc.git] DEBUG [detached HEAD 17ddc1d] merge master -Dorg -Ssuccess-only
2024-08-31 00:43:11,341 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:11,342 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:43:11,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-08-31 00:43:12,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-08-31 00:43:12,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-08-31 00:43:13,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-08-31 00:43:13,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-31 00:43:14,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:43:14,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-31 00:43:14,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:43:14,939 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-31 00:43:14,940 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:43:14,940 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-31 00:43:14,940 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:14,940 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:14,948 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:43:14,953 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:43:14,953 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:43:14,959 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:43:14,965 [ scc.git] DEBUG Already up to date.
2024-08-31 00:43:14,965 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-08-31 00:43:15,411 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-08-31 00:43:15,411 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-08-31 00:43:15,417 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:43:15,417 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:15,418 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:15,423 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-08-31 00:43:15,429 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:15,434 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-08-31 00:43:15,444 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-08-31 00:43:15,445 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:43:15,447 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-08-31 00:43:15,447 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-08-31 00:43:15,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:15,605 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:43:15,646 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:15,646 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:15,651 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:43:15,691 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:43:15,697 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe5b131ca60> has no local changes
2024-08-31 00:43:15,698 [ 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#170 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/)'
2024-08-31 00:43:15,706 [ scc.git] DEBUG [detached HEAD 6ee75f7] merge master -Dorg -Ssuccess-only
2024-08-31 00:43:15,707 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:15,707 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:43:16,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-08-31 00:43:16,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-08-31 00:43:16,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-08-31 00:43:17,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-31 00:43:17,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:43:18,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-31 00:43:18,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:43:18,846 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-31 00:43:18,846 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:43:18,846 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-31 00:43:18,846 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:18,847 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:18,853 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:43:18,858 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:43:18,859 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:43:18,864 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:43:18,871 [ scc.git] DEBUG Already up to date.
2024-08-31 00:43:18,871 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-31 00:43:19,301 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-08-31 00:43:19,301 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-31 00:43:19,307 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:43:19,307 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:19,307 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:19,312 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-31 00:43:19,318 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:19,323 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-31 00:43:19,333 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-08-31 00:43:19,333 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-08-31 00:43:19,333 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-08-31 00:43:19,333 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-08-31 00:43:19,333 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-08-31 00:43:19,333 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-08-31 00:43:19,333 [ scc.git] DEBUG Auto-merging setup.py
2024-08-31 00:43:19,333 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-08-31 00:43:19,334 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-31 00:43:19,334 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-31 00:43:19,339 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-31 00:43:19,346 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-08-31 00:43:19,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:19,478 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-31 00:43:19,484 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-31 00:43:19,489 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#170](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- setup.py
- omero_signup/urls.py
- omero_signup/views.py
--conflicts
2024-08-31 00:43:19,493 [ scc.config] DEBUG Found github.token
2024-08-31 00:43:19,494 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-08-31 00:43:19,494 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:43:19,533 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:19,533 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:19,539 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:43:19,576 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:43:19,582 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe5b02934c0> has no local changes
2024-08-31 00:43:19,583 [ 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#170 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/)'
2024-08-31 00:43:19,591 [ scc.git] DEBUG [detached HEAD 1ba58f3] merge master -Dorg -Ssuccess-only
2024-08-31 00:43:19,591 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:19,591 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:43:19,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-08-31 00:43:20,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-08-31 00:43:20,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-08-31 00:43:21,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-31 00:43:21,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:43:22,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-31 00:43:22,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:43:22,770 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-31 00:43:22,771 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:43:22,771 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-31 00:43:22,771 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:22,771 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:22,777 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:43:22,782 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:43:22,783 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:43:22,788 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:43:22,794 [ scc.git] DEBUG Already up to date.
2024-08-31 00:43:22,795 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-08-31 00:43:23,284 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-08-31 00:43:23,285 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-08-31 00:43:23,290 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:43:23,290 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:23,290 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:23,296 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-08-31 00:43:23,303 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:23,307 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-08-31 00:43:23,321 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:43:23,324 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-08-31 00:43:23,324 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-08-31 00:43:23,324 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-08-31 00:43:23,324 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-08-31 00:43:23,324 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-08-31 00:43:23,324 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-08-31 00:43:23,324 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-08-31 00:43:23,324 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-08-31 00:43:23,324 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-08-31 00:43:23,324 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-08-31 00:43:23,324 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-08-31 00:43:23,324 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-08-31 00:43:23,324 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-08-31 00:43:23,324 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-08-31 00:43:23,327 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-08-31 00:43:23,327 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-08-31 00:43:23,327 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-08-31 00:43:23,327 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-08-31 00:43:23,327 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-08-31 00:43:23,327 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-08-31 00:43:23,327 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-08-31 00:43:23,327 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-08-31 00:43:23,327 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-08-31 00:43:23,327 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-08-31 00:43:23,327 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-08-31 00:43:23,327 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-08-31 00:43:23,327 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-08-31 00:43:23,327 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-08-31 00:43:23,327 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-08-31 00:43:23,327 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-08-31 00:43:23,327 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-08-31 00:43:23,327 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-08-31 00:43:23,327 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-08-31 00:43:23,327 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-08-31 00:43:23,327 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-08-31 00:43:23,327 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-08-31 00:43:23,327 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-08-31 00:43:23,327 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-08-31 00:43:23,327 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-08-31 00:43:23,327 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-08-31 00:43:23,327 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-08-31 00:43:23,327 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-08-31 00:43:23,327 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-08-31 00:43:23,327 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-08-31 00:43:23,328 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-08-31 00:43:23,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:23,458 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:43:23,500 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:23,500 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:23,506 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:43:23,547 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:43:23,554 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe5b02f3f40> has no local changes
2024-08-31 00:43:23,554 [ 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#170 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/)'
2024-08-31 00:43:23,564 [ scc.git] DEBUG [detached HEAD 885ddaa] merge master -Dorg -Ssuccess-only
2024-08-31 00:43:23,564 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:23,564 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:43:23,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-08-31 00:43:23,858 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:43:23,858 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-31 00:43:23,858 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:23,858 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:23,865 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:43:23,870 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:43:23,871 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:43:23,877 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:43:23,883 [ scc.git] DEBUG Already up to date.
2024-08-31 00:43:23,884 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:43:23,884 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:23,884 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:23,889 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:43:23,931 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:23,931 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:23,936 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:43:23,976 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:43:23,982 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe5b0284f10> has no local changes
2024-08-31 00:43:23,982 [ 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#170 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/)'
2024-08-31 00:43:23,991 [ scc.git] DEBUG [detached HEAD bc51a09] merge master -Dorg -Ssuccess-only
2024-08-31 00:43:23,992 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:23,992 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:43:24,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-08-31 00:43:24,267 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:43:24,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-31 00:43:24,267 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:24,267 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:24,273 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:43:24,277 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:43:24,277 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:43:24,282 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:43:24,288 [ scc.git] DEBUG Already up to date.
2024-08-31 00:43:24,288 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:43:24,288 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:24,288 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:24,293 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:43:24,331 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:24,332 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:24,337 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:43:24,379 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:43:24,387 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe5b0239940> has no local changes
2024-08-31 00:43:24,387 [ 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#170 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/)'
2024-08-31 00:43:24,396 [ scc.git] DEBUG [detached HEAD d0be812] merge master -Dorg -Ssuccess-only
2024-08-31 00:43:24,396 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:24,397 [ scc.git] INFO Overriding base-branch from master to main
2024-08-31 00:43:24,397 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:43:24,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-08-31 00:43:25,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-08-31 00:43:25,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-08-31 00:43:26,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-08-31 00:43:26,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-31 00:43:27,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:43:27,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-31 00:43:27,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:43:27,931 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-31 00:43:27,932 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:43:27,932 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-31 00:43:27,932 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:27,932 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:27,938 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-08-31 00:43:27,944 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:43:27,945 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-08-31 00:43:27,950 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-08-31 00:43:27,956 [ scc.git] DEBUG Already up to date.
2024-08-31 00:43:27,956 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-08-31 00:43:28,323 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-08-31 00:43:28,323 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-08-31 00:43:28,328 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:43:28,328 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:28,329 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:28,335 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-31 00:43:28,341 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:28,347 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-31 00:43:28,357 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-08-31 00:43:28,357 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-08-31 00:43:28,358 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-31 00:43:28,358 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-31 00:43:28,365 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-31 00:43:28,372 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-08-31 00:43:28,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:28,508 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-31 00:43:28,513 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-31 00:43:28,518 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#170](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-08-31 00:43:28,523 [ scc.config] DEBUG Found github.token
2024-08-31 00:43:28,523 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-08-31 00:43:28,523 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:43:28,561 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:28,561 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:28,567 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:43:28,609 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:43:28,615 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe5b0269670> has no local changes
2024-08-31 00:43:28,616 [ 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#170 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/)'
2024-08-31 00:43:28,624 [ scc.git] DEBUG [detached HEAD b911387] merge master -Dorg -Ssuccess-only
2024-08-31 00:43:28,624 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:28,624 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:43:28,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-08-31 00:43:28,920 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:43:28,920 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-31 00:43:28,920 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:28,920 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:28,926 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:43:28,932 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:43:28,932 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:43:28,939 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:43:28,946 [ scc.git] DEBUG Already up to date.
2024-08-31 00:43:28,946 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:43:28,946 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:28,946 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:28,951 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:43:28,991 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:28,991 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:28,996 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:43:29,036 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:43:29,042 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe5b0259e80> has no local changes
2024-08-31 00:43:29,042 [ 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#170 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/)'
2024-08-31 00:43:29,050 [ scc.git] DEBUG [detached HEAD bdbf8de] merge master -Dorg -Ssuccess-only
2024-08-31 00:43:29,050 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:29,050 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:43:29,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-08-31 00:43:29,317 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:43:29,317 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-31 00:43:29,317 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:29,317 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:29,323 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:43:29,327 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:43:29,328 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:43:29,333 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:43:29,338 [ scc.git] DEBUG Already up to date.
2024-08-31 00:43:29,338 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:43:29,338 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:29,338 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:29,343 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:43:29,380 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:29,381 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:29,386 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:43:29,425 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:43:29,431 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe5b0210640> has no local changes
2024-08-31 00:43:29,432 [ 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#170 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/)'
2024-08-31 00:43:29,439 [ scc.git] DEBUG [detached HEAD 6bacb68] merge master -Dorg -Ssuccess-only
2024-08-31 00:43:29,440 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:29,440 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:43:29,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-08-31 00:43:30,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-08-31 00:43:30,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-08-31 00:43:31,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-31 00:43:31,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:43:32,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-31 00:43:32,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:43:32,552 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-08-31 00:43:32,553 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:43:32,553 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-31 00:43:32,553 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:32,553 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:32,559 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:43:32,565 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:43:32,565 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:43:32,571 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:43:32,578 [ scc.git] DEBUG Already up to date.
2024-08-31 00:43:32,578 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-08-31 00:43:32,886 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-08-31 00:43:32,886 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-08-31 00:43:32,891 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:43:32,891 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:32,891 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:32,896 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-31 00:43:32,903 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:32,909 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-31 00:43:32,966 [ scc.git] DEBUG Auto-merging Dockerfile
2024-08-31 00:43:32,966 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-08-31 00:43:32,966 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-31 00:43:32,967 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-31 00:43:32,973 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-31 00:43:32,980 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-08-31 00:43:33,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:33,120 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-31 00:43:33,127 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-31 00:43:33,134 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#170](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-08-31 00:43:33,140 [ scc.config] DEBUG Found github.token
2024-08-31 00:43:33,140 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-08-31 00:43:33,140 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:43:33,181 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:33,181 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:33,186 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:43:33,224 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:43:33,231 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe5b0221d90> has no local changes
2024-08-31 00:43:33,232 [ 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#170 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/)'
2024-08-31 00:43:33,241 [ scc.git] DEBUG [detached HEAD 21230ad] merge master -Dorg -Ssuccess-only
2024-08-31 00:43:33,242 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:33,242 [ scc.git] INFO Overriding base-branch from master to develop
2024-08-31 00:43:33,242 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:43:33,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-08-31 00:43:34,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-08-31 00:43:34,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-08-31 00:43:35,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-08-31 00:43:35,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-08-31 00:43:36,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-08-31 00:43:36,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-08-31 00:43:36,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-31 00:43:37,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:43:37,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-31 00:43:38,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:43:38,163 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-31 00:43:38,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-08-31 00:43:39,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-08-31 00:43:39,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-08-31 00:43:39,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-08-31 00:43:39,986 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:43:39,986 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-31 00:43:39,986 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:39,986 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:39,992 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-08-31 00:43:39,996 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:43:39,997 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-08-31 00:43:40,003 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-08-31 00:43:40,010 [ scc.git] DEBUG Already up to date.
2024-08-31 00:43:40,010 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-08-31 00:43:40,409 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-08-31 00:43:40,409 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-08-31 00:43:40,414 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:43:40,414 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:40,414 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:40,420 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-31 00:43:40,428 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:40,434 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-31 00:43:40,505 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-08-31 00:43:40,506 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-08-31 00:43:40,506 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-31 00:43:40,506 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-31 00:43:40,512 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-31 00:43:40,520 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-08-31 00:43:40,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:40,667 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-31 00:43:40,674 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-31 00:43:40,681 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#170](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-08-31 00:43:40,686 [ scc.config] DEBUG Found github.token
2024-08-31 00:43:40,686 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-08-31 00:43:40,686 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:43:40,727 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:43:40,727 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:43:40,733 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:43:40,774 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:43:40,782 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe5b0264e20> has no local changes
2024-08-31 00:43:40,782 [ 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#170 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/)'
2024-08-31 00:43:40,793 [ scc.git] DEBUG [detached HEAD 5ae0584] merge master -Dorg -Ssuccess-only
2024-08-31 00:43:40,793 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:40,793 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:43:40,871 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-08-31 00:43:41,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:41,073 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-08-31 00:43:41,079 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-08-31 00:43:41,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:41,453 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-08-31 00:43:41,459 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-08-31 00:43:41,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:41,842 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-08-31 00:43:41,847 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-08-31 00:43:42,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:42,230 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-08-31 00:43:42,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:42,601 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-08-31 00:43:42,608 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-08-31 00:43:42,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:42,990 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-08-31 00:43:42,996 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-08-31 00:43:43,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:43,403 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-08-31 00:43:43,416 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-08-31 00:43:43,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:43,771 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-08-31 00:43:43,781 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-08-31 00:43:44,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:44,149 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-08-31 00:43:44,161 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-08-31 00:43:44,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:44,581 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-08-31 00:43:44,597 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-08-31 00:43:44,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:44,976 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-08-31 00:43:44,989 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-08-31 00:43:45,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:45,388 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-08-31 00:43:45,393 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-08-31 00:43:45,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:45,790 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-08-31 00:43:46,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:46,206 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-08-31 00:43:46,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:46,590 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-08-31 00:43:46,597 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-08-31 00:43:46,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:46,972 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-08-31 00:43:47,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:47,361 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-08-31 00:43:47,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:47,742 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-08-31 00:43:47,748 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-08-31 00:43:48,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:48,121 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-08-31 00:43:48,125 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-08-31 00:43:48,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:48,521 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-08-31 00:43:48,527 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-08-31 00:43:48,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:48,900 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-08-31 00:43:48,905 [ scc.config] DEBUG Found submodule.scripts.url
2024-08-31 00:43:49,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:43:49,271 [ scc.config] DEBUG Found submodule.scripts.branch
2024-08-31 00:43:49,271 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:43:49,365 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe5b4477760> has local changes
2024-08-31 00:43:49,366 [ 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 387 dependabot[bot] 'Bump omero-figure from `47f4948` to `cbdd365`'
Repository: ome/minimal-omero-client
Already up to date.
Merged PRs:
- PR 66 jburel 'Gateway 5 9 2'
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 584 Rdornier 'Link url to image' (user: Rdornier)
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 578 Rdornier 'Image outline' (status: failure)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
Conflicting PRs (not included):
- PR 577 Rdornier 'Fill rois'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
- PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
- PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
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.
Merged PRs:
- PR 86 dominikl 'Add tablename option'
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#170 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/170/)'
2024-08-31 00:43:49,384 [ scc.git] DEBUG [detached HEAD f7dfb40] merge master -Dorg -Ssuccess-only
2024-08-31 00:43:49,384 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-08-31 00:43:49,385 [ scc.merge] INFO Repository: ome/omero-plugins
2024-08-31 00:43:49,385 [ scc.merge] INFO Already up to date.
2024-08-31 00:43:49,385 [ scc.merge] INFO
2024-08-31 00:43:49,385 [ scc.merge] INFO Merged PRs:
2024-08-31 00:43:49,385 [ scc.merge] INFO - PR 387 dependabot[bot] 'Bump omero-figure from `47f4948` to `cbdd365`'
2024-08-31 00:43:49,385 [ scc.merge] INFO
2024-08-31 00:43:49,385 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-08-31 00:43:49,385 [ scc.merge] INFO Already up to date.
2024-08-31 00:43:49,385 [ scc.merge] INFO
2024-08-31 00:43:49,385 [ scc.merge] INFO Merged PRs:
2024-08-31 00:43:49,385 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-08-31 00:43:49,385 [ scc.merge] INFO
2024-08-31 00:43:49,385 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-08-31 00:43:49,385 [ scc.merge] INFO Excluded PRs:
2024-08-31 00:43:49,385 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-08-31 00:43:49,385 [ scc.merge] INFO Already up to date.
2024-08-31 00:43:49,385 [ scc.merge] INFO
2024-08-31 00:43:49,385 [ scc.merge] INFO Merged PRs:
2024-08-31 00:43:49,385 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-08-31 00:43:49,385 [ scc.merge] INFO
2024-08-31 00:43:49,385 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-08-31 00:43:49,385 [ scc.merge] INFO Excluded PRs:
2024-08-31 00:43:49,385 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-08-31 00:43:49,385 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-08-31 00:43:49,385 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-08-31 00:43:49,385 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-08-31 00:43:49,385 [ scc.merge] INFO Already up to date.
2024-08-31 00:43:49,385 [ scc.merge] INFO
2024-08-31 00:43:49,385 [ scc.merge] INFO Merged PRs:
2024-08-31 00:43:49,386 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-08-31 00:43:49,386 [ scc.merge] INFO
2024-08-31 00:43:49,386 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-08-31 00:43:49,386 [ scc.merge] INFO Excluded PRs:
2024-08-31 00:43:49,386 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-31 00:43:49,386 [ scc.merge] INFO Already up to date.
2024-08-31 00:43:49,386 [ scc.merge] INFO
2024-08-31 00:43:49,386 [ scc.merge] INFO Merged PRs:
2024-08-31 00:43:49,386 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-08-31 00:43:49,386 [ scc.merge] INFO
2024-08-31 00:43:49,386 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-31 00:43:49,386 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-08-31 00:43:49,386 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-08-31 00:43:49,386 [ scc.merge] INFO
2024-08-31 00:43:49,386 [ scc.merge] INFO Repository: ome/omero-figure
2024-08-31 00:43:49,386 [ scc.merge] INFO Excluded PRs:
2024-08-31 00:43:49,386 [ scc.merge] INFO - PR 584 Rdornier 'Link url to image' (user: Rdornier)
2024-08-31 00:43:49,386 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-08-31 00:43:49,386 [ scc.merge] INFO - PR 578 Rdornier 'Image outline' (status: failure)
2024-08-31 00:43:49,386 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-08-31 00:43:49,386 [ scc.merge] INFO Already up to date.
2024-08-31 00:43:49,386 [ scc.merge] INFO
2024-08-31 00:43:49,386 [ scc.merge] INFO Merged PRs:
2024-08-31 00:43:49,386 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-08-31 00:43:49,386 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-08-31 00:43:49,386 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-08-31 00:43:49,386 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-08-31 00:43:49,386 [ scc.merge] INFO - PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
2024-08-31 00:43:49,386 [ scc.merge] INFO
2024-08-31 00:43:49,386 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-31 00:43:49,386 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois'
2024-08-31 00:43:49,386 [ scc.merge] INFO
2024-08-31 00:43:49,386 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-08-31 00:43:49,386 [ scc.merge] INFO Already up to date.
2024-08-31 00:43:49,386 [ scc.merge] INFO
2024-08-31 00:43:49,386 [ scc.merge] INFO Merged PRs:
2024-08-31 00:43:49,386 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-08-31 00:43:49,386 [ scc.merge] INFO
2024-08-31 00:43:49,386 [ scc.merge] INFO Repository: ome/omero-gallery
2024-08-31 00:43:49,387 [ scc.merge] INFO Already up to date.
2024-08-31 00:43:49,387 [ scc.merge] INFO
2024-08-31 00:43:49,387 [ scc.merge] INFO Merged PRs:
2024-08-31 00:43:49,387 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-31 00:43:49,387 [ scc.merge] INFO
2024-08-31 00:43:49,387 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-08-31 00:43:49,387 [ scc.merge] INFO Excluded PRs:
2024-08-31 00:43:49,387 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-08-31 00:43:49,387 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-08-31 00:43:49,387 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-08-31 00:43:49,387 [ scc.merge] INFO Already up to date.
2024-08-31 00:43:49,387 [ scc.merge] INFO
2024-08-31 00:43:49,387 [ scc.merge] INFO Merged PRs:
2024-08-31 00:43:49,387 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-08-31 00:43:49,387 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-08-31 00:43:49,387 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-31 00:43:49,387 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-31 00:43:49,387 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-31 00:43:49,387 [ scc.merge] INFO - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-08-31 00:43:49,387 [ scc.merge] INFO - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-08-31 00:43:49,387 [ scc.merge] INFO
2024-08-31 00:43:49,387 [ scc.merge] INFO Repository: ome/omero-mapr
2024-08-31 00:43:49,387 [ scc.merge] INFO Excluded PRs:
2024-08-31 00:43:49,387 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-08-31 00:43:49,387 [ scc.merge] INFO Already up to date.
2024-08-31 00:43:49,387 [ scc.merge] INFO
2024-08-31 00:43:49,387 [ scc.merge] INFO Merged PRs:
2024-08-31 00:43:49,387 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-08-31 00:43:49,387 [ scc.merge] INFO
2024-08-31 00:43:49,387 [ scc.merge] INFO Repository: ome/omero-metadata
2024-08-31 00:43:49,387 [ scc.merge] INFO Already up to date.
2024-08-31 00:43:49,387 [ scc.merge] INFO
2024-08-31 00:43:49,387 [ scc.merge] INFO Merged PRs:
2024-08-31 00:43:49,387 [ scc.merge] INFO - PR 86 dominikl 'Add tablename option'
2024-08-31 00:43:49,387 [ scc.merge] INFO
2024-08-31 00:43:49,387 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-31 00:43:49,387 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-31 00:43:49,387 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-31 00:43:49,388 [ scc.merge] INFO
2024-08-31 00:43:49,388 [ scc.merge] INFO Repository: ome/omero-parade
2024-08-31 00:43:49,388 [ scc.merge] INFO Excluded PRs:
2024-08-31 00:43:49,388 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-08-31 00:43:49,388 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-08-31 00:43:49,388 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-08-31 00:43:49,388 [ scc.merge] INFO Already up to date.
2024-08-31 00:43:49,388 [ scc.merge] INFO
2024-08-31 00:43:49,388 [ scc.merge] INFO Merged PRs:
2024-08-31 00:43:49,388 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-31 00:43:49,388 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-31 00:43:49,388 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-31 00:43:49,388 [ scc.merge] INFO
2024-08-31 00:43:49,388 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-08-31 00:43:49,388 [ scc.merge] INFO Already up to date.
2024-08-31 00:43:49,388 [ scc.merge] INFO
2024-08-31 00:43:49,388 [ scc.merge] INFO Merged PRs:
2024-08-31 00:43:49,388 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-08-31 00:43:49,388 [ scc.merge] INFO
2024-08-31 00:43:49,388 [ scc.merge] INFO Repository: ome/omero-rois
2024-08-31 00:43:49,388 [ scc.merge] INFO Excluded PRs:
2024-08-31 00:43:49,388 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-31 00:43:49,388 [ scc.merge] INFO Already up to date.
2024-08-31 00:43:49,388 [ scc.merge] INFO
2024-08-31 00:43:49,388 [ scc.merge] INFO Merged PRs:
2024-08-31 00:43:49,388 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-31 00:43:49,388 [ scc.merge] INFO
2024-08-31 00:43:49,388 [ scc.merge] INFO Repository: ome/omero-signup
2024-08-31 00:43:49,388 [ scc.merge] INFO Already up to date.
2024-08-31 00:43:49,388 [ scc.merge] INFO
2024-08-31 00:43:49,388 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-31 00:43:49,388 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-31 00:43:49,388 [ scc.merge] INFO
2024-08-31 00:43:49,388 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-08-31 00:43:49,388 [ scc.merge] INFO Already up to date.
2024-08-31 00:43:49,388 [ scc.merge] INFO
2024-08-31 00:43:49,388 [ scc.merge] INFO Merged PRs:
2024-08-31 00:43:49,388 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-31 00:43:49,388 [ scc.merge] INFO
2024-08-31 00:43:49,389 [ scc.merge] INFO Repository: ome/omero-upload
2024-08-31 00:43:49,389 [ scc.merge] INFO Already up to date.
2024-08-31 00:43:49,389 [ scc.merge] INFO
2024-08-31 00:43:49,389 [ scc.merge] INFO
2024-08-31 00:43:49,389 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-08-31 00:43:49,389 [ scc.merge] INFO Already up to date.
2024-08-31 00:43:49,389 [ scc.merge] INFO
2024-08-31 00:43:49,389 [ scc.merge] INFO
2024-08-31 00:43:49,389 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-08-31 00:43:49,389 [ scc.merge] INFO Excluded PRs:
2024-08-31 00:43:49,389 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-08-31 00:43:49,389 [ scc.merge] INFO Already up to date.
2024-08-31 00:43:49,389 [ scc.merge] INFO
2024-08-31 00:43:49,389 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-31 00:43:49,389 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-31 00:43:49,389 [ scc.merge] INFO
2024-08-31 00:43:49,389 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-08-31 00:43:49,389 [ scc.merge] INFO Already up to date.
2024-08-31 00:43:49,389 [ scc.merge] INFO
2024-08-31 00:43:49,389 [ scc.merge] INFO
2024-08-31 00:43:49,389 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-08-31 00:43:49,389 [ scc.merge] INFO Already up to date.
2024-08-31 00:43:49,389 [ scc.merge] INFO
2024-08-31 00:43:49,389 [ scc.merge] INFO
2024-08-31 00:43:49,389 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-08-31 00:43:49,389 [ scc.merge] INFO Already up to date.
2024-08-31 00:43:49,389 [ scc.merge] INFO
2024-08-31 00:43:49,389 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-31 00:43:49,389 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-08-31 00:43:49,389 [ scc.merge] INFO
2024-08-31 00:43:49,389 [ scc.merge] INFO Repository: ome/scripts
2024-08-31 00:43:49,389 [ scc.merge] INFO Excluded PRs:
2024-08-31 00:43:49,389 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-08-31 00:43:49,389 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-08-31 00:43:49,389 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-08-31 00:43:49,389 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-08-31 00:43:49,389 [ scc.merge] INFO Already up to date.
2024-08-31 00:43:49,389 [ scc.merge] INFO
2024-08-31 00:43:49,390 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-31 00:43:49,390 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-31 00:43:49,390 [ scc.merge] INFO
2024-08-31 00:43:49,390 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-08-31 00:43:49,390 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:43:49,396 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-08-31 00:43:49,396 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:43:49,405 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:49,405 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-08-31 00:43:49,405 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:43:49,412 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:49,412 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-08-31 00:43:49,412 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:43:49,419 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:49,419 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-08-31 00:43:49,419 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:43:49,425 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:49,425 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-08-31 00:43:49,425 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:43:49,430 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:49,430 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-31 00:43:49,430 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:43:49,438 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:49,438 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-31 00:43:49,438 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:43:49,447 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:49,447 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-31 00:43:49,447 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:43:49,454 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:49,454 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-31 00:43:49,454 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:43:49,461 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:49,461 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-31 00:43:49,461 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:43:49,470 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:49,470 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-31 00:43:49,470 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:43:49,479 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:49,479 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-31 00:43:49,480 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:43:49,487 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:49,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-31 00:43:49,488 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:43:49,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:49,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-31 00:43:49,495 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:43:49,521 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:49,522 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-31 00:43:49,522 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:43:49,530 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:49,531 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-31 00:43:49,531 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:43:49,539 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:49,539 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-31 00:43:49,539 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:43:49,548 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:49,548 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-31 00:43:49,548 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:43:49,555 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:49,555 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-31 00:43:49,555 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:43:49,563 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:49,563 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-31 00:43:49,563 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:43:49,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:49,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-31 00:43:49,571 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:43:49,580 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-31 00:43:49,580 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-31 00:43:49,580 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:43:49,589 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.9.2 to 5.9.3-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD c9f5403] 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 173cac0
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 9b73dd9
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from cbdd3657
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from a8f380f
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 312afbe
nothing to commit, working tree clean
[detached HEAD 832cd63] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-08-31 00:44:36,073 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-08-31 00:44:44,714 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-08-31 00:44:46,938 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-08-31 00:44:51,466 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-08-31 00:45:31,274 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/d0200910/images/svgs/logo.svg){kind=logo}
