Skipping 225 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-04-08 00:53:55,532 [ scc.git] DEBUG package.json | 2 +-
2025-04-08 00:53:55,532 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-04-08 00:53:55,748 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:53:55,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:53:55,907 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-08 00:53:55,913 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:53:55,915 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-08 00:53:55,954 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-08 00:53:55,954 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-04-08 00:53:55,954 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-08 00:53:55,955 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-08 00:53:55,958 [ scc.git] DEBUG Calling 'git reset --hard ef73cb60be3a94c0f50459be195533d9e1ef1365'
2025-04-08 00:53:55,966 [ scc.git] DEBUG HEAD is now at ef73cb6 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-04-08 00:53:56,158 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:53:56,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:53:56,323 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-08 00:53:56,326 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-04-08 00:53:56,329 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#381](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-04-08 00:53:56,331 [ scc.config] DEBUG Found github.token
2025-04-08 00:53:56,331 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-04-08 00:53:56,331 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7705b58a7a2049651eb10142e2260cf73dcc29fe'
2025-04-08 00:53:56,338 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:53:56,340 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 506 (Use the release/v1 branch for the PyPA action publishing to PyPI) 7705b58a7a2049651eb10142e2260cf73dcc29fe'
2025-04-08 00:53:56,355 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-08 00:53:56,359 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-08 00:53:56,359 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-08 00:53:56,573 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:53:56,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:53:56,762 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 00:53:56,802 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:53:56,802 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:53:56,805 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 00:53:56,843 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 00:53:56,847 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6b3a51d450> has no local changes
2025-04-08 00:53:56,848 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
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 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Generated by OMERO-plugins-push#381 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/)'
2025-04-08 00:53:56,855 [ scc.git] DEBUG [detached HEAD 072f432] merge master -Dorg -Ssuccess-only
2025-04-08 00:53:56,855 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:53:56,855 [ scc.repo] DEBUG ## PRs found:
2025-04-08 00:53:57,013 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:53:57,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-04-08 00:53:57,584 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:53:57,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-04-08 00:53:58,049 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:53:58,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-08 00:53:58,574 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:53:58,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-08 00:53:59,085 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:53:59,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-08 00:53:59,624 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:53:59,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-04-08 00:53:59,816 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-08 00:54:00,067 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:00,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-04-08 00:54:00,553 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:00,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-04-08 00:54:01,167 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:01,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-08 00:54:01,699 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:01,934 [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
2025-04-08 00:54:02,186 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:02,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-08 00:54:02,702 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:02,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-04-08 00:54:02,875 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-04-08 00:54:02,875 [ scc.repo] DEBUG ## Branches found:
2025-04-08 00:54:02,875 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-08 00:54:02,875 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:02,875 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:02,879 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-08 00:54:02,881 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-08 00:54:02,881 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-08 00:54:02,884 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-08 00:54:02,887 [ scc.git] DEBUG Already up to date.
2025-04-08 00:54:02,887 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-04-08 00:54:03,187 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-08 00:54:03,187 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-04-08 00:54:03,191 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-04-08 00:54:03,532 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-08 00:54:03,532 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-04-08 00:54:03,536 [ scc.git] DEBUG ## Unique users: []
2025-04-08 00:54:03,536 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:03,536 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:03,538 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-08 00:54:03,542 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:03,545 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-08 00:54:03,554 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-08 00:54:03,558 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-04-08 00:54:03,558 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-04-08 00:54:03,558 [ scc.git] DEBUG requirements.txt | 2 +-
2025-04-08 00:54:03,558 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-04-08 00:54:03,558 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-04-08 00:54:03,558 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-04-08 00:54:03,559 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:03,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:54:03,726 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-08 00:54:03,731 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:03,733 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 94 (Use the release/v1 branch for the PyPA action publishing to PyPI) 1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-08 00:54:03,742 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-08 00:54:03,746 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-08 00:54:03,746 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-08 00:54:03,977 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:04,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:54:04,167 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 00:54:04,207 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:04,207 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:04,210 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 00:54:04,249 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 00:54:04,253 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6b3a599250> has no local changes
2025-04-08 00:54:04,253 [ 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'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Generated by OMERO-plugins-push#381 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/)'
2025-04-08 00:54:04,259 [ scc.git] DEBUG [detached HEAD 4f183f0] merge master -Dorg -Ssuccess-only
2025-04-08 00:54:04,260 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:54:04,260 [ scc.repo] DEBUG ## PRs found:
2025-04-08 00:54:04,418 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:04,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-04-08 00:54:04,974 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:05,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-04-08 00:54:05,475 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:05,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-04-08 00:54:06,051 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:06,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-08 00:54:06,584 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:06,783 [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
2025-04-08 00:54:07,035 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:07,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-08 00:54:07,533 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:07,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-04-08 00:54:07,729 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-08 00:54:07,980 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:08,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-04-08 00:54:08,500 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:08,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-04-08 00:54:08,988 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:09,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-08 00:54:09,535 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:09,768 [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
2025-04-08 00:54:10,020 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:10,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-08 00:54:10,574 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:10,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-04-08 00:54:10,767 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-08 00:54:10,767 [ scc.repo] DEBUG ## Branches found:
2025-04-08 00:54:10,767 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-08 00:54:10,767 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:10,767 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:10,770 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-08 00:54:10,772 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-08 00:54:10,772 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-08 00:54:10,776 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-08 00:54:10,784 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-04-08 00:54:11,018 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:11,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-04-08 00:54:11,450 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-04-08 00:54:11,735 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-08 00:54:11,736 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-04-08 00:54:11,740 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-04-08 00:54:12,010 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-08 00:54:12,010 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-04-08 00:54:12,015 [ scc.git] DEBUG ## Unique users: []
2025-04-08 00:54:12,015 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:12,015 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:12,017 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-08 00:54:12,022 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:12,024 [ 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'
2025-04-08 00:54:12,038 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-04-08 00:54:12,038 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-04-08 00:54:12,038 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-08 00:54:12,038 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-08 00:54:12,038 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-08 00:54:12,038 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-08 00:54:12,041 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-08 00:54:12,046 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-08 00:54:12,047 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:12,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:54:12,210 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-08 00:54:12,214 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-08 00:54:12,218 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#381](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-04-08 00:54:12,220 [ scc.config] DEBUG Found github.token
2025-04-08 00:54:12,220 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-04-08 00:54:12,220 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-08 00:54:12,224 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:12,227 [ 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'
2025-04-08 00:54:12,242 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-08 00:54:12,242 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-08 00:54:12,242 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-04-08 00:54:12,242 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-08 00:54:12,242 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-08 00:54:12,245 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-08 00:54:12,251 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-08 00:54:12,461 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:12,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:54:12,653 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-08 00:54:12,657 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-08 00:54:12,661 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#381](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/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
2025-04-08 00:54:12,663 [ scc.config] DEBUG Found github.token
2025-04-08 00:54:12,663 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-04-08 00:54:12,663 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 00:54:12,702 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:12,703 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:12,705 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 00:54:12,743 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 00:54:12,748 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6b3a7c9e10> has no local changes
2025-04-08 00:54:12,748 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
- PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
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#381 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/)'
2025-04-08 00:54:12,755 [ scc.git] DEBUG [detached HEAD edbc8ad] merge master -Dorg -Ssuccess-only
2025-04-08 00:54:12,755 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:54:12,756 [ scc.repo] DEBUG ## PRs found:
2025-04-08 00:54:12,904 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:13,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-04-08 00:54:13,638 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:13,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-04-08 00:54:14,141 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:14,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-08 00:54:14,711 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:14,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-08 00:54:15,197 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:15,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-08 00:54:15,683 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:15,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-08 00:54:16,250 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:16,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-04-08 00:54:16,431 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-08 00:54:16,682 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:16,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-04-08 00:54:16,906 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-08 00:54:17,157 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:17,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-08 00:54:17,779 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:18,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-08 00:54:18,371 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:18,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-08 00:54:18,883 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:19,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-08 00:54:19,349 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:19,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-04-08 00:54:19,543 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-08 00:54:19,794 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:20,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-04-08 00:54:20,018 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-08 00:54:20,269 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:20,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-08 00:54:20,821 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:21,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-08 00:54:21,401 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:21,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-08 00:54:21,969 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:22,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-08 00:54:22,448 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:22,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-04-08 00:54:22,639 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-08 00:54:22,890 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:23,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-04-08 00:54:23,373 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:23,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-04-08 00:54:23,894 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:24,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-04-08 00:54:24,390 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:24,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-04-08 00:54:24,902 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:25,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-04-08 00:54:25,491 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:25,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-04-08 00:54:25,980 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:26,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-04-08 00:54:26,301 [ scc.repo] DEBUG ## Branches found:
2025-04-08 00:54:26,301 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-08 00:54:26,302 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:26,302 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:26,305 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-08 00:54:26,307 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-08 00:54:26,307 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-08 00:54:26,310 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-08 00:54:26,313 [ scc.git] DEBUG Already up to date.
2025-04-08 00:54:26,313 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-04-08 00:54:26,623 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-08 00:54:26,623 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-04-08 00:54:26,627 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-04-08 00:54:26,897 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-08 00:54:26,897 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-04-08 00:54:26,901 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-04-08 00:54:27,181 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-08 00:54:27,181 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-04-08 00:54:27,185 [ scc.git] DEBUG ## Unique users: []
2025-04-08 00:54:27,185 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:27,185 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:27,188 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-04-08 00:54:27,191 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:27,193 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 140 (Bump vite from 4.2.3 to 4.5.9) 6301bc61b0a877104173846d526382bf15cc70a0'
2025-04-08 00:54:27,201 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-08 00:54:27,205 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-04-08 00:54:27,205 [ scc.git] DEBUG package.json | 2 +-
2025-04-08 00:54:27,205 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-04-08 00:54:27,206 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:27,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:54:27,385 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-04-08 00:54:27,388 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:27,390 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 141 (Bump axios from 1.6.0 to 1.8.2) de7db17cd62b498179713df276cff151a1f36d80'
2025-04-08 00:54:27,401 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-08 00:54:27,401 [ scc.git] DEBUG Auto-merging package.json
2025-04-08 00:54:27,402 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-08 00:54:27,405 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-04-08 00:54:27,405 [ scc.git] DEBUG package.json | 2 +-
2025-04-08 00:54:27,405 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-04-08 00:54:27,636 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:27,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:54:27,809 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-08 00:54:27,812 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:27,815 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 142 (Use the release/v1 branch for the PyPA action publishing to PyPI) 16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-08 00:54:27,823 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-08 00:54:27,826 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-08 00:54:27,826 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-08 00:54:28,060 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:28,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:54:28,220 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 00:54:28,260 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:28,260 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:28,263 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 00:54:28,301 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 00:54:28,306 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6b3a7bcb10> has no local changes
2025-04-08 00:54:28,306 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- 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 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
- PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Generated by OMERO-plugins-push#381 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/)'
2025-04-08 00:54:28,312 [ scc.git] DEBUG [detached HEAD 2715ca2] merge master -Dorg -Ssuccess-only
2025-04-08 00:54:28,312 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:54:28,313 [ scc.repo] DEBUG ## PRs found:
2025-04-08 00:54:28,471 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:28,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-04-08 00:54:28,730 [ scc.repo] DEBUG ## Branches found:
2025-04-08 00:54:28,730 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-08 00:54:28,730 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:28,730 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:28,733 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-08 00:54:28,735 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-08 00:54:28,735 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-08 00:54:28,738 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-08 00:54:28,741 [ scc.git] DEBUG Already up to date.
2025-04-08 00:54:28,741 [ scc.git] DEBUG ## Unique users: []
2025-04-08 00:54:28,741 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:28,741 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:28,744 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 00:54:28,782 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:28,782 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:28,784 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 00:54:28,822 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 00:54:28,825 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6b3a787790> has no local changes
2025-04-08 00:54:28,825 [ 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.
Generated by OMERO-plugins-push#381 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/)'
2025-04-08 00:54:28,831 [ scc.git] DEBUG [detached HEAD 8c993fe] merge master -Dorg -Ssuccess-only
2025-04-08 00:54:28,832 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:54:28,832 [ scc.repo] DEBUG ## PRs found:
2025-04-08 00:54:28,981 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:29,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-04-08 00:54:29,529 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:29,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-04-08 00:54:30,076 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:30,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-04-08 00:54:30,547 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:30,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-04-08 00:54:30,801 [ scc.repo] DEBUG ## Branches found:
2025-04-08 00:54:30,801 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-08 00:54:30,801 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:30,801 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:30,803 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-08 00:54:30,806 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-08 00:54:30,806 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-08 00:54:30,809 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-08 00:54:30,811 [ scc.git] DEBUG Already up to date.
2025-04-08 00:54:30,812 [ scc.git] DEBUG ## Unique users: []
2025-04-08 00:54:30,812 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:30,812 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:30,814 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 00:54:30,853 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:30,853 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:30,855 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 00:54:30,893 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 00:54:30,897 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6b3840a610> has no local changes
2025-04-08 00:54:30,897 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Generated by OMERO-plugins-push#381 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/)'
2025-04-08 00:54:30,903 [ scc.git] DEBUG [detached HEAD 7883079] merge master -Dorg -Ssuccess-only
2025-04-08 00:54:30,904 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:54:30,904 [ scc.repo] DEBUG ## PRs found:
2025-04-08 00:54:31,051 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:31,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-04-08 00:54:31,617 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:31,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-04-08 00:54:32,104 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:32,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-04-08 00:54:32,590 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:32,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-08 00:54:33,155 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:33,403 [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
2025-04-08 00:54:33,654 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:33,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-08 00:54:34,231 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:34,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-04-08 00:54:34,418 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-08 00:54:34,418 [ scc.repo] DEBUG ## Branches found:
2025-04-08 00:54:34,418 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-08 00:54:34,418 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:34,418 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:34,421 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-08 00:54:34,424 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-08 00:54:34,424 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-08 00:54:34,427 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-08 00:54:34,430 [ scc.git] DEBUG Already up to date.
2025-04-08 00:54:34,430 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-04-08 00:54:34,696 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-04-08 00:54:34,696 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-04-08 00:54:34,700 [ scc.git] DEBUG ## Unique users: []
2025-04-08 00:54:34,700 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:34,700 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:34,703 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-08 00:54:34,706 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:34,708 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-08 00:54:34,717 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-04-08 00:54:34,718 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-04-08 00:54:34,718 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-04-08 00:54:34,718 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-04-08 00:54:34,718 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-04-08 00:54:34,718 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-04-08 00:54:34,718 [ scc.git] DEBUG Auto-merging setup.py
2025-04-08 00:54:34,718 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-04-08 00:54:34,718 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-08 00:54:34,718 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-08 00:54:34,721 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-08 00:54:34,725 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-04-08 00:54:34,726 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:34,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:54:34,902 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-08 00:54:34,905 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-08 00:54:34,908 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#381](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/views.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
--conflicts
2025-04-08 00:54:34,910 [ scc.config] DEBUG Found github.token
2025-04-08 00:54:34,911 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-04-08 00:54:34,911 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 00:54:34,952 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:34,952 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:34,955 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 00:54:34,992 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 00:54:34,996 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6b383ea890> has no local changes
2025-04-08 00:54:34,996 [ 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#381 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/)'
2025-04-08 00:54:35,106 [ scc.git] DEBUG [detached HEAD a4bbfa0] merge master -Dorg -Ssuccess-only
2025-04-08 00:54:35,106 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:54:35,106 [ scc.repo] DEBUG ## PRs found:
2025-04-08 00:54:35,153 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:35,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-04-08 00:54:35,688 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:35,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-04-08 00:54:36,179 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:36,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-04-08 00:54:36,635 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:37,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-04-08 00:54:37,286 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:37,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-08 00:54:37,793 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:38,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-08 00:54:38,293 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:38,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-04-08 00:54:38,796 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:39,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-04-08 00:54:39,261 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:39,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-04-08 00:54:39,786 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:40,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-04-08 00:54:40,287 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:40,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-08 00:54:40,823 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:41,077 [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
2025-04-08 00:54:41,329 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:41,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-08 00:54:41,826 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:42,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2025-04-08 00:54:42,003 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-08 00:54:42,003 [ scc.repo] DEBUG ## Branches found:
2025-04-08 00:54:42,003 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-08 00:54:42,004 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:42,004 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:42,007 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-08 00:54:42,009 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-08 00:54:42,009 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-08 00:54:42,012 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-08 00:54:42,015 [ scc.git] DEBUG Already up to date.
2025-04-08 00:54:42,015 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-04-08 00:54:42,342 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-08 00:54:42,342 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-04-08 00:54:42,346 [ scc.git] DEBUG ## Unique users: []
2025-04-08 00:54:42,346 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:42,346 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:42,349 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-04-08 00:54:42,353 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:42,356 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2025-04-08 00:54:42,368 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-08 00:54:42,372 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-04-08 00:54:42,372 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-04-08 00:54:42,372 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-04-08 00:54:42,372 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-04-08 00:54:42,372 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-04-08 00:54:42,372 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-04-08 00:54:42,372 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-04-08 00:54:42,372 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-04-08 00:54:42,373 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:42,373 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-04-08 00:54:42,373 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-04-08 00:54:42,373 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-04-08 00:54:42,373 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-04-08 00:54:42,373 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-04-08 00:54:42,373 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-04-08 00:54:42,373 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-04-08 00:54:42,373 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-04-08 00:54:42,373 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-04-08 00:54:42,373 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-04-08 00:54:42,373 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-04-08 00:54:42,374 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-04-08 00:54:42,374 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-04-08 00:54:42,374 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-04-08 00:54:42,374 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-04-08 00:54:42,374 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-04-08 00:54:42,374 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-04-08 00:54:42,374 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-04-08 00:54:42,374 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-04-08 00:54:42,374 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-04-08 00:54:42,374 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-04-08 00:54:42,374 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-04-08 00:54:42,374 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-04-08 00:54:42,374 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-04-08 00:54:42,374 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-04-08 00:54:42,374 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-04-08 00:54:42,374 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-04-08 00:54:42,374 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-04-08 00:54:42,374 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-04-08 00:54:42,374 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-04-08 00:54:42,374 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-04-08 00:54:42,374 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-04-08 00:54:42,375 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-04-08 00:54:42,375 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-04-08 00:54:42,375 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-04-08 00:54:42,375 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-04-08 00:54:42,375 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-04-08 00:54:42,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:54:42,547 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 00:54:42,586 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:42,587 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:42,589 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 00:54:42,627 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 00:54:42,631 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6b38426a90> has no local changes
2025-04-08 00:54:42,631 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Generated by OMERO-plugins-push#381 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/)'
2025-04-08 00:54:42,639 [ scc.git] DEBUG [detached HEAD c6a2607] merge master -Dorg -Ssuccess-only
2025-04-08 00:54:42,639 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:54:42,640 [ scc.repo] DEBUG ## PRs found:
2025-04-08 00:54:42,798 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:43,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-04-08 00:54:43,012 [ scc.repo] DEBUG ## Branches found:
2025-04-08 00:54:43,012 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-08 00:54:43,012 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:43,012 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:43,014 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-08 00:54:43,017 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-08 00:54:43,017 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-08 00:54:43,020 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-08 00:54:43,023 [ scc.git] DEBUG Already up to date.
2025-04-08 00:54:43,023 [ scc.git] DEBUG ## Unique users: []
2025-04-08 00:54:43,023 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:43,023 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:43,025 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 00:54:43,063 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:43,063 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:43,066 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 00:54:43,104 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 00:54:43,108 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6b3a7876d0> has no local changes
2025-04-08 00:54:43,108 [ 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#381 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/)'
2025-04-08 00:54:43,114 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:54:43,114 [ scc.git] DEBUG [detached HEAD 404ca7e] merge master -Dorg -Ssuccess-only
2025-04-08 00:54:43,115 [ scc.repo] DEBUG ## PRs found:
2025-04-08 00:54:43,263 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:43,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-04-08 00:54:43,801 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:44,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-04-08 00:54:44,309 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:44,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-04-08 00:54:44,778 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:45,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-08 00:54:45,336 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:45,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-08 00:54:45,860 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:46,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-08 00:54:46,368 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:46,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-08 00:54:46,899 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:47,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2025-04-08 00:54:47,077 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-04-08 00:54:47,078 [ scc.repo] DEBUG ## Branches found:
2025-04-08 00:54:47,078 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-08 00:54:47,078 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:47,078 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:47,081 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-08 00:54:47,083 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-08 00:54:47,083 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-08 00:54:47,086 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-08 00:54:47,089 [ scc.git] DEBUG Already up to date.
2025-04-08 00:54:47,089 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-04-08 00:54:47,378 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-04-08 00:54:47,378 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-04-08 00:54:47,382 [ scc.git] DEBUG ## Unique users: []
2025-04-08 00:54:47,382 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:47,382 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:47,385 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-04-08 00:54:47,388 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:47,390 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-04-08 00:54:47,397 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-08 00:54:47,400 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-04-08 00:54:47,400 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-04-08 00:54:47,400 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-04-08 00:54:47,400 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-04-08 00:54:47,400 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-04-08 00:54:47,402 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:47,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:54:47,603 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 00:54:47,642 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:47,642 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:47,645 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 00:54:47,683 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 00:54:47,687 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6b3a7ca210> has no local changes
2025-04-08 00:54:47,687 [ 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.
Merged PRs:
- PR 20 jburel 'Build'
Generated by OMERO-plugins-push#381 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/)'
2025-04-08 00:54:47,694 [ scc.git] DEBUG [detached HEAD a212981] merge master -Dorg -Ssuccess-only
2025-04-08 00:54:47,694 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:54:47,694 [ scc.git] INFO Overriding base-branch from master to main
2025-04-08 00:54:47,695 [ scc.repo] DEBUG ## PRs found:
2025-04-08 00:54:47,854 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:48,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-04-08 00:54:48,392 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:48,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-04-08 00:54:48,868 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:49,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-04-08 00:54:49,401 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:49,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-04-08 00:54:49,925 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:50,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-08 00:54:50,443 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:50,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-08 00:54:50,932 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:51,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-04-08 00:54:51,445 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:51,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-04-08 00:54:51,916 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:52,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-04-08 00:54:52,402 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:52,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-08 00:54:52,954 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:53,187 [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
2025-04-08 00:54:53,438 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:53,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-08 00:54:53,895 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:54,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2025-04-08 00:54:54,092 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-08 00:54:54,092 [ scc.repo] DEBUG ## Branches found:
2025-04-08 00:54:54,093 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-08 00:54:54,093 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:54,093 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:54,096 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-04-08 00:54:54,098 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-08 00:54:54,098 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-04-08 00:54:54,101 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-04-08 00:54:54,104 [ scc.git] DEBUG Already up to date.
2025-04-08 00:54:54,105 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-04-08 00:54:54,411 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-04-08 00:54:54,411 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-04-08 00:54:54,415 [ scc.git] DEBUG ## Unique users: []
2025-04-08 00:54:54,415 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:54,415 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:54,418 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-08 00:54:54,421 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:54,423 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-08 00:54:54,431 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-04-08 00:54:54,431 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-04-08 00:54:54,431 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-08 00:54:54,431 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-08 00:54:54,434 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-08 00:54:54,438 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-04-08 00:54:54,440 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:54,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:54:54,629 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-08 00:54:54,632 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-08 00:54:54,635 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#381](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-04-08 00:54:54,637 [ scc.config] DEBUG Found github.token
2025-04-08 00:54:54,637 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-04-08 00:54:54,637 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 00:54:54,676 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:54,676 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:54,678 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 00:54:54,716 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 00:54:54,720 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6b3840de50> has no local changes
2025-04-08 00:54:54,720 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- 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#381 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/)'
2025-04-08 00:54:54,726 [ scc.git] DEBUG [detached HEAD d726c76] merge master -Dorg -Ssuccess-only
2025-04-08 00:54:54,726 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:54:54,726 [ scc.repo] DEBUG ## PRs found:
2025-04-08 00:54:54,880 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:55,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-04-08 00:54:55,103 [ scc.repo] DEBUG ## Branches found:
2025-04-08 00:54:55,103 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-08 00:54:55,103 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:55,103 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:55,106 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-08 00:54:55,109 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-08 00:54:55,109 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-08 00:54:55,112 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-08 00:54:55,115 [ scc.git] DEBUG Already up to date.
2025-04-08 00:54:55,115 [ scc.git] DEBUG ## Unique users: []
2025-04-08 00:54:55,115 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:55,115 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:55,117 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 00:54:55,155 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:55,155 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:55,157 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 00:54:55,196 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 00:54:55,200 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6b3843de90> has no local changes
2025-04-08 00:54:55,200 [ 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#381 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/)'
2025-04-08 00:54:55,206 [ scc.git] DEBUG [detached HEAD 8fc8792] merge master -Dorg -Ssuccess-only
2025-04-08 00:54:55,207 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:54:55,207 [ scc.repo] DEBUG ## PRs found:
2025-04-08 00:54:55,354 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:55,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-04-08 00:54:55,617 [ scc.repo] DEBUG ## Branches found:
2025-04-08 00:54:55,617 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-08 00:54:55,617 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:55,617 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:55,620 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-08 00:54:55,622 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-08 00:54:55,622 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-08 00:54:55,625 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-08 00:54:55,628 [ scc.git] DEBUG Already up to date.
2025-04-08 00:54:55,628 [ scc.git] DEBUG ## Unique users: []
2025-04-08 00:54:55,628 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:55,628 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:55,630 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 00:54:55,669 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:55,670 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:55,672 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 00:54:55,709 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 00:54:55,713 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6b383eb410> has no local changes
2025-04-08 00:54:55,713 [ 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#381 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/)'
2025-04-08 00:54:55,720 [ scc.git] DEBUG [detached HEAD b89ad78] merge master -Dorg -Ssuccess-only
2025-04-08 00:54:55,720 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:54:55,721 [ scc.repo] DEBUG ## PRs found:
2025-04-08 00:54:55,868 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:56,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-04-08 00:54:56,414 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:56,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-04-08 00:54:56,932 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:57,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-04-08 00:54:57,414 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:57,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-08 00:54:57,972 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:58,218 [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
2025-04-08 00:54:58,470 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:58,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-08 00:54:59,033 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:59,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-04-08 00:54:59,208 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-04-08 00:54:59,208 [ scc.repo] DEBUG ## Branches found:
2025-04-08 00:54:59,208 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-08 00:54:59,208 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:59,208 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:59,211 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-08 00:54:59,214 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-08 00:54:59,214 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-08 00:54:59,217 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-08 00:54:59,220 [ scc.git] DEBUG Already up to date.
2025-04-08 00:54:59,220 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-04-08 00:54:59,514 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-04-08 00:54:59,514 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-04-08 00:54:59,519 [ scc.git] DEBUG ## Unique users: []
2025-04-08 00:54:59,519 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:59,519 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:59,521 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-08 00:54:59,524 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:59,526 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-08 00:54:59,535 [ scc.git] DEBUG Auto-merging Dockerfile
2025-04-08 00:54:59,535 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-04-08 00:54:59,535 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-08 00:54:59,536 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-08 00:54:59,539 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-08 00:54:59,544 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-04-08 00:54:59,545 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:54:59,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:54:59,733 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-08 00:54:59,736 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-08 00:54:59,739 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#381](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-04-08 00:54:59,741 [ scc.config] DEBUG Found github.token
2025-04-08 00:54:59,741 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-04-08 00:54:59,741 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 00:54:59,780 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:54:59,780 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:54:59,783 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 00:54:59,821 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 00:54:59,825 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6b3a5dbf90> has no local changes
2025-04-08 00:54:59,825 [ 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#381 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/)'
2025-04-08 00:54:59,832 [ scc.git] DEBUG [detached HEAD d5fb73f] merge master -Dorg -Ssuccess-only
2025-04-08 00:54:59,832 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:54:59,833 [ scc.git] INFO Overriding base-branch from master to develop
2025-04-08 00:54:59,833 [ scc.repo] DEBUG ## PRs found:
2025-04-08 00:54:59,984 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:00,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-04-08 00:55:00,526 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:00,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-04-08 00:55:01,002 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:01,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-04-08 00:55:01,456 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:01,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-08 00:55:01,967 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:02,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-08 00:55:02,496 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:02,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-08 00:55:02,994 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:03,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-08 00:55:03,499 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:03,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-04-08 00:55:03,676 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-08 00:55:03,927 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:04,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-04-08 00:55:04,399 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:04,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-04-08 00:55:04,902 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:05,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-08 00:55:05,365 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:05,586 [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
2025-04-08 00:55:05,838 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:06,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-08 00:55:06,310 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:06,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-04-08 00:55:06,527 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-08 00:55:06,778 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:07,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-04-08 00:55:07,288 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:07,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-04-08 00:55:07,810 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:08,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-04-08 00:55:08,310 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:08,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-04-08 00:55:08,596 [ scc.repo] DEBUG ## Branches found:
2025-04-08 00:55:08,596 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-08 00:55:08,596 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:55:08,596 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:55:08,600 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-04-08 00:55:08,602 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-08 00:55:08,602 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-04-08 00:55:08,605 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-04-08 00:55:08,614 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-04-08 00:55:08,846 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:09,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-04-08 00:55:09,297 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-04-08 00:55:09,585 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-08 00:55:09,585 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-04-08 00:55:09,589 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-04-08 00:55:09,883 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-08 00:55:09,883 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-04-08 00:55:09,888 [ scc.git] DEBUG ## Unique users: []
2025-04-08 00:55:09,888 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:55:09,888 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:55:09,891 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-08 00:55:09,896 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:55:09,898 [ 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'
2025-04-08 00:55:09,909 [ scc.git] DEBUG CONFLICT (modify/delete): omero/annotation_scripts/KeyVal_to_csv.py deleted in HEAD and modified in 1fd6030669613cdb8879cfe6395db8c820fdcf19. Version 1fd6030669613cdb8879cfe6395db8c820fdcf19 of omero/annotation_scripts/KeyVal_to_csv.py left in tree.
2025-04-08 00:55:09,910 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-08 00:55:09,910 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-08 00:55:09,913 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-08 00:55:09,917 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-04-08 00:55:09,918 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:10,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:55:10,087 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-08 00:55:10,093 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-08 00:55:10,097 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#381](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-04-08 00:55:10,099 [ scc.config] DEBUG Found github.token
2025-04-08 00:55:10,099 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-04-08 00:55:10,099 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-04-08 00:55:10,103 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:55:10,105 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-04-08 00:55:10,115 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-08 00:55:10,118 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-04-08 00:55:10,118 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-04-08 00:55:10,338 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:10,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:55:10,510 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-08 00:55:10,549 [ scc.git] DEBUG Get sha1 of %s
2025-04-08 00:55:10,549 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-08 00:55:10,551 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 00:55:10,589 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 00:55:10,593 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6b3c9f5610> has no local changes
2025-04-08 00:55:10,593 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- 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)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#381 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/)'
2025-04-08 00:55:10,600 [ scc.git] DEBUG [detached HEAD 1fe3217] merge master -Dorg -Ssuccess-only
2025-04-08 00:55:10,600 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:55:10,600 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-08 00:55:10,677 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-04-08 00:55:10,761 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:10,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:55:10,959 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-04-08 00:55:10,961 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-04-08 00:55:11,205 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:11,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:55:11,403 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-04-08 00:55:11,405 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-04-08 00:55:11,649 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:11,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:55:11,833 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-04-08 00:55:11,835 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-04-08 00:55:12,079 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:12,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:55:12,277 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-04-08 00:55:12,521 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:12,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:55:12,706 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-04-08 00:55:12,708 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-04-08 00:55:12,953 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:13,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:55:13,133 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-04-08 00:55:13,135 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-04-08 00:55:13,380 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:13,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:55:13,550 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-04-08 00:55:13,552 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-04-08 00:55:13,797 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:13,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:55:13,970 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-04-08 00:55:13,972 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-04-08 00:55:14,217 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:14,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:55:14,403 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-04-08 00:55:14,405 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-04-08 00:55:14,649 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:14,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:55:14,849 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-04-08 00:55:14,851 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-04-08 00:55:15,095 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:15,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:55:15,275 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-04-08 00:55:15,277 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-04-08 00:55:15,521 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:15,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:55:15,691 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-04-08 00:55:15,693 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-04-08 00:55:15,938 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:16,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:55:16,150 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-04-08 00:55:16,395 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:16,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:55:16,569 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-04-08 00:55:16,813 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:16,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:55:16,987 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-04-08 00:55:16,989 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-04-08 00:55:17,233 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:17,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:55:17,402 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-04-08 00:55:17,647 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:17,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:55:17,817 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-04-08 00:55:18,061 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:18,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:55:18,231 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-04-08 00:55:18,233 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-04-08 00:55:18,478 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:18,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:55:18,693 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-04-08 00:55:18,695 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-04-08 00:55:18,940 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:19,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:55:19,112 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-04-08 00:55:19,114 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-04-08 00:55:19,359 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:19,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:55:19,526 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-04-08 00:55:19,528 [ scc.config] DEBUG Found submodule.scripts.url
2025-04-08 00:55:19,773 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-08 00:55:19,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-08 00:55:19,941 [ scc.config] DEBUG Found submodule.scripts.branch
2025-04-08 00:55:19,941 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-08 00:55:20,031 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6b3a7bc550> has local changes
2025-04-08 00:55:20,031 [ 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 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 170 will-moore 'Use ome zarr models py' (stage: draft)
- PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Updating 11d3587..7a2c812
Previously merged:
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 147 will-moore 'Name option'
- PR 171 will-moore 'Initial addition of integration tests'
Conflicting PRs (not included):
- PR 123 will-moore 'Support export of Fileset:ID'
- PR 167 dominikl 'Add extinfo command'
Repository: ome/omero-figure
Excluded PRs:
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 600 Rdornier 'Label on rois'
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
- PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
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 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
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 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
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'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
- PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
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 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- 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 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
- PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
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
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
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.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- 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 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)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#381 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/381/)'
2025-04-08 00:55:20,045 [ scc.git] DEBUG [detached HEAD 88e7792] merge master -Dorg -Ssuccess-only
2025-04-08 00:55:20,045 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-04-08 00:55:20,045 [ scc.merge] INFO Repository: ome/omero-plugins
2025-04-08 00:55:20,045 [ scc.merge] INFO Already up to date.
2025-04-08 00:55:20,045 [ scc.merge] INFO
2025-04-08 00:55:20,045 [ scc.merge] INFO Merged PRs:
2025-04-08 00:55:20,045 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-04-08 00:55:20,045 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-04-08 00:55:20,046 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-04-08 00:55:20,046 [ scc.merge] INFO
2025-04-08 00:55:20,046 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-04-08 00:55:20,046 [ scc.merge] INFO Already up to date.
2025-04-08 00:55:20,046 [ scc.merge] INFO
2025-04-08 00:55:20,046 [ scc.merge] INFO
2025-04-08 00:55:20,046 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-04-08 00:55:20,046 [ scc.merge] INFO Excluded PRs:
2025-04-08 00:55:20,046 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-04-08 00:55:20,046 [ scc.merge] INFO Already up to date.
2025-04-08 00:55:20,046 [ scc.merge] INFO
2025-04-08 00:55:20,046 [ scc.merge] INFO
2025-04-08 00:55:20,046 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-04-08 00:55:20,046 [ scc.merge] INFO Excluded PRs:
2025-04-08 00:55:20,046 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-04-08 00:55:20,046 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-04-08 00:55:20,046 [ scc.merge] INFO Already up to date.
2025-04-08 00:55:20,046 [ scc.merge] INFO
2025-04-08 00:55:20,046 [ scc.merge] INFO Merged PRs:
2025-04-08 00:55:20,046 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-04-08 00:55:20,046 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-04-08 00:55:20,046 [ scc.merge] INFO
2025-04-08 00:55:20,046 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-04-08 00:55:20,046 [ scc.merge] INFO Excluded PRs:
2025-04-08 00:55:20,046 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-04-08 00:55:20,046 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-04-08 00:55:20,046 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-04-08 00:55:20,046 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-08 00:55:20,046 [ scc.merge] INFO Updating 11d3587..7a2c812
2025-04-08 00:55:20,046 [ scc.merge] INFO Previously merged:
2025-04-08 00:55:20,046 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-08 00:55:20,046 [ scc.merge] INFO
2025-04-08 00:55:20,046 [ scc.merge] INFO Merged PRs:
2025-04-08 00:55:20,046 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-04-08 00:55:20,046 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-04-08 00:55:20,046 [ scc.merge] INFO
2025-04-08 00:55:20,046 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-08 00:55:20,046 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-04-08 00:55:20,047 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-04-08 00:55:20,047 [ scc.merge] INFO
2025-04-08 00:55:20,047 [ scc.merge] INFO Repository: ome/omero-figure
2025-04-08 00:55:20,047 [ scc.merge] INFO Excluded PRs:
2025-04-08 00:55:20,047 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-04-08 00:55:20,047 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-04-08 00:55:20,047 [ scc.merge] INFO Already up to date.
2025-04-08 00:55:20,047 [ scc.merge] INFO
2025-04-08 00:55:20,047 [ scc.merge] INFO Merged PRs:
2025-04-08 00:55:20,047 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-04-08 00:55:20,047 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-04-08 00:55:20,047 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-04-08 00:55:20,047 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-04-08 00:55:20,047 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-04-08 00:55:20,047 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-08 00:55:20,047 [ scc.merge] INFO
2025-04-08 00:55:20,047 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-08 00:55:20,047 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-04-08 00:55:20,047 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-04-08 00:55:20,047 [ scc.merge] INFO
2025-04-08 00:55:20,047 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-04-08 00:55:20,047 [ scc.merge] INFO Already up to date.
2025-04-08 00:55:20,047 [ scc.merge] INFO
2025-04-08 00:55:20,047 [ scc.merge] INFO Merged PRs:
2025-04-08 00:55:20,047 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-04-08 00:55:20,047 [ scc.merge] INFO
2025-04-08 00:55:20,047 [ scc.merge] INFO Repository: ome/omero-gallery
2025-04-08 00:55:20,047 [ scc.merge] INFO Already up to date.
2025-04-08 00:55:20,047 [ scc.merge] INFO
2025-04-08 00:55:20,047 [ scc.merge] INFO Merged PRs:
2025-04-08 00:55:20,047 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-04-08 00:55:20,047 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-04-08 00:55:20,047 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-04-08 00:55:20,047 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-04-08 00:55:20,047 [ scc.merge] INFO
2025-04-08 00:55:20,047 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-08 00:55:20,047 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-04-08 00:55:20,047 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-04-08 00:55:20,047 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-04-08 00:55:20,047 [ scc.merge] INFO
2025-04-08 00:55:20,048 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-04-08 00:55:20,048 [ scc.merge] INFO Excluded PRs:
2025-04-08 00:55:20,048 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-04-08 00:55:20,048 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-04-08 00:55:20,048 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-04-08 00:55:20,048 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-04-08 00:55:20,048 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-04-08 00:55:20,048 [ scc.merge] INFO Already up to date.
2025-04-08 00:55:20,048 [ scc.merge] INFO
2025-04-08 00:55:20,048 [ scc.merge] INFO Merged PRs:
2025-04-08 00:55:20,048 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-04-08 00:55:20,048 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-04-08 00:55:20,048 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-04-08 00:55:20,048 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-04-08 00:55:20,048 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-08 00:55:20,048 [ scc.merge] INFO
2025-04-08 00:55:20,048 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-08 00:55:20,048 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-04-08 00:55:20,048 [ scc.merge] INFO
2025-04-08 00:55:20,048 [ scc.merge] INFO Repository: ome/omero-mapr
2025-04-08 00:55:20,048 [ scc.merge] INFO Excluded PRs:
2025-04-08 00:55:20,048 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-04-08 00:55:20,048 [ scc.merge] INFO Already up to date.
2025-04-08 00:55:20,048 [ scc.merge] INFO
2025-04-08 00:55:20,048 [ scc.merge] INFO Merged PRs:
2025-04-08 00:55:20,048 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-04-08 00:55:20,048 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-08 00:55:20,048 [ scc.merge] INFO
2025-04-08 00:55:20,048 [ scc.merge] INFO Repository: ome/omero-metadata
2025-04-08 00:55:20,048 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-04-08 00:55:20,048 [ scc.merge] INFO Previously merged:
2025-04-08 00:55:20,048 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-08 00:55:20,048 [ scc.merge] INFO
2025-04-08 00:55:20,048 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-08 00:55:20,048 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-08 00:55:20,048 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-08 00:55:20,048 [ scc.merge] INFO
2025-04-08 00:55:20,048 [ scc.merge] INFO Repository: ome/omero-parade
2025-04-08 00:55:20,048 [ scc.merge] INFO Excluded PRs:
2025-04-08 00:55:20,049 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-04-08 00:55:20,049 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-04-08 00:55:20,049 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-04-08 00:55:20,049 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-04-08 00:55:20,049 [ scc.merge] INFO Already up to date.
2025-04-08 00:55:20,049 [ scc.merge] INFO
2025-04-08 00:55:20,049 [ scc.merge] INFO Merged PRs:
2025-04-08 00:55:20,049 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-08 00:55:20,049 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-08 00:55:20,049 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-08 00:55:20,049 [ scc.merge] INFO
2025-04-08 00:55:20,049 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-04-08 00:55:20,049 [ scc.merge] INFO Already up to date.
2025-04-08 00:55:20,049 [ scc.merge] INFO
2025-04-08 00:55:20,049 [ scc.merge] INFO
2025-04-08 00:55:20,049 [ scc.merge] INFO Repository: ome/omero-rois
2025-04-08 00:55:20,049 [ scc.merge] INFO Excluded PRs:
2025-04-08 00:55:20,049 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-04-08 00:55:20,049 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-08 00:55:20,049 [ scc.merge] INFO Already up to date.
2025-04-08 00:55:20,049 [ scc.merge] INFO
2025-04-08 00:55:20,049 [ scc.merge] INFO
2025-04-08 00:55:20,049 [ scc.merge] INFO Repository: ome/omero-signup
2025-04-08 00:55:20,049 [ scc.merge] INFO Already up to date.
2025-04-08 00:55:20,049 [ scc.merge] INFO
2025-04-08 00:55:20,049 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-08 00:55:20,049 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-08 00:55:20,049 [ scc.merge] INFO
2025-04-08 00:55:20,049 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-04-08 00:55:20,049 [ scc.merge] INFO Excluded PRs:
2025-04-08 00:55:20,049 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-04-08 00:55:20,049 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-04-08 00:55:20,049 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-04-08 00:55:20,049 [ scc.merge] INFO Already up to date.
2025-04-08 00:55:20,049 [ scc.merge] INFO
2025-04-08 00:55:20,049 [ scc.merge] INFO Merged PRs:
2025-04-08 00:55:20,049 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-08 00:55:20,049 [ scc.merge] INFO
2025-04-08 00:55:20,049 [ scc.merge] INFO Repository: ome/omero-upload
2025-04-08 00:55:20,049 [ scc.merge] INFO Already up to date.
2025-04-08 00:55:20,050 [ scc.merge] INFO
2025-04-08 00:55:20,050 [ scc.merge] INFO
2025-04-08 00:55:20,050 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-04-08 00:55:20,050 [ scc.merge] INFO Already up to date.
2025-04-08 00:55:20,050 [ scc.merge] INFO
2025-04-08 00:55:20,050 [ scc.merge] INFO Merged PRs:
2025-04-08 00:55:20,050 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-04-08 00:55:20,050 [ scc.merge] INFO
2025-04-08 00:55:20,050 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-04-08 00:55:20,050 [ scc.merge] INFO Excluded PRs:
2025-04-08 00:55:20,050 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-04-08 00:55:20,050 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-04-08 00:55:20,050 [ scc.merge] INFO Already up to date.
2025-04-08 00:55:20,050 [ scc.merge] INFO
2025-04-08 00:55:20,050 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-08 00:55:20,050 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-08 00:55:20,050 [ scc.merge] INFO
2025-04-08 00:55:20,050 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-04-08 00:55:20,050 [ scc.merge] INFO Already up to date.
2025-04-08 00:55:20,050 [ scc.merge] INFO
2025-04-08 00:55:20,050 [ scc.merge] INFO
2025-04-08 00:55:20,050 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-04-08 00:55:20,050 [ scc.merge] INFO Already up to date.
2025-04-08 00:55:20,050 [ scc.merge] INFO
2025-04-08 00:55:20,050 [ scc.merge] INFO
2025-04-08 00:55:20,050 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-04-08 00:55:20,050 [ scc.merge] INFO Already up to date.
2025-04-08 00:55:20,050 [ scc.merge] INFO
2025-04-08 00:55:20,050 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-08 00:55:20,050 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-04-08 00:55:20,050 [ scc.merge] INFO
2025-04-08 00:55:20,050 [ scc.merge] INFO Repository: ome/scripts
2025-04-08 00:55:20,050 [ scc.merge] INFO Excluded PRs:
2025-04-08 00:55:20,050 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-04-08 00:55:20,050 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-04-08 00:55:20,050 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-04-08 00:55:20,050 [ scc.merge] INFO Previously merged:
2025-04-08 00:55:20,050 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-04-08 00:55:20,050 [ scc.merge] INFO
2025-04-08 00:55:20,050 [ scc.merge] INFO Merged PRs:
2025-04-08 00:55:20,050 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-08 00:55:20,051 [ scc.merge] INFO
2025-04-08 00:55:20,051 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-08 00:55:20,051 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-08 00:55:20,051 [ scc.merge] INFO
2025-04-08 00:55:20,051 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-04-08 00:55:20,051 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 00:55:20,053 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-04-08 00:55:20,053 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 00:55:20,055 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:55:20,055 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-04-08 00:55:20,055 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 00:55:20,057 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:55:20,057 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-04-08 00:55:20,057 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 00:55:20,060 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:55:20,060 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-04-08 00:55:20,060 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 00:55:20,062 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:55:20,062 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-04-08 00:55:20,062 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 00:55:20,064 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:55:20,064 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-04-08 00:55:20,064 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 00:55:20,066 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:55:20,066 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-04-08 00:55:20,066 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 00:55:20,069 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:55:20,069 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-04-08 00:55:20,069 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 00:55:20,071 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:55:20,071 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-08 00:55:20,071 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 00:55:20,073 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:55:20,073 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-08 00:55:20,073 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 00:55:20,075 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:55:20,075 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-08 00:55:20,075 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 00:55:20,077 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:55:20,077 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-08 00:55:20,077 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 00:55:20,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:55:20,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-08 00:55:20,080 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 00:55:20,082 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:55:20,082 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-08 00:55:20,082 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 00:55:20,084 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:55:20,084 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-08 00:55:20,084 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 00:55:20,086 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:55:20,086 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-08 00:55:20,086 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 00:55:20,088 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:55:20,088 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-08 00:55:20,089 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 00:55:20,091 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:55:20,091 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-08 00:55:20,091 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 00:55:20,093 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:55:20,093 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-08 00:55:20,093 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 00:55:20,095 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:55:20,095 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-08 00:55:20,095 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 00:55:20,097 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:55:20,097 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-08 00:55:20,097 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 00:55:20,100 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-08 00:55:20,100 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-08 00:55:20,100 [ scc.git] DEBUG Calling 'git remote'
2025-04-08 00:55:20,102 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/installer.py:27: SetuptoolsDeprecationWarning: setuptools.installer is deprecated. Requirements should be satisfied by a PEP 517 installer.
warnings.warn(
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/installer.py:27: SetuptoolsDeprecationWarning: setuptools.installer is deprecated. Requirements should be satisfied by a PEP 517 installer.
warnings.warn(
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:530: 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.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:530: 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.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
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
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3.11: 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
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3.11: 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.10.0 to 5.10.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 b48acfd] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 4777ef8
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from ce6e13c
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 11d3587
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 9cc36cde
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from 3b6c05a
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 2a621da
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from 7a798ce
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 0a557da
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from 3cd120c
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from fb5ae86
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from eb47378
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from bdfeb5e
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from be76813
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 100f6ae
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 8f3c313
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from 70b01ed
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 5bfef29
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 4b4c755
nothing to commit, working tree clean
[detached HEAD 1cedcce] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-04-08 00:56:09,284 [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
2025-04-08 00:56:18,956 [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
2025-04-08 00:56:21,576 [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
2025-04-08 00:56:26,384 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-04-08 00:57:07,431 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/9bac06d9/images/svgs/logo.svg){kind=logo}
