Console Output
Skipping 90 KB..
Full Log09 00:44:18,655 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-12-09 00:44:18,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:44:18,794 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-09 00:44:18,839 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:44:18,839 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:44:18,845 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-09 00:44:18,890 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-09 00:44:18,898 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f02c9a14e50> has no local changes
2024-12-09 00:44:18,898 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-fpbioimage
Updating e5b3ca3..3b6c05a
Previously merged:
- PR 30 jburel 'Build'
Merged PRs:
- PR 18 jburel 'default size z value'
Generated by OMERO-plugins-push#273 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/)'
2024-12-09 00:44:18,908 [ scc.git] DEBUG [detached HEAD 45683be] merge master -Dorg -Ssuccess-only
2024-12-09 00:44:18,909 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:44:18,909 [ scc.repo] DEBUG ## PRs found:
2024-12-09 00:44:19,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-12-09 00:44:19,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118 HTTP/1.1" 200 None
2024-12-09 00:44:20,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 200 None
2024-12-09 00:44:20,282 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-09 00:44:20,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2024-12-09 00:44:21,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-09 00:44:21,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-09 00:44:22,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2024-12-09 00:44:22,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/2bf34ddacb511c52e473a104fe2a1c00204bae1d?per_page=1 HTTP/1.1" 200 2
2024-12-09 00:44:22,905 [ scc.repo] DEBUG - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2024-12-09 00:44:23,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/117 HTTP/1.1" 200 None
2024-12-09 00:44:23,397 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-09 00:44:23,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2024-12-09 00:44:24,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-09 00:44:25,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-09 00:44:25,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2024-12-09 00:44:25,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/155d7ddab4f04c4a91bffc5736ba0741003c566c?per_page=1 HTTP/1.1" 200 2
2024-12-09 00:44:25,881 [ scc.repo] DEBUG - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2024-12-09 00:44:26,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/116 HTTP/1.1" 200 None
2024-12-09 00:44:26,371 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-09 00:44:26,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2024-12-09 00:44:27,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-09 00:44:28,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-09 00:44:28,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2024-12-09 00:44:29,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d?per_page=1 HTTP/1.1" 200 2
2024-12-09 00:44:29,306 [ scc.repo] DEBUG - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2024-12-09 00:44:29,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115 HTTP/1.1" 200 None
2024-12-09 00:44:30,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115/comments HTTP/1.1" 200 None
2024-12-09 00:44:30,226 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-09 00:44:30,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2024-12-09 00:44:31,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-09 00:44:31,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-09 00:44:32,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2024-12-09 00:44:32,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/25020d66a7df4ec3cad5967706bb7d13b1493bb5?per_page=1 HTTP/1.1" 200 2
2024-12-09 00:44:32,765 [ scc.repo] DEBUG - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2024-12-09 00:44:33,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/114 HTTP/1.1" 200 None
2024-12-09 00:44:33,248 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-09 00:44:33,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2024-12-09 00:44:34,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-09 00:44:34,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-09 00:44:35,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2024-12-09 00:44:35,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/cf75d259b2882000d6be73bc1c11c99c27aa439b?per_page=1 HTTP/1.1" 200 2
2024-12-09 00:44:35,985 [ scc.repo] DEBUG - PR 114 dependabot[bot] 'Bump tar and fsevents'
2024-12-09 00:44:36,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/113 HTTP/1.1" 200 None
2024-12-09 00:44:36,477 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-09 00:44:37,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2024-12-09 00:44:37,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-09 00:44:38,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-09 00:44:38,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2024-12-09 00:44:39,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/6a657d7a4e0bbfaa3464e851023f29c63db15d4e?per_page=1 HTTP/1.1" 200 2
2024-12-09 00:44:39,033 [ scc.repo] DEBUG - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2024-12-09 00:44:39,033 [ scc.repo] DEBUG ## Branches found:
2024-12-09 00:44:39,033 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-12-09 00:44:39,034 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:44:39,034 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:44:39,040 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-09 00:44:39,046 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-09 00:44:39,046 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-09 00:44:39,053 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-09 00:44:39,060 [ scc.git] DEBUG Already up to date.
2024-12-09 00:44:39,060 [ scc.git] DEBUG Calling 'git fetch origin pull/113/head'
2024-12-09 00:44:39,382 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-09 00:44:39,383 [ scc.git] DEBUG * branch refs/pull/113/head -> FETCH_HEAD
2024-12-09 00:44:39,388 [ scc.git] DEBUG Calling 'git fetch origin pull/114/head'
2024-12-09 00:44:39,696 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-09 00:44:39,697 [ scc.git] DEBUG * branch refs/pull/114/head -> FETCH_HEAD
2024-12-09 00:44:39,702 [ scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2024-12-09 00:44:40,000 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-09 00:44:40,001 [ scc.git] DEBUG * branch refs/pull/115/head -> FETCH_HEAD
2024-12-09 00:44:40,005 [ scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2024-12-09 00:44:40,287 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-09 00:44:40,287 [ scc.git] DEBUG * branch refs/pull/116/head -> FETCH_HEAD
2024-12-09 00:44:40,293 [ scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2024-12-09 00:44:40,581 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-09 00:44:40,582 [ scc.git] DEBUG * branch refs/pull/117/head -> FETCH_HEAD
2024-12-09 00:44:40,586 [ scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2024-12-09 00:44:40,870 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-09 00:44:40,870 [ scc.git] DEBUG * branch refs/pull/118/head -> FETCH_HEAD
2024-12-09 00:44:40,874 [ scc.git] DEBUG ## Unique users: []
2024-12-09 00:44:40,875 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:44:40,875 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:44:40,881 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2024-12-09 00:44:40,921 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:44:40,927 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 113 (Bump elliptic from 6.5.4 to 6.6.1) 6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2024-12-09 00:44:40,972 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-09 00:44:40,977 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2024-12-09 00:44:40,978 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2024-12-09 00:44:41,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:44:41,123 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2024-12-09 00:44:41,144 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:44:41,151 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2024-12-09 00:44:41,220 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-09 00:44:41,220 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-09 00:44:41,226 [ scc.git] DEBUG package-lock.json | 625 +++---------------------------------------------------
2024-12-09 00:44:41,226 [ scc.git] DEBUG 1 file changed, 29 insertions(+), 596 deletions(-)
2024-12-09 00:44:41,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:44:41,511 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-12-09 00:44:41,535 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:44:41,541 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 115 (Bump micromatch, webpack-cli and webpack) 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-12-09 00:44:41,684 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-09 00:44:41,684 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2024-12-09 00:44:41,684 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-09 00:44:41,685 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-09 00:44:41,692 [ scc.git] DEBUG Calling 'git reset --hard e4286f0445a7c6187ceac2a2f89f34778bfd9645'
2024-12-09 00:44:41,701 [ scc.git] DEBUG HEAD is now at e4286f0 merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2024-12-09 00:44:41,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:44:41,900 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-12-09 00:44:41,907 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2024-12-09 00:44:41,913 [ scc.git] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#273](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/consoleText) for more details.
Possible conflicts:
- PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- package-lock.json
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
--conflicts
2024-12-09 00:44:41,920 [ scc.config] DEBUG Found github.token
2024-12-09 00:44:41,920 [ scc.git] DEBUG Not adding comment to issue #115, already --conflicts.
2024-12-09 00:44:41,920 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2024-12-09 00:44:41,960 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:44:41,966 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 116 (Bump browserify-sign from 4.0.4 to 4.2.3) 42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2024-12-09 00:44:42,069 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-09 00:44:42,069 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-09 00:44:42,074 [ scc.git] DEBUG package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2024-12-09 00:44:42,074 [ scc.git] DEBUG 1 file changed, 108 insertions(+), 11 deletions(-)
2024-12-09 00:44:42,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:44:42,300 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2024-12-09 00:44:42,316 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:44:42,322 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6) 155d7ddab4f04c4a91bffc5736ba0741003c566c'
2024-12-09 00:44:42,378 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-09 00:44:42,379 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-09 00:44:42,384 [ scc.git] DEBUG package-lock.json | 6 +++---
2024-12-09 00:44:42,384 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-12-09 00:44:42,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:44:42,690 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-12-09 00:44:42,710 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:44:42,716 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 118 (Bump braces, webpack-cli and webpack) 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-12-09 00:44:42,770 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-09 00:44:42,770 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2024-12-09 00:44:42,770 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-09 00:44:42,771 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-09 00:44:42,778 [ scc.git] DEBUG Calling 'git reset --hard d43740adf9475963adfc19414223110644994212'
2024-12-09 00:44:42,788 [ scc.git] DEBUG HEAD is now at d43740a merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2024-12-09 00:44:43,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:44:43,081 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-12-09 00:44:43,087 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2024-12-09 00:44:43,093 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#273](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/consoleText) for more details.
Possible conflicts:
- PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- package-lock.json
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
- PR #115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- package-lock.json
- PR #116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- package-lock.json
- PR #117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
- package-lock.json
--conflicts
2024-12-09 00:44:43,097 [ scc.config] DEBUG Found github.token
2024-12-09 00:44:43,098 [ scc.git] DEBUG Adding comment to issue #118.
2024-12-09 00:44:43,946 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 201 2394
2024-12-09 00:44:43,947 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-09 00:44:43,991 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:44:43,992 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:44:43,998 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-09 00:44:44,061 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-09 00:44:44,069 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f02c9a22f40> has no local changes
2024-12-09 00:44:44,070 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 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'
Generated by OMERO-plugins-push#273 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/)'
2024-12-09 00:44:44,082 [ scc.git] DEBUG [detached HEAD c0f2532] merge master -Dorg -Ssuccess-only
2024-12-09 00:44:44,082 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:44:44,083 [ scc.repo] DEBUG ## PRs found:
2024-12-09 00:44:44,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-12-09 00:44:44,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2024-12-09 00:44:45,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2024-12-09 00:44:46,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-12-09 00:44:46,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-12-09 00:44:47,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-12-09 00:44:47,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-09 00:44:47,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-09 00:44:48,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-12-09 00:44:48,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-12-09 00:44:48,915 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-12-09 00:44:49,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-12-09 00:44:49,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-12-09 00:44:50,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-12-09 00:44:50,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-09 00:44:51,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-09 00:44:51,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-12-09 00:44:52,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-12-09 00:44:52,510 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-12-09 00:44:53,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-12-09 00:44:53,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-12-09 00:44:54,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-12-09 00:44:54,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-09 00:44:54,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-12-09 00:44:55,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-12-09 00:44:55,374 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-12-09 00:44:55,375 [ scc.repo] DEBUG ## Branches found:
2024-12-09 00:44:55,375 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-12-09 00:44:55,375 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:44:55,375 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:44:55,382 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-09 00:44:55,387 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-09 00:44:55,387 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-09 00:44:55,392 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-09 00:44:55,398 [ scc.git] DEBUG Already up to date.
2024-12-09 00:44:55,398 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-12-09 00:44:57,124 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-09 00:44:57,124 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-12-09 00:44:57,129 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-12-09 00:44:58,650 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-09 00:44:58,650 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-12-09 00:44:58,656 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-12-09 00:44:59,145 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-09 00:44:59,145 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-12-09 00:44:59,150 [ scc.git] DEBUG ## Unique users: []
2024-12-09 00:44:59,150 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:44:59,150 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:44:59,156 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-12-09 00:44:59,163 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:44:59,169 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-12-09 00:44:59,231 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-12-09 00:44:59,231 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-09 00:44:59,237 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-12-09 00:44:59,237 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-12-09 00:44:59,237 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-12-09 00:44:59,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:44:59,393 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-12-09 00:44:59,412 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:44:59,418 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-12-09 00:44:59,630 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-12-09 00:44:59,630 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-12-09 00:44:59,630 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-12-09 00:44:59,630 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-12-09 00:44:59,631 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-09 00:44:59,635 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-12-09 00:44:59,635 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-12-09 00:44:59,635 [ scc.git] DEBUG src/app/header.html | 5 +
2024-12-09 00:44:59,635 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-12-09 00:44:59,635 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-12-09 00:44:59,635 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-12-09 00:44:59,635 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-12-09 00:44:59,635 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-12-09 00:44:59,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:44:59,802 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-12-09 00:44:59,812 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:44:59,819 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-12-09 00:44:59,883 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-12-09 00:44:59,884 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-09 00:44:59,887 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-12-09 00:44:59,887 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-12-09 00:44:59,887 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-12-09 00:45:00,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:45:00,188 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-09 00:45:00,228 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:00,228 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:00,235 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-09 00:45:00,277 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-09 00:45:00,287 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f02c8198610> has no local changes
2024-12-09 00:45:00,288 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- 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)
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'
Generated by OMERO-plugins-push#273 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/)'
2024-12-09 00:45:00,298 [ scc.git] DEBUG [detached HEAD fe029de] merge master -Dorg -Ssuccess-only
2024-12-09 00:45:00,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:45:00,299 [ scc.repo] DEBUG ## PRs found:
2024-12-09 00:45:00,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-12-09 00:45:01,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-12-09 00:45:01,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-12-09 00:45:02,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-12-09 00:45:02,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-09 00:45:03,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-12-09 00:45:03,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-12-09 00:45:03,905 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-12-09 00:45:03,905 [ scc.repo] DEBUG ## Branches found:
2024-12-09 00:45:03,906 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-12-09 00:45:03,906 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:03,906 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:03,913 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-09 00:45:03,919 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-09 00:45:03,919 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-09 00:45:03,925 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-09 00:45:03,930 [ scc.git] DEBUG Already up to date.
2024-12-09 00:45:03,931 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-12-09 00:45:04,530 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-12-09 00:45:04,530 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-12-09 00:45:04,536 [ scc.git] DEBUG ## Unique users: []
2024-12-09 00:45:04,536 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:04,536 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:04,542 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-12-09 00:45:04,549 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:04,554 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-12-09 00:45:04,564 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-09 00:45:04,567 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-12-09 00:45:04,567 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-12-09 00:45:04,567 [ scc.git] DEBUG requirements.txt | 2 +-
2024-12-09 00:45:04,567 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-12-09 00:45:04,567 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-12-09 00:45:04,567 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-12-09 00:45:04,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:45:04,705 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-09 00:45:04,750 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:04,750 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:04,756 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-09 00:45:04,795 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-09 00:45:04,802 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f02c81abbb0> has no local changes
2024-12-09 00:45:04,802 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Generated by OMERO-plugins-push#273 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/)'
2024-12-09 00:45:04,810 [ scc.git] DEBUG [detached HEAD 7f216ca] merge master -Dorg -Ssuccess-only
2024-12-09 00:45:04,810 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:45:04,810 [ scc.repo] DEBUG ## PRs found:
2024-12-09 00:45:05,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-12-09 00:45:05,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-12-09 00:45:06,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-12-09 00:45:06,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-12-09 00:45:07,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-09 00:45:07,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-12-09 00:45:08,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-12-09 00:45:08,252 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-12-09 00:45:08,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-12-09 00:45:09,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-12-09 00:45:09,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-12-09 00:45:10,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-09 00:45:10,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-12-09 00:45:11,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-12-09 00:45:11,114 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-12-09 00:45:11,114 [ scc.repo] DEBUG ## Branches found:
2024-12-09 00:45:11,114 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-12-09 00:45:11,114 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:11,114 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:11,121 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-09 00:45:11,126 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-09 00:45:11,126 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-09 00:45:11,132 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-09 00:45:11,139 [ scc.git] DEBUG Already up to date.
2024-12-09 00:45:11,139 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-12-09 00:45:11,853 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-12-09 00:45:11,854 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-12-09 00:45:11,859 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-12-09 00:45:12,733 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-12-09 00:45:12,733 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-12-09 00:45:12,739 [ scc.git] DEBUG ## Unique users: []
2024-12-09 00:45:12,739 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:12,740 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:12,747 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-12-09 00:45:12,756 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:12,763 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-12-09 00:45:12,882 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-12-09 00:45:12,882 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-12-09 00:45:12,882 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-12-09 00:45:12,882 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-12-09 00:45:12,883 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-09 00:45:12,884 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-09 00:45:12,890 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-09 00:45:12,897 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2024-12-09 00:45:13,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:45:13,065 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-12-09 00:45:13,073 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-09 00:45:13,156 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#273](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-12-09 00:45:13,162 [ scc.config] DEBUG Found github.token
2024-12-09 00:45:13,162 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-12-09 00:45:13,162 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-12-09 00:45:13,169 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:13,174 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-12-09 00:45:13,285 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-12-09 00:45:13,285 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-12-09 00:45:13,285 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-12-09 00:45:13,285 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-09 00:45:13,285 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-09 00:45:13,292 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-09 00:45:13,299 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2024-12-09 00:45:13,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:45:13,486 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2024-12-09 00:45:13,493 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-09 00:45:13,499 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#273](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-12-09 00:45:13,504 [ scc.config] DEBUG Found github.token
2024-12-09 00:45:13,505 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-12-09 00:45:13,505 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-09 00:45:13,545 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:13,546 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:13,551 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-09 00:45:13,591 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-09 00:45:13,599 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f02c8152880> has no local changes
2024-12-09 00:45:13,599 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Generated by OMERO-plugins-push#273 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/)'
2024-12-09 00:45:13,609 [ scc.git] DEBUG [detached HEAD 63a63ff] merge master -Dorg -Ssuccess-only
2024-12-09 00:45:13,609 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:45:13,610 [ scc.repo] DEBUG ## PRs found:
2024-12-09 00:45:14,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-12-09 00:45:14,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-12-09 00:45:14,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-12-09 00:45:15,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-12-09 00:45:16,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-12-09 00:45:16,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-12-09 00:45:17,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-12-09 00:45:17,143 [ scc.repo] DEBUG ## Branches found:
2024-12-09 00:45:17,143 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-12-09 00:45:17,143 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:17,143 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:17,150 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-09 00:45:17,155 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-09 00:45:17,155 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-09 00:45:17,160 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-09 00:45:17,166 [ scc.git] DEBUG Already up to date.
2024-12-09 00:45:17,166 [ scc.git] DEBUG ## Unique users: []
2024-12-09 00:45:17,166 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:17,166 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:17,171 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-09 00:45:17,210 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:17,210 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:17,216 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-09 00:45:17,256 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-09 00:45:17,263 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f02c8152670> has no local changes
2024-12-09 00:45:17,263 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Generated by OMERO-plugins-push#273 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/)'
2024-12-09 00:45:17,271 [ scc.git] DEBUG [detached HEAD 7ea1082] merge master -Dorg -Ssuccess-only
2024-12-09 00:45:17,272 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:45:17,272 [ scc.repo] DEBUG ## PRs found:
2024-12-09 00:45:17,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-12-09 00:45:18,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/15 HTTP/1.1" 200 None
2024-12-09 00:45:18,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/b5d953edc0b64a1bba13e9d5d90f3f9e68b7a332 HTTP/1.1" 200 None
2024-12-09 00:45:19,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/b5d953edc0b64a1bba13e9d5d90f3f9e68b7a332/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-09 00:45:19,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/b5d953edc0b64a1bba13e9d5d90f3f9e68b7a332/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-09 00:45:20,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-12-09 00:45:20,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-12-09 00:45:21,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-09 00:45:21,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-12-09 00:45:22,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-12-09 00:45:22,120 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-12-09 00:45:22,120 [ scc.repo] DEBUG ## Branches found:
2024-12-09 00:45:22,120 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-12-09 00:45:22,121 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:22,121 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:22,128 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-09 00:45:22,135 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-09 00:45:22,136 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-09 00:45:22,143 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-09 00:45:22,150 [ scc.git] DEBUG Already up to date.
2024-12-09 00:45:22,150 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-12-09 00:45:22,459 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-12-09 00:45:22,459 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-12-09 00:45:22,464 [ scc.git] DEBUG ## Unique users: []
2024-12-09 00:45:22,465 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:22,465 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:22,470 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-12-09 00:45:22,476 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:22,480 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-12-09 00:45:22,489 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-09 00:45:22,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:45:22,633 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-09 00:45:22,675 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:22,675 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:22,685 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-09 00:45:22,734 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-09 00:45:22,744 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f02c819dcd0> has no local changes
2024-12-09 00:45:22,745 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-prometheus-tools
Excluded PRs:
- PR 15 jburel 'Build' (status: failure)
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Generated by OMERO-plugins-push#273 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/)'
2024-12-09 00:45:22,757 [ scc.git] DEBUG [detached HEAD 7715bae] merge master -Dorg -Ssuccess-only
2024-12-09 00:45:22,758 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:45:22,758 [ scc.repo] DEBUG ## PRs found:
2024-12-09 00:45:23,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-12-09 00:45:23,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/29 HTTP/1.1" 200 None
2024-12-09 00:45:24,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24 HTTP/1.1" 200 None
2024-12-09 00:45:24,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-09 00:45:25,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24 HTTP/1.1" 200 None
2024-12-09 00:45:25,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24?per_page=1 HTTP/1.1" 200 None
2024-12-09 00:45:26,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24 HTTP/1.1" 200 None
2024-12-09 00:45:26,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24/status HTTP/1.1" 200 None
2024-12-09 00:45:26,563 [ scc.repo] DEBUG - PR 29 jburel 'Build'
2024-12-09 00:45:27,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-12-09 00:45:27,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-12-09 00:45:28,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-12-09 00:45:28,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-12-09 00:45:29,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-09 00:45:29,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-12-09 00:45:30,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-12-09 00:45:30,159 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-12-09 00:45:30,160 [ scc.repo] DEBUG ## Branches found:
2024-12-09 00:45:30,160 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-12-09 00:45:30,160 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:30,160 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:30,166 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-09 00:45:30,171 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-09 00:45:30,171 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-09 00:45:30,177 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-09 00:45:30,184 [ scc.git] DEBUG Already up to date.
2024-12-09 00:45:30,185 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-12-09 00:45:30,640 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-12-09 00:45:30,640 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-12-09 00:45:30,645 [ scc.git] DEBUG Calling 'git fetch origin pull/29/head'
2024-12-09 00:45:31,140 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-12-09 00:45:31,140 [ scc.git] DEBUG * branch refs/pull/29/head -> FETCH_HEAD
2024-12-09 00:45:31,146 [ scc.git] DEBUG ## Unique users: []
2024-12-09 00:45:31,146 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:31,147 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:31,153 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-12-09 00:45:31,159 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:31,164 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-12-09 00:45:31,187 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-12-09 00:45:31,188 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-09 00:45:31,191 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-12-09 00:45:31,191 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-12-09 00:45:31,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:45:31,370 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24'
2024-12-09 00:45:31,378 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:31,383 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 29 (Build) 92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24'
2024-12-09 00:45:31,416 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-09 00:45:31,419 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-12-09 00:45:31,419 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2024-12-09 00:45:31,419 [ scc.git] DEBUG 2 files changed, 8 insertions(+), 6 deletions(-)
2024-12-09 00:45:31,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:45:31,751 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-09 00:45:31,790 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:31,791 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:31,796 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-09 00:45:31,833 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-09 00:45:31,840 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f02c8180730> has no local changes
2024-12-09 00:45:31,840 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
- PR 29 jburel 'Build'
Generated by OMERO-plugins-push#273 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/)'
2024-12-09 00:45:31,848 [ scc.git] DEBUG [detached HEAD 28ba9ce] merge master -Dorg -Ssuccess-only
2024-12-09 00:45:31,848 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:45:31,848 [ scc.repo] DEBUG ## PRs found:
2024-12-09 00:45:32,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-12-09 00:45:32,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/21 HTTP/1.1" 200 None
2024-12-09 00:45:33,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/d8cd79097b8e36aef506d1589aa1bc281a0fc1b1 HTTP/1.1" 200 None
2024-12-09 00:45:34,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/d8cd79097b8e36aef506d1589aa1bc281a0fc1b1/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-09 00:45:34,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/d8cd79097b8e36aef506d1589aa1bc281a0fc1b1/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-09 00:45:35,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/d8cd79097b8e36aef506d1589aa1bc281a0fc1b1 HTTP/1.1" 200 None
2024-12-09 00:45:35,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/d8cd79097b8e36aef506d1589aa1bc281a0fc1b1?per_page=1 HTTP/1.1" 200 2
2024-12-09 00:45:35,468 [ scc.repo] DEBUG - PR 21 jburel 'Build'
2024-12-09 00:45:35,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-12-09 00:45:36,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-12-09 00:45:36,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-12-09 00:45:37,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-09 00:45:37,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-12-09 00:45:38,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-12-09 00:45:38,321 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-12-09 00:45:38,321 [ scc.repo] DEBUG ## Branches found:
2024-12-09 00:45:38,321 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-12-09 00:45:38,321 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:38,321 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:38,328 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-09 00:45:38,333 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-09 00:45:38,333 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-09 00:45:38,339 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-09 00:45:38,345 [ scc.git] DEBUG Already up to date.
2024-12-09 00:45:38,345 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-12-09 00:45:38,728 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-12-09 00:45:38,729 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-12-09 00:45:38,735 [ scc.git] DEBUG Calling 'git fetch origin pull/21/head'
2024-12-09 00:45:39,068 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-12-09 00:45:39,069 [ scc.git] DEBUG * branch refs/pull/21/head -> FETCH_HEAD
2024-12-09 00:45:39,074 [ scc.git] DEBUG ## Unique users: []
2024-12-09 00:45:39,074 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:39,074 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:39,080 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-09 00:45:39,086 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:39,093 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-09 00:45:39,313 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-12-09 00:45:39,313 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-12-09 00:45:39,313 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-12-09 00:45:39,313 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-12-09 00:45:39,313 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-12-09 00:45:39,313 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-12-09 00:45:39,313 [ scc.git] DEBUG Auto-merging setup.py
2024-12-09 00:45:39,313 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-12-09 00:45:39,313 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-09 00:45:39,314 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-09 00:45:39,321 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-12-09 00:45:39,331 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-12-09 00:45:39,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:45:39,486 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-09 00:45:39,493 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-12-09 00:45:39,500 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#273](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/urls.py
- omero_signup/signup_settings.py
- setup.py
--conflicts
2024-12-09 00:45:39,507 [ scc.config] DEBUG Found github.token
2024-12-09 00:45:39,507 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-12-09 00:45:39,508 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8cd79097b8e36aef506d1589aa1bc281a0fc1b1'
2024-12-09 00:45:39,515 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:39,521 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 21 (Build) d8cd79097b8e36aef506d1589aa1bc281a0fc1b1'
2024-12-09 00:45:39,611 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-09 00:45:39,614 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-12-09 00:45:39,614 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2024-12-09 00:45:39,614 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2024-12-09 00:45:39,614 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2024-12-09 00:45:39,614 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2024-12-09 00:45:39,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:45:39,912 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-09 00:45:39,972 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:39,972 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:39,979 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-09 00:45:40,024 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-09 00:45:40,032 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f02c8180610> has no local changes
2024-12-09 00:45:40,032 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-signup
Already up to date.
Merged PRs:
- PR 21 jburel 'Build'
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Generated by OMERO-plugins-push#273 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/)'
2024-12-09 00:45:40,042 [ scc.git] DEBUG [detached HEAD f74cd43] merge master -Dorg -Ssuccess-only
2024-12-09 00:45:40,043 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:45:40,043 [ scc.repo] DEBUG ## PRs found:
2024-12-09 00:45:40,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-12-09 00:45:40,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-12-09 00:45:41,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-12-09 00:45:41,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-12-09 00:45:42,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-09 00:45:42,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-12-09 00:45:43,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-12-09 00:45:43,245 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-12-09 00:45:43,245 [ scc.repo] DEBUG ## Branches found:
2024-12-09 00:45:43,245 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-12-09 00:45:43,245 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:43,245 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:43,252 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-09 00:45:43,257 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-09 00:45:43,258 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-09 00:45:43,264 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-09 00:45:43,269 [ scc.git] DEBUG Already up to date.
2024-12-09 00:45:43,270 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-12-09 00:45:43,828 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-12-09 00:45:43,828 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-12-09 00:45:43,833 [ scc.git] DEBUG ## Unique users: []
2024-12-09 00:45:43,833 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:43,833 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:43,841 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-12-09 00:45:43,849 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:43,856 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-12-09 00:45:43,943 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-09 00:45:43,946 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-12-09 00:45:43,946 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-12-09 00:45:43,946 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-12-09 00:45:43,946 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-12-09 00:45:43,947 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-12-09 00:45:43,947 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-12-09 00:45:43,947 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-12-09 00:45:43,947 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-12-09 00:45:43,947 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-12-09 00:45:43,947 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-12-09 00:45:43,947 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-12-09 00:45:43,947 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-12-09 00:45:43,947 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-12-09 00:45:43,947 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-12-09 00:45:43,947 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-12-09 00:45:43,947 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-12-09 00:45:43,947 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-12-09 00:45:43,947 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-12-09 00:45:43,947 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-12-09 00:45:43,947 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-12-09 00:45:43,947 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-12-09 00:45:43,947 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-12-09 00:45:43,947 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-12-09 00:45:43,947 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-12-09 00:45:43,947 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-12-09 00:45:43,950 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-12-09 00:45:43,950 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-12-09 00:45:43,950 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-12-09 00:45:43,950 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-12-09 00:45:43,950 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-12-09 00:45:43,950 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-12-09 00:45:43,950 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-12-09 00:45:43,950 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-12-09 00:45:43,951 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-12-09 00:45:43,951 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-12-09 00:45:43,951 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-12-09 00:45:43,951 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-12-09 00:45:43,951 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-12-09 00:45:43,951 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-12-09 00:45:43,951 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-12-09 00:45:43,951 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-12-09 00:45:43,951 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-12-09 00:45:43,951 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-12-09 00:45:43,951 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-12-09 00:45:43,951 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-12-09 00:45:44,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:45:44,183 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-09 00:45:44,228 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:44,228 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:44,246 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-09 00:45:44,292 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-09 00:45:44,300 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f02c8155c70> has no local changes
2024-12-09 00:45:44,301 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Generated by OMERO-plugins-push#273 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/)'
2024-12-09 00:45:44,311 [ scc.git] DEBUG [detached HEAD 1977ea5] merge master -Dorg -Ssuccess-only
2024-12-09 00:45:44,311 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:45:44,312 [ scc.repo] DEBUG ## PRs found:
2024-12-09 00:45:44,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-12-09 00:45:44,607 [ scc.repo] DEBUG ## Branches found:
2024-12-09 00:45:44,607 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-12-09 00:45:44,607 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:44,607 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:44,613 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-09 00:45:44,618 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-09 00:45:44,618 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-09 00:45:44,624 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-09 00:45:44,633 [ scc.git] DEBUG Updating aca9e9c..100f6ae
2024-12-09 00:45:45,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls/13 HTTP/1.1" 200 None
2024-12-09 00:45:45,328 [ scc.git] DEBUG ## Unique users: []
2024-12-09 00:45:45,328 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:45,328 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:45,335 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-09 00:45:45,373 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:45,374 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:45,379 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-09 00:45:45,419 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-09 00:45:45,426 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f02c81c4bb0> has no local changes
2024-12-09 00:45:45,426 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-upload
Updating aca9e9c..100f6ae
Previously merged:
- PR 13 jburel 'Build'
Generated by OMERO-plugins-push#273 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/)'
2024-12-09 00:45:45,434 [ scc.git] DEBUG [detached HEAD a87d7fe] merge master -Dorg -Ssuccess-only
2024-12-09 00:45:45,434 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:45:45,434 [ scc.repo] DEBUG ## PRs found:
2024-12-09 00:45:45,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2024-12-09 00:45:46,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2024-12-09 00:45:46,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2024-12-09 00:45:47,559 [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
2024-12-09 00:45:48,114 [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
2024-12-09 00:45:48,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2024-12-09 00:45:49,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2024-12-09 00:45:49,100 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2024-12-09 00:45:49,100 [ scc.repo] DEBUG ## Branches found:
2024-12-09 00:45:49,100 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-12-09 00:45:49,101 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:49,101 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:49,107 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-09 00:45:49,113 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-09 00:45:49,113 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-09 00:45:49,119 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-09 00:45:49,125 [ scc.git] DEBUG Already up to date.
2024-12-09 00:45:49,126 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2024-12-09 00:45:49,473 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2024-12-09 00:45:49,473 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2024-12-09 00:45:49,482 [ scc.git] DEBUG ## Unique users: []
2024-12-09 00:45:49,482 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:49,482 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:49,493 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2024-12-09 00:45:49,501 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:49,511 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2024-12-09 00:45:49,554 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-09 00:45:49,560 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-12-09 00:45:49,560 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2024-12-09 00:45:49,560 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2024-12-09 00:45:49,560 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2024-12-09 00:45:49,560 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2024-12-09 00:45:49,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:45:49,689 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-09 00:45:49,729 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:49,729 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:49,735 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-09 00:45:49,774 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-09 00:45:49,780 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f02c8110f70> has no local changes
2024-12-09 00:45:49,780 [ 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#273 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/)'
2024-12-09 00:45:49,789 [ scc.git] DEBUG [detached HEAD 5282da6] merge master -Dorg -Ssuccess-only
2024-12-09 00:45:49,789 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:45:49,789 [ scc.git] INFO Overriding base-branch from master to main
2024-12-09 00:45:49,789 [ scc.repo] DEBUG ## PRs found:
2024-12-09 00:45:50,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-12-09 00:45:50,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2024-12-09 00:45:51,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2024-12-09 00:45:51,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2024-12-09 00:45:52,115 [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
2024-12-09 00:45:52,651 [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
2024-12-09 00:45:53,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/17 HTTP/1.1" 200 None
2024-12-09 00:45:53,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/17/comments HTTP/1.1" 200 None
2024-12-09 00:45:54,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/020e85775bda54e9136b3fb9e699411e0d4f8c95 HTTP/1.1" 200 None
2024-12-09 00:45:54,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/020e85775bda54e9136b3fb9e699411e0d4f8c95/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-09 00:45:55,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/020e85775bda54e9136b3fb9e699411e0d4f8c95/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-09 00:45:55,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-12-09 00:45:56,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-12-09 00:45:56,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-12-09 00:45:56,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-12-09 00:45:57,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-09 00:45:57,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-12-09 00:45:58,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-12-09 00:45:58,319 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-12-09 00:45:58,320 [ scc.repo] DEBUG ## Branches found:
2024-12-09 00:45:58,320 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-12-09 00:45:58,320 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:58,320 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:58,327 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-12-09 00:45:58,333 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-09 00:45:58,333 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-12-09 00:45:58,340 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-12-09 00:45:58,347 [ scc.git] DEBUG Already up to date.
2024-12-09 00:45:58,347 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-12-09 00:45:58,780 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-12-09 00:45:58,781 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-12-09 00:45:58,786 [ scc.git] DEBUG ## Unique users: []
2024-12-09 00:45:58,786 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:58,787 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:58,793 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-09 00:45:58,800 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:58,806 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-09 00:45:58,897 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-12-09 00:45:58,898 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-12-09 00:45:58,898 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-09 00:45:58,898 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-09 00:45:58,904 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-12-09 00:45:58,911 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-12-09 00:45:59,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:45:59,053 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-09 00:45:59,059 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-12-09 00:45:59,064 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#273](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-12-09 00:45:59,069 [ scc.config] DEBUG Found github.token
2024-12-09 00:45:59,069 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-12-09 00:45:59,069 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-09 00:45:59,111 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:59,111 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:59,116 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-09 00:45:59,155 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-09 00:45:59,162 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f02c80f1af0> has no local changes
2024-12-09 00:45:59,162 [ 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 17 jburel '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#273 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/)'
2024-12-09 00:45:59,170 [ scc.git] DEBUG [detached HEAD 4368d61] merge master -Dorg -Ssuccess-only
2024-12-09 00:45:59,170 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:45:59,170 [ scc.repo] DEBUG ## PRs found:
2024-12-09 00:45:59,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-12-09 00:45:59,471 [ scc.repo] DEBUG ## Branches found:
2024-12-09 00:45:59,471 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-12-09 00:45:59,471 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:45:59,471 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:45:59,477 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-09 00:45:59,482 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-09 00:45:59,482 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-09 00:45:59,488 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-09 00:45:59,497 [ scc.git] DEBUG Updating adfa132..70b01ed
2024-12-09 00:46:00,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls/24 HTTP/1.1" 200 None
2024-12-09 00:46:00,112 [ scc.git] DEBUG ## Unique users: []
2024-12-09 00:46:00,112 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:46:00,112 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:46:00,118 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-09 00:46:00,160 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:46:00,160 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:46:00,165 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-09 00:46:00,204 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-09 00:46:00,210 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f02c80f1a30> has no local changes
2024-12-09 00:46:00,210 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-weberror
Updating adfa132..70b01ed
Previously merged:
- PR 24 jburel 'Build'
Generated by OMERO-plugins-push#273 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/)'
2024-12-09 00:46:00,219 [ scc.git] DEBUG [detached HEAD 6dd6781] merge master -Dorg -Ssuccess-only
2024-12-09 00:46:00,219 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:46:00,220 [ scc.repo] DEBUG ## PRs found:
2024-12-09 00:46:00,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-12-09 00:46:00,566 [ scc.repo] DEBUG ## Branches found:
2024-12-09 00:46:00,567 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-12-09 00:46:00,567 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:46:00,567 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:46:00,573 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-09 00:46:00,578 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-09 00:46:00,578 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-09 00:46:00,583 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-09 00:46:00,593 [ scc.git] DEBUG Updating 8da48e1..5bfef29
2024-12-09 00:46:01,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls/36 HTTP/1.1" 200 None
2024-12-09 00:46:01,314 [ scc.git] DEBUG ## Unique users: []
2024-12-09 00:46:01,314 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:46:01,314 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:46:01,320 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-09 00:46:01,362 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:46:01,362 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:46:01,369 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-09 00:46:01,412 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-09 00:46:01,420 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f02c80968b0> has no local changes
2024-12-09 00:46:01,420 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-webtest
Updating 8da48e1..5bfef29
Previously merged:
- PR 36 jburel 'Build'
Generated by OMERO-plugins-push#273 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/)'
2024-12-09 00:46:01,429 [ scc.git] DEBUG [detached HEAD 5336531] merge master -Dorg -Ssuccess-only
2024-12-09 00:46:01,429 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:46:01,430 [ scc.repo] DEBUG ## PRs found:
2024-12-09 00:46:01,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-12-09 00:46:02,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-12-09 00:46:02,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-12-09 00:46:03,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-12-09 00:46:03,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-09 00:46:04,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-12-09 00:46:04,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-12-09 00:46:04,657 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-12-09 00:46:04,657 [ scc.repo] DEBUG ## Branches found:
2024-12-09 00:46:04,658 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-12-09 00:46:04,658 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:46:04,658 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:46:04,664 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-09 00:46:04,669 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-09 00:46:04,669 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-09 00:46:04,674 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-09 00:46:04,680 [ scc.git] DEBUG Already up to date.
2024-12-09 00:46:04,680 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-12-09 00:46:05,084 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-12-09 00:46:05,084 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-12-09 00:46:05,090 [ scc.git] DEBUG ## Unique users: []
2024-12-09 00:46:05,090 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:46:05,090 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:46:05,096 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-09 00:46:05,101 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:46:05,106 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-09 00:46:05,155 [ scc.git] DEBUG Auto-merging Dockerfile
2024-12-09 00:46:05,155 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-12-09 00:46:05,155 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-09 00:46:05,155 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-09 00:46:05,162 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-12-09 00:46:05,168 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-12-09 00:46:05,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:46:05,311 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-09 00:46:05,317 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-12-09 00:46:05,322 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#273](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-12-09 00:46:05,327 [ scc.config] DEBUG Found github.token
2024-12-09 00:46:05,328 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-12-09 00:46:05,328 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-09 00:46:05,367 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:46:05,367 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:46:05,372 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-09 00:46:05,412 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-09 00:46:05,419 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f02c80965b0> has no local changes
2024-12-09 00:46:05,419 [ 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#273 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/)'
2024-12-09 00:46:05,427 [ scc.git] DEBUG [detached HEAD 1ca7043] merge master -Dorg -Ssuccess-only
2024-12-09 00:46:05,428 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:46:05,428 [ scc.git] INFO Overriding base-branch from master to develop
2024-12-09 00:46:05,428 [ scc.repo] DEBUG ## PRs found:
2024-12-09 00:46:05,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-12-09 00:46:06,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-12-09 00:46:06,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2024-12-09 00:46:07,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-12-09 00:46:07,854 [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
2024-12-09 00:46:08,364 [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
2024-12-09 00:46:08,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-12-09 00:46:09,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2024-12-09 00:46:09,395 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-12-09 00:46:09,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-12-09 00:46:10,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-12-09 00:46:11,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/4865545/issues/216/comments?page=2 HTTP/1.1" 200 None
2024-12-09 00:46:11,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-12-09 00:46:12,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-12-09 00:46:12,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-12-09 00:46:12,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-12-09 00:46:13,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-12-09 00:46:13,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-09 00:46:14,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-12-09 00:46:14,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-12-09 00:46:14,742 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-12-09 00:46:15,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-12-09 00:46:15,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-12-09 00:46:16,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-12-09 00:46:16,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-12-09 00:46:16,691 [ scc.repo] DEBUG ## Branches found:
2024-12-09 00:46:16,691 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-12-09 00:46:16,691 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:46:16,691 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:46:16,698 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-12-09 00:46:16,705 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-09 00:46:16,705 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-12-09 00:46:16,711 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-12-09 00:46:16,716 [ scc.git] DEBUG Already up to date.
2024-12-09 00:46:16,716 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-12-09 00:46:17,659 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-12-09 00:46:17,659 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-12-09 00:46:17,665 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-12-09 00:46:18,081 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-12-09 00:46:18,081 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-12-09 00:46:18,087 [ scc.git] DEBUG ## Unique users: []
2024-12-09 00:46:18,088 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:46:18,088 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:46:18,096 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-09 00:46:18,106 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:46:18,111 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-09 00:46:18,149 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-12-09 00:46:18,149 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-12-09 00:46:18,149 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-09 00:46:18,150 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-09 00:46:18,156 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-12-09 00:46:18,163 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-12-09 00:46:18,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:46:18,311 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-09 00:46:18,320 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-12-09 00:46:18,326 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#273](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-12-09 00:46:18,331 [ scc.config] DEBUG Found github.token
2024-12-09 00:46:18,331 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-12-09 00:46:18,331 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-12-09 00:46:18,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:46:18,342 [ 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'
2024-12-09 00:46:18,369 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-09 00:46:18,373 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-12-09 00:46:18,373 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-12-09 00:46:18,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:46:18,707 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-09 00:46:18,747 [ scc.git] DEBUG Get sha1 of %s
2024-12-09 00:46:18,747 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-09 00:46:18,753 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-09 00:46:18,794 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-09 00:46:18,802 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f02c812af10> has no local changes
2024-12-09 00:46:18,802 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
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#273 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/)'
2024-12-09 00:46:18,812 [ scc.git] DEBUG [detached HEAD 9c5908b] merge master -Dorg -Ssuccess-only
2024-12-09 00:46:18,812 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:46:18,813 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-09 00:46:18,913 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-12-09 00:46:19,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:46:19,105 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-12-09 00:46:19,111 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-12-09 00:46:19,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:46:19,490 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-12-09 00:46:19,495 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-12-09 00:46:19,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:46:19,875 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-12-09 00:46:19,880 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-12-09 00:46:20,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:46:20,270 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-12-09 00:46:20,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:46:20,653 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-12-09 00:46:20,660 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-12-09 00:46:21,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:46:21,041 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-12-09 00:46:21,047 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-12-09 00:46:21,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:46:21,432 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-12-09 00:46:21,436 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-12-09 00:46:21,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:46:21,824 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-12-09 00:46:21,828 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-12-09 00:46:22,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:46:22,241 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-12-09 00:46:22,246 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-12-09 00:46:22,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:46:22,645 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-12-09 00:46:22,650 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-12-09 00:46:23,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:46:23,044 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-12-09 00:46:23,049 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-12-09 00:46:23,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:46:23,461 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-12-09 00:46:23,467 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-12-09 00:46:23,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:46:23,854 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-12-09 00:46:24,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:46:24,242 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-12-09 00:46:24,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:46:24,618 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-12-09 00:46:24,623 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-12-09 00:46:24,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:46:25,005 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-12-09 00:46:25,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:46:25,389 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-12-09 00:46:25,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:46:25,776 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-12-09 00:46:25,784 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-12-09 00:46:26,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:46:26,165 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-12-09 00:46:26,172 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-12-09 00:46:26,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:46:26,561 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-12-09 00:46:26,567 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-12-09 00:46:26,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:46:26,960 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-12-09 00:46:26,969 [ scc.config] DEBUG Found submodule.scripts.url
2024-12-09 00:46:27,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-09 00:46:27,344 [ scc.config] DEBUG Found submodule.scripts.branch
2024-12-09 00:46:27,345 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-09 00:46:27,425 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f02cce65e20> has local changes
2024-12-09 00:46:27,425 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
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 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'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 600 Rdornier 'Label on rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 592 will-moore 'Filter owners and groups dropdown lists'
- PR 602 will-moore 'Changelog 7.2.0'
- PR 603 will-moore 'Inset bugfixes'
Repository: ome/omero-fpbioimage
Updating e5b3ca3..3b6c05a
Previously merged:
- PR 30 jburel 'Build'
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'
Repository: ome/omero-iviewer
Excluded PRs:
- 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)
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'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Repository: ome/omero-prometheus-tools
Excluded PRs:
- PR 15 jburel 'Build' (status: failure)
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
- PR 29 jburel 'Build'
Repository: ome/omero-signup
Already up to date.
Merged PRs:
- PR 21 jburel 'Build'
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Updating aca9e9c..100f6ae
Previously merged:
- PR 13 jburel 'Build'
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 17 jburel '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
Updating adfa132..70b01ed
Previously merged:
- PR 24 jburel 'Build'
Repository: openmicroscopy/omero-webtest
Updating 8da48e1..5bfef29
Previously merged:
- PR 36 jburel 'Build'
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
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#273 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/273/)'
2024-12-09 00:46:27,442 [ scc.git] DEBUG [detached HEAD 2626f58] merge master -Dorg -Ssuccess-only
2024-12-09 00:46:27,442 [ scc.merge] INFO Repository: ome/omero-plugins
2024-12-09 00:46:27,442 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-12-09 00:46:27,442 [ scc.merge] INFO Already up to date.
2024-12-09 00:46:27,443 [ scc.merge] INFO
2024-12-09 00:46:27,443 [ scc.merge] INFO
2024-12-09 00:46:27,443 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-12-09 00:46:27,443 [ scc.merge] INFO Already up to date.
2024-12-09 00:46:27,443 [ scc.merge] INFO
2024-12-09 00:46:27,443 [ scc.merge] INFO
2024-12-09 00:46:27,443 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-12-09 00:46:27,443 [ scc.merge] INFO Excluded PRs:
2024-12-09 00:46:27,443 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-12-09 00:46:27,443 [ scc.merge] INFO Already up to date.
2024-12-09 00:46:27,443 [ scc.merge] INFO
2024-12-09 00:46:27,443 [ scc.merge] INFO
2024-12-09 00:46:27,443 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-12-09 00:46:27,443 [ scc.merge] INFO Excluded PRs:
2024-12-09 00:46:27,443 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-12-09 00:46:27,443 [ scc.merge] INFO Already up to date.
2024-12-09 00:46:27,443 [ scc.merge] INFO
2024-12-09 00:46:27,443 [ scc.merge] INFO Merged PRs:
2024-12-09 00:46:27,443 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-12-09 00:46:27,443 [ scc.merge] INFO
2024-12-09 00:46:27,443 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-12-09 00:46:27,443 [ scc.merge] INFO Excluded PRs:
2024-12-09 00:46:27,443 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-12-09 00:46:27,443 [ scc.merge] INFO Already up to date.
2024-12-09 00:46:27,443 [ scc.merge] INFO
2024-12-09 00:46:27,443 [ scc.merge] INFO Merged PRs:
2024-12-09 00:46:27,443 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-12-09 00:46:27,443 [ scc.merge] INFO
2024-12-09 00:46:27,443 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-09 00:46:27,443 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-12-09 00:46:27,443 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-12-09 00:46:27,443 [ scc.merge] INFO
2024-12-09 00:46:27,443 [ scc.merge] INFO Repository: ome/omero-figure
2024-12-09 00:46:27,443 [ scc.merge] INFO Excluded PRs:
2024-12-09 00:46:27,444 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (user: Rdornier)
2024-12-09 00:46:27,444 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-12-09 00:46:27,444 [ scc.merge] INFO Already up to date.
2024-12-09 00:46:27,444 [ scc.merge] INFO
2024-12-09 00:46:27,444 [ scc.merge] INFO Merged PRs:
2024-12-09 00:46:27,444 [ scc.merge] INFO - PR 592 will-moore 'Filter owners and groups dropdown lists'
2024-12-09 00:46:27,444 [ scc.merge] INFO - PR 602 will-moore 'Changelog 7.2.0'
2024-12-09 00:46:27,444 [ scc.merge] INFO - PR 603 will-moore 'Inset bugfixes'
2024-12-09 00:46:27,444 [ scc.merge] INFO
2024-12-09 00:46:27,444 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-12-09 00:46:27,444 [ scc.merge] INFO Updating e5b3ca3..3b6c05a
2024-12-09 00:46:27,444 [ scc.merge] INFO Previously merged:
2024-12-09 00:46:27,444 [ scc.merge] INFO - PR 30 jburel 'Build'
2024-12-09 00:46:27,444 [ scc.merge] INFO
2024-12-09 00:46:27,444 [ scc.merge] INFO Merged PRs:
2024-12-09 00:46:27,444 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-12-09 00:46:27,444 [ scc.merge] INFO
2024-12-09 00:46:27,444 [ scc.merge] INFO Repository: ome/omero-gallery
2024-12-09 00:46:27,444 [ scc.merge] INFO Already up to date.
2024-12-09 00:46:27,444 [ scc.merge] INFO
2024-12-09 00:46:27,444 [ scc.merge] INFO Merged PRs:
2024-12-09 00:46:27,444 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2024-12-09 00:46:27,444 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2024-12-09 00:46:27,444 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2024-12-09 00:46:27,444 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2024-12-09 00:46:27,444 [ scc.merge] INFO
2024-12-09 00:46:27,444 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-09 00:46:27,444 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2024-12-09 00:46:27,444 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2024-12-09 00:46:27,444 [ scc.merge] INFO
2024-12-09 00:46:27,444 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-12-09 00:46:27,444 [ scc.merge] INFO Excluded PRs:
2024-12-09 00:46:27,444 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2024-12-09 00:46:27,444 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-12-09 00:46:27,444 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-12-09 00:46:27,444 [ scc.merge] INFO Already up to date.
2024-12-09 00:46:27,444 [ scc.merge] INFO
2024-12-09 00:46:27,444 [ scc.merge] INFO Merged PRs:
2024-12-09 00:46:27,445 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-12-09 00:46:27,445 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-12-09 00:46:27,445 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-12-09 00:46:27,445 [ scc.merge] INFO
2024-12-09 00:46:27,445 [ scc.merge] INFO Repository: ome/omero-mapr
2024-12-09 00:46:27,445 [ scc.merge] INFO Excluded PRs:
2024-12-09 00:46:27,445 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-12-09 00:46:27,445 [ scc.merge] INFO Already up to date.
2024-12-09 00:46:27,445 [ scc.merge] INFO
2024-12-09 00:46:27,445 [ scc.merge] INFO Merged PRs:
2024-12-09 00:46:27,445 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-12-09 00:46:27,445 [ scc.merge] INFO
2024-12-09 00:46:27,445 [ scc.merge] INFO Repository: ome/omero-metadata
2024-12-09 00:46:27,445 [ scc.merge] INFO Already up to date.
2024-12-09 00:46:27,445 [ scc.merge] INFO
2024-12-09 00:46:27,445 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-09 00:46:27,445 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-12-09 00:46:27,445 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-12-09 00:46:27,445 [ scc.merge] INFO
2024-12-09 00:46:27,445 [ scc.merge] INFO Repository: ome/omero-parade
2024-12-09 00:46:27,445 [ scc.merge] INFO Excluded PRs:
2024-12-09 00:46:27,445 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-12-09 00:46:27,445 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-12-09 00:46:27,445 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-12-09 00:46:27,445 [ scc.merge] INFO Already up to date.
2024-12-09 00:46:27,445 [ scc.merge] INFO
2024-12-09 00:46:27,445 [ scc.merge] INFO
2024-12-09 00:46:27,445 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-12-09 00:46:27,445 [ scc.merge] INFO Excluded PRs:
2024-12-09 00:46:27,445 [ scc.merge] INFO - PR 15 jburel 'Build' (status: failure)
2024-12-09 00:46:27,445 [ scc.merge] INFO Already up to date.
2024-12-09 00:46:27,445 [ scc.merge] INFO
2024-12-09 00:46:27,445 [ scc.merge] INFO Merged PRs:
2024-12-09 00:46:27,445 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-12-09 00:46:27,445 [ scc.merge] INFO
2024-12-09 00:46:27,445 [ scc.merge] INFO Repository: ome/omero-rois
2024-12-09 00:46:27,445 [ scc.merge] INFO Excluded PRs:
2024-12-09 00:46:27,445 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-12-09 00:46:27,446 [ scc.merge] INFO Already up to date.
2024-12-09 00:46:27,446 [ scc.merge] INFO
2024-12-09 00:46:27,446 [ scc.merge] INFO Merged PRs:
2024-12-09 00:46:27,446 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-12-09 00:46:27,446 [ scc.merge] INFO - PR 29 jburel 'Build'
2024-12-09 00:46:27,446 [ scc.merge] INFO
2024-12-09 00:46:27,446 [ scc.merge] INFO Repository: ome/omero-signup
2024-12-09 00:46:27,446 [ scc.merge] INFO Already up to date.
2024-12-09 00:46:27,446 [ scc.merge] INFO
2024-12-09 00:46:27,446 [ scc.merge] INFO Merged PRs:
2024-12-09 00:46:27,446 [ scc.merge] INFO - PR 21 jburel 'Build'
2024-12-09 00:46:27,446 [ scc.merge] INFO
2024-12-09 00:46:27,446 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-09 00:46:27,446 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-12-09 00:46:27,446 [ scc.merge] INFO
2024-12-09 00:46:27,446 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-12-09 00:46:27,446 [ scc.merge] INFO Already up to date.
2024-12-09 00:46:27,446 [ scc.merge] INFO
2024-12-09 00:46:27,446 [ scc.merge] INFO Merged PRs:
2024-12-09 00:46:27,446 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-12-09 00:46:27,446 [ scc.merge] INFO
2024-12-09 00:46:27,446 [ scc.merge] INFO Repository: ome/omero-upload
2024-12-09 00:46:27,446 [ scc.merge] INFO Updating aca9e9c..100f6ae
2024-12-09 00:46:27,446 [ scc.merge] INFO Previously merged:
2024-12-09 00:46:27,446 [ scc.merge] INFO - PR 13 jburel 'Build'
2024-12-09 00:46:27,446 [ scc.merge] INFO
2024-12-09 00:46:27,446 [ scc.merge] INFO
2024-12-09 00:46:27,446 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-12-09 00:46:27,446 [ scc.merge] INFO Already up to date.
2024-12-09 00:46:27,446 [ scc.merge] INFO
2024-12-09 00:46:27,446 [ scc.merge] INFO Merged PRs:
2024-12-09 00:46:27,446 [ scc.merge] INFO - PR 20 jburel 'Build'
2024-12-09 00:46:27,446 [ scc.merge] INFO
2024-12-09 00:46:27,446 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-12-09 00:46:27,446 [ scc.merge] INFO Excluded PRs:
2024-12-09 00:46:27,446 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2024-12-09 00:46:27,446 [ scc.merge] INFO - PR 17 jburel 'Build' (status: failure)
2024-12-09 00:46:27,446 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-12-09 00:46:27,446 [ scc.merge] INFO Already up to date.
2024-12-09 00:46:27,446 [ scc.merge] INFO
2024-12-09 00:46:27,447 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-09 00:46:27,447 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-12-09 00:46:27,447 [ scc.merge] INFO
2024-12-09 00:46:27,447 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-12-09 00:46:27,447 [ scc.merge] INFO Updating adfa132..70b01ed
2024-12-09 00:46:27,447 [ scc.merge] INFO Previously merged:
2024-12-09 00:46:27,447 [ scc.merge] INFO - PR 24 jburel 'Build'
2024-12-09 00:46:27,447 [ scc.merge] INFO
2024-12-09 00:46:27,447 [ scc.merge] INFO
2024-12-09 00:46:27,447 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-12-09 00:46:27,447 [ scc.merge] INFO Updating 8da48e1..5bfef29
2024-12-09 00:46:27,447 [ scc.merge] INFO Previously merged:
2024-12-09 00:46:27,447 [ scc.merge] INFO - PR 36 jburel 'Build'
2024-12-09 00:46:27,447 [ scc.merge] INFO
2024-12-09 00:46:27,447 [ scc.merge] INFO
2024-12-09 00:46:27,447 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-12-09 00:46:27,447 [ scc.merge] INFO Already up to date.
2024-12-09 00:46:27,447 [ scc.merge] INFO
2024-12-09 00:46:27,447 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-09 00:46:27,447 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-12-09 00:46:27,447 [ scc.merge] INFO
2024-12-09 00:46:27,447 [ scc.merge] INFO Repository: ome/scripts
2024-12-09 00:46:27,447 [ scc.merge] INFO Excluded PRs:
2024-12-09 00:46:27,447 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-12-09 00:46:27,447 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-12-09 00:46:27,447 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-12-09 00:46:27,447 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-12-09 00:46:27,447 [ scc.merge] INFO Already up to date.
2024-12-09 00:46:27,447 [ scc.merge] INFO
2024-12-09 00:46:27,447 [ scc.merge] INFO Merged PRs:
2024-12-09 00:46:27,447 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-12-09 00:46:27,447 [ scc.merge] INFO
2024-12-09 00:46:27,447 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-09 00:46:27,447 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-12-09 00:46:27,447 [ scc.merge] INFO
2024-12-09 00:46:27,447 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-12-09 00:46:27,448 [ scc.git] DEBUG Calling 'git remote'
2024-12-09 00:46:27,455 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-12-09 00:46:27,456 [ scc.git] DEBUG Calling 'git remote'
2024-12-09 00:46:27,464 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:46:27,464 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-12-09 00:46:27,464 [ scc.git] DEBUG Calling 'git remote'
2024-12-09 00:46:27,471 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:46:27,472 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-12-09 00:46:27,472 [ scc.git] DEBUG Calling 'git remote'
2024-12-09 00:46:27,478 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:46:27,479 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-12-09 00:46:27,479 [ scc.git] DEBUG Calling 'git remote'
2024-12-09 00:46:27,485 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:46:27,486 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-12-09 00:46:27,486 [ scc.git] DEBUG Calling 'git remote'
2024-12-09 00:46:27,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:46:27,492 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-12-09 00:46:27,492 [ scc.git] DEBUG Calling 'git remote'
2024-12-09 00:46:27,500 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:46:27,500 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-12-09 00:46:27,500 [ scc.git] DEBUG Calling 'git remote'
2024-12-09 00:46:27,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:46:27,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-12-09 00:46:27,505 [ scc.git] DEBUG Calling 'git remote'
2024-12-09 00:46:27,510 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:46:27,510 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-12-09 00:46:27,510 [ scc.git] DEBUG Calling 'git remote'
2024-12-09 00:46:27,515 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:46:27,515 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-12-09 00:46:27,515 [ scc.git] DEBUG Calling 'git remote'
2024-12-09 00:46:27,520 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:46:27,520 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-12-09 00:46:27,520 [ scc.git] DEBUG Calling 'git remote'
2024-12-09 00:46:27,525 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:46:27,525 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-12-09 00:46:27,525 [ scc.git] DEBUG Calling 'git remote'
2024-12-09 00:46:27,530 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:46:27,530 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-12-09 00:46:27,530 [ scc.git] DEBUG Calling 'git remote'
2024-12-09 00:46:27,535 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:46:27,535 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-12-09 00:46:27,535 [ scc.git] DEBUG Calling 'git remote'
2024-12-09 00:46:27,540 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:46:27,540 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-12-09 00:46:27,541 [ scc.git] DEBUG Calling 'git remote'
2024-12-09 00:46:27,545 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:46:27,545 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-12-09 00:46:27,545 [ scc.git] DEBUG Calling 'git remote'
2024-12-09 00:46:27,550 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:46:27,550 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-12-09 00:46:27,551 [ scc.git] DEBUG Calling 'git remote'
2024-12-09 00:46:27,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:46:27,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-12-09 00:46:27,556 [ scc.git] DEBUG Calling 'git remote'
2024-12-09 00:46:27,560 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:46:27,561 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-12-09 00:46:27,561 [ scc.git] DEBUG Calling 'git remote'
2024-12-09 00:46:27,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:46:27,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-12-09 00:46:27,566 [ scc.git] DEBUG Calling 'git remote'
2024-12-09 00:46:27,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:46:27,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-12-09 00:46:27,571 [ scc.git] DEBUG Calling 'git remote'
2024-12-09 00:46:27,575 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-09 00:46:27,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-12-09 00:46:27,576 [ scc.git] DEBUG Calling 'git remote'
2024-12-09 00:46:27,580 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.10.0 to 5.10.1-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 d9a0d19] 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 1dfb1389
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 2a621da
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from b4102d4
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 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 312afbe
nothing to commit, working tree clean
[detached HEAD e4f3bb5] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-12-09 00:47:14,197 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-12-09 00:47:23,198 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-12-09 00:47:25,632 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-12-09 00:47:30,117 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-12-09 00:48:09,487 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci