Skipping 225 KB..
Full Log2025-04-07 00:40:58,435 [ scc.git] DEBUG package.json | 2 +-
2025-04-07 00:40:58,435 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-04-07 00:40:58,651 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:40:58,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:40:58,802 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-07 00:40:58,809 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:40:58,811 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-07 00:40:58,849 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-07 00:40:58,850 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-04-07 00:40:58,850 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-07 00:40:58,850 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-07 00:40:58,853 [ scc.git] DEBUG Calling 'git reset --hard 7e11e3e8f2dc0e9d1481410baba1f6454a40741d'
2025-04-07 00:40:58,861 [ scc.git] DEBUG HEAD is now at 7e11e3e merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-04-07 00:40:59,053 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:40:59,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:40:59,237 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-07 00:40:59,240 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-04-07 00:40:59,242 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#380](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-04-07 00:40:59,245 [ scc.config] DEBUG Found github.token
2025-04-07 00:40:59,245 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-04-07 00:40:59,245 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7705b58a7a2049651eb10142e2260cf73dcc29fe'
2025-04-07 00:40:59,252 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:40:59,254 [ 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-07 00:40:59,271 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-07 00:40:59,274 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-07 00:40:59,274 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-07 00:40:59,487 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:40:59,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:40:59,658 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-07 00:40:59,698 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:40:59,698 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:40:59,701 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-07 00:40:59,739 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-07 00:40:59,744 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f793f8d7fd0> has no local changes
2025-04-07 00:40:59,744 [ 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#380 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/)'
2025-04-07 00:40:59,751 [ scc.git] DEBUG [detached HEAD edc53f4] merge master -Dorg -Ssuccess-only
2025-04-07 00:40:59,751 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:40:59,751 [ scc.repo] DEBUG ## PRs found:
2025-04-07 00:40:59,909 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:00,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-04-07 00:41:00,455 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:00,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-04-07 00:41:00,931 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:01,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-07 00:41:01,462 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:01,684 [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-07 00:41:01,936 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:02,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-07 00:41:02,384 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:02,562 [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-07 00:41:02,562 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-07 00:41:02,813 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:03,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-04-07 00:41:03,318 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:03,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-04-07 00:41:03,804 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:04,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-07 00:41:04,312 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:04,575 [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-07 00:41:04,827 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:05,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-07 00:41:05,350 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:05,541 [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-07 00:41:05,541 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-04-07 00:41:05,541 [ scc.repo] DEBUG ## Branches found:
2025-04-07 00:41:05,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-07 00:41:05,542 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:05,542 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:05,544 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-07 00:41:05,547 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-07 00:41:05,547 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-07 00:41:05,550 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-07 00:41:05,553 [ scc.git] DEBUG Already up to date.
2025-04-07 00:41:05,553 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-04-07 00:41:05,818 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-07 00:41:05,818 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-04-07 00:41:05,823 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-04-07 00:41:06,090 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-07 00:41:06,090 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-04-07 00:41:06,094 [ scc.git] DEBUG ## Unique users: []
2025-04-07 00:41:06,094 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:06,094 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:06,097 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-07 00:41:06,101 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:06,103 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-07 00:41:06,112 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-07 00:41:06,116 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-04-07 00:41:06,116 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-04-07 00:41:06,116 [ scc.git] DEBUG requirements.txt | 2 +-
2025-04-07 00:41:06,116 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-04-07 00:41:06,116 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-04-07 00:41:06,116 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-04-07 00:41:06,117 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:06,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:41:06,273 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-07 00:41:06,277 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:06,280 [ 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-07 00:41:06,289 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-07 00:41:06,292 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-07 00:41:06,292 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-07 00:41:06,524 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:06,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:41:06,691 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-07 00:41:06,730 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:06,730 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:06,732 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-07 00:41:06,771 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-07 00:41:06,775 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f793e7fb5d0> has no local changes
2025-04-07 00:41:06,775 [ 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#380 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/)'
2025-04-07 00:41:06,782 [ scc.git] DEBUG [detached HEAD fd87964] merge master -Dorg -Ssuccess-only
2025-04-07 00:41:06,782 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:41:06,782 [ scc.repo] DEBUG ## PRs found:
2025-04-07 00:41:06,942 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:07,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-04-07 00:41:07,441 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:07,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-04-07 00:41:07,927 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:08,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-04-07 00:41:08,498 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:08,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-07 00:41:09,034 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:09,265 [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-07 00:41:09,516 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:09,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-07 00:41:09,973 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:10,144 [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-07 00:41:10,144 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-07 00:41:10,395 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:10,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-04-07 00:41:10,880 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:11,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-04-07 00:41:11,363 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:11,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-07 00:41:11,891 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:12,141 [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-07 00:41:12,392 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:12,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-07 00:41:12,885 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:13,050 [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-07 00:41:13,050 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-07 00:41:13,050 [ scc.repo] DEBUG ## Branches found:
2025-04-07 00:41:13,050 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-07 00:41:13,051 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:13,051 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:13,053 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-07 00:41:13,056 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-07 00:41:13,056 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-07 00:41:13,059 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-07 00:41:13,067 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-04-07 00:41:13,301 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:13,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-04-07 00:41:13,704 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-04-07 00:41:13,979 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-07 00:41:13,980 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-04-07 00:41:13,984 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-04-07 00:41:14,243 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-07 00:41:14,243 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-04-07 00:41:14,247 [ scc.git] DEBUG ## Unique users: []
2025-04-07 00:41:14,247 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:14,247 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:14,250 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-07 00:41:14,254 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:14,257 [ 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-07 00:41:14,270 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-04-07 00:41:14,270 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-04-07 00:41:14,270 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-07 00:41:14,270 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-07 00:41:14,270 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-07 00:41:14,270 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-07 00:41:14,273 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-07 00:41:14,278 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-07 00:41:14,279 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:14,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:41:14,462 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-07 00:41:14,467 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-07 00:41:14,470 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#380](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-04-07 00:41:14,472 [ scc.config] DEBUG Found github.token
2025-04-07 00:41:14,472 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-04-07 00:41:14,472 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-07 00:41:14,477 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:14,479 [ 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-07 00:41:14,494 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-07 00:41:14,495 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-07 00:41:14,495 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-04-07 00:41:14,495 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-07 00:41:14,495 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-07 00:41:14,498 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-07 00:41:14,503 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-07 00:41:14,713 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:14,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:41:14,865 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-07 00:41:14,870 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-07 00:41:14,873 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#380](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/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-07 00:41:14,875 [ scc.config] DEBUG Found github.token
2025-04-07 00:41:14,875 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-04-07 00:41:14,876 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-07 00:41:14,915 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:14,915 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:14,917 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-07 00:41:14,956 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-07 00:41:14,960 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f793e66a210> has no local changes
2025-04-07 00:41:14,960 [ 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#380 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/)'
2025-04-07 00:41:14,967 [ scc.git] DEBUG [detached HEAD 10be203] merge master -Dorg -Ssuccess-only
2025-04-07 00:41:14,968 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:41:14,968 [ scc.repo] DEBUG ## PRs found:
2025-04-07 00:41:15,116 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:15,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-04-07 00:41:15,677 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:15,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-04-07 00:41:16,156 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:16,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-07 00:41:16,718 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:16,957 [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-07 00:41:17,208 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:17,512 [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-07 00:41:17,763 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:17,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-07 00:41:18,214 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:18,392 [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-07 00:41:18,392 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-07 00:41:18,643 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:18,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-04-07 00:41:18,874 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-07 00:41:19,125 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:19,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-07 00:41:19,724 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:20,000 [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-07 00:41:20,252 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:20,495 [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-07 00:41:20,747 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:21,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-07 00:41:21,291 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:21,468 [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-07 00:41:21,469 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-07 00:41:21,720 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:21,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-04-07 00:41:21,949 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-07 00:41:22,200 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:22,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-07 00:41:22,836 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:23,085 [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-07 00:41:23,336 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:23,649 [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-07 00:41:23,900 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:24,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-07 00:41:24,446 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:24,618 [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-07 00:41:24,618 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-07 00:41:24,869 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:25,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-04-07 00:41:25,340 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:25,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-04-07 00:41:25,811 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:26,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-04-07 00:41:26,285 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:26,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-04-07 00:41:26,772 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:27,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-04-07 00:41:27,268 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:27,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-04-07 00:41:27,726 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:28,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-04-07 00:41:28,064 [ scc.repo] DEBUG ## Branches found:
2025-04-07 00:41:28,064 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-07 00:41:28,064 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:28,065 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:28,067 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-07 00:41:28,070 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-07 00:41:28,070 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-07 00:41:28,073 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-07 00:41:28,076 [ scc.git] DEBUG Already up to date.
2025-04-07 00:41:28,076 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-04-07 00:41:28,350 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-07 00:41:28,350 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-04-07 00:41:28,354 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-04-07 00:41:28,634 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-07 00:41:28,635 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-04-07 00:41:28,639 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-04-07 00:41:28,909 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-07 00:41:28,909 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-04-07 00:41:28,913 [ scc.git] DEBUG ## Unique users: []
2025-04-07 00:41:28,913 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:28,913 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:28,916 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-04-07 00:41:28,918 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:28,920 [ 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-07 00:41:28,929 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-07 00:41:28,932 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-04-07 00:41:28,932 [ scc.git] DEBUG package.json | 2 +-
2025-04-07 00:41:28,932 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-04-07 00:41:28,933 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:29,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:41:29,101 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-04-07 00:41:29,104 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:29,107 [ 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-07 00:41:29,116 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-07 00:41:29,117 [ scc.git] DEBUG Auto-merging package.json
2025-04-07 00:41:29,118 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-07 00:41:29,121 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-04-07 00:41:29,121 [ scc.git] DEBUG package.json | 2 +-
2025-04-07 00:41:29,121 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-04-07 00:41:29,352 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:29,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:41:29,536 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-07 00:41:29,539 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:29,542 [ 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-07 00:41:29,551 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-07 00:41:29,553 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-07 00:41:29,553 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-07 00:41:29,787 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:29,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:41:29,963 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-07 00:41:30,001 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:30,001 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:30,003 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-07 00:41:30,040 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-07 00:41:30,044 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f793c538c10> has no local changes
2025-04-07 00:41:30,045 [ 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#380 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/)'
2025-04-07 00:41:30,051 [ scc.git] DEBUG [detached HEAD 68ea5f0] merge master -Dorg -Ssuccess-only
2025-04-07 00:41:30,051 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:41:30,051 [ scc.repo] DEBUG ## PRs found:
2025-04-07 00:41:30,214 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:30,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-04-07 00:41:30,408 [ scc.repo] DEBUG ## Branches found:
2025-04-07 00:41:30,408 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-07 00:41:30,408 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:30,408 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:30,411 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-07 00:41:30,413 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-07 00:41:30,413 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-07 00:41:30,416 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-07 00:41:30,419 [ scc.git] DEBUG Already up to date.
2025-04-07 00:41:30,419 [ scc.git] DEBUG ## Unique users: []
2025-04-07 00:41:30,419 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:30,419 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:30,421 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-07 00:41:30,458 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:30,459 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:30,461 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-07 00:41:30,498 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-07 00:41:30,501 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f793c52eb10> has no local changes
2025-04-07 00:41:30,501 [ 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#380 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/)'
2025-04-07 00:41:30,507 [ scc.git] DEBUG [detached HEAD 8866d8b] merge master -Dorg -Ssuccess-only
2025-04-07 00:41:30,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:41:30,507 [ scc.repo] DEBUG ## PRs found:
2025-04-07 00:41:30,660 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:30,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-04-07 00:41:31,151 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:31,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-04-07 00:41:31,658 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:31,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-04-07 00:41:32,150 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:32,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-04-07 00:41:32,401 [ scc.repo] DEBUG ## Branches found:
2025-04-07 00:41:32,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-07 00:41:32,401 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:32,401 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:32,403 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-07 00:41:32,406 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-07 00:41:32,406 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-07 00:41:32,409 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-07 00:41:32,412 [ scc.git] DEBUG Already up to date.
2025-04-07 00:41:32,412 [ scc.git] DEBUG ## Unique users: []
2025-04-07 00:41:32,412 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:32,412 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:32,414 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-07 00:41:32,453 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:32,453 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:32,455 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-07 00:41:32,493 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-07 00:41:32,496 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f793c5143d0> has no local changes
2025-04-07 00:41:32,496 [ 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#380 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/)'
2025-04-07 00:41:32,502 [ scc.git] DEBUG [detached HEAD fe7f3c6] merge master -Dorg -Ssuccess-only
2025-04-07 00:41:32,503 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:41:32,503 [ scc.repo] DEBUG ## PRs found:
2025-04-07 00:41:32,652 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:32,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-04-07 00:41:33,151 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:33,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-04-07 00:41:33,632 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:33,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-04-07 00:41:34,098 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:34,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-07 00:41:34,666 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:34,905 [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-07 00:41:35,156 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:35,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-07 00:41:35,615 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:35,783 [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-07 00:41:35,783 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-07 00:41:35,783 [ scc.repo] DEBUG ## Branches found:
2025-04-07 00:41:35,783 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-07 00:41:35,783 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:35,783 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:35,786 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-07 00:41:35,788 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-07 00:41:35,788 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-07 00:41:35,791 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-07 00:41:35,794 [ scc.git] DEBUG Already up to date.
2025-04-07 00:41:35,794 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-04-07 00:41:36,081 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-04-07 00:41:36,082 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-04-07 00:41:36,086 [ scc.git] DEBUG ## Unique users: []
2025-04-07 00:41:36,086 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:36,086 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:36,088 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-07 00:41:36,091 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:36,094 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-07 00:41:36,103 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-04-07 00:41:36,103 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-04-07 00:41:36,103 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-04-07 00:41:36,103 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-04-07 00:41:36,103 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-04-07 00:41:36,103 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-04-07 00:41:36,103 [ scc.git] DEBUG Auto-merging setup.py
2025-04-07 00:41:36,103 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-04-07 00:41:36,103 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-07 00:41:36,103 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-07 00:41:36,106 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-07 00:41:36,110 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-04-07 00:41:36,111 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:36,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:41:36,272 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-07 00:41:36,276 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-07 00:41:36,279 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#380](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- setup.py
- omero_signup/urls.py
- omero_signup/views.py
--conflicts
2025-04-07 00:41:36,281 [ scc.config] DEBUG Found github.token
2025-04-07 00:41:36,281 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-04-07 00:41:36,281 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-07 00:41:36,320 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:36,320 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:36,323 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-07 00:41:36,360 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-07 00:41:36,363 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f793c54f810> has no local changes
2025-04-07 00:41:36,363 [ 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#380 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/)'
2025-04-07 00:41:36,370 [ scc.git] DEBUG [detached HEAD f4e3162] merge master -Dorg -Ssuccess-only
2025-04-07 00:41:36,370 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:41:36,370 [ scc.repo] DEBUG ## PRs found:
2025-04-07 00:41:36,523 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:36,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-04-07 00:41:37,024 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:37,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-04-07 00:41:37,518 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:37,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-04-07 00:41:38,029 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:38,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-04-07 00:41:38,533 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:38,774 [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-07 00:41:39,026 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:39,272 [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-07 00:41:39,524 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:39,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-04-07 00:41:40,025 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:40,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-04-07 00:41:40,517 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:40,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-04-07 00:41:40,989 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:41,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-04-07 00:41:41,477 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:41,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-07 00:41:41,997 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:42,177 [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-07 00:41:42,429 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:42,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-07 00:41:42,871 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:43,050 [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-07 00:41:43,050 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-07 00:41:43,051 [ scc.repo] DEBUG ## Branches found:
2025-04-07 00:41:43,051 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-07 00:41:43,051 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:43,051 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:43,054 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-07 00:41:43,056 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-07 00:41:43,056 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-07 00:41:43,059 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-07 00:41:43,062 [ scc.git] DEBUG Already up to date.
2025-04-07 00:41:43,062 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-04-07 00:41:43,352 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-07 00:41:43,352 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-04-07 00:41:43,356 [ scc.git] DEBUG ## Unique users: []
2025-04-07 00:41:43,356 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:43,357 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:43,359 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-04-07 00:41:43,363 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:43,365 [ 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-07 00:41:43,378 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-07 00:41:43,381 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-04-07 00:41:43,381 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-04-07 00:41:43,381 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-04-07 00:41:43,381 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-04-07 00:41:43,381 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-04-07 00:41:43,381 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-04-07 00:41:43,382 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-04-07 00:41:43,382 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:43,383 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-04-07 00:41:43,383 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-04-07 00:41:43,383 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-04-07 00:41:43,383 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-04-07 00:41:43,383 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-04-07 00:41:43,383 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-04-07 00:41:43,383 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-04-07 00:41:43,383 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-04-07 00:41:43,383 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-04-07 00:41:43,383 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-04-07 00:41:43,383 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-04-07 00:41:43,383 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-04-07 00:41:43,383 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-04-07 00:41:43,383 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-04-07 00:41:43,383 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-04-07 00:41:43,383 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-04-07 00:41:43,383 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-04-07 00:41:43,383 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-04-07 00:41:43,383 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-04-07 00:41:43,383 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-04-07 00:41:43,383 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-04-07 00:41:43,383 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-04-07 00:41:43,383 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-04-07 00:41:43,383 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-04-07 00:41:43,383 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-04-07 00:41:43,383 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-04-07 00:41:43,383 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-04-07 00:41:43,383 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-04-07 00:41:43,383 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-04-07 00:41:43,383 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-04-07 00:41:43,383 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-04-07 00:41:43,383 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-04-07 00:41:43,383 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-04-07 00:41:43,384 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-04-07 00:41:43,384 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-04-07 00:41:43,384 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-04-07 00:41:43,384 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-04-07 00:41:43,384 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-04-07 00:41:43,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:41:43,549 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-07 00:41:43,588 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:43,588 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:43,590 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-07 00:41:43,627 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-07 00:41:43,631 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f793e63fdd0> has no local changes
2025-04-07 00:41:43,631 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Generated by OMERO-plugins-push#380 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/)'
2025-04-07 00:41:43,638 [ scc.git] DEBUG [detached HEAD 5ce76c3] merge master -Dorg -Ssuccess-only
2025-04-07 00:41:43,639 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:41:43,639 [ scc.repo] DEBUG ## PRs found:
2025-04-07 00:41:43,800 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:43,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-04-07 00:41:43,990 [ scc.repo] DEBUG ## Branches found:
2025-04-07 00:41:43,990 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-07 00:41:43,990 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:43,990 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:43,992 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-07 00:41:43,995 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-07 00:41:43,995 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-07 00:41:43,998 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-07 00:41:44,001 [ scc.git] DEBUG Already up to date.
2025-04-07 00:41:44,002 [ scc.git] DEBUG ## Unique users: []
2025-04-07 00:41:44,002 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:44,002 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:44,004 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-07 00:41:44,042 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:44,042 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:44,044 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-07 00:41:44,081 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-07 00:41:44,084 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f793e900310> has no local changes
2025-04-07 00:41:44,084 [ 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#380 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/)'
2025-04-07 00:41:44,091 [ scc.git] DEBUG [detached HEAD 104f2c8] merge master -Dorg -Ssuccess-only
2025-04-07 00:41:44,091 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:41:44,092 [ scc.repo] DEBUG ## PRs found:
2025-04-07 00:41:44,241 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:44,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-04-07 00:41:44,778 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:44,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-04-07 00:41:45,244 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:45,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-04-07 00:41:45,695 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:45,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-07 00:41:46,226 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:46,477 [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-07 00:41:46,729 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:46,954 [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-07 00:41:47,206 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:47,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-07 00:41:47,658 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:47,858 [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-07 00:41:47,859 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-04-07 00:41:47,859 [ scc.repo] DEBUG ## Branches found:
2025-04-07 00:41:47,859 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-07 00:41:47,859 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:47,859 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:47,862 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-07 00:41:47,864 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-07 00:41:47,864 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-07 00:41:47,867 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-07 00:41:47,870 [ scc.git] DEBUG Already up to date.
2025-04-07 00:41:47,870 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-04-07 00:41:48,140 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-04-07 00:41:48,140 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-04-07 00:41:48,144 [ scc.git] DEBUG ## Unique users: []
2025-04-07 00:41:48,144 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:48,144 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:48,146 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-04-07 00:41:48,149 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:48,151 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-04-07 00:41:48,159 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-07 00:41:48,162 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-04-07 00:41:48,162 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-04-07 00:41:48,162 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-04-07 00:41:48,162 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-04-07 00:41:48,162 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-04-07 00:41:48,164 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:48,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:41:48,334 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-07 00:41:48,373 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:48,373 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:48,376 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-07 00:41:48,414 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-07 00:41:48,417 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f793c57fc10> has no local changes
2025-04-07 00:41:48,417 [ 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#380 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/)'
2025-04-07 00:41:48,424 [ scc.git] DEBUG [detached HEAD 9c25f9c] merge master -Dorg -Ssuccess-only
2025-04-07 00:41:48,424 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:41:48,425 [ scc.git] INFO Overriding base-branch from master to main
2025-04-07 00:41:48,425 [ scc.repo] DEBUG ## PRs found:
2025-04-07 00:41:48,585 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:48,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-04-07 00:41:49,125 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:49,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-04-07 00:41:49,599 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:49,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-04-07 00:41:50,108 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:50,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-04-07 00:41:50,621 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:50,851 [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-07 00:41:51,103 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:51,351 [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-07 00:41:51,602 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:51,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-04-07 00:41:52,078 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:52,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-04-07 00:41:52,550 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:52,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-04-07 00:41:53,020 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:53,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-07 00:41:53,541 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:53,809 [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-07 00:41:54,061 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:54,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-07 00:41:54,494 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:54,677 [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-07 00:41:54,678 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-07 00:41:54,678 [ scc.repo] DEBUG ## Branches found:
2025-04-07 00:41:54,678 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-07 00:41:54,678 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:54,678 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:54,681 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-04-07 00:41:54,683 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-07 00:41:54,683 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-04-07 00:41:54,686 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-04-07 00:41:54,689 [ scc.git] DEBUG Already up to date.
2025-04-07 00:41:54,689 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-04-07 00:41:54,971 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-04-07 00:41:54,971 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-04-07 00:41:54,975 [ scc.git] DEBUG ## Unique users: []
2025-04-07 00:41:54,975 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:54,975 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:54,978 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-07 00:41:54,981 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:54,983 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-07 00:41:54,991 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-04-07 00:41:54,991 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-04-07 00:41:54,991 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-07 00:41:54,991 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-07 00:41:54,994 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-07 00:41:54,998 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-04-07 00:41:54,999 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:55,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:41:55,162 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-07 00:41:55,165 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-07 00:41:55,169 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#380](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-04-07 00:41:55,171 [ scc.config] DEBUG Found github.token
2025-04-07 00:41:55,171 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-04-07 00:41:55,171 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-07 00:41:55,210 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:55,210 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:55,212 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-07 00:41:55,249 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-07 00:41:55,253 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f793e737ad0> has no local changes
2025-04-07 00:41:55,253 [ 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#380 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/)'
2025-04-07 00:41:55,260 [ scc.git] DEBUG [detached HEAD cbbc092] merge master -Dorg -Ssuccess-only
2025-04-07 00:41:55,260 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:41:55,260 [ scc.repo] DEBUG ## PRs found:
2025-04-07 00:41:55,413 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:55,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-04-07 00:41:55,594 [ scc.repo] DEBUG ## Branches found:
2025-04-07 00:41:55,595 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-07 00:41:55,595 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:55,595 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:55,597 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-07 00:41:55,599 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-07 00:41:55,600 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-07 00:41:55,602 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-07 00:41:55,605 [ scc.git] DEBUG Already up to date.
2025-04-07 00:41:55,605 [ scc.git] DEBUG ## Unique users: []
2025-04-07 00:41:55,605 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:55,605 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:55,608 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-07 00:41:55,646 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:55,646 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:55,648 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-07 00:41:55,685 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-07 00:41:55,688 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f793c5ac890> has no local changes
2025-04-07 00:41:55,688 [ 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#380 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/)'
2025-04-07 00:41:55,695 [ scc.git] DEBUG [detached HEAD dd441e6] merge master -Dorg -Ssuccess-only
2025-04-07 00:41:55,695 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:41:55,695 [ scc.repo] DEBUG ## PRs found:
2025-04-07 00:41:55,846 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:56,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-04-07 00:41:56,017 [ scc.repo] DEBUG ## Branches found:
2025-04-07 00:41:56,017 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-07 00:41:56,017 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:56,017 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:56,020 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-07 00:41:56,022 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-07 00:41:56,022 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-07 00:41:56,025 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-07 00:41:56,028 [ scc.git] DEBUG Already up to date.
2025-04-07 00:41:56,028 [ scc.git] DEBUG ## Unique users: []
2025-04-07 00:41:56,028 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:56,028 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:56,031 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-07 00:41:56,070 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:56,070 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:56,072 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-07 00:41:56,110 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-07 00:41:56,113 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f793c587490> has no local changes
2025-04-07 00:41:56,113 [ 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#380 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/)'
2025-04-07 00:41:56,120 [ scc.git] DEBUG [detached HEAD 794ac16] merge master -Dorg -Ssuccess-only
2025-04-07 00:41:56,120 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:41:56,120 [ scc.repo] DEBUG ## PRs found:
2025-04-07 00:41:56,268 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:56,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-04-07 00:41:56,762 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:56,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-04-07 00:41:57,220 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:57,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-04-07 00:41:57,701 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:58,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-07 00:41:58,252 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:58,461 [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-07 00:41:58,713 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:58,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-07 00:41:59,245 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:59,429 [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-07 00:41:59,429 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-04-07 00:41:59,429 [ scc.repo] DEBUG ## Branches found:
2025-04-07 00:41:59,429 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-07 00:41:59,429 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:59,429 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:59,432 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-07 00:41:59,436 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-07 00:41:59,436 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-07 00:41:59,438 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-07 00:41:59,442 [ scc.git] DEBUG Already up to date.
2025-04-07 00:41:59,442 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-04-07 00:41:59,726 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-04-07 00:41:59,726 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-04-07 00:41:59,730 [ scc.git] DEBUG ## Unique users: []
2025-04-07 00:41:59,730 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:59,730 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:59,732 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-07 00:41:59,735 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:59,737 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-07 00:41:59,746 [ scc.git] DEBUG Auto-merging Dockerfile
2025-04-07 00:41:59,746 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-04-07 00:41:59,746 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-07 00:41:59,747 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-07 00:41:59,750 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-07 00:41:59,757 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-04-07 00:41:59,758 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:41:59,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:41:59,917 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-07 00:41:59,920 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-07 00:41:59,923 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#380](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-04-07 00:41:59,925 [ scc.config] DEBUG Found github.token
2025-04-07 00:41:59,925 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-04-07 00:41:59,925 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-07 00:41:59,965 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:41:59,965 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:41:59,967 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-07 00:42:00,005 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-07 00:42:00,009 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f793e810890> has no local changes
2025-04-07 00:42:00,010 [ 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#380 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/)'
2025-04-07 00:42:00,016 [ scc.git] DEBUG [detached HEAD 71814fa] merge master -Dorg -Ssuccess-only
2025-04-07 00:42:00,016 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:42:00,016 [ scc.git] INFO Overriding base-branch from master to develop
2025-04-07 00:42:00,016 [ scc.repo] DEBUG ## PRs found:
2025-04-07 00:42:00,169 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:00,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-04-07 00:42:00,739 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:00,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-04-07 00:42:01,243 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:01,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-04-07 00:42:01,723 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:01,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-07 00:42:02,223 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:02,460 [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-07 00:42:02,712 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:02,927 [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-07 00:42:03,179 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:03,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-07 00:42:03,632 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:03,816 [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-07 00:42:03,816 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-07 00:42:04,067 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:04,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-04-07 00:42:04,573 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:04,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-04-07 00:42:05,027 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:05,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-07 00:42:05,457 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:05,655 [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-07 00:42:05,907 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:06,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-07 00:42:06,351 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:06,529 [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-07 00:42:06,529 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-07 00:42:06,780 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:07,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-04-07 00:42:07,264 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:07,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-04-07 00:42:07,802 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:08,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-04-07 00:42:08,349 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:08,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-04-07 00:42:08,602 [ scc.repo] DEBUG ## Branches found:
2025-04-07 00:42:08,602 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-07 00:42:08,602 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:42:08,602 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:42:08,605 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-04-07 00:42:08,607 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-07 00:42:08,607 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-04-07 00:42:08,610 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-04-07 00:42:08,619 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-04-07 00:42:08,852 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:09,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-04-07 00:42:09,261 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-04-07 00:42:09,585 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-07 00:42:09,585 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-04-07 00:42:09,589 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-04-07 00:42:09,855 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-07 00:42:09,855 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-04-07 00:42:09,859 [ scc.git] DEBUG ## Unique users: []
2025-04-07 00:42:09,859 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:42:09,860 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:42:09,862 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-07 00:42:09,867 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:42:09,870 [ 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-07 00:42:09,880 [ 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-07 00:42:09,881 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-07 00:42:09,881 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-07 00:42:09,884 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-07 00:42:09,888 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-04-07 00:42:09,889 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:10,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:42:10,059 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-07 00:42:10,064 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-07 00:42:10,068 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#380](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-04-07 00:42:10,070 [ scc.config] DEBUG Found github.token
2025-04-07 00:42:10,070 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-04-07 00:42:10,071 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-04-07 00:42:10,075 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:42:10,077 [ 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-07 00:42:10,086 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-07 00:42:10,089 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-04-07 00:42:10,089 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-04-07 00:42:10,310 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:10,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:42:10,477 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-07 00:42:10,517 [ scc.git] DEBUG Get sha1 of %s
2025-04-07 00:42:10,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-07 00:42:10,519 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-07 00:42:10,559 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-07 00:42:10,563 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f793c5c0ed0> has no local changes
2025-04-07 00:42:10,563 [ 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#380 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/)'
2025-04-07 00:42:10,569 [ scc.git] DEBUG [detached HEAD 4aa4826] merge master -Dorg -Ssuccess-only
2025-04-07 00:42:10,569 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:42:10,570 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-07 00:42:10,646 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-04-07 00:42:10,728 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:10,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:42:10,899 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-04-07 00:42:10,901 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-04-07 00:42:11,145 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:11,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:42:11,324 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-04-07 00:42:11,327 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-04-07 00:42:11,571 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:11,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:42:11,727 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-04-07 00:42:11,729 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-04-07 00:42:11,973 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:12,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:42:12,134 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-04-07 00:42:12,379 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:12,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:42:12,545 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-04-07 00:42:12,547 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-04-07 00:42:12,792 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:12,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:42:12,963 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-04-07 00:42:12,965 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-04-07 00:42:13,209 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:13,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:42:13,367 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-04-07 00:42:13,369 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-04-07 00:42:13,614 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:13,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:42:13,775 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-04-07 00:42:13,777 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-04-07 00:42:14,022 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:14,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:42:14,197 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-04-07 00:42:14,198 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-04-07 00:42:14,443 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:14,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:42:14,605 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-04-07 00:42:14,607 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-04-07 00:42:14,851 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:15,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:42:15,017 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-04-07 00:42:15,019 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-04-07 00:42:15,263 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:15,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:42:15,431 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-04-07 00:42:15,433 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-04-07 00:42:15,677 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:15,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:42:15,838 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-04-07 00:42:16,083 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:16,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:42:16,255 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-04-07 00:42:16,500 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:16,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:42:16,665 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-04-07 00:42:16,667 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-04-07 00:42:16,912 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:17,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:42:17,081 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-04-07 00:42:17,325 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:17,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:42:17,494 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-04-07 00:42:17,738 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:17,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:42:17,907 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-04-07 00:42:17,909 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-04-07 00:42:18,153 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:18,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:42:18,320 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-04-07 00:42:18,322 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-04-07 00:42:18,566 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:18,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:42:18,727 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-04-07 00:42:18,729 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-04-07 00:42:18,974 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:19,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:42:19,136 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-04-07 00:42:19,138 [ scc.config] DEBUG Found submodule.scripts.url
2025-04-07 00:42:19,383 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-07 00:42:19,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-07 00:42:19,542 [ scc.config] DEBUG Found submodule.scripts.branch
2025-04-07 00:42:19,542 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-07 00:42:19,632 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f793e903810> has local changes
2025-04-07 00:42:19,632 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 170 will-moore 'Use ome zarr models py' (stage: draft)
- PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Updating 11d3587..7a2c812
Previously merged:
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 147 will-moore 'Name option'
- PR 171 will-moore 'Initial addition of integration tests'
Conflicting PRs (not included):
- PR 123 will-moore 'Support export of Fileset:ID'
- PR 167 dominikl 'Add extinfo command'
Repository: ome/omero-figure
Excluded PRs:
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 600 Rdornier 'Label on rois'
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
- PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
- PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
- PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#380 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/380/)'
2025-04-07 00:42:19,646 [ scc.git] DEBUG [detached HEAD 41ed0ce] merge master -Dorg -Ssuccess-only
2025-04-07 00:42:19,646 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-04-07 00:42:19,646 [ scc.merge] INFO Repository: ome/omero-plugins
2025-04-07 00:42:19,646 [ scc.merge] INFO Already up to date.
2025-04-07 00:42:19,646 [ scc.merge] INFO
2025-04-07 00:42:19,646 [ scc.merge] INFO Merged PRs:
2025-04-07 00:42:19,646 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-04-07 00:42:19,646 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-04-07 00:42:19,646 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-04-07 00:42:19,646 [ scc.merge] INFO
2025-04-07 00:42:19,646 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-04-07 00:42:19,646 [ scc.merge] INFO Already up to date.
2025-04-07 00:42:19,646 [ scc.merge] INFO
2025-04-07 00:42:19,646 [ scc.merge] INFO
2025-04-07 00:42:19,646 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-04-07 00:42:19,646 [ scc.merge] INFO Excluded PRs:
2025-04-07 00:42:19,646 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-04-07 00:42:19,646 [ scc.merge] INFO Already up to date.
2025-04-07 00:42:19,646 [ scc.merge] INFO
2025-04-07 00:42:19,646 [ scc.merge] INFO
2025-04-07 00:42:19,646 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-04-07 00:42:19,646 [ scc.merge] INFO Excluded PRs:
2025-04-07 00:42:19,647 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-04-07 00:42:19,647 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-04-07 00:42:19,647 [ scc.merge] INFO Already up to date.
2025-04-07 00:42:19,647 [ scc.merge] INFO
2025-04-07 00:42:19,647 [ scc.merge] INFO Merged PRs:
2025-04-07 00:42:19,647 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-04-07 00:42:19,647 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-04-07 00:42:19,647 [ scc.merge] INFO
2025-04-07 00:42:19,647 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-04-07 00:42:19,647 [ scc.merge] INFO Excluded PRs:
2025-04-07 00:42:19,647 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-04-07 00:42:19,647 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-04-07 00:42:19,647 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-04-07 00:42:19,647 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-07 00:42:19,647 [ scc.merge] INFO Updating 11d3587..7a2c812
2025-04-07 00:42:19,647 [ scc.merge] INFO Previously merged:
2025-04-07 00:42:19,647 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-07 00:42:19,647 [ scc.merge] INFO
2025-04-07 00:42:19,647 [ scc.merge] INFO Merged PRs:
2025-04-07 00:42:19,647 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-04-07 00:42:19,647 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-04-07 00:42:19,647 [ scc.merge] INFO
2025-04-07 00:42:19,647 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-07 00:42:19,647 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-04-07 00:42:19,647 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-04-07 00:42:19,647 [ scc.merge] INFO
2025-04-07 00:42:19,647 [ scc.merge] INFO Repository: ome/omero-figure
2025-04-07 00:42:19,647 [ scc.merge] INFO Excluded PRs:
2025-04-07 00:42:19,647 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-04-07 00:42:19,647 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-04-07 00:42:19,647 [ scc.merge] INFO Already up to date.
2025-04-07 00:42:19,647 [ scc.merge] INFO
2025-04-07 00:42:19,647 [ scc.merge] INFO Merged PRs:
2025-04-07 00:42:19,647 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-04-07 00:42:19,647 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-04-07 00:42:19,647 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-04-07 00:42:19,647 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-04-07 00:42:19,647 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-04-07 00:42:19,648 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-07 00:42:19,648 [ scc.merge] INFO
2025-04-07 00:42:19,648 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-07 00:42:19,648 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-04-07 00:42:19,648 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-04-07 00:42:19,648 [ scc.merge] INFO
2025-04-07 00:42:19,648 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-04-07 00:42:19,648 [ scc.merge] INFO Already up to date.
2025-04-07 00:42:19,648 [ scc.merge] INFO
2025-04-07 00:42:19,648 [ scc.merge] INFO Merged PRs:
2025-04-07 00:42:19,648 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-04-07 00:42:19,648 [ scc.merge] INFO
2025-04-07 00:42:19,648 [ scc.merge] INFO Repository: ome/omero-gallery
2025-04-07 00:42:19,648 [ scc.merge] INFO Already up to date.
2025-04-07 00:42:19,648 [ scc.merge] INFO
2025-04-07 00:42:19,648 [ scc.merge] INFO Merged PRs:
2025-04-07 00:42:19,648 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-04-07 00:42:19,648 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-04-07 00:42:19,648 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-04-07 00:42:19,648 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-04-07 00:42:19,648 [ scc.merge] INFO
2025-04-07 00:42:19,648 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-07 00:42:19,648 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-04-07 00:42:19,648 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-04-07 00:42:19,648 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-04-07 00:42:19,648 [ scc.merge] INFO
2025-04-07 00:42:19,648 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-04-07 00:42:19,648 [ scc.merge] INFO Excluded PRs:
2025-04-07 00:42:19,648 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-04-07 00:42:19,648 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-04-07 00:42:19,648 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-04-07 00:42:19,648 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-04-07 00:42:19,648 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-04-07 00:42:19,648 [ scc.merge] INFO Already up to date.
2025-04-07 00:42:19,648 [ scc.merge] INFO
2025-04-07 00:42:19,648 [ scc.merge] INFO Merged PRs:
2025-04-07 00:42:19,648 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-04-07 00:42:19,648 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-04-07 00:42:19,648 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-04-07 00:42:19,648 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-04-07 00:42:19,649 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-07 00:42:19,649 [ scc.merge] INFO
2025-04-07 00:42:19,649 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-07 00:42:19,649 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-04-07 00:42:19,649 [ scc.merge] INFO
2025-04-07 00:42:19,649 [ scc.merge] INFO Repository: ome/omero-mapr
2025-04-07 00:42:19,649 [ scc.merge] INFO Excluded PRs:
2025-04-07 00:42:19,649 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-04-07 00:42:19,649 [ scc.merge] INFO Already up to date.
2025-04-07 00:42:19,649 [ scc.merge] INFO
2025-04-07 00:42:19,649 [ scc.merge] INFO Merged PRs:
2025-04-07 00:42:19,649 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-04-07 00:42:19,649 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-07 00:42:19,649 [ scc.merge] INFO
2025-04-07 00:42:19,649 [ scc.merge] INFO Repository: ome/omero-metadata
2025-04-07 00:42:19,649 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-04-07 00:42:19,649 [ scc.merge] INFO Previously merged:
2025-04-07 00:42:19,649 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-07 00:42:19,649 [ scc.merge] INFO
2025-04-07 00:42:19,649 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-07 00:42:19,649 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-07 00:42:19,649 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-07 00:42:19,649 [ scc.merge] INFO
2025-04-07 00:42:19,649 [ scc.merge] INFO Repository: ome/omero-parade
2025-04-07 00:42:19,649 [ scc.merge] INFO Excluded PRs:
2025-04-07 00:42:19,649 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-04-07 00:42:19,649 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-04-07 00:42:19,649 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-04-07 00:42:19,649 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-04-07 00:42:19,649 [ scc.merge] INFO Already up to date.
2025-04-07 00:42:19,649 [ scc.merge] INFO
2025-04-07 00:42:19,649 [ scc.merge] INFO Merged PRs:
2025-04-07 00:42:19,649 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-07 00:42:19,649 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-07 00:42:19,649 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-07 00:42:19,649 [ scc.merge] INFO
2025-04-07 00:42:19,649 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-04-07 00:42:19,649 [ scc.merge] INFO Already up to date.
2025-04-07 00:42:19,649 [ scc.merge] INFO
2025-04-07 00:42:19,649 [ scc.merge] INFO
2025-04-07 00:42:19,650 [ scc.merge] INFO Repository: ome/omero-rois
2025-04-07 00:42:19,650 [ scc.merge] INFO Excluded PRs:
2025-04-07 00:42:19,650 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-04-07 00:42:19,650 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-07 00:42:19,650 [ scc.merge] INFO Already up to date.
2025-04-07 00:42:19,650 [ scc.merge] INFO
2025-04-07 00:42:19,650 [ scc.merge] INFO
2025-04-07 00:42:19,650 [ scc.merge] INFO Repository: ome/omero-signup
2025-04-07 00:42:19,650 [ scc.merge] INFO Already up to date.
2025-04-07 00:42:19,650 [ scc.merge] INFO
2025-04-07 00:42:19,650 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-07 00:42:19,650 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-07 00:42:19,650 [ scc.merge] INFO
2025-04-07 00:42:19,650 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-04-07 00:42:19,650 [ scc.merge] INFO Excluded PRs:
2025-04-07 00:42:19,650 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-04-07 00:42:19,650 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-04-07 00:42:19,650 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-04-07 00:42:19,650 [ scc.merge] INFO Already up to date.
2025-04-07 00:42:19,650 [ scc.merge] INFO
2025-04-07 00:42:19,650 [ scc.merge] INFO Merged PRs:
2025-04-07 00:42:19,650 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-07 00:42:19,650 [ scc.merge] INFO
2025-04-07 00:42:19,650 [ scc.merge] INFO Repository: ome/omero-upload
2025-04-07 00:42:19,650 [ scc.merge] INFO Already up to date.
2025-04-07 00:42:19,650 [ scc.merge] INFO
2025-04-07 00:42:19,650 [ scc.merge] INFO
2025-04-07 00:42:19,650 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-04-07 00:42:19,650 [ scc.merge] INFO Already up to date.
2025-04-07 00:42:19,650 [ scc.merge] INFO
2025-04-07 00:42:19,650 [ scc.merge] INFO Merged PRs:
2025-04-07 00:42:19,650 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-04-07 00:42:19,650 [ scc.merge] INFO
2025-04-07 00:42:19,650 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-04-07 00:42:19,650 [ scc.merge] INFO Excluded PRs:
2025-04-07 00:42:19,650 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-04-07 00:42:19,650 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-04-07 00:42:19,650 [ scc.merge] INFO Already up to date.
2025-04-07 00:42:19,650 [ scc.merge] INFO
2025-04-07 00:42:19,651 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-07 00:42:19,651 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-07 00:42:19,651 [ scc.merge] INFO
2025-04-07 00:42:19,651 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-04-07 00:42:19,651 [ scc.merge] INFO Already up to date.
2025-04-07 00:42:19,651 [ scc.merge] INFO
2025-04-07 00:42:19,651 [ scc.merge] INFO
2025-04-07 00:42:19,651 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-04-07 00:42:19,651 [ scc.merge] INFO Already up to date.
2025-04-07 00:42:19,651 [ scc.merge] INFO
2025-04-07 00:42:19,651 [ scc.merge] INFO
2025-04-07 00:42:19,651 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-04-07 00:42:19,651 [ scc.merge] INFO Already up to date.
2025-04-07 00:42:19,651 [ scc.merge] INFO
2025-04-07 00:42:19,651 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-07 00:42:19,651 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-04-07 00:42:19,651 [ scc.merge] INFO
2025-04-07 00:42:19,651 [ scc.merge] INFO Repository: ome/scripts
2025-04-07 00:42:19,651 [ scc.merge] INFO Excluded PRs:
2025-04-07 00:42:19,651 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-04-07 00:42:19,651 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-04-07 00:42:19,651 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-04-07 00:42:19,651 [ scc.merge] INFO Previously merged:
2025-04-07 00:42:19,651 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-04-07 00:42:19,651 [ scc.merge] INFO
2025-04-07 00:42:19,651 [ scc.merge] INFO Merged PRs:
2025-04-07 00:42:19,651 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-07 00:42:19,651 [ scc.merge] INFO
2025-04-07 00:42:19,651 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-07 00:42:19,651 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-07 00:42:19,651 [ scc.merge] INFO
2025-04-07 00:42:19,651 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-04-07 00:42:19,651 [ scc.git] DEBUG Calling 'git remote'
2025-04-07 00:42:19,653 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-04-07 00:42:19,653 [ scc.git] DEBUG Calling 'git remote'
2025-04-07 00:42:19,656 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:42:19,656 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-04-07 00:42:19,656 [ scc.git] DEBUG Calling 'git remote'
2025-04-07 00:42:19,658 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:42:19,658 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-04-07 00:42:19,658 [ scc.git] DEBUG Calling 'git remote'
2025-04-07 00:42:19,660 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:42:19,660 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-04-07 00:42:19,660 [ scc.git] DEBUG Calling 'git remote'
2025-04-07 00:42:19,662 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:42:19,663 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-04-07 00:42:19,663 [ scc.git] DEBUG Calling 'git remote'
2025-04-07 00:42:19,665 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:42:19,665 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-04-07 00:42:19,665 [ scc.git] DEBUG Calling 'git remote'
2025-04-07 00:42:19,667 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:42:19,667 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-04-07 00:42:19,667 [ scc.git] DEBUG Calling 'git remote'
2025-04-07 00:42:19,669 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:42:19,669 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-04-07 00:42:19,669 [ scc.git] DEBUG Calling 'git remote'
2025-04-07 00:42:19,671 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:42:19,671 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-07 00:42:19,671 [ scc.git] DEBUG Calling 'git remote'
2025-04-07 00:42:19,674 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:42:19,674 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-07 00:42:19,674 [ scc.git] DEBUG Calling 'git remote'
2025-04-07 00:42:19,676 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:42:19,676 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-07 00:42:19,676 [ scc.git] DEBUG Calling 'git remote'
2025-04-07 00:42:19,678 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:42:19,678 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-07 00:42:19,678 [ scc.git] DEBUG Calling 'git remote'
2025-04-07 00:42:19,680 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:42:19,680 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-07 00:42:19,680 [ scc.git] DEBUG Calling 'git remote'
2025-04-07 00:42:19,682 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:42:19,682 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-07 00:42:19,682 [ scc.git] DEBUG Calling 'git remote'
2025-04-07 00:42:19,685 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:42:19,685 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-07 00:42:19,685 [ scc.git] DEBUG Calling 'git remote'
2025-04-07 00:42:19,687 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:42:19,687 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-07 00:42:19,687 [ scc.git] DEBUG Calling 'git remote'
2025-04-07 00:42:19,689 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:42:19,689 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-07 00:42:19,689 [ scc.git] DEBUG Calling 'git remote'
2025-04-07 00:42:19,691 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:42:19,691 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-07 00:42:19,691 [ scc.git] DEBUG Calling 'git remote'
2025-04-07 00:42:19,693 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:42:19,693 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-07 00:42:19,693 [ scc.git] DEBUG Calling 'git remote'
2025-04-07 00:42:19,695 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:42:19,696 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-07 00:42:19,696 [ scc.git] DEBUG Calling 'git remote'
2025-04-07 00:42:19,698 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:42:19,698 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-07 00:42:19,698 [ scc.git] DEBUG Calling 'git remote'
2025-04-07 00:42:19,700 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-07 00:42:19,700 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-07 00:42:19,700 [ scc.git] DEBUG Calling 'git remote'
2025-04-07 00:42:19,702 [ 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 4a2241d] 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 f405663] 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-07 00:43:06,674 [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-07 00:43:16,054 [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-07 00:43:18,561 [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-07 00:43:23,353 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-04-07 00:44:02,264 [ 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/316c2b55/images/svgs/logo.svg){kind=logo}
