Console Output
Skipping 90 KB..
Full Log07 00:44:07,954 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-12-07 00:44:08,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:44:08,087 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-07 00:44:08,131 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:44:08,131 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:44:08,137 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-07 00:44:08,180 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-07 00:44:08,190 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffba4138580> has no local changes
2024-12-07 00:44:08,190 [ 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#271 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/)'
2024-12-07 00:44:08,201 [ scc.git] DEBUG [detached HEAD 0818d5c] merge master -Dorg -Ssuccess-only
2024-12-07 00:44:08,201 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:44:08,202 [ scc.repo] DEBUG ## PRs found:
2024-12-07 00:44:08,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-12-07 00:44:09,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118 HTTP/1.1" 200 None
2024-12-07 00:44:09,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 200 None
2024-12-07 00:44:09,571 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-07 00:44:10,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2024-12-07 00:44:10,682 [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-07 00:44:11,171 [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-07 00:44:11,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2024-12-07 00:44:12,166 [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-07 00:44:12,167 [ scc.repo] DEBUG - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2024-12-07 00:44:12,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/117 HTTP/1.1" 200 None
2024-12-07 00:44:12,672 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-07 00:44:13,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2024-12-07 00:44:13,745 [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-07 00:44:14,221 [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-07 00:44:14,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2024-12-07 00:44:15,134 [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-07 00:44:15,135 [ scc.repo] DEBUG - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2024-12-07 00:44:15,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/116 HTTP/1.1" 200 None
2024-12-07 00:44:15,592 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-07 00:44:16,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2024-12-07 00:44:16,636 [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-07 00:44:17,143 [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-07 00:44:17,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2024-12-07 00:44:18,175 [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-07 00:44:18,176 [ scc.repo] DEBUG - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2024-12-07 00:44:18,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115 HTTP/1.1" 200 None
2024-12-07 00:44:19,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115/comments HTTP/1.1" 200 None
2024-12-07 00:44:19,102 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-07 00:44:19,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2024-12-07 00:44:20,180 [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-07 00:44:20,680 [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-07 00:44:21,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2024-12-07 00:44:21,677 [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-07 00:44:21,678 [ scc.repo] DEBUG - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2024-12-07 00:44:22,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/114 HTTP/1.1" 200 None
2024-12-07 00:44:22,187 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-07 00:44:22,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2024-12-07 00:44:23,266 [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-07 00:44:23,791 [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-07 00:44:24,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2024-12-07 00:44:24,733 [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-07 00:44:24,734 [ scc.repo] DEBUG - PR 114 dependabot[bot] 'Bump tar and fsevents'
2024-12-07 00:44:25,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/113 HTTP/1.1" 200 None
2024-12-07 00:44:25,183 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-07 00:44:25,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2024-12-07 00:44:26,192 [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-07 00:44:26,694 [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-07 00:44:27,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2024-12-07 00:44:27,723 [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-07 00:44:27,724 [ scc.repo] DEBUG - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2024-12-07 00:44:27,724 [ scc.repo] DEBUG ## Branches found:
2024-12-07 00:44:27,724 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-12-07 00:44:27,724 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:44:27,725 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:44:27,732 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-07 00:44:27,738 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-07 00:44:27,739 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-07 00:44:27,746 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-07 00:44:27,753 [ scc.git] DEBUG Already up to date.
2024-12-07 00:44:27,753 [ scc.git] DEBUG Calling 'git fetch origin pull/113/head'
2024-12-07 00:44:28,067 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-07 00:44:28,067 [ scc.git] DEBUG * branch refs/pull/113/head -> FETCH_HEAD
2024-12-07 00:44:28,073 [ scc.git] DEBUG Calling 'git fetch origin pull/114/head'
2024-12-07 00:44:28,358 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-07 00:44:28,358 [ scc.git] DEBUG * branch refs/pull/114/head -> FETCH_HEAD
2024-12-07 00:44:28,363 [ scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2024-12-07 00:44:28,643 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-07 00:44:28,644 [ scc.git] DEBUG * branch refs/pull/115/head -> FETCH_HEAD
2024-12-07 00:44:28,648 [ scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2024-12-07 00:44:28,954 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-07 00:44:28,954 [ scc.git] DEBUG * branch refs/pull/116/head -> FETCH_HEAD
2024-12-07 00:44:28,959 [ scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2024-12-07 00:44:29,261 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-07 00:44:29,261 [ scc.git] DEBUG * branch refs/pull/117/head -> FETCH_HEAD
2024-12-07 00:44:29,267 [ scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2024-12-07 00:44:29,546 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-07 00:44:29,546 [ scc.git] DEBUG * branch refs/pull/118/head -> FETCH_HEAD
2024-12-07 00:44:29,551 [ scc.git] DEBUG ## Unique users: []
2024-12-07 00:44:29,551 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:44:29,551 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:44:29,557 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2024-12-07 00:44:29,572 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:44:29,578 [ 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-07 00:44:29,601 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-07 00:44:29,606 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2024-12-07 00:44:29,607 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2024-12-07 00:44:29,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:44:29,750 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2024-12-07 00:44:29,797 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:44:29,803 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2024-12-07 00:44:29,875 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-07 00:44:29,876 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-07 00:44:29,882 [ scc.git] DEBUG package-lock.json | 625 +++---------------------------------------------------
2024-12-07 00:44:29,882 [ scc.git] DEBUG 1 file changed, 29 insertions(+), 596 deletions(-)
2024-12-07 00:44:30,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:44:30,132 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-12-07 00:44:30,140 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:44:30,146 [ 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-07 00:44:30,170 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-07 00:44:30,170 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2024-12-07 00:44:30,170 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-07 00:44:30,171 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-07 00:44:30,177 [ scc.git] DEBUG Calling 'git reset --hard 12fb1eb78a04c5992b82933ca648b364a6787961'
2024-12-07 00:44:30,185 [ scc.git] DEBUG HEAD is now at 12fb1eb merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2024-12-07 00:44:30,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:44:30,515 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-12-07 00:44:30,521 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2024-12-07 00:44:30,527 [ scc.git] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#271](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/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-07 00:44:30,533 [ scc.config] DEBUG Found github.token
2024-12-07 00:44:30,533 [ scc.git] DEBUG Not adding comment to issue #115, already --conflicts.
2024-12-07 00:44:30,533 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2024-12-07 00:44:30,576 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:44:30,582 [ 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-07 00:44:30,656 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-07 00:44:30,656 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-07 00:44:30,662 [ scc.git] DEBUG package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2024-12-07 00:44:30,662 [ scc.git] DEBUG 1 file changed, 108 insertions(+), 11 deletions(-)
2024-12-07 00:44:30,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:44:30,929 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2024-12-07 00:44:30,948 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:44:30,954 [ 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-07 00:44:31,405 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-07 00:44:31,406 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-07 00:44:31,411 [ scc.git] DEBUG package-lock.json | 6 +++---
2024-12-07 00:44:31,411 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-12-07 00:44:31,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:44:31,544 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-12-07 00:44:31,552 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:44:31,557 [ 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-07 00:44:31,663 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-07 00:44:31,663 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2024-12-07 00:44:31,663 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-07 00:44:31,664 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-07 00:44:31,670 [ scc.git] DEBUG Calling 'git reset --hard d790e6c6a187f1a21e1422037101407772e823fb'
2024-12-07 00:44:31,678 [ scc.git] DEBUG HEAD is now at d790e6c merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2024-12-07 00:44:31,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:44:31,935 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-12-07 00:44:31,943 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2024-12-07 00:44:31,949 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#271](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/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-07 00:44:31,955 [ scc.config] DEBUG Found github.token
2024-12-07 00:44:31,956 [ scc.git] DEBUG Adding comment to issue #118.
2024-12-07 00:44:32,822 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 201 2394
2024-12-07 00:44:32,824 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-07 00:44:32,868 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:44:32,868 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:44:32,873 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-07 00:44:32,916 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-07 00:44:32,923 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffba69dae20> has no local changes
2024-12-07 00:44:32,924 [ 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#271 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/)'
2024-12-07 00:44:32,932 [ scc.git] DEBUG [detached HEAD c5405d0] merge master -Dorg -Ssuccess-only
2024-12-07 00:44:32,933 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:44:32,933 [ scc.repo] DEBUG ## PRs found:
2024-12-07 00:44:33,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-12-07 00:44:33,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2024-12-07 00:44:34,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2024-12-07 00:44:34,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-12-07 00:44:35,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-12-07 00:44:35,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-12-07 00:44:36,430 [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-07 00:44:36,868 [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-07 00:44:37,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-12-07 00:44:37,734 [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-07 00:44:37,735 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-12-07 00:44:38,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-12-07 00:44:38,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-12-07 00:44:39,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-12-07 00:44:39,733 [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-07 00:44:40,210 [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-07 00:44:40,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-12-07 00:44:41,136 [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-07 00:44:41,137 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-12-07 00:44:41,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-12-07 00:44:42,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-12-07 00:44:42,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-12-07 00:44:43,061 [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-07 00:44:43,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-12-07 00:44:44,027 [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-07 00:44:44,028 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-12-07 00:44:44,028 [ scc.repo] DEBUG ## Branches found:
2024-12-07 00:44:44,028 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-12-07 00:44:44,029 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:44:44,029 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:44:44,036 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-07 00:44:44,041 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-07 00:44:44,041 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-07 00:44:44,047 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-07 00:44:44,053 [ scc.git] DEBUG Already up to date.
2024-12-07 00:44:44,053 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-12-07 00:44:46,250 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-07 00:44:46,250 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-12-07 00:44:46,256 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-12-07 00:44:47,835 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-07 00:44:47,835 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-12-07 00:44:47,840 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-12-07 00:44:48,217 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-07 00:44:48,217 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-12-07 00:44:48,222 [ scc.git] DEBUG ## Unique users: []
2024-12-07 00:44:48,223 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:44:48,223 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:44:48,228 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-12-07 00:44:48,237 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:44:48,243 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-12-07 00:44:48,596 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-12-07 00:44:48,597 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-07 00:44:48,601 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-12-07 00:44:48,601 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-12-07 00:44:48,601 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-12-07 00:44:48,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:44:48,741 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-12-07 00:44:48,750 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:44:48,756 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-12-07 00:44:49,086 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-12-07 00:44:49,086 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-12-07 00:44:49,086 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-12-07 00:44:49,086 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-12-07 00:44:49,087 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-07 00:44:49,092 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-12-07 00:44:49,092 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-12-07 00:44:49,092 [ scc.git] DEBUG src/app/header.html | 5 +
2024-12-07 00:44:49,092 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-12-07 00:44:49,092 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-12-07 00:44:49,092 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-12-07 00:44:49,092 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-12-07 00:44:49,092 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-12-07 00:44:49,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:44:49,237 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-12-07 00:44:49,246 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:44:49,252 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-12-07 00:44:49,340 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-12-07 00:44:49,341 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-07 00:44:49,344 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-12-07 00:44:49,345 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-12-07 00:44:49,345 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-12-07 00:44:49,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:44:49,619 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-07 00:44:49,667 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:44:49,667 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:44:49,673 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-07 00:44:49,718 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-07 00:44:49,727 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffba41385e0> has no local changes
2024-12-07 00:44:49,727 [ 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#271 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/)'
2024-12-07 00:44:49,739 [ scc.git] DEBUG [detached HEAD b143c72] merge master -Dorg -Ssuccess-only
2024-12-07 00:44:49,739 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:44:49,740 [ scc.repo] DEBUG ## PRs found:
2024-12-07 00:44:50,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-12-07 00:44:50,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-12-07 00:44:51,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-12-07 00:44:51,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-12-07 00:44:52,064 [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-07 00:44:52,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-12-07 00:44:53,017 [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-07 00:44:53,017 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-12-07 00:44:53,018 [ scc.repo] DEBUG ## Branches found:
2024-12-07 00:44:53,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-12-07 00:44:53,018 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:44:53,018 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:44:53,024 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-07 00:44:53,030 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-07 00:44:53,030 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-07 00:44:53,035 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-07 00:44:53,041 [ scc.git] DEBUG Already up to date.
2024-12-07 00:44:53,041 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-12-07 00:44:53,840 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-12-07 00:44:53,840 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-12-07 00:44:53,845 [ scc.git] DEBUG ## Unique users: []
2024-12-07 00:44:53,846 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:44:53,846 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:44:53,851 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-12-07 00:44:53,858 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:44:53,864 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-12-07 00:44:53,876 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-07 00:44:53,879 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-12-07 00:44:53,879 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-12-07 00:44:53,879 [ scc.git] DEBUG requirements.txt | 2 +-
2024-12-07 00:44:53,879 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-12-07 00:44:53,879 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-12-07 00:44:53,879 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-12-07 00:44:54,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:44:54,037 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-07 00:44:54,083 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:44:54,083 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:44:54,090 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-07 00:44:54,133 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-07 00:44:54,141 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffba4149bb0> has no local changes
2024-12-07 00:44:54,142 [ 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#271 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/)'
2024-12-07 00:44:54,152 [ scc.git] DEBUG [detached HEAD d30451d] merge master -Dorg -Ssuccess-only
2024-12-07 00:44:54,153 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:44:54,153 [ scc.repo] DEBUG ## PRs found:
2024-12-07 00:44:54,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-12-07 00:44:55,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-12-07 00:44:55,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-12-07 00:44:56,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-12-07 00:44:56,557 [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-07 00:44:57,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-12-07 00:44:57,476 [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-07 00:44:57,476 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-12-07 00:44:57,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-12-07 00:44:58,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-12-07 00:44:58,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-12-07 00:44:59,357 [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-07 00:44:59,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-12-07 00:45:00,286 [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-07 00:45:00,286 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-12-07 00:45:00,287 [ scc.repo] DEBUG ## Branches found:
2024-12-07 00:45:00,287 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-12-07 00:45:00,287 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:00,287 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:00,293 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-07 00:45:00,299 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-07 00:45:00,299 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-07 00:45:00,305 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-07 00:45:00,311 [ scc.git] DEBUG Already up to date.
2024-12-07 00:45:00,312 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-12-07 00:45:01,039 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-12-07 00:45:01,040 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-12-07 00:45:01,045 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-12-07 00:45:01,921 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-12-07 00:45:01,921 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-12-07 00:45:01,926 [ scc.git] DEBUG ## Unique users: []
2024-12-07 00:45:01,927 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:01,927 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:01,932 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-12-07 00:45:01,940 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:01,947 [ 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-07 00:45:02,205 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-12-07 00:45:02,206 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-12-07 00:45:02,206 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-12-07 00:45:02,206 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-12-07 00:45:02,206 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-07 00:45:02,207 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-07 00:45:02,213 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-07 00:45:02,221 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2024-12-07 00:45:02,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:45:02,359 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-12-07 00:45:02,369 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-07 00:45:02,428 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#271](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-12-07 00:45:02,436 [ scc.config] DEBUG Found github.token
2024-12-07 00:45:02,436 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-12-07 00:45:02,436 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-12-07 00:45:02,444 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:02,451 [ 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-07 00:45:02,603 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-12-07 00:45:02,604 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-12-07 00:45:02,604 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-12-07 00:45:02,604 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-07 00:45:02,604 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-07 00:45:02,611 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-07 00:45:02,619 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2024-12-07 00:45:02,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:45:02,759 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2024-12-07 00:45:02,767 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2024-12-07 00:45:02,774 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#271](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/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-07 00:45:02,780 [ scc.config] DEBUG Found github.token
2024-12-07 00:45:02,780 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-12-07 00:45:02,780 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-07 00:45:02,826 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:02,826 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:02,832 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-07 00:45:02,877 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-07 00:45:02,885 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffba40f1880> has no local changes
2024-12-07 00:45:02,886 [ 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#271 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/)'
2024-12-07 00:45:02,896 [ scc.git] DEBUG [detached HEAD 09fb64e] merge master -Dorg -Ssuccess-only
2024-12-07 00:45:02,897 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:45:02,897 [ scc.repo] DEBUG ## PRs found:
2024-12-07 00:45:03,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-12-07 00:45:03,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-12-07 00:45:04,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-12-07 00:45:04,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-12-07 00:45:05,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-12-07 00:45:05,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-12-07 00:45:06,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-12-07 00:45:06,198 [ scc.repo] DEBUG ## Branches found:
2024-12-07 00:45:06,198 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-12-07 00:45:06,198 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:06,198 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:06,206 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-07 00:45:06,212 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-07 00:45:06,213 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-07 00:45:06,220 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-07 00:45:06,226 [ scc.git] DEBUG Already up to date.
2024-12-07 00:45:06,227 [ scc.git] DEBUG ## Unique users: []
2024-12-07 00:45:06,227 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:06,227 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:06,233 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-07 00:45:06,280 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:06,280 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:06,288 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-07 00:45:06,334 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-07 00:45:06,343 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffba40f1670> has no local changes
2024-12-07 00:45:06,343 [ 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#271 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/)'
2024-12-07 00:45:06,354 [ scc.git] DEBUG [detached HEAD 49cc100] merge master -Dorg -Ssuccess-only
2024-12-07 00:45:06,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:45:06,355 [ scc.repo] DEBUG ## PRs found:
2024-12-07 00:45:06,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-12-07 00:45:07,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/15 HTTP/1.1" 200 None
2024-12-07 00:45:07,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/b5d953edc0b64a1bba13e9d5d90f3f9e68b7a332 HTTP/1.1" 200 None
2024-12-07 00:45:08,218 [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-07 00:45:08,709 [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-07 00:45:09,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-12-07 00:45:09,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-12-07 00:45:10,120 [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-07 00:45:10,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-12-07 00:45:11,070 [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-07 00:45:11,071 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-12-07 00:45:11,071 [ scc.repo] DEBUG ## Branches found:
2024-12-07 00:45:11,071 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-12-07 00:45:11,071 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:11,071 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:11,078 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-07 00:45:11,083 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-07 00:45:11,083 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-07 00:45:11,089 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-07 00:45:11,094 [ scc.git] DEBUG Already up to date.
2024-12-07 00:45:11,095 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-12-07 00:45:11,414 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-12-07 00:45:11,414 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-12-07 00:45:11,419 [ scc.git] DEBUG ## Unique users: []
2024-12-07 00:45:11,419 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:11,419 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:11,425 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-12-07 00:45:11,431 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:11,436 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-12-07 00:45:11,446 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-07 00:45:11,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:45:11,605 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-07 00:45:11,648 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:11,648 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:11,654 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-07 00:45:11,696 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-07 00:45:11,703 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffba4146cd0> has no local changes
2024-12-07 00:45:11,703 [ 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#271 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/)'
2024-12-07 00:45:11,713 [ scc.git] DEBUG [detached HEAD fd56ef0] merge master -Dorg -Ssuccess-only
2024-12-07 00:45:11,713 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:45:11,713 [ scc.repo] DEBUG ## PRs found:
2024-12-07 00:45:12,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-12-07 00:45:12,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/29 HTTP/1.1" 200 None
2024-12-07 00:45:13,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24 HTTP/1.1" 200 None
2024-12-07 00:45:13,715 [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-07 00:45:14,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24 HTTP/1.1" 200 None
2024-12-07 00:45:14,661 [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-07 00:45:15,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24 HTTP/1.1" 200 None
2024-12-07 00:45:15,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24/status HTTP/1.1" 200 None
2024-12-07 00:45:15,626 [ scc.repo] DEBUG - PR 29 jburel 'Build'
2024-12-07 00:45:16,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-12-07 00:45:16,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-12-07 00:45:17,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-12-07 00:45:17,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-12-07 00:45:18,028 [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-07 00:45:18,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-12-07 00:45:18,952 [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-07 00:45:18,953 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-12-07 00:45:18,953 [ scc.repo] DEBUG ## Branches found:
2024-12-07 00:45:18,953 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-12-07 00:45:18,953 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:18,953 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:18,959 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-07 00:45:18,965 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-07 00:45:18,966 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-07 00:45:18,973 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-07 00:45:18,979 [ scc.git] DEBUG Already up to date.
2024-12-07 00:45:18,979 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-12-07 00:45:19,510 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-12-07 00:45:19,510 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-12-07 00:45:19,515 [ scc.git] DEBUG Calling 'git fetch origin pull/29/head'
2024-12-07 00:45:20,166 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-12-07 00:45:20,167 [ scc.git] DEBUG * branch refs/pull/29/head -> FETCH_HEAD
2024-12-07 00:45:20,172 [ scc.git] DEBUG ## Unique users: []
2024-12-07 00:45:20,172 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:20,172 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:20,178 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-12-07 00:45:20,184 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:20,190 [ 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-07 00:45:20,218 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-12-07 00:45:20,218 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-07 00:45:20,221 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-12-07 00:45:20,222 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-12-07 00:45:20,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:45:20,382 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24'
2024-12-07 00:45:20,390 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:20,395 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 29 (Build) 92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24'
2024-12-07 00:45:20,453 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-07 00:45:20,456 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-12-07 00:45:20,456 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2024-12-07 00:45:20,456 [ scc.git] DEBUG 2 files changed, 8 insertions(+), 6 deletions(-)
2024-12-07 00:45:20,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:45:20,782 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-07 00:45:20,827 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:20,827 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:20,832 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-07 00:45:20,878 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-07 00:45:20,884 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffba410b730> has no local changes
2024-12-07 00:45:20,885 [ 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#271 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/)'
2024-12-07 00:45:20,895 [ scc.git] DEBUG [detached HEAD 22edcd6] merge master -Dorg -Ssuccess-only
2024-12-07 00:45:20,895 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:45:20,895 [ scc.repo] DEBUG ## PRs found:
2024-12-07 00:45:21,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-12-07 00:45:21,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/21 HTTP/1.1" 200 None
2024-12-07 00:45:22,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/d8cd79097b8e36aef506d1589aa1bc281a0fc1b1 HTTP/1.1" 200 None
2024-12-07 00:45:22,825 [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-07 00:45:23,306 [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-07 00:45:23,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/d8cd79097b8e36aef506d1589aa1bc281a0fc1b1 HTTP/1.1" 200 None
2024-12-07 00:45:24,166 [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-07 00:45:24,166 [ scc.repo] DEBUG - PR 21 jburel 'Build'
2024-12-07 00:45:24,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-12-07 00:45:25,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-12-07 00:45:25,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-12-07 00:45:26,057 [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-07 00:45:26,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-12-07 00:45:26,940 [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-07 00:45:26,940 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-12-07 00:45:26,940 [ scc.repo] DEBUG ## Branches found:
2024-12-07 00:45:26,941 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-12-07 00:45:26,941 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:26,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:26,947 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-07 00:45:26,952 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-07 00:45:26,952 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-07 00:45:26,958 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-07 00:45:26,964 [ scc.git] DEBUG Already up to date.
2024-12-07 00:45:26,964 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-12-07 00:45:27,309 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-12-07 00:45:27,309 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-12-07 00:45:27,314 [ scc.git] DEBUG Calling 'git fetch origin pull/21/head'
2024-12-07 00:45:27,802 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-12-07 00:45:27,803 [ scc.git] DEBUG * branch refs/pull/21/head -> FETCH_HEAD
2024-12-07 00:45:27,807 [ scc.git] DEBUG ## Unique users: []
2024-12-07 00:45:27,808 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:27,808 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:27,815 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-07 00:45:27,821 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:27,826 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-07 00:45:27,885 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-12-07 00:45:27,885 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-12-07 00:45:27,885 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-12-07 00:45:27,885 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-12-07 00:45:27,885 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-12-07 00:45:27,885 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-12-07 00:45:27,885 [ scc.git] DEBUG Auto-merging setup.py
2024-12-07 00:45:27,885 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-12-07 00:45:27,885 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-07 00:45:27,886 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-07 00:45:27,892 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-12-07 00:45:27,898 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-12-07 00:45:28,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:45:28,031 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-07 00:45:28,040 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-12-07 00:45:28,045 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#271](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- setup.py
- omero_signup/urls.py
- omero_signup/views.py
--conflicts
2024-12-07 00:45:28,051 [ scc.config] DEBUG Found github.token
2024-12-07 00:45:28,051 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-12-07 00:45:28,051 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8cd79097b8e36aef506d1589aa1bc281a0fc1b1'
2024-12-07 00:45:28,056 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:28,061 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 21 (Build) d8cd79097b8e36aef506d1589aa1bc281a0fc1b1'
2024-12-07 00:45:28,072 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-07 00:45:28,074 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-12-07 00:45:28,074 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2024-12-07 00:45:28,074 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2024-12-07 00:45:28,075 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2024-12-07 00:45:28,075 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2024-12-07 00:45:28,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:45:28,414 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-07 00:45:28,460 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:28,460 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:28,466 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-07 00:45:28,509 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-07 00:45:28,516 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffba410b610> has no local changes
2024-12-07 00:45:28,516 [ 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#271 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/)'
2024-12-07 00:45:28,524 [ scc.git] DEBUG [detached HEAD cfdcf35] merge master -Dorg -Ssuccess-only
2024-12-07 00:45:28,525 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:45:28,525 [ scc.repo] DEBUG ## PRs found:
2024-12-07 00:45:28,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-12-07 00:45:29,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-12-07 00:45:29,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-12-07 00:45:30,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-12-07 00:45:30,755 [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-07 00:45:31,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-12-07 00:45:31,664 [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-07 00:45:31,665 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-12-07 00:45:31,665 [ scc.repo] DEBUG ## Branches found:
2024-12-07 00:45:31,665 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-12-07 00:45:31,665 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:31,665 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:31,672 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-07 00:45:31,679 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-07 00:45:31,679 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-07 00:45:31,686 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-07 00:45:31,693 [ scc.git] DEBUG Already up to date.
2024-12-07 00:45:31,694 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-12-07 00:45:32,226 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-12-07 00:45:32,226 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-12-07 00:45:32,230 [ scc.git] DEBUG ## Unique users: []
2024-12-07 00:45:32,230 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:32,231 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:32,236 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-12-07 00:45:32,251 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:32,258 [ 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-07 00:45:32,351 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-07 00:45:32,354 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-12-07 00:45:32,355 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-12-07 00:45:32,355 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-12-07 00:45:32,355 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-12-07 00:45:32,355 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-12-07 00:45:32,355 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-12-07 00:45:32,355 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-12-07 00:45:32,355 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-12-07 00:45:32,355 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-12-07 00:45:32,355 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-12-07 00:45:32,355 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-12-07 00:45:32,357 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-12-07 00:45:32,357 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-12-07 00:45:32,357 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-12-07 00:45:32,357 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-12-07 00:45:32,357 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-12-07 00:45:32,357 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-12-07 00:45:32,357 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-12-07 00:45:32,357 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-12-07 00:45:32,357 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-12-07 00:45:32,357 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-12-07 00:45:32,357 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-12-07 00:45:32,357 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-12-07 00:45:32,357 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-12-07 00:45:32,357 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-12-07 00:45:32,357 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-12-07 00:45:32,357 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-12-07 00:45:32,357 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-12-07 00:45:32,358 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-12-07 00:45:32,358 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-12-07 00:45:32,358 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-12-07 00:45:32,358 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-12-07 00:45:32,358 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-12-07 00:45:32,358 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-12-07 00:45:32,358 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-12-07 00:45:32,358 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-12-07 00:45:32,358 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-12-07 00:45:32,358 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-12-07 00:45:32,358 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-12-07 00:45:32,358 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-12-07 00:45:32,358 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-12-07 00:45:32,358 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-12-07 00:45:32,358 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-12-07 00:45:32,358 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-12-07 00:45:32,358 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-12-07 00:45:32,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:45:32,498 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-07 00:45:32,542 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:32,543 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:32,549 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-07 00:45:32,593 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-07 00:45:32,602 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffba40edc70> has no local changes
2024-12-07 00:45:32,603 [ 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#271 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/)'
2024-12-07 00:45:32,613 [ scc.git] DEBUG [detached HEAD 32e9a37] merge master -Dorg -Ssuccess-only
2024-12-07 00:45:32,614 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:45:32,614 [ scc.repo] DEBUG ## PRs found:
2024-12-07 00:45:32,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-12-07 00:45:32,917 [ scc.repo] DEBUG ## Branches found:
2024-12-07 00:45:32,917 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-12-07 00:45:32,917 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:32,917 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:32,923 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-07 00:45:32,929 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-07 00:45:32,929 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-07 00:45:32,934 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-07 00:45:32,945 [ scc.git] DEBUG Updating aca9e9c..100f6ae
2024-12-07 00:45:33,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls/13 HTTP/1.1" 200 None
2024-12-07 00:45:33,573 [ scc.git] DEBUG ## Unique users: []
2024-12-07 00:45:33,574 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:33,574 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:33,580 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-07 00:45:33,620 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:33,620 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:33,625 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-07 00:45:33,667 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-07 00:45:33,674 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffba41477c0> has no local changes
2024-12-07 00:45:33,674 [ 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#271 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/)'
2024-12-07 00:45:33,682 [ scc.git] DEBUG [detached HEAD 4aa4bd0] merge master -Dorg -Ssuccess-only
2024-12-07 00:45:33,683 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:45:33,683 [ scc.repo] DEBUG ## PRs found:
2024-12-07 00:45:34,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2024-12-07 00:45:34,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2024-12-07 00:45:35,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2024-12-07 00:45:35,576 [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-07 00:45:36,095 [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-07 00:45:36,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2024-12-07 00:45:36,988 [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-07 00:45:36,989 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2024-12-07 00:45:36,989 [ scc.repo] DEBUG ## Branches found:
2024-12-07 00:45:36,989 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-12-07 00:45:36,989 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:36,989 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:36,995 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-07 00:45:37,001 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-07 00:45:37,001 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-07 00:45:37,007 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-07 00:45:37,013 [ scc.git] DEBUG Already up to date.
2024-12-07 00:45:37,013 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2024-12-07 00:45:37,373 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2024-12-07 00:45:37,373 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2024-12-07 00:45:37,378 [ scc.git] DEBUG ## Unique users: []
2024-12-07 00:45:37,378 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:37,378 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:37,384 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2024-12-07 00:45:37,391 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:37,397 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2024-12-07 00:45:37,414 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-07 00:45:37,417 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-12-07 00:45:37,418 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2024-12-07 00:45:37,418 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2024-12-07 00:45:37,418 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2024-12-07 00:45:37,418 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2024-12-07 00:45:37,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:45:37,580 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-07 00:45:37,625 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:37,625 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:37,631 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-07 00:45:37,674 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-07 00:45:37,681 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffba4119f40> has no local changes
2024-12-07 00:45:37,681 [ 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#271 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/)'
2024-12-07 00:45:37,691 [ scc.git] DEBUG [detached HEAD cf189e3] merge master -Dorg -Ssuccess-only
2024-12-07 00:45:37,691 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:45:37,691 [ scc.git] INFO Overriding base-branch from master to main
2024-12-07 00:45:37,691 [ scc.repo] DEBUG ## PRs found:
2024-12-07 00:45:38,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-12-07 00:45:38,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2024-12-07 00:45:39,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2024-12-07 00:45:39,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2024-12-07 00:45:40,159 [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-07 00:45:40,641 [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-07 00:45:41,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/17 HTTP/1.1" 200 None
2024-12-07 00:45:41,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/17/comments HTTP/1.1" 200 None
2024-12-07 00:45:42,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/020e85775bda54e9136b3fb9e699411e0d4f8c95 HTTP/1.1" 200 None
2024-12-07 00:45:42,578 [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-07 00:45:43,136 [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-07 00:45:43,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-12-07 00:45:44,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-12-07 00:45:44,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-12-07 00:45:45,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-12-07 00:45:45,563 [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-07 00:45:46,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-12-07 00:45:46,442 [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-07 00:45:46,443 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-12-07 00:45:46,444 [ scc.repo] DEBUG ## Branches found:
2024-12-07 00:45:46,444 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-12-07 00:45:46,444 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:46,444 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:46,451 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-12-07 00:45:46,456 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-07 00:45:46,457 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-12-07 00:45:46,462 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-12-07 00:45:46,467 [ scc.git] DEBUG Already up to date.
2024-12-07 00:45:46,468 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-12-07 00:45:46,922 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-12-07 00:45:46,922 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-12-07 00:45:46,927 [ scc.git] DEBUG ## Unique users: []
2024-12-07 00:45:46,927 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:46,927 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:46,934 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-07 00:45:46,940 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:46,946 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-07 00:45:47,042 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-12-07 00:45:47,042 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-12-07 00:45:47,042 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-07 00:45:47,042 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-07 00:45:47,049 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-12-07 00:45:47,061 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-12-07 00:45:47,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:45:47,203 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-07 00:45:47,209 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-12-07 00:45:47,215 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#271](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-12-07 00:45:47,220 [ scc.config] DEBUG Found github.token
2024-12-07 00:45:47,220 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-12-07 00:45:47,221 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-07 00:45:47,264 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:47,264 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:47,270 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-07 00:45:47,313 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-07 00:45:47,320 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffba408fb50> has no local changes
2024-12-07 00:45:47,320 [ 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#271 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/)'
2024-12-07 00:45:47,329 [ scc.git] DEBUG [detached HEAD 6bc1430] merge master -Dorg -Ssuccess-only
2024-12-07 00:45:47,330 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:45:47,330 [ scc.repo] DEBUG ## PRs found:
2024-12-07 00:45:47,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-12-07 00:45:47,651 [ scc.repo] DEBUG ## Branches found:
2024-12-07 00:45:47,651 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-12-07 00:45:47,651 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:47,651 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:47,658 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-07 00:45:47,665 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-07 00:45:47,665 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-07 00:45:47,673 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-07 00:45:47,686 [ scc.git] DEBUG Updating adfa132..70b01ed
2024-12-07 00:45:48,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls/24 HTTP/1.1" 200 None
2024-12-07 00:45:48,335 [ scc.git] DEBUG ## Unique users: []
2024-12-07 00:45:48,335 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:48,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:48,344 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-07 00:45:48,385 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:48,386 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:48,391 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-07 00:45:48,433 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-07 00:45:48,440 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffba408fa00> has no local changes
2024-12-07 00:45:48,440 [ 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#271 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/)'
2024-12-07 00:45:48,448 [ scc.git] DEBUG [detached HEAD c2b9826] merge master -Dorg -Ssuccess-only
2024-12-07 00:45:48,449 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:45:48,449 [ scc.repo] DEBUG ## PRs found:
2024-12-07 00:45:48,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-12-07 00:45:48,752 [ scc.repo] DEBUG ## Branches found:
2024-12-07 00:45:48,752 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-12-07 00:45:48,753 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:48,753 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:48,759 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-07 00:45:48,764 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-07 00:45:48,764 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-07 00:45:48,770 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-07 00:45:48,781 [ scc.git] DEBUG Updating 8da48e1..5bfef29
2024-12-07 00:45:49,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls/36 HTTP/1.1" 200 None
2024-12-07 00:45:49,444 [ scc.git] DEBUG ## Unique users: []
2024-12-07 00:45:49,444 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:49,444 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:49,450 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-07 00:45:49,490 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:49,490 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:49,496 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-07 00:45:49,539 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-07 00:45:49,547 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffba40358b0> has no local changes
2024-12-07 00:45:49,547 [ 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#271 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/)'
2024-12-07 00:45:49,557 [ scc.git] DEBUG [detached HEAD 1a63db7] merge master -Dorg -Ssuccess-only
2024-12-07 00:45:49,557 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:45:49,558 [ scc.repo] DEBUG ## PRs found:
2024-12-07 00:45:49,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-12-07 00:45:50,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-12-07 00:45:50,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-12-07 00:45:51,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-12-07 00:45:51,837 [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-07 00:45:52,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-12-07 00:45:52,751 [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-07 00:45:52,752 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-12-07 00:45:52,752 [ scc.repo] DEBUG ## Branches found:
2024-12-07 00:45:52,752 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-12-07 00:45:52,752 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:52,752 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:52,759 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-07 00:45:52,764 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-07 00:45:52,764 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-07 00:45:52,770 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-07 00:45:52,778 [ scc.git] DEBUG Already up to date.
2024-12-07 00:45:52,778 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-12-07 00:45:53,219 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-12-07 00:45:53,219 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-12-07 00:45:53,224 [ scc.git] DEBUG ## Unique users: []
2024-12-07 00:45:53,224 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:53,225 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:53,230 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-07 00:45:53,236 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:53,241 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-07 00:45:53,359 [ scc.git] DEBUG Auto-merging Dockerfile
2024-12-07 00:45:53,359 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-12-07 00:45:53,359 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-07 00:45:53,360 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-07 00:45:53,366 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-12-07 00:45:53,374 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-12-07 00:45:53,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:45:53,521 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-07 00:45:53,528 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-12-07 00:45:53,534 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#271](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-12-07 00:45:53,539 [ scc.config] DEBUG Found github.token
2024-12-07 00:45:53,539 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-12-07 00:45:53,539 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-07 00:45:53,602 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:45:53,602 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:45:53,610 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-07 00:45:53,655 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-07 00:45:53,676 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffba40355b0> has no local changes
2024-12-07 00:45:53,676 [ 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#271 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/)'
2024-12-07 00:45:53,687 [ scc.git] DEBUG [detached HEAD 6c980d4] merge master -Dorg -Ssuccess-only
2024-12-07 00:45:53,687 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:45:53,687 [ scc.git] INFO Overriding base-branch from master to develop
2024-12-07 00:45:53,687 [ scc.repo] DEBUG ## PRs found:
2024-12-07 00:45:54,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-12-07 00:45:54,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-12-07 00:45:55,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2024-12-07 00:45:55,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-12-07 00:45:55,939 [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-07 00:45:56,412 [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-07 00:45:56,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-12-07 00:45:57,248 [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-07 00:45:57,249 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-12-07 00:45:57,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-12-07 00:45:58,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-12-07 00:45:58,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/4865545/issues/216/comments?page=2 HTTP/1.1" 200 None
2024-12-07 00:45:59,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-12-07 00:45:59,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-12-07 00:46:00,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-12-07 00:46:00,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-12-07 00:46:03,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-12-07 00:46:03,651 [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-07 00:46:04,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-12-07 00:46:04,485 [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-07 00:46:04,486 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-12-07 00:46:04,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-12-07 00:46:05,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-12-07 00:46:05,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-12-07 00:46:06,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-12-07 00:46:06,487 [ scc.repo] DEBUG ## Branches found:
2024-12-07 00:46:06,487 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-12-07 00:46:06,487 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:46:06,487 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:46:06,494 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-12-07 00:46:06,499 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-07 00:46:06,499 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-12-07 00:46:06,505 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-12-07 00:46:06,510 [ scc.git] DEBUG Already up to date.
2024-12-07 00:46:06,511 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-12-07 00:46:06,958 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-12-07 00:46:06,958 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-12-07 00:46:06,965 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-12-07 00:46:07,825 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-12-07 00:46:07,825 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-12-07 00:46:07,831 [ scc.git] DEBUG ## Unique users: []
2024-12-07 00:46:07,831 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:46:07,831 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:46:07,838 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-07 00:46:07,845 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:46:07,852 [ 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-07 00:46:07,887 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-12-07 00:46:07,887 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-12-07 00:46:07,887 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-07 00:46:07,888 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-07 00:46:07,895 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-12-07 00:46:07,902 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-12-07 00:46:08,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:46:08,033 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-07 00:46:08,048 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-12-07 00:46:08,056 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#271](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-12-07 00:46:08,062 [ scc.config] DEBUG Found github.token
2024-12-07 00:46:08,063 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-12-07 00:46:08,063 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-12-07 00:46:08,068 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:46:08,074 [ 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-07 00:46:08,088 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-07 00:46:08,091 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-12-07 00:46:08,091 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-12-07 00:46:08,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:46:08,418 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-07 00:46:08,461 [ scc.git] DEBUG Get sha1 of %s
2024-12-07 00:46:08,461 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-07 00:46:08,468 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-07 00:46:08,508 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-07 00:46:08,516 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffba40c7f10> has no local changes
2024-12-07 00:46:08,516 [ 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#271 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/)'
2024-12-07 00:46:08,526 [ scc.git] DEBUG [detached HEAD c202ba9] merge master -Dorg -Ssuccess-only
2024-12-07 00:46:08,526 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:46:08,527 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-07 00:46:08,606 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-12-07 00:46:08,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:46:08,818 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-12-07 00:46:08,823 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-12-07 00:46:09,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:46:09,236 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-12-07 00:46:09,241 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-12-07 00:46:09,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:46:09,623 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-12-07 00:46:09,628 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-12-07 00:46:09,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:46:10,019 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-12-07 00:46:10,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:46:10,392 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-12-07 00:46:10,399 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-12-07 00:46:10,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:46:10,788 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-12-07 00:46:10,795 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-12-07 00:46:11,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:46:11,212 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-12-07 00:46:11,217 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-12-07 00:46:11,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:46:11,631 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-12-07 00:46:11,636 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-12-07 00:46:12,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:46:12,019 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-12-07 00:46:12,025 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-12-07 00:46:12,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:46:12,415 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-12-07 00:46:12,420 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-12-07 00:46:12,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:46:12,797 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-12-07 00:46:12,803 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-12-07 00:46:13,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:46:13,185 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-12-07 00:46:13,192 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-12-07 00:46:13,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:46:13,589 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-12-07 00:46:13,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:46:13,966 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-12-07 00:46:14,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:46:14,340 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-12-07 00:46:14,346 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-12-07 00:46:14,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:46:14,727 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-12-07 00:46:15,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:46:15,123 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-12-07 00:46:15,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:46:15,518 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-12-07 00:46:15,522 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-12-07 00:46:15,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:46:15,916 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-12-07 00:46:15,921 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-12-07 00:46:16,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:46:16,315 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-12-07 00:46:16,320 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-12-07 00:46:16,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:46:16,700 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-12-07 00:46:16,705 [ scc.config] DEBUG Found submodule.scripts.url
2024-12-07 00:46:17,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-07 00:46:17,084 [ scc.config] DEBUG Found submodule.scripts.branch
2024-12-07 00:46:17,084 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-07 00:46:17,165 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ffba9f65820> has local changes
2024-12-07 00:46:17,165 [ 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#271 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/271/)'
2024-12-07 00:46:17,180 [ scc.git] DEBUG [detached HEAD b99f19e] merge master -Dorg -Ssuccess-only
2024-12-07 00:46:17,181 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-12-07 00:46:17,181 [ scc.merge] INFO Repository: ome/omero-plugins
2024-12-07 00:46:17,181 [ scc.merge] INFO Already up to date.
2024-12-07 00:46:17,181 [ scc.merge] INFO
2024-12-07 00:46:17,181 [ scc.merge] INFO
2024-12-07 00:46:17,181 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-12-07 00:46:17,181 [ scc.merge] INFO Already up to date.
2024-12-07 00:46:17,181 [ scc.merge] INFO
2024-12-07 00:46:17,181 [ scc.merge] INFO
2024-12-07 00:46:17,181 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-12-07 00:46:17,181 [ scc.merge] INFO Excluded PRs:
2024-12-07 00:46:17,181 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-12-07 00:46:17,181 [ scc.merge] INFO Already up to date.
2024-12-07 00:46:17,181 [ scc.merge] INFO
2024-12-07 00:46:17,181 [ scc.merge] INFO
2024-12-07 00:46:17,181 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-12-07 00:46:17,181 [ scc.merge] INFO Excluded PRs:
2024-12-07 00:46:17,181 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-12-07 00:46:17,181 [ scc.merge] INFO Already up to date.
2024-12-07 00:46:17,181 [ scc.merge] INFO
2024-12-07 00:46:17,181 [ scc.merge] INFO Merged PRs:
2024-12-07 00:46:17,182 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-12-07 00:46:17,182 [ scc.merge] INFO
2024-12-07 00:46:17,182 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-12-07 00:46:17,182 [ scc.merge] INFO Excluded PRs:
2024-12-07 00:46:17,182 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-12-07 00:46:17,182 [ scc.merge] INFO Already up to date.
2024-12-07 00:46:17,182 [ scc.merge] INFO
2024-12-07 00:46:17,182 [ scc.merge] INFO Merged PRs:
2024-12-07 00:46:17,182 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-12-07 00:46:17,182 [ scc.merge] INFO
2024-12-07 00:46:17,182 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-07 00:46:17,182 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-12-07 00:46:17,182 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-12-07 00:46:17,182 [ scc.merge] INFO
2024-12-07 00:46:17,182 [ scc.merge] INFO Repository: ome/omero-figure
2024-12-07 00:46:17,182 [ scc.merge] INFO Excluded PRs:
2024-12-07 00:46:17,182 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (user: Rdornier)
2024-12-07 00:46:17,182 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-12-07 00:46:17,182 [ scc.merge] INFO Already up to date.
2024-12-07 00:46:17,182 [ scc.merge] INFO
2024-12-07 00:46:17,182 [ scc.merge] INFO Merged PRs:
2024-12-07 00:46:17,182 [ scc.merge] INFO - PR 592 will-moore 'Filter owners and groups dropdown lists'
2024-12-07 00:46:17,182 [ scc.merge] INFO - PR 602 will-moore 'Changelog 7.2.0'
2024-12-07 00:46:17,182 [ scc.merge] INFO - PR 603 will-moore 'Inset bugfixes'
2024-12-07 00:46:17,182 [ scc.merge] INFO
2024-12-07 00:46:17,182 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-12-07 00:46:17,182 [ scc.merge] INFO Updating e5b3ca3..3b6c05a
2024-12-07 00:46:17,182 [ scc.merge] INFO Previously merged:
2024-12-07 00:46:17,182 [ scc.merge] INFO - PR 30 jburel 'Build'
2024-12-07 00:46:17,182 [ scc.merge] INFO
2024-12-07 00:46:17,182 [ scc.merge] INFO Merged PRs:
2024-12-07 00:46:17,182 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-12-07 00:46:17,183 [ scc.merge] INFO
2024-12-07 00:46:17,183 [ scc.merge] INFO Repository: ome/omero-gallery
2024-12-07 00:46:17,183 [ scc.merge] INFO Already up to date.
2024-12-07 00:46:17,183 [ scc.merge] INFO
2024-12-07 00:46:17,183 [ scc.merge] INFO Merged PRs:
2024-12-07 00:46:17,183 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2024-12-07 00:46:17,183 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2024-12-07 00:46:17,183 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2024-12-07 00:46:17,183 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2024-12-07 00:46:17,183 [ scc.merge] INFO
2024-12-07 00:46:17,183 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-07 00:46:17,183 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2024-12-07 00:46:17,183 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2024-12-07 00:46:17,183 [ scc.merge] INFO
2024-12-07 00:46:17,183 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-12-07 00:46:17,183 [ scc.merge] INFO Excluded PRs:
2024-12-07 00:46:17,183 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2024-12-07 00:46:17,183 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-12-07 00:46:17,183 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-12-07 00:46:17,183 [ scc.merge] INFO Already up to date.
2024-12-07 00:46:17,183 [ scc.merge] INFO
2024-12-07 00:46:17,183 [ scc.merge] INFO Merged PRs:
2024-12-07 00:46:17,183 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-12-07 00:46:17,183 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-12-07 00:46:17,183 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-12-07 00:46:17,183 [ scc.merge] INFO
2024-12-07 00:46:17,183 [ scc.merge] INFO Repository: ome/omero-mapr
2024-12-07 00:46:17,183 [ scc.merge] INFO Excluded PRs:
2024-12-07 00:46:17,183 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-12-07 00:46:17,183 [ scc.merge] INFO Already up to date.
2024-12-07 00:46:17,183 [ scc.merge] INFO
2024-12-07 00:46:17,183 [ scc.merge] INFO Merged PRs:
2024-12-07 00:46:17,183 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-12-07 00:46:17,184 [ scc.merge] INFO
2024-12-07 00:46:17,184 [ scc.merge] INFO Repository: ome/omero-metadata
2024-12-07 00:46:17,184 [ scc.merge] INFO Already up to date.
2024-12-07 00:46:17,184 [ scc.merge] INFO
2024-12-07 00:46:17,184 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-07 00:46:17,184 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-12-07 00:46:17,184 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-12-07 00:46:17,184 [ scc.merge] INFO
2024-12-07 00:46:17,184 [ scc.merge] INFO Repository: ome/omero-parade
2024-12-07 00:46:17,184 [ scc.merge] INFO Excluded PRs:
2024-12-07 00:46:17,184 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-12-07 00:46:17,184 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-12-07 00:46:17,184 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-12-07 00:46:17,184 [ scc.merge] INFO Already up to date.
2024-12-07 00:46:17,184 [ scc.merge] INFO
2024-12-07 00:46:17,184 [ scc.merge] INFO
2024-12-07 00:46:17,184 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-12-07 00:46:17,184 [ scc.merge] INFO Excluded PRs:
2024-12-07 00:46:17,184 [ scc.merge] INFO - PR 15 jburel 'Build' (status: failure)
2024-12-07 00:46:17,184 [ scc.merge] INFO Already up to date.
2024-12-07 00:46:17,184 [ scc.merge] INFO
2024-12-07 00:46:17,184 [ scc.merge] INFO Merged PRs:
2024-12-07 00:46:17,184 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-12-07 00:46:17,184 [ scc.merge] INFO
2024-12-07 00:46:17,184 [ scc.merge] INFO Repository: ome/omero-rois
2024-12-07 00:46:17,184 [ scc.merge] INFO Excluded PRs:
2024-12-07 00:46:17,184 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-12-07 00:46:17,184 [ scc.merge] INFO Already up to date.
2024-12-07 00:46:17,184 [ scc.merge] INFO
2024-12-07 00:46:17,184 [ scc.merge] INFO Merged PRs:
2024-12-07 00:46:17,184 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-12-07 00:46:17,184 [ scc.merge] INFO - PR 29 jburel 'Build'
2024-12-07 00:46:17,184 [ scc.merge] INFO
2024-12-07 00:46:17,185 [ scc.merge] INFO Repository: ome/omero-signup
2024-12-07 00:46:17,185 [ scc.merge] INFO Already up to date.
2024-12-07 00:46:17,185 [ scc.merge] INFO
2024-12-07 00:46:17,185 [ scc.merge] INFO Merged PRs:
2024-12-07 00:46:17,185 [ scc.merge] INFO - PR 21 jburel 'Build'
2024-12-07 00:46:17,185 [ scc.merge] INFO
2024-12-07 00:46:17,185 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-07 00:46:17,185 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-12-07 00:46:17,185 [ scc.merge] INFO
2024-12-07 00:46:17,185 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-12-07 00:46:17,185 [ scc.merge] INFO Already up to date.
2024-12-07 00:46:17,185 [ scc.merge] INFO
2024-12-07 00:46:17,185 [ scc.merge] INFO Merged PRs:
2024-12-07 00:46:17,185 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-12-07 00:46:17,185 [ scc.merge] INFO
2024-12-07 00:46:17,185 [ scc.merge] INFO Repository: ome/omero-upload
2024-12-07 00:46:17,185 [ scc.merge] INFO Updating aca9e9c..100f6ae
2024-12-07 00:46:17,185 [ scc.merge] INFO Previously merged:
2024-12-07 00:46:17,185 [ scc.merge] INFO - PR 13 jburel 'Build'
2024-12-07 00:46:17,185 [ scc.merge] INFO
2024-12-07 00:46:17,185 [ scc.merge] INFO
2024-12-07 00:46:17,185 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-12-07 00:46:17,185 [ scc.merge] INFO Already up to date.
2024-12-07 00:46:17,185 [ scc.merge] INFO
2024-12-07 00:46:17,185 [ scc.merge] INFO Merged PRs:
2024-12-07 00:46:17,185 [ scc.merge] INFO - PR 20 jburel 'Build'
2024-12-07 00:46:17,185 [ scc.merge] INFO
2024-12-07 00:46:17,185 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-12-07 00:46:17,185 [ scc.merge] INFO Excluded PRs:
2024-12-07 00:46:17,185 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2024-12-07 00:46:17,185 [ scc.merge] INFO - PR 17 jburel 'Build' (status: failure)
2024-12-07 00:46:17,185 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-12-07 00:46:17,185 [ scc.merge] INFO Already up to date.
2024-12-07 00:46:17,186 [ scc.merge] INFO
2024-12-07 00:46:17,186 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-07 00:46:17,186 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-12-07 00:46:17,186 [ scc.merge] INFO
2024-12-07 00:46:17,186 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-12-07 00:46:17,186 [ scc.merge] INFO Updating adfa132..70b01ed
2024-12-07 00:46:17,186 [ scc.merge] INFO Previously merged:
2024-12-07 00:46:17,186 [ scc.merge] INFO - PR 24 jburel 'Build'
2024-12-07 00:46:17,186 [ scc.merge] INFO
2024-12-07 00:46:17,186 [ scc.merge] INFO
2024-12-07 00:46:17,186 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-12-07 00:46:17,186 [ scc.merge] INFO Updating 8da48e1..5bfef29
2024-12-07 00:46:17,186 [ scc.merge] INFO Previously merged:
2024-12-07 00:46:17,186 [ scc.merge] INFO - PR 36 jburel 'Build'
2024-12-07 00:46:17,186 [ scc.merge] INFO
2024-12-07 00:46:17,186 [ scc.merge] INFO
2024-12-07 00:46:17,186 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-12-07 00:46:17,186 [ scc.merge] INFO Already up to date.
2024-12-07 00:46:17,186 [ scc.merge] INFO
2024-12-07 00:46:17,186 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-07 00:46:17,186 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-12-07 00:46:17,186 [ scc.merge] INFO
2024-12-07 00:46:17,186 [ scc.merge] INFO Repository: ome/scripts
2024-12-07 00:46:17,186 [ scc.merge] INFO Excluded PRs:
2024-12-07 00:46:17,186 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-12-07 00:46:17,186 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-12-07 00:46:17,186 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-12-07 00:46:17,186 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-12-07 00:46:17,186 [ scc.merge] INFO Already up to date.
2024-12-07 00:46:17,186 [ scc.merge] INFO
2024-12-07 00:46:17,186 [ scc.merge] INFO Merged PRs:
2024-12-07 00:46:17,186 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-12-07 00:46:17,186 [ scc.merge] INFO
2024-12-07 00:46:17,187 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-07 00:46:17,187 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-12-07 00:46:17,187 [ scc.merge] INFO
2024-12-07 00:46:17,187 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-12-07 00:46:17,187 [ scc.git] DEBUG Calling 'git remote'
2024-12-07 00:46:17,198 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-12-07 00:46:17,198 [ scc.git] DEBUG Calling 'git remote'
2024-12-07 00:46:17,205 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:46:17,205 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-12-07 00:46:17,205 [ scc.git] DEBUG Calling 'git remote'
2024-12-07 00:46:17,210 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:46:17,210 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-12-07 00:46:17,210 [ scc.git] DEBUG Calling 'git remote'
2024-12-07 00:46:17,215 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:46:17,215 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-12-07 00:46:17,215 [ scc.git] DEBUG Calling 'git remote'
2024-12-07 00:46:17,220 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:46:17,220 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-12-07 00:46:17,220 [ scc.git] DEBUG Calling 'git remote'
2024-12-07 00:46:17,225 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:46:17,225 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-12-07 00:46:17,225 [ scc.git] DEBUG Calling 'git remote'
2024-12-07 00:46:17,230 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:46:17,230 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-12-07 00:46:17,230 [ scc.git] DEBUG Calling 'git remote'
2024-12-07 00:46:17,235 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:46:17,235 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-12-07 00:46:17,235 [ scc.git] DEBUG Calling 'git remote'
2024-12-07 00:46:17,240 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:46:17,240 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-12-07 00:46:17,240 [ scc.git] DEBUG Calling 'git remote'
2024-12-07 00:46:17,245 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:46:17,245 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-12-07 00:46:17,245 [ scc.git] DEBUG Calling 'git remote'
2024-12-07 00:46:17,250 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:46:17,250 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-12-07 00:46:17,250 [ scc.git] DEBUG Calling 'git remote'
2024-12-07 00:46:17,254 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:46:17,254 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-12-07 00:46:17,255 [ scc.git] DEBUG Calling 'git remote'
2024-12-07 00:46:17,259 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:46:17,259 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-12-07 00:46:17,259 [ scc.git] DEBUG Calling 'git remote'
2024-12-07 00:46:17,264 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:46:17,264 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-12-07 00:46:17,264 [ scc.git] DEBUG Calling 'git remote'
2024-12-07 00:46:17,269 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:46:17,269 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-12-07 00:46:17,269 [ scc.git] DEBUG Calling 'git remote'
2024-12-07 00:46:17,274 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:46:17,274 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-12-07 00:46:17,274 [ scc.git] DEBUG Calling 'git remote'
2024-12-07 00:46:17,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:46:17,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-12-07 00:46:17,280 [ scc.git] DEBUG Calling 'git remote'
2024-12-07 00:46:17,286 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:46:17,286 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-12-07 00:46:17,286 [ scc.git] DEBUG Calling 'git remote'
2024-12-07 00:46:17,291 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:46:17,291 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-12-07 00:46:17,291 [ scc.git] DEBUG Calling 'git remote'
2024-12-07 00:46:17,296 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:46:17,296 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-12-07 00:46:17,296 [ scc.git] DEBUG Calling 'git remote'
2024-12-07 00:46:17,300 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:46:17,301 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-12-07 00:46:17,301 [ scc.git] DEBUG Calling 'git remote'
2024-12-07 00:46:17,306 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-07 00:46:17,307 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-12-07 00:46:17,307 [ scc.git] DEBUG Calling 'git remote'
2024-12-07 00:46:17,313 [ 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 5f6bbe5] 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 060a1fb] 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-07 00:47:05,682 [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-07 00:47:14,803 [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-07 00:47:17,084 [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-07 00:47:21,602 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-12-07 00:48:03,857 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/f5fa13f0/images/svgs/logo.svg){kind=logo}
