Skipping 228 KB..
Full Log2025-04-02 01:58:48,100 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-04-02 01:58:48,101 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:58:48,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 01:58:48,257 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-02 01:58:48,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:58:48,276 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-02 01:58:48,358 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-02 01:58:48,358 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-04-02 01:58:48,358 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-02 01:58:48,359 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-02 01:58:48,361 [ scc.git] DEBUG Calling 'git reset --hard 19b51c4690eabfd9dc1f3d89fe7588a9ece11b1f'
2025-04-02 01:58:48,369 [ scc.git] DEBUG HEAD is now at 19b51c4 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-04-02 01:58:48,508 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:58:48,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 01:58:48,670 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-02 01:58:48,673 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-04-02 01:58:48,675 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#375](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-04-02 01:58:48,677 [ scc.config] DEBUG Found github.token
2025-04-02 01:58:48,677 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-04-02 01:58:48,677 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7705b58a7a2049651eb10142e2260cf73dcc29fe'
2025-04-02 01:58:48,684 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:58:48,686 [ 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-02 01:58:48,703 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-02 01:58:48,706 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-02 01:58:48,706 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-02 01:58:48,921 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:58:49,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 01:58:49,079 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-02 01:58:49,118 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:58:49,118 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:58:49,121 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-02 01:58:49,158 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-02 01:58:49,166 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffadae02090> has no local changes
2025-04-02 01:58:49,166 [ 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#375 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/)'
2025-04-02 01:58:49,173 [ scc.git] DEBUG [detached HEAD e206078] merge master -Dorg -Ssuccess-only
2025-04-02 01:58:49,173 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 01:58:49,173 [ scc.repo] DEBUG ## PRs found:
2025-04-02 01:58:49,330 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:58:49,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-04-02 01:58:49,864 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:58:50,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-04-02 01:58:50,352 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:58:50,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-02 01:58:50,909 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:58:51,152 [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-02 01:58:51,404 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:58:51,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-02 01:58:51,886 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:58:52,057 [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-02 01:58:52,057 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-02 01:58:52,308 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:58:52,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-04-02 01:58:52,789 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:58:53,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-04-02 01:58:53,325 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:58:53,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-02 01:58:53,916 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:58:54,156 [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-02 01:58:54,408 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:58:54,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-02 01:58:54,862 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:58:55,055 [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-02 01:58:55,056 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-04-02 01:58:55,056 [ scc.repo] DEBUG ## Branches found:
2025-04-02 01:58:55,056 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-02 01:58:55,056 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:58:55,056 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:58:55,059 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-02 01:58:55,062 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-02 01:58:55,062 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-02 01:58:55,065 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-02 01:58:55,068 [ scc.git] DEBUG Already up to date.
2025-04-02 01:58:55,068 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-04-02 01:58:55,970 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-02 01:58:55,970 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-04-02 01:58:55,974 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-04-02 01:58:56,297 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-02 01:58:56,297 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-04-02 01:58:56,301 [ scc.git] DEBUG ## Unique users: []
2025-04-02 01:58:56,301 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:58:56,301 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:58:56,303 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-02 01:58:56,307 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:58:56,310 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-02 01:58:56,387 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-02 01:58:56,390 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-04-02 01:58:56,390 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-04-02 01:58:56,390 [ scc.git] DEBUG requirements.txt | 2 +-
2025-04-02 01:58:56,390 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-04-02 01:58:56,390 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-04-02 01:58:56,390 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-04-02 01:58:56,391 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:58:56,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 01:58:56,548 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-02 01:58:56,552 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:58:56,554 [ 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-02 01:58:56,563 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-02 01:58:56,566 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-02 01:58:56,566 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-02 01:58:56,799 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:58:56,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 01:58:56,965 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-02 01:58:57,003 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:58:57,003 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:58:57,005 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-02 01:58:57,043 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-02 01:58:57,047 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffadab20410> has no local changes
2025-04-02 01:58:57,047 [ 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#375 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/)'
2025-04-02 01:58:57,054 [ scc.git] DEBUG [detached HEAD 25bc47e] merge master -Dorg -Ssuccess-only
2025-04-02 01:58:57,054 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 01:58:57,054 [ scc.repo] DEBUG ## PRs found:
2025-04-02 01:58:57,216 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:58:57,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-04-02 01:58:57,758 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:58:58,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-04-02 01:58:58,258 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:58:58,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-04-02 01:58:58,782 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:58:59,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-02 01:58:59,297 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:58:59,521 [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-02 01:58:59,773 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:00,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-02 01:59:00,268 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:00,434 [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-02 01:59:00,434 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-02 01:59:00,685 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:00,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-04-02 01:59:01,175 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:01,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-04-02 01:59:01,664 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:01,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-02 01:59:02,218 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:02,444 [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-02 01:59:02,696 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:02,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-02 01:59:03,159 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:03,374 [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-02 01:59:03,374 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-02 01:59:03,374 [ scc.repo] DEBUG ## Branches found:
2025-04-02 01:59:03,374 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-02 01:59:03,374 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:03,374 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:03,377 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-02 01:59:03,379 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-02 01:59:03,379 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-02 01:59:03,382 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-02 01:59:03,390 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-04-02 01:59:03,625 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:03,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-04-02 01:59:03,998 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-04-02 01:59:04,604 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-02 01:59:04,604 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-04-02 01:59:04,608 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-04-02 01:59:05,132 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-02 01:59:05,132 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-04-02 01:59:05,136 [ scc.git] DEBUG ## Unique users: []
2025-04-02 01:59:05,136 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:05,136 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:05,139 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-02 01:59:05,144 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:05,146 [ 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-02 01:59:05,224 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-04-02 01:59:05,224 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-04-02 01:59:05,224 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-02 01:59:05,224 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-02 01:59:05,225 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-02 01:59:05,225 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-02 01:59:05,227 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-02 01:59:05,232 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-02 01:59:05,233 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:05,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 01:59:05,442 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-02 01:59:05,447 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-02 01:59:05,450 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#375](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-04-02 01:59:05,452 [ scc.config] DEBUG Found github.token
2025-04-02 01:59:05,452 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-04-02 01:59:05,453 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-02 01:59:05,457 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:05,459 [ 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-02 01:59:05,540 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-02 01:59:05,540 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-02 01:59:05,540 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-04-02 01:59:05,540 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-02 01:59:05,540 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-02 01:59:05,543 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-02 01:59:05,548 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-02 01:59:05,693 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:05,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 01:59:05,855 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-02 01:59:05,860 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-02 01:59:05,863 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#375](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/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-02 01:59:05,866 [ scc.config] DEBUG Found github.token
2025-04-02 01:59:05,866 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-04-02 01:59:05,866 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-02 01:59:05,904 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:05,904 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:05,906 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-02 01:59:05,943 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-02 01:59:05,948 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffadabd2510> has no local changes
2025-04-02 01:59:05,948 [ 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#375 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/)'
2025-04-02 01:59:05,955 [ scc.git] DEBUG [detached HEAD 0fbe358] merge master -Dorg -Ssuccess-only
2025-04-02 01:59:05,955 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 01:59:05,955 [ scc.repo] DEBUG ## PRs found:
2025-04-02 01:59:06,106 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:06,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-04-02 01:59:06,658 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:06,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-04-02 01:59:07,126 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:07,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-02 01:59:07,668 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:07,915 [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-02 01:59:08,166 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:08,416 [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-02 01:59:08,668 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:08,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-02 01:59:09,204 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:09,401 [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-02 01:59:09,402 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-02 01:59:09,653 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:09,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-04-02 01:59:09,877 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-02 01:59:10,128 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:10,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-02 01:59:10,694 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:11,023 [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-02 01:59:11,275 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:11,582 [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-02 01:59:11,834 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:12,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-02 01:59:12,301 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:12,485 [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-02 01:59:12,485 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-02 01:59:12,736 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:12,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-04-02 01:59:12,998 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-02 01:59:13,249 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:13,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-02 01:59:13,833 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:14,102 [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-02 01:59:14,353 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:14,626 [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-02 01:59:14,878 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:15,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-02 01:59:15,592 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:15,774 [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-02 01:59:15,775 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-02 01:59:16,026 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:16,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-04-02 01:59:16,865 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:17,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-04-02 01:59:17,361 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:17,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-04-02 01:59:17,848 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:18,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-04-02 01:59:18,338 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:18,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-04-02 01:59:18,866 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:19,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-04-02 01:59:19,377 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:19,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-04-02 01:59:19,654 [ scc.repo] DEBUG ## Branches found:
2025-04-02 01:59:19,654 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-02 01:59:19,654 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:19,654 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:19,657 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-02 01:59:19,660 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-02 01:59:19,660 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-02 01:59:19,663 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-02 01:59:19,665 [ scc.git] DEBUG Already up to date.
2025-04-02 01:59:19,666 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-04-02 01:59:19,972 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-02 01:59:19,972 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-04-02 01:59:19,977 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-04-02 01:59:20,248 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-02 01:59:20,248 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-04-02 01:59:20,253 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-04-02 01:59:20,513 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-02 01:59:20,513 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-04-02 01:59:20,517 [ scc.git] DEBUG ## Unique users: []
2025-04-02 01:59:20,518 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:20,518 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:20,520 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-04-02 01:59:20,595 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:20,597 [ 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-02 01:59:20,720 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-02 01:59:20,723 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-04-02 01:59:20,723 [ scc.git] DEBUG package.json | 2 +-
2025-04-02 01:59:20,723 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-04-02 01:59:20,724 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:20,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 01:59:20,881 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-04-02 01:59:20,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:20,943 [ 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-02 01:59:21,102 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-02 01:59:21,102 [ scc.git] DEBUG Auto-merging package.json
2025-04-02 01:59:21,103 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-02 01:59:21,106 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-04-02 01:59:21,106 [ scc.git] DEBUG package.json | 2 +-
2025-04-02 01:59:21,106 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-04-02 01:59:21,132 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:21,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 01:59:21,301 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-02 01:59:21,304 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:21,306 [ 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-02 01:59:21,315 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-02 01:59:21,318 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-02 01:59:21,318 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-02 01:59:21,552 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:21,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 01:59:21,708 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-02 01:59:21,746 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:21,746 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:21,749 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-02 01:59:21,786 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-02 01:59:21,790 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffadae13b90> has no local changes
2025-04-02 01:59:21,790 [ 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#375 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/)'
2025-04-02 01:59:21,797 [ scc.git] DEBUG [detached HEAD 54102c9] merge master -Dorg -Ssuccess-only
2025-04-02 01:59:21,798 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 01:59:21,798 [ scc.repo] DEBUG ## PRs found:
2025-04-02 01:59:21,959 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:22,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-04-02 01:59:22,142 [ scc.repo] DEBUG ## Branches found:
2025-04-02 01:59:22,143 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-02 01:59:22,143 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:22,143 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:22,145 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-02 01:59:22,147 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-02 01:59:22,147 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-02 01:59:22,150 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-02 01:59:22,153 [ scc.git] DEBUG Already up to date.
2025-04-02 01:59:22,153 [ scc.git] DEBUG ## Unique users: []
2025-04-02 01:59:22,153 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:22,153 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:22,155 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-02 01:59:22,193 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:22,193 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:22,195 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-02 01:59:22,231 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-02 01:59:22,235 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffadae11b90> has no local changes
2025-04-02 01:59:22,235 [ 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#375 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/)'
2025-04-02 01:59:22,241 [ scc.git] DEBUG [detached HEAD fa21a1e] merge master -Dorg -Ssuccess-only
2025-04-02 01:59:22,241 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 01:59:22,241 [ scc.repo] DEBUG ## PRs found:
2025-04-02 01:59:22,393 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:22,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-04-02 01:59:22,912 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:23,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-04-02 01:59:23,414 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:23,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-04-02 01:59:23,876 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:24,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-04-02 01:59:24,121 [ scc.repo] DEBUG ## Branches found:
2025-04-02 01:59:24,122 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-02 01:59:24,122 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:24,122 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:24,124 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-02 01:59:24,126 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-02 01:59:24,126 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-02 01:59:24,129 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-02 01:59:24,132 [ scc.git] DEBUG Already up to date.
2025-04-02 01:59:24,132 [ scc.git] DEBUG ## Unique users: []
2025-04-02 01:59:24,132 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:24,132 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:24,135 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-02 01:59:24,173 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:24,173 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:24,176 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-02 01:59:24,212 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-02 01:59:24,216 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffadae03690> has no local changes
2025-04-02 01:59:24,216 [ 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#375 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/)'
2025-04-02 01:59:24,222 [ scc.git] DEBUG [detached HEAD 4cbbdde] merge master -Dorg -Ssuccess-only
2025-04-02 01:59:24,223 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 01:59:24,223 [ scc.repo] DEBUG ## PRs found:
2025-04-02 01:59:24,372 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:24,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-04-02 01:59:24,924 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:25,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-04-02 01:59:25,415 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:25,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-04-02 01:59:26,118 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:26,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-02 01:59:26,684 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:26,912 [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-02 01:59:27,163 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:27,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-02 01:59:27,730 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:27,919 [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-02 01:59:27,919 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-02 01:59:27,919 [ scc.repo] DEBUG ## Branches found:
2025-04-02 01:59:27,919 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-02 01:59:27,919 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:27,919 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:27,922 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-02 01:59:27,924 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-02 01:59:27,924 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-02 01:59:27,927 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-02 01:59:27,930 [ scc.git] DEBUG Already up to date.
2025-04-02 01:59:27,930 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-04-02 01:59:28,363 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-04-02 01:59:28,363 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-04-02 01:59:28,367 [ scc.git] DEBUG ## Unique users: []
2025-04-02 01:59:28,367 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:28,367 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:28,369 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-02 01:59:28,372 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:28,375 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-02 01:59:28,548 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-04-02 01:59:28,548 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-04-02 01:59:28,548 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-04-02 01:59:28,548 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-04-02 01:59:28,548 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-04-02 01:59:28,548 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-04-02 01:59:28,548 [ scc.git] DEBUG Auto-merging setup.py
2025-04-02 01:59:28,548 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-04-02 01:59:28,548 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-02 01:59:28,549 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-02 01:59:28,551 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-02 01:59:28,555 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-04-02 01:59:28,557 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:28,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 01:59:28,712 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-02 01:59:28,715 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-02 01:59:28,718 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#375](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- setup.py
- omero_signup/signup_settings.py
- omero_signup/views.py
--conflicts
2025-04-02 01:59:28,720 [ scc.config] DEBUG Found github.token
2025-04-02 01:59:28,720 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-04-02 01:59:28,720 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-02 01:59:28,758 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:28,758 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:28,760 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-02 01:59:28,798 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-02 01:59:28,802 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffad823dc10> has no local changes
2025-04-02 01:59:28,802 [ 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#375 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/)'
2025-04-02 01:59:28,808 [ scc.git] DEBUG [detached HEAD c0d1837] merge master -Dorg -Ssuccess-only
2025-04-02 01:59:28,808 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 01:59:28,808 [ scc.repo] DEBUG ## PRs found:
2025-04-02 01:59:28,963 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:29,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-04-02 01:59:29,496 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:29,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-04-02 01:59:29,976 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:30,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-04-02 01:59:30,483 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:30,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-04-02 01:59:30,998 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:31,226 [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-02 01:59:31,478 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:31,738 [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-02 01:59:31,990 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:32,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-04-02 01:59:32,528 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:32,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-04-02 01:59:32,989 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:33,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-04-02 01:59:33,473 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:33,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-04-02 01:59:33,980 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:34,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-02 01:59:34,525 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:34,715 [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-02 01:59:34,966 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:35,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-02 01:59:35,421 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:35,619 [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-02 01:59:35,620 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-02 01:59:35,620 [ scc.repo] DEBUG ## Branches found:
2025-04-02 01:59:35,620 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-02 01:59:35,620 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:35,620 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:35,623 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-02 01:59:35,625 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-02 01:59:35,625 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-02 01:59:35,628 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-02 01:59:35,631 [ scc.git] DEBUG Already up to date.
2025-04-02 01:59:35,631 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-04-02 01:59:36,038 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-02 01:59:36,038 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-04-02 01:59:36,042 [ scc.git] DEBUG ## Unique users: []
2025-04-02 01:59:36,042 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:36,043 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:36,045 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-04-02 01:59:36,049 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:36,051 [ 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-02 01:59:36,063 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-02 01:59:36,067 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-04-02 01:59:36,067 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-04-02 01:59:36,068 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-04-02 01:59:36,068 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-04-02 01:59:36,068 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-04-02 01:59:36,068 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-04-02 01:59:36,068 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-04-02 01:59:36,068 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-04-02 01:59:36,068 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-04-02 01:59:36,069 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:36,069 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-04-02 01:59:36,069 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-04-02 01:59:36,069 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-04-02 01:59:36,069 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-04-02 01:59:36,069 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-04-02 01:59:36,069 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-04-02 01:59:36,069 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-04-02 01:59:36,069 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-04-02 01:59:36,069 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-04-02 01:59:36,069 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-04-02 01:59:36,069 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-04-02 01:59:36,069 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-04-02 01:59:36,069 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-04-02 01:59:36,069 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-04-02 01:59:36,069 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-04-02 01:59:36,069 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-04-02 01:59:36,069 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-04-02 01:59:36,069 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-04-02 01:59:36,069 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-04-02 01:59:36,069 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-04-02 01:59:36,069 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-04-02 01:59:36,069 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-04-02 01:59:36,069 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-04-02 01:59:36,069 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-04-02 01:59:36,069 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-04-02 01:59:36,069 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-04-02 01:59:36,070 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-04-02 01:59:36,070 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-04-02 01:59:36,070 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-04-02 01:59:36,070 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-04-02 01:59:36,070 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-04-02 01:59:36,070 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-04-02 01:59:36,070 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-04-02 01:59:36,070 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-04-02 01:59:36,070 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-04-02 01:59:36,070 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-04-02 01:59:36,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 01:59:36,227 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-02 01:59:36,264 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:36,265 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:36,267 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-02 01:59:36,304 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-02 01:59:36,308 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffad8258210> has no local changes
2025-04-02 01:59:36,309 [ 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#375 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/)'
2025-04-02 01:59:36,316 [ scc.git] DEBUG [detached HEAD 6f1ce2e] merge master -Dorg -Ssuccess-only
2025-04-02 01:59:36,316 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 01:59:36,317 [ scc.repo] DEBUG ## PRs found:
2025-04-02 01:59:36,478 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:36,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-04-02 01:59:36,661 [ scc.repo] DEBUG ## Branches found:
2025-04-02 01:59:36,661 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-02 01:59:36,661 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:36,661 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:36,664 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-02 01:59:36,666 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-02 01:59:36,666 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-02 01:59:36,669 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-02 01:59:36,671 [ scc.git] DEBUG Already up to date.
2025-04-02 01:59:36,672 [ scc.git] DEBUG ## Unique users: []
2025-04-02 01:59:36,672 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:36,672 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:36,674 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-02 01:59:36,713 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:36,713 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:36,715 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-02 01:59:36,753 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-02 01:59:36,756 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffadbc81b90> has no local changes
2025-04-02 01:59:36,756 [ 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#375 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/)'
2025-04-02 01:59:36,762 [ scc.git] DEBUG [detached HEAD c9f4915] merge master -Dorg -Ssuccess-only
2025-04-02 01:59:36,763 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 01:59:36,763 [ scc.repo] DEBUG ## PRs found:
2025-04-02 01:59:36,912 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:37,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-04-02 01:59:37,439 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:37,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-04-02 01:59:37,947 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:38,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-04-02 01:59:38,412 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:38,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-02 01:59:38,938 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:39,200 [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-02 01:59:39,452 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:39,728 [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-02 01:59:39,980 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:40,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-02 01:59:40,499 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:40,673 [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-02 01:59:40,673 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-04-02 01:59:40,673 [ scc.repo] DEBUG ## Branches found:
2025-04-02 01:59:40,673 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-02 01:59:40,673 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:40,674 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:40,676 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-02 01:59:40,678 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-02 01:59:40,679 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-02 01:59:40,681 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-02 01:59:40,684 [ scc.git] DEBUG Already up to date.
2025-04-02 01:59:40,684 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-04-02 01:59:41,175 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-04-02 01:59:41,175 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-04-02 01:59:41,180 [ scc.git] DEBUG ## Unique users: []
2025-04-02 01:59:41,180 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:41,180 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:41,182 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-04-02 01:59:41,185 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:41,187 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-04-02 01:59:41,195 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-02 01:59:41,198 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-04-02 01:59:41,198 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-04-02 01:59:41,198 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-04-02 01:59:41,198 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-04-02 01:59:41,198 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-04-02 01:59:41,199 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:41,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 01:59:41,362 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-02 01:59:41,399 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:41,399 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:41,402 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-02 01:59:41,440 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-02 01:59:41,443 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffad82297d0> has no local changes
2025-04-02 01:59:41,443 [ 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#375 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/)'
2025-04-02 01:59:41,450 [ scc.git] DEBUG [detached HEAD 968a587] merge master -Dorg -Ssuccess-only
2025-04-02 01:59:41,450 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 01:59:41,450 [ scc.git] INFO Overriding base-branch from master to main
2025-04-02 01:59:41,451 [ scc.repo] DEBUG ## PRs found:
2025-04-02 01:59:41,613 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:41,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-04-02 01:59:42,156 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:42,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-04-02 01:59:42,621 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:43,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-04-02 01:59:43,330 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:43,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-04-02 01:59:43,866 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:44,118 [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-02 01:59:44,370 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:44,636 [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-02 01:59:44,889 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:45,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-04-02 01:59:45,371 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:45,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-04-02 01:59:45,886 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:46,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-04-02 01:59:46,345 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:46,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-02 01:59:46,902 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:47,135 [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-02 01:59:47,387 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:47,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-02 01:59:47,921 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:48,110 [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-02 01:59:48,110 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-02 01:59:48,111 [ scc.repo] DEBUG ## Branches found:
2025-04-02 01:59:48,111 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-02 01:59:48,111 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:48,111 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:48,114 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-04-02 01:59:48,116 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-02 01:59:48,116 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-04-02 01:59:48,119 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-04-02 01:59:48,122 [ scc.git] DEBUG Already up to date.
2025-04-02 01:59:48,122 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-04-02 01:59:48,569 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-04-02 01:59:48,569 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-04-02 01:59:48,574 [ scc.git] DEBUG ## Unique users: []
2025-04-02 01:59:48,574 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:48,574 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:48,576 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-02 01:59:48,579 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:48,582 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-02 01:59:48,625 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-04-02 01:59:48,625 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-04-02 01:59:48,626 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-02 01:59:48,626 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-02 01:59:48,628 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-02 01:59:48,632 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-04-02 01:59:48,634 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:48,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 01:59:48,804 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-02 01:59:48,807 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-02 01:59:48,810 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#375](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-04-02 01:59:48,812 [ scc.config] DEBUG Found github.token
2025-04-02 01:59:48,812 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-04-02 01:59:48,812 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-02 01:59:48,850 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:48,850 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:48,852 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-02 01:59:48,889 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-02 01:59:48,893 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffad8253750> has no local changes
2025-04-02 01:59:48,893 [ 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#375 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/)'
2025-04-02 01:59:48,899 [ scc.git] DEBUG [detached HEAD 52dc67d] merge master -Dorg -Ssuccess-only
2025-04-02 01:59:48,900 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 01:59:48,900 [ scc.repo] DEBUG ## PRs found:
2025-04-02 01:59:49,055 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:49,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-04-02 01:59:49,262 [ scc.repo] DEBUG ## Branches found:
2025-04-02 01:59:49,262 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-02 01:59:49,262 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:49,263 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:49,265 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-02 01:59:49,267 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-02 01:59:49,267 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-02 01:59:49,270 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-02 01:59:49,273 [ scc.git] DEBUG Already up to date.
2025-04-02 01:59:49,273 [ scc.git] DEBUG ## Unique users: []
2025-04-02 01:59:49,273 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:49,273 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:49,275 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-02 01:59:49,314 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:49,314 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:49,316 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-02 01:59:49,353 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-02 01:59:49,356 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffadbb8b710> has no local changes
2025-04-02 01:59:49,356 [ 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#375 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/)'
2025-04-02 01:59:49,362 [ scc.git] DEBUG [detached HEAD 44f378c] merge master -Dorg -Ssuccess-only
2025-04-02 01:59:49,363 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 01:59:49,363 [ scc.repo] DEBUG ## PRs found:
2025-04-02 01:59:49,513 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:49,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-04-02 01:59:49,696 [ scc.repo] DEBUG ## Branches found:
2025-04-02 01:59:49,696 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-02 01:59:49,696 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:49,696 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:49,698 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-02 01:59:49,701 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-02 01:59:49,701 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-02 01:59:49,704 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-02 01:59:49,707 [ scc.git] DEBUG Already up to date.
2025-04-02 01:59:49,707 [ scc.git] DEBUG ## Unique users: []
2025-04-02 01:59:49,707 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:49,707 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:49,709 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-02 01:59:49,747 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:49,747 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:49,749 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-02 01:59:49,786 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-02 01:59:49,789 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffad826f650> has no local changes
2025-04-02 01:59:49,789 [ 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#375 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/)'
2025-04-02 01:59:49,797 [ scc.git] DEBUG [detached HEAD e549f97] merge master -Dorg -Ssuccess-only
2025-04-02 01:59:49,797 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 01:59:49,797 [ scc.repo] DEBUG ## PRs found:
2025-04-02 01:59:49,947 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:50,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-04-02 01:59:50,454 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:50,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-04-02 01:59:50,942 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:51,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-04-02 01:59:51,393 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:51,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-02 01:59:51,951 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:52,174 [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-02 01:59:52,426 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:52,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-02 01:59:52,951 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:53,134 [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-02 01:59:53,134 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-04-02 01:59:53,134 [ scc.repo] DEBUG ## Branches found:
2025-04-02 01:59:53,134 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-02 01:59:53,135 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:53,135 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:53,137 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-02 01:59:53,140 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-02 01:59:53,140 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-02 01:59:53,142 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-02 01:59:53,145 [ scc.git] DEBUG Already up to date.
2025-04-02 01:59:53,145 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-04-02 01:59:53,615 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-04-02 01:59:53,615 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-04-02 01:59:53,620 [ scc.git] DEBUG ## Unique users: []
2025-04-02 01:59:53,620 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:53,620 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:53,622 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-02 01:59:53,625 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:53,627 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-02 01:59:53,683 [ scc.git] DEBUG Auto-merging Dockerfile
2025-04-02 01:59:53,683 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-04-02 01:59:53,684 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-02 01:59:53,684 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-02 01:59:53,687 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-02 01:59:53,691 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-04-02 01:59:53,693 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:53,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 01:59:53,858 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-02 01:59:53,861 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-02 01:59:53,863 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#375](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-04-02 01:59:53,865 [ scc.config] DEBUG Found github.token
2025-04-02 01:59:53,865 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-04-02 01:59:53,865 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-02 01:59:53,904 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 01:59:53,904 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 01:59:53,906 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-02 01:59:53,944 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-02 01:59:53,947 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffad82d3690> has no local changes
2025-04-02 01:59:53,947 [ 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#375 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/)'
2025-04-02 01:59:53,954 [ scc.git] DEBUG [detached HEAD 5f19133] merge master -Dorg -Ssuccess-only
2025-04-02 01:59:53,954 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 01:59:53,954 [ scc.git] INFO Overriding base-branch from master to develop
2025-04-02 01:59:53,954 [ scc.repo] DEBUG ## PRs found:
2025-04-02 01:59:54,108 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:54,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-04-02 01:59:54,640 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:54,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-04-02 01:59:55,118 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:55,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-04-02 01:59:55,595 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:55,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-02 01:59:56,027 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:56,281 [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-02 01:59:56,532 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:56,767 [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-02 01:59:57,018 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:57,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-02 01:59:57,510 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:57,686 [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-02 01:59:57,686 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-02 01:59:57,937 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:58,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-04-02 01:59:58,412 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:58,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-04-02 01:59:58,865 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:59,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-02 01:59:59,323 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 01:59:59,793 [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-02 02:00:00,044 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:00,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-02 02:00:00,504 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:00,696 [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-02 02:00:00,696 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-02 02:00:00,947 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:02,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-04-02 02:00:02,513 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:02,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-04-02 02:00:03,054 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:03,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-04-02 02:00:03,540 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:03,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-04-02 02:00:03,812 [ scc.repo] DEBUG ## Branches found:
2025-04-02 02:00:03,812 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-02 02:00:03,813 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 02:00:03,813 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 02:00:03,816 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-04-02 02:00:03,818 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-02 02:00:03,818 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-04-02 02:00:03,821 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-04-02 02:00:03,829 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-04-02 02:00:04,063 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:04,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-04-02 02:00:04,473 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-04-02 02:00:05,043 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-02 02:00:05,043 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-04-02 02:00:05,047 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-04-02 02:00:05,851 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-02 02:00:05,851 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-04-02 02:00:05,855 [ scc.git] DEBUG ## Unique users: []
2025-04-02 02:00:05,855 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 02:00:05,855 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 02:00:05,858 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-02 02:00:05,863 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 02:00:05,866 [ 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-02 02:00:06,245 [ 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-02 02:00:06,245 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-02 02:00:06,246 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-02 02:00:06,248 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-02 02:00:06,252 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-04-02 02:00:06,253 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:06,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 02:00:06,412 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-02 02:00:06,417 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-02 02:00:06,421 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#375](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-04-02 02:00:06,423 [ scc.config] DEBUG Found github.token
2025-04-02 02:00:06,423 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-04-02 02:00:06,423 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-04-02 02:00:06,428 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 02:00:06,430 [ 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-02 02:00:06,439 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-02 02:00:06,443 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-04-02 02:00:06,443 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-04-02 02:00:06,663 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:06,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 02:00:06,834 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-02 02:00:06,873 [ scc.git] DEBUG Get sha1 of %s
2025-04-02 02:00:06,873 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-02 02:00:06,876 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-02 02:00:06,914 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-02 02:00:06,918 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffad8260910> has no local changes
2025-04-02 02:00:06,918 [ 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#375 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/)'
2025-04-02 02:00:06,925 [ scc.git] DEBUG [detached HEAD 2f03d2d] merge master -Dorg -Ssuccess-only
2025-04-02 02:00:06,925 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 02:00:06,925 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-02 02:00:06,999 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-04-02 02:00:07,085 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:07,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 02:00:07,297 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-04-02 02:00:07,299 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-04-02 02:00:07,544 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:07,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 02:00:07,715 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-04-02 02:00:07,718 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-04-02 02:00:07,962 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:08,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 02:00:08,150 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-04-02 02:00:08,152 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-04-02 02:00:08,397 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:08,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 02:00:08,571 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-04-02 02:00:08,816 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:08,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 02:00:08,981 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-04-02 02:00:08,983 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-04-02 02:00:09,228 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:09,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 02:00:09,393 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-04-02 02:00:09,395 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-04-02 02:00:09,640 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:09,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 02:00:09,813 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-04-02 02:00:09,815 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-04-02 02:00:10,059 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:10,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 02:00:10,224 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-04-02 02:00:10,226 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-04-02 02:00:10,471 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:10,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 02:00:10,716 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-04-02 02:00:10,718 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-04-02 02:00:10,963 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:11,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 02:00:11,164 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-04-02 02:00:11,166 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-04-02 02:00:11,410 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:11,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 02:00:11,570 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-04-02 02:00:11,572 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-04-02 02:00:11,817 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:11,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 02:00:11,979 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-04-02 02:00:11,981 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-04-02 02:00:12,226 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:12,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 02:00:12,400 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-04-02 02:00:12,645 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:12,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 02:00:12,819 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-04-02 02:00:13,063 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:13,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 02:00:13,253 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-04-02 02:00:13,255 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-04-02 02:00:13,499 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:13,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 02:00:13,667 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-04-02 02:00:13,911 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:14,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 02:00:14,089 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-04-02 02:00:14,334 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:14,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 02:00:14,514 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-04-02 02:00:14,516 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-04-02 02:00:14,760 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:14,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 02:00:14,946 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-04-02 02:00:14,948 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-04-02 02:00:15,192 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:15,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 02:00:15,374 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-04-02 02:00:15,376 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-04-02 02:00:15,620 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:15,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 02:00:15,800 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-04-02 02:00:15,802 [ scc.config] DEBUG Found submodule.scripts.url
2025-04-02 02:00:16,046 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-02 02:00:16,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-02 02:00:16,325 [ scc.config] DEBUG Found submodule.scripts.branch
2025-04-02 02:00:16,326 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-02 02:00:16,413 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffadad06b10> has local changes
2025-04-02 02:00:16,413 [ 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 171 will-moore 'Initial addition of integration tests' (stage: draft)
- 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])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
- PR 167 dominikl 'Add extinfo command'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
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#375 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/375/)'
2025-04-02 02:00:16,427 [ scc.git] DEBUG [detached HEAD d9f67c4] merge master -Dorg -Ssuccess-only
2025-04-02 02:00:16,427 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-04-02 02:00:16,427 [ scc.merge] INFO Repository: ome/omero-plugins
2025-04-02 02:00:16,427 [ scc.merge] INFO Already up to date.
2025-04-02 02:00:16,427 [ scc.merge] INFO
2025-04-02 02:00:16,427 [ scc.merge] INFO Merged PRs:
2025-04-02 02:00:16,427 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-04-02 02:00:16,427 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-04-02 02:00:16,427 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-04-02 02:00:16,427 [ scc.merge] INFO
2025-04-02 02:00:16,427 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-04-02 02:00:16,427 [ scc.merge] INFO Already up to date.
2025-04-02 02:00:16,427 [ scc.merge] INFO
2025-04-02 02:00:16,427 [ scc.merge] INFO
2025-04-02 02:00:16,427 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-04-02 02:00:16,427 [ scc.merge] INFO Excluded PRs:
2025-04-02 02:00:16,428 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-04-02 02:00:16,428 [ scc.merge] INFO Already up to date.
2025-04-02 02:00:16,428 [ scc.merge] INFO
2025-04-02 02:00:16,428 [ scc.merge] INFO
2025-04-02 02:00:16,428 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-04-02 02:00:16,428 [ scc.merge] INFO Excluded PRs:
2025-04-02 02:00:16,428 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-04-02 02:00:16,428 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-04-02 02:00:16,428 [ scc.merge] INFO Already up to date.
2025-04-02 02:00:16,428 [ scc.merge] INFO
2025-04-02 02:00:16,428 [ scc.merge] INFO Merged PRs:
2025-04-02 02:00:16,428 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-04-02 02:00:16,428 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-04-02 02:00:16,428 [ scc.merge] INFO
2025-04-02 02:00:16,428 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-04-02 02:00:16,428 [ scc.merge] INFO Excluded PRs:
2025-04-02 02:00:16,428 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests' (stage: draft)
2025-04-02 02:00:16,428 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-04-02 02:00:16,428 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-04-02 02:00:16,428 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-04-02 02:00:16,428 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-02 02:00:16,428 [ scc.merge] INFO Already up to date.
2025-04-02 02:00:16,428 [ scc.merge] INFO
2025-04-02 02:00:16,428 [ scc.merge] INFO Merged PRs:
2025-04-02 02:00:16,428 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-04-02 02:00:16,428 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-04-02 02:00:16,428 [ scc.merge] INFO
2025-04-02 02:00:16,428 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-02 02:00:16,428 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-04-02 02:00:16,428 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-04-02 02:00:16,428 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-02 02:00:16,428 [ scc.merge] INFO
2025-04-02 02:00:16,428 [ scc.merge] INFO Repository: ome/omero-figure
2025-04-02 02:00:16,428 [ scc.merge] INFO Excluded PRs:
2025-04-02 02:00:16,428 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-04-02 02:00:16,428 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-04-02 02:00:16,428 [ scc.merge] INFO Already up to date.
2025-04-02 02:00:16,428 [ scc.merge] INFO
2025-04-02 02:00:16,428 [ scc.merge] INFO Merged PRs:
2025-04-02 02:00:16,428 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-04-02 02:00:16,429 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-04-02 02:00:16,429 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-04-02 02:00:16,429 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-04-02 02:00:16,429 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-04-02 02:00:16,429 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-02 02:00:16,429 [ scc.merge] INFO
2025-04-02 02:00:16,429 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-02 02:00:16,429 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-04-02 02:00:16,429 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-04-02 02:00:16,429 [ scc.merge] INFO
2025-04-02 02:00:16,429 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-04-02 02:00:16,429 [ scc.merge] INFO Already up to date.
2025-04-02 02:00:16,429 [ scc.merge] INFO
2025-04-02 02:00:16,429 [ scc.merge] INFO Merged PRs:
2025-04-02 02:00:16,429 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-04-02 02:00:16,429 [ scc.merge] INFO
2025-04-02 02:00:16,429 [ scc.merge] INFO Repository: ome/omero-gallery
2025-04-02 02:00:16,429 [ scc.merge] INFO Already up to date.
2025-04-02 02:00:16,429 [ scc.merge] INFO
2025-04-02 02:00:16,429 [ scc.merge] INFO Merged PRs:
2025-04-02 02:00:16,429 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-04-02 02:00:16,429 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-04-02 02:00:16,429 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-04-02 02:00:16,429 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-04-02 02:00:16,429 [ scc.merge] INFO
2025-04-02 02:00:16,429 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-02 02:00:16,429 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-04-02 02:00:16,429 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-04-02 02:00:16,429 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-04-02 02:00:16,429 [ scc.merge] INFO
2025-04-02 02:00:16,429 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-04-02 02:00:16,429 [ scc.merge] INFO Excluded PRs:
2025-04-02 02:00:16,429 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-04-02 02:00:16,429 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-04-02 02:00:16,429 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-04-02 02:00:16,429 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-04-02 02:00:16,429 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-04-02 02:00:16,429 [ scc.merge] INFO Already up to date.
2025-04-02 02:00:16,429 [ scc.merge] INFO
2025-04-02 02:00:16,429 [ scc.merge] INFO Merged PRs:
2025-04-02 02:00:16,429 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-04-02 02:00:16,430 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-04-02 02:00:16,430 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-04-02 02:00:16,430 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-04-02 02:00:16,430 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-02 02:00:16,430 [ scc.merge] INFO
2025-04-02 02:00:16,430 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-02 02:00:16,430 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-04-02 02:00:16,430 [ scc.merge] INFO
2025-04-02 02:00:16,430 [ scc.merge] INFO Repository: ome/omero-mapr
2025-04-02 02:00:16,430 [ scc.merge] INFO Excluded PRs:
2025-04-02 02:00:16,430 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-04-02 02:00:16,430 [ scc.merge] INFO Already up to date.
2025-04-02 02:00:16,430 [ scc.merge] INFO
2025-04-02 02:00:16,430 [ scc.merge] INFO Merged PRs:
2025-04-02 02:00:16,430 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-04-02 02:00:16,430 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-02 02:00:16,430 [ scc.merge] INFO
2025-04-02 02:00:16,430 [ scc.merge] INFO Repository: ome/omero-metadata
2025-04-02 02:00:16,430 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-04-02 02:00:16,430 [ scc.merge] INFO Previously merged:
2025-04-02 02:00:16,430 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-02 02:00:16,430 [ scc.merge] INFO
2025-04-02 02:00:16,430 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-02 02:00:16,430 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-02 02:00:16,430 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-02 02:00:16,430 [ scc.merge] INFO
2025-04-02 02:00:16,430 [ scc.merge] INFO Repository: ome/omero-parade
2025-04-02 02:00:16,430 [ scc.merge] INFO Excluded PRs:
2025-04-02 02:00:16,430 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-04-02 02:00:16,430 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-04-02 02:00:16,430 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-04-02 02:00:16,430 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-04-02 02:00:16,430 [ scc.merge] INFO Already up to date.
2025-04-02 02:00:16,430 [ scc.merge] INFO
2025-04-02 02:00:16,430 [ scc.merge] INFO Merged PRs:
2025-04-02 02:00:16,430 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-02 02:00:16,430 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-02 02:00:16,430 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-02 02:00:16,430 [ scc.merge] INFO
2025-04-02 02:00:16,430 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-04-02 02:00:16,431 [ scc.merge] INFO Already up to date.
2025-04-02 02:00:16,431 [ scc.merge] INFO
2025-04-02 02:00:16,431 [ scc.merge] INFO
2025-04-02 02:00:16,431 [ scc.merge] INFO Repository: ome/omero-rois
2025-04-02 02:00:16,431 [ scc.merge] INFO Excluded PRs:
2025-04-02 02:00:16,431 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-04-02 02:00:16,431 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-02 02:00:16,431 [ scc.merge] INFO Already up to date.
2025-04-02 02:00:16,431 [ scc.merge] INFO
2025-04-02 02:00:16,431 [ scc.merge] INFO
2025-04-02 02:00:16,431 [ scc.merge] INFO Repository: ome/omero-signup
2025-04-02 02:00:16,431 [ scc.merge] INFO Already up to date.
2025-04-02 02:00:16,431 [ scc.merge] INFO
2025-04-02 02:00:16,431 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-02 02:00:16,431 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-02 02:00:16,431 [ scc.merge] INFO
2025-04-02 02:00:16,431 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-04-02 02:00:16,431 [ scc.merge] INFO Excluded PRs:
2025-04-02 02:00:16,431 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-04-02 02:00:16,431 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-04-02 02:00:16,431 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-04-02 02:00:16,431 [ scc.merge] INFO Already up to date.
2025-04-02 02:00:16,431 [ scc.merge] INFO
2025-04-02 02:00:16,431 [ scc.merge] INFO Merged PRs:
2025-04-02 02:00:16,431 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-02 02:00:16,431 [ scc.merge] INFO
2025-04-02 02:00:16,431 [ scc.merge] INFO Repository: ome/omero-upload
2025-04-02 02:00:16,431 [ scc.merge] INFO Already up to date.
2025-04-02 02:00:16,431 [ scc.merge] INFO
2025-04-02 02:00:16,431 [ scc.merge] INFO
2025-04-02 02:00:16,431 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-04-02 02:00:16,431 [ scc.merge] INFO Already up to date.
2025-04-02 02:00:16,431 [ scc.merge] INFO
2025-04-02 02:00:16,431 [ scc.merge] INFO Merged PRs:
2025-04-02 02:00:16,431 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-04-02 02:00:16,431 [ scc.merge] INFO
2025-04-02 02:00:16,431 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-04-02 02:00:16,431 [ scc.merge] INFO Excluded PRs:
2025-04-02 02:00:16,431 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-04-02 02:00:16,431 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-04-02 02:00:16,431 [ scc.merge] INFO Already up to date.
2025-04-02 02:00:16,432 [ scc.merge] INFO
2025-04-02 02:00:16,432 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-02 02:00:16,432 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-02 02:00:16,432 [ scc.merge] INFO
2025-04-02 02:00:16,432 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-04-02 02:00:16,432 [ scc.merge] INFO Already up to date.
2025-04-02 02:00:16,432 [ scc.merge] INFO
2025-04-02 02:00:16,432 [ scc.merge] INFO
2025-04-02 02:00:16,432 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-04-02 02:00:16,432 [ scc.merge] INFO Already up to date.
2025-04-02 02:00:16,432 [ scc.merge] INFO
2025-04-02 02:00:16,432 [ scc.merge] INFO
2025-04-02 02:00:16,432 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-04-02 02:00:16,432 [ scc.merge] INFO Already up to date.
2025-04-02 02:00:16,432 [ scc.merge] INFO
2025-04-02 02:00:16,432 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-02 02:00:16,432 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-04-02 02:00:16,432 [ scc.merge] INFO
2025-04-02 02:00:16,432 [ scc.merge] INFO Repository: ome/scripts
2025-04-02 02:00:16,432 [ scc.merge] INFO Excluded PRs:
2025-04-02 02:00:16,432 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-04-02 02:00:16,432 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-04-02 02:00:16,432 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-04-02 02:00:16,432 [ scc.merge] INFO Previously merged:
2025-04-02 02:00:16,432 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-04-02 02:00:16,432 [ scc.merge] INFO
2025-04-02 02:00:16,432 [ scc.merge] INFO Merged PRs:
2025-04-02 02:00:16,432 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-02 02:00:16,432 [ scc.merge] INFO
2025-04-02 02:00:16,432 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-02 02:00:16,432 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-02 02:00:16,432 [ scc.merge] INFO
2025-04-02 02:00:16,432 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-04-02 02:00:16,432 [ scc.git] DEBUG Calling 'git remote'
2025-04-02 02:00:16,435 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-04-02 02:00:16,435 [ scc.git] DEBUG Calling 'git remote'
2025-04-02 02:00:16,437 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 02:00:16,437 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-04-02 02:00:16,438 [ scc.git] DEBUG Calling 'git remote'
2025-04-02 02:00:16,440 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 02:00:16,440 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-04-02 02:00:16,440 [ scc.git] DEBUG Calling 'git remote'
2025-04-02 02:00:16,442 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 02:00:16,442 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-04-02 02:00:16,442 [ scc.git] DEBUG Calling 'git remote'
2025-04-02 02:00:16,444 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 02:00:16,444 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-04-02 02:00:16,444 [ scc.git] DEBUG Calling 'git remote'
2025-04-02 02:00:16,446 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 02:00:16,447 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-04-02 02:00:16,447 [ scc.git] DEBUG Calling 'git remote'
2025-04-02 02:00:16,449 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 02:00:16,449 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-04-02 02:00:16,449 [ scc.git] DEBUG Calling 'git remote'
2025-04-02 02:00:16,451 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 02:00:16,451 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-04-02 02:00:16,451 [ scc.git] DEBUG Calling 'git remote'
2025-04-02 02:00:16,453 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 02:00:16,453 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-02 02:00:16,453 [ scc.git] DEBUG Calling 'git remote'
2025-04-02 02:00:16,455 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 02:00:16,455 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-02 02:00:16,455 [ scc.git] DEBUG Calling 'git remote'
2025-04-02 02:00:16,457 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 02:00:16,457 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-02 02:00:16,457 [ scc.git] DEBUG Calling 'git remote'
2025-04-02 02:00:16,459 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 02:00:16,460 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-02 02:00:16,460 [ scc.git] DEBUG Calling 'git remote'
2025-04-02 02:00:16,462 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 02:00:16,462 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-02 02:00:16,462 [ scc.git] DEBUG Calling 'git remote'
2025-04-02 02:00:16,464 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 02:00:16,464 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-02 02:00:16,464 [ scc.git] DEBUG Calling 'git remote'
2025-04-02 02:00:16,466 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 02:00:16,466 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-02 02:00:16,466 [ scc.git] DEBUG Calling 'git remote'
2025-04-02 02:00:16,468 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 02:00:16,468 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-02 02:00:16,468 [ scc.git] DEBUG Calling 'git remote'
2025-04-02 02:00:16,471 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 02:00:16,471 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-02 02:00:16,471 [ scc.git] DEBUG Calling 'git remote'
2025-04-02 02:00:16,473 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 02:00:16,473 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-02 02:00:16,473 [ scc.git] DEBUG Calling 'git remote'
2025-04-02 02:00:16,475 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 02:00:16,475 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-02 02:00:16,475 [ scc.git] DEBUG Calling 'git remote'
2025-04-02 02:00:16,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 02:00:16,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-02 02:00:16,478 [ scc.git] DEBUG Calling 'git remote'
2025-04-02 02:00:16,480 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 02:00:16,480 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-02 02:00:16,480 [ scc.git] DEBUG Calling 'git remote'
2025-04-02 02:00:16,482 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-02 02:00:16,482 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-02 02:00:16,482 [ scc.git] DEBUG Calling 'git remote'
2025-04-02 02:00:16,484 [ 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 3a420fa] 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 fbafdd8] 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-02 02:01:04,683 [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-02 02:01:14,392 [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-02 02:01:16,902 [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-02 02:01:21,700 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-04-02 02:02:03,053 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts (hide)
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/3d58bc78/images/svgs/logo.svg){kind=logo}
