Console Output
Skipping 112 KB..
Full Logcommits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2024-11-28 10:58:14,170 [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-11-28 10:58:14,693 [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-11-28 10:58:15,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2024-11-28 10:58:15,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/25020d66a7df4ec3cad5967706bb7d13b1493bb5?per_page=1 HTTP/1.1" 200 2
2024-11-28 10:58:15,551 [ scc.repo] DEBUG - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2024-11-28 10:58:16,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/114 HTTP/1.1" 200 None
2024-11-28 10:58:16,075 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-28 10:58:16,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2024-11-28 10:58:17,149 [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-11-28 10:58:17,672 [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-11-28 10:58:18,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2024-11-28 10:58:18,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/cf75d259b2882000d6be73bc1c11c99c27aa439b?per_page=1 HTTP/1.1" 200 2
2024-11-28 10:58:18,635 [ scc.repo] DEBUG - PR 114 dependabot[bot] 'Bump tar and fsevents'
2024-11-28 10:58:19,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/113 HTTP/1.1" 200 None
2024-11-28 10:58:19,125 [ scc.repo] DEBUG # ... Include label: dependencies
2024-11-28 10:58:19,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2024-11-28 10:58:20,203 [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-11-28 10:58:20,684 [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-11-28 10:58:21,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2024-11-28 10:58:21,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/6a657d7a4e0bbfaa3464e851023f29c63db15d4e?per_page=1 HTTP/1.1" 200 2
2024-11-28 10:58:21,566 [ scc.repo] DEBUG - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2024-11-28 10:58:21,566 [ scc.repo] DEBUG ## Branches found:
2024-11-28 10:58:21,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-11-28 10:58:21,566 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:58:21,566 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:58:21,572 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-28 10:58:21,576 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-28 10:58:21,576 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-28 10:58:21,582 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-28 10:58:21,587 [ scc.git] DEBUG Already up to date.
2024-11-28 10:58:21,587 [ scc.git] DEBUG Calling 'git fetch origin pull/113/head'
2024-11-28 10:58:21,964 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-11-28 10:58:21,965 [ scc.git] DEBUG * branch refs/pull/113/head -> FETCH_HEAD
2024-11-28 10:58:21,968 [ scc.git] DEBUG Calling 'git fetch origin pull/114/head'
2024-11-28 10:58:22,245 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-11-28 10:58:22,245 [ scc.git] DEBUG * branch refs/pull/114/head -> FETCH_HEAD
2024-11-28 10:58:22,249 [ scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2024-11-28 10:58:22,555 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-11-28 10:58:22,555 [ scc.git] DEBUG * branch refs/pull/115/head -> FETCH_HEAD
2024-11-28 10:58:22,560 [ scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2024-11-28 10:58:22,863 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-11-28 10:58:22,863 [ scc.git] DEBUG * branch refs/pull/116/head -> FETCH_HEAD
2024-11-28 10:58:22,867 [ scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2024-11-28 10:58:23,155 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-11-28 10:58:23,155 [ scc.git] DEBUG * branch refs/pull/117/head -> FETCH_HEAD
2024-11-28 10:58:23,159 [ scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2024-11-28 10:58:23,488 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-11-28 10:58:23,488 [ scc.git] DEBUG * branch refs/pull/118/head -> FETCH_HEAD
2024-11-28 10:58:23,491 [ scc.git] DEBUG ## Unique users: []
2024-11-28 10:58:23,492 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:58:23,492 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:58:23,496 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2024-11-28 10:58:23,516 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:58:23,520 [ 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-11-28 10:58:23,583 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-28 10:58:23,588 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2024-11-28 10:58:23,588 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2024-11-28 10:58:23,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 10:58:23,726 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2024-11-28 10:58:23,745 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:58:23,750 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2024-11-28 10:58:23,842 [ scc.git] DEBUG Auto-merging package-lock.json
2024-11-28 10:58:23,843 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-28 10:58:23,848 [ scc.git] DEBUG package-lock.json | 625 +++---------------------------------------------------
2024-11-28 10:58:23,848 [ scc.git] DEBUG 1 file changed, 29 insertions(+), 596 deletions(-)
2024-11-28 10:58:24,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 10:58:24,113 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-11-28 10:58:24,131 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:58:24,136 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 115 (Bump micromatch, webpack-cli and webpack) 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-11-28 10:58:24,219 [ scc.git] DEBUG Auto-merging package-lock.json
2024-11-28 10:58:24,219 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2024-11-28 10:58:24,220 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-28 10:58:24,220 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-28 10:58:24,225 [ scc.git] DEBUG Calling 'git reset --hard a9d4af971db40a319c84b5364d401096bb066455'
2024-11-28 10:58:24,232 [ scc.git] DEBUG HEAD is now at a9d4af9 merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2024-11-28 10:58:24,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 10:58:24,507 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-11-28 10:58:24,512 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2024-11-28 10:58:24,517 [ scc.git] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#261](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/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-11-28 10:58:24,521 [ scc.config] DEBUG Found github.token
2024-11-28 10:58:24,522 [ scc.git] DEBUG Not adding comment to issue #115, already --conflicts.
2024-11-28 10:58:24,522 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2024-11-28 10:58:24,590 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:58:24,595 [ 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-11-28 10:58:24,731 [ scc.git] DEBUG Auto-merging package-lock.json
2024-11-28 10:58:24,732 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-28 10:58:24,736 [ scc.git] DEBUG package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2024-11-28 10:58:24,736 [ scc.git] DEBUG 1 file changed, 108 insertions(+), 11 deletions(-)
2024-11-28 10:58:24,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 10:58:24,896 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2024-11-28 10:58:24,912 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:58:24,916 [ 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-11-28 10:58:25,006 [ scc.git] DEBUG Auto-merging package-lock.json
2024-11-28 10:58:25,006 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-28 10:58:25,011 [ scc.git] DEBUG package-lock.json | 6 +++---
2024-11-28 10:58:25,011 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-11-28 10:58:25,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 10:58:25,287 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-11-28 10:58:25,293 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:58:25,298 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 118 (Bump braces, webpack-cli and webpack) 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-11-28 10:58:25,340 [ scc.git] DEBUG Auto-merging package-lock.json
2024-11-28 10:58:25,341 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2024-11-28 10:58:25,341 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-28 10:58:25,341 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-28 10:58:25,346 [ scc.git] DEBUG Calling 'git reset --hard e3f931432717295d0917778f93a6177119aa51e1'
2024-11-28 10:58:25,352 [ scc.git] DEBUG HEAD is now at e3f9314 merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2024-11-28 10:58:25,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 10:58:25,671 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-11-28 10:58:25,676 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2024-11-28 10:58:25,681 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#261](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/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-11-28 10:58:25,685 [ scc.config] DEBUG Found github.token
2024-11-28 10:58:25,686 [ scc.git] DEBUG Adding comment to issue #118.
2024-11-28 10:58:26,479 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 201 2394
2024-11-28 10:58:26,480 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-28 10:58:26,518 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:58:26,519 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:58:26,523 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-28 10:58:26,561 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-28 10:58:26,568 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe319be3f10> has no local changes
2024-11-28 10:58:26,568 [ 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#261 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/)'
2024-11-28 10:58:26,576 [ scc.git] DEBUG [detached HEAD 9d05954] merge master -Dorg -Ssuccess-only
2024-11-28 10:58:26,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 10:58:26,577 [ scc.repo] DEBUG ## PRs found:
2024-11-28 10:58:27,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-11-28 10:58:27,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2024-11-28 10:58:27,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2024-11-28 10:58:28,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-11-28 10:58:28,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-11-28 10:58:29,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-11-28 10:58:30,027 [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-11-28 10:58:30,595 [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-11-28 10:58:31,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-11-28 10:58:31,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-11-28 10:58:31,477 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-11-28 10:58:31,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-11-28 10:58:32,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-11-28 10:58:33,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-11-28 10:58:33,474 [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-11-28 10:58:34,017 [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-11-28 10:58:34,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-11-28 10:58:34,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-11-28 10:58:34,944 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-11-28 10:58:35,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-11-28 10:58:35,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-11-28 10:58:36,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-11-28 10:58:36,896 [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-11-28 10:58:37,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-11-28 10:58:37,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-11-28 10:58:37,720 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-11-28 10:58:37,721 [ scc.repo] DEBUG ## Branches found:
2024-11-28 10:58:37,721 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-11-28 10:58:37,721 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:58:37,721 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:58:37,726 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-28 10:58:37,731 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-28 10:58:37,731 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-28 10:58:37,736 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-28 10:58:37,741 [ scc.git] DEBUG Already up to date.
2024-11-28 10:58:37,742 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-11-28 10:58:39,145 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-28 10:58:39,145 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-11-28 10:58:39,148 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-11-28 10:58:41,135 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-28 10:58:41,135 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-11-28 10:58:41,139 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-11-28 10:58:41,546 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-28 10:58:41,546 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-11-28 10:58:41,550 [ scc.git] DEBUG ## Unique users: []
2024-11-28 10:58:41,550 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:58:41,550 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:58:41,555 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-11-28 10:58:41,562 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:58:41,566 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-11-28 10:58:41,613 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-11-28 10:58:41,614 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-28 10:58:41,617 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-11-28 10:58:41,617 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-11-28 10:58:41,617 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-11-28 10:58:41,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 10:58:41,753 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-11-28 10:58:41,760 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:58:41,764 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-11-28 10:58:42,002 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-11-28 10:58:42,002 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-11-28 10:58:42,002 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-11-28 10:58:42,002 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-11-28 10:58:42,003 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-28 10:58:42,006 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-11-28 10:58:42,007 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-11-28 10:58:42,007 [ scc.git] DEBUG src/app/header.html | 5 +
2024-11-28 10:58:42,007 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-11-28 10:58:42,007 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-11-28 10:58:42,007 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-11-28 10:58:42,007 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-11-28 10:58:42,007 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-11-28 10:58:42,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 10:58:42,156 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-11-28 10:58:42,163 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:58:42,167 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-11-28 10:58:42,203 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-11-28 10:58:42,204 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-28 10:58:42,207 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-11-28 10:58:42,207 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-11-28 10:58:42,207 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-11-28 10:58:42,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 10:58:42,551 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-28 10:58:42,587 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:58:42,588 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:58:42,592 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-28 10:58:42,628 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-28 10:58:42,634 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe3183685e0> has no local changes
2024-11-28 10:58:42,634 [ 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#261 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/)'
2024-11-28 10:58:42,643 [ scc.git] DEBUG [detached HEAD 720fb2f] merge master -Dorg -Ssuccess-only
2024-11-28 10:58:42,643 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 10:58:42,643 [ scc.repo] DEBUG ## PRs found:
2024-11-28 10:58:43,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-11-28 10:58:43,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-11-28 10:58:44,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-11-28 10:58:44,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-11-28 10:58:45,138 [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-11-28 10:58:45,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-11-28 10:58:46,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-11-28 10:58:46,091 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-11-28 10:58:46,091 [ scc.repo] DEBUG ## Branches found:
2024-11-28 10:58:46,091 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-11-28 10:58:46,091 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:58:46,091 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:58:46,097 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-28 10:58:46,101 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-28 10:58:46,102 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-28 10:58:46,107 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-28 10:58:46,112 [ scc.git] DEBUG Already up to date.
2024-11-28 10:58:46,112 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-11-28 10:58:46,535 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-11-28 10:58:46,535 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-11-28 10:58:46,539 [ scc.git] DEBUG ## Unique users: []
2024-11-28 10:58:46,539 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:58:46,539 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:58:46,544 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-11-28 10:58:46,550 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:58:46,554 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-11-28 10:58:46,564 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-28 10:58:46,567 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-11-28 10:58:46,567 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-11-28 10:58:46,567 [ scc.git] DEBUG requirements.txt | 2 +-
2024-11-28 10:58:46,567 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-11-28 10:58:46,567 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-11-28 10:58:46,567 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-11-28 10:58:46,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 10:58:46,724 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-28 10:58:46,763 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:58:46,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:58:46,767 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-28 10:58:46,804 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-28 10:58:46,809 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe318379b50> has no local changes
2024-11-28 10:58:46,810 [ 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#261 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/)'
2024-11-28 10:58:46,818 [ scc.git] DEBUG [detached HEAD 3b8dcc8] merge master -Dorg -Ssuccess-only
2024-11-28 10:58:46,818 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 10:58:46,818 [ scc.repo] DEBUG ## PRs found:
2024-11-28 10:58:47,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-11-28 10:58:47,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/89 HTTP/1.1" 200 None
2024-11-28 10:58:48,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/dfc227486da13c78bc278fc534e59b40cbc97175 HTTP/1.1" 200 None
2024-11-28 10:58:48,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/dfc227486da13c78bc278fc534e59b40cbc97175/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-28 10:58:49,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/dfc227486da13c78bc278fc534e59b40cbc97175/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-28 10:58:49,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/dfc227486da13c78bc278fc534e59b40cbc97175 HTTP/1.1" 200 None
2024-11-28 10:58:50,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/dfc227486da13c78bc278fc534e59b40cbc97175?per_page=1 HTTP/1.1" 200 2
2024-11-28 10:58:50,157 [ scc.repo] DEBUG - PR 89 jburel 'Build'
2024-11-28 10:58:50,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-11-28 10:58:51,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-11-28 10:58:51,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-11-28 10:58:52,185 [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-11-28 10:58:52,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-11-28 10:58:53,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-11-28 10:58:53,130 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-11-28 10:58:53,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-11-28 10:58:54,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-11-28 10:58:54,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-11-28 10:58:55,053 [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-11-28 10:58:55,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-11-28 10:58:55,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-11-28 10:58:55,906 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-11-28 10:58:55,906 [ scc.repo] DEBUG ## Branches found:
2024-11-28 10:58:55,906 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-11-28 10:58:55,906 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:58:55,906 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:58:55,912 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-28 10:58:55,916 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-28 10:58:55,917 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-28 10:58:55,922 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-28 10:58:55,927 [ scc.git] DEBUG Already up to date.
2024-11-28 10:58:55,927 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-11-28 10:58:56,522 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-11-28 10:58:56,522 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-11-28 10:58:56,526 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-11-28 10:58:56,994 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-11-28 10:58:56,994 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-11-28 10:58:56,998 [ scc.git] DEBUG Calling 'git fetch origin pull/89/head'
2024-11-28 10:58:57,497 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-11-28 10:58:57,497 [ scc.git] DEBUG * branch refs/pull/89/head -> FETCH_HEAD
2024-11-28 10:58:57,500 [ scc.git] DEBUG ## Unique users: []
2024-11-28 10:58:57,501 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:58:57,501 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:58:57,505 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-11-28 10:58:57,512 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:58:57,516 [ 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-11-28 10:58:57,842 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-11-28 10:58:57,842 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-11-28 10:58:57,842 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-11-28 10:58:57,842 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-11-28 10:58:57,842 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-28 10:58:57,843 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-28 10:58:57,848 [ scc.git] DEBUG Calling 'git reset --hard fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-11-28 10:58:57,854 [ scc.git] DEBUG HEAD is now at fc20959 Bump version: 0.13.0 → 0.13.1.dev0
2024-11-28 10:58:58,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 10:58:58,001 [ scc.git] DEBUG Calling 'git merge-base fc2095901f5dfd24ecd29a99092283f136de04d5 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-11-28 10:58:58,007 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-11-28 10:58:58,086 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#261](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-11-28 10:58:58,091 [ scc.config] DEBUG Found github.token
2024-11-28 10:58:58,091 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-11-28 10:58:58,091 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-11-28 10:58:58,097 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:58:58,102 [ 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-11-28 10:58:58,150 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-11-28 10:58:58,150 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-11-28 10:58:58,150 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-11-28 10:58:58,150 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-28 10:58:58,151 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-28 10:58:58,156 [ scc.git] DEBUG Calling 'git reset --hard fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-11-28 10:58:58,162 [ scc.git] DEBUG HEAD is now at fc20959 Bump version: 0.13.0 → 0.13.1.dev0
2024-11-28 10:58:58,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 10:58:58,415 [ scc.git] DEBUG Calling 'git merge-base fc2095901f5dfd24ecd29a99092283f136de04d5 78e55539b68e351ed5ef202854718b49a37729a7'
2024-11-28 10:58:58,421 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-11-28 10:58:58,426 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#261](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/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-11-28 10:58:58,431 [ scc.config] DEBUG Found github.token
2024-11-28 10:58:58,431 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-11-28 10:58:58,431 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dfc227486da13c78bc278fc534e59b40cbc97175'
2024-11-28 10:58:58,436 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:58:58,441 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 89 (Build) dfc227486da13c78bc278fc534e59b40cbc97175'
2024-11-28 10:58:58,470 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-28 10:58:58,472 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2024-11-28 10:58:58,472 [ scc.git] DEBUG 1 file changed, 7 insertions(+), 5 deletions(-)
2024-11-28 10:58:58,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 10:58:58,834 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-28 10:58:58,872 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:58:58,872 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:58:58,877 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-28 10:58:58,913 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-28 10:58:58,919 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe3183217c0> has no local changes
2024-11-28 10:58:58,919 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-metadata
Already up to date.
Merged PRs:
- PR 89 jburel 'Build'
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#261 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/)'
2024-11-28 10:58:58,928 [ scc.git] DEBUG [detached HEAD fcba91d] merge master -Dorg -Ssuccess-only
2024-11-28 10:58:58,928 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 10:58:58,928 [ scc.repo] DEBUG ## PRs found:
2024-11-28 10:58:59,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-11-28 10:58:59,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-11-28 10:59:00,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-11-28 10:59:00,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-11-28 10:59:01,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-11-28 10:59:01,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-11-28 10:59:02,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-11-28 10:59:02,444 [ scc.repo] DEBUG ## Branches found:
2024-11-28 10:59:02,445 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-11-28 10:59:02,445 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:02,445 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:02,450 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-28 10:59:02,455 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-28 10:59:02,455 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-28 10:59:02,460 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-28 10:59:02,472 [ scc.git] DEBUG Updating 5d441c2..fb5ae86
2024-11-28 10:59:03,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls/133 HTTP/1.1" 200 None
2024-11-28 10:59:03,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls/129 HTTP/1.1" 200 None
2024-11-28 10:59:04,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls/131 HTTP/1.1" 200 None
2024-11-28 10:59:05,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls/128 HTTP/1.1" 200 None
2024-11-28 10:59:05,139 [ scc.git] DEBUG ## Unique users: []
2024-11-28 10:59:05,139 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:05,139 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:05,144 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-28 10:59:05,182 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:05,182 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:05,187 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-28 10:59:05,223 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-28 10:59:05,229 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe318321640> has no local changes
2024-11-28 10:59:05,229 [ 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)
Updating 5d441c2..fb5ae86
Previously merged:
- PR 133 jburel 'Build'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
Generated by OMERO-plugins-push#261 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/)'
2024-11-28 10:59:05,237 [ scc.git] DEBUG [detached HEAD 3358982] merge master -Dorg -Ssuccess-only
2024-11-28 10:59:05,237 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 10:59:05,237 [ scc.repo] DEBUG ## PRs found:
2024-11-28 10:59:05,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-11-28 10:59:06,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/15 HTTP/1.1" 200 None
2024-11-28 10:59:06,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/b5d953edc0b64a1bba13e9d5d90f3f9e68b7a332 HTTP/1.1" 200 None
2024-11-28 10:59:07,246 [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-11-28 10:59:07,693 [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-11-28 10:59:08,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-11-28 10:59:08,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-11-28 10:59:09,172 [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-11-28 10:59:09,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-11-28 10:59:10,026 [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-11-28 10:59:10,027 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-11-28 10:59:10,027 [ scc.repo] DEBUG ## Branches found:
2024-11-28 10:59:10,027 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-11-28 10:59:10,027 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:10,027 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:10,036 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-28 10:59:10,040 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-28 10:59:10,041 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-28 10:59:10,046 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-28 10:59:10,051 [ scc.git] DEBUG Already up to date.
2024-11-28 10:59:10,051 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-11-28 10:59:10,379 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-11-28 10:59:10,379 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-11-28 10:59:10,384 [ scc.git] DEBUG ## Unique users: []
2024-11-28 10:59:10,384 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:10,384 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:10,389 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-11-28 10:59:10,394 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:10,399 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-11-28 10:59:10,407 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-28 10:59:10,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 10:59:10,550 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-28 10:59:10,587 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:10,587 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:10,592 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-28 10:59:10,629 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-28 10:59:10,634 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe318380ca0> has no local changes
2024-11-28 10:59:10,634 [ 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#261 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/)'
2024-11-28 10:59:10,642 [ scc.git] DEBUG [detached HEAD 54a438f] merge master -Dorg -Ssuccess-only
2024-11-28 10:59:10,642 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 10:59:10,642 [ scc.repo] DEBUG ## PRs found:
2024-11-28 10:59:11,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-11-28 10:59:11,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/29 HTTP/1.1" 200 None
2024-11-28 10:59:13,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24 HTTP/1.1" 200 None
2024-11-28 10:59:13,574 [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-11-28 10:59:14,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24 HTTP/1.1" 200 None
2024-11-28 10:59:14,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24?per_page=1 HTTP/1.1" 200 None
2024-11-28 10:59:14,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24 HTTP/1.1" 200 None
2024-11-28 10:59:15,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24/status HTTP/1.1" 200 None
2024-11-28 10:59:15,459 [ scc.repo] DEBUG - PR 29 jburel 'Build'
2024-11-28 10:59:15,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-11-28 10:59:16,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-11-28 10:59:16,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-11-28 10:59:17,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-11-28 10:59:17,790 [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-11-28 10:59:18,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-11-28 10:59:18,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-11-28 10:59:18,933 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-11-28 10:59:18,933 [ scc.repo] DEBUG ## Branches found:
2024-11-28 10:59:18,933 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-11-28 10:59:18,934 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:18,934 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:18,939 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-28 10:59:18,944 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-28 10:59:18,944 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-28 10:59:18,949 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-28 10:59:18,954 [ scc.git] DEBUG Already up to date.
2024-11-28 10:59:18,954 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-11-28 10:59:19,314 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-11-28 10:59:19,314 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-11-28 10:59:19,318 [ scc.git] DEBUG Calling 'git fetch origin pull/29/head'
2024-11-28 10:59:19,949 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-11-28 10:59:19,950 [ scc.git] DEBUG * branch refs/pull/29/head -> FETCH_HEAD
2024-11-28 10:59:19,954 [ scc.git] DEBUG ## Unique users: []
2024-11-28 10:59:19,954 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:19,954 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:19,960 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-11-28 10:59:19,966 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:19,970 [ 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-11-28 10:59:19,979 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-11-28 10:59:19,980 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-28 10:59:19,982 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-11-28 10:59:19,982 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-11-28 10:59:20,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 10:59:20,124 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24'
2024-11-28 10:59:20,130 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:20,135 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 29 (Build) 92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24'
2024-11-28 10:59:20,218 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-28 10:59:20,220 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-11-28 10:59:20,220 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2024-11-28 10:59:20,220 [ scc.git] DEBUG 2 files changed, 8 insertions(+), 6 deletions(-)
2024-11-28 10:59:20,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 10:59:20,510 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-28 10:59:20,547 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:20,547 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:20,552 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-28 10:59:20,588 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-28 10:59:20,594 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe3183521c0> has no local changes
2024-11-28 10:59:20,595 [ 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#261 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/)'
2024-11-28 10:59:20,603 [ scc.git] DEBUG [detached HEAD 9153ca0] merge master -Dorg -Ssuccess-only
2024-11-28 10:59:20,603 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 10:59:20,603 [ scc.repo] DEBUG ## PRs found:
2024-11-28 10:59:21,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-11-28 10:59:21,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/21 HTTP/1.1" 200 None
2024-11-28 10:59:22,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/d8cd79097b8e36aef506d1589aa1bc281a0fc1b1 HTTP/1.1" 200 None
2024-11-28 10:59:22,662 [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-11-28 10:59:23,113 [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-11-28 10:59:23,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/d8cd79097b8e36aef506d1589aa1bc281a0fc1b1 HTTP/1.1" 200 None
2024-11-28 10:59:23,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/d8cd79097b8e36aef506d1589aa1bc281a0fc1b1?per_page=1 HTTP/1.1" 200 2
2024-11-28 10:59:23,926 [ scc.repo] DEBUG - PR 21 jburel 'Build'
2024-11-28 10:59:24,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-11-28 10:59:24,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-11-28 10:59:25,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-11-28 10:59:25,853 [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-11-28 10:59:26,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-11-28 10:59:26,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-11-28 10:59:26,827 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-11-28 10:59:26,827 [ scc.repo] DEBUG ## Branches found:
2024-11-28 10:59:26,827 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-11-28 10:59:26,827 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:26,827 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:26,833 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-28 10:59:26,837 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-28 10:59:26,837 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-28 10:59:26,842 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-28 10:59:26,847 [ scc.git] DEBUG Already up to date.
2024-11-28 10:59:26,848 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-11-28 10:59:27,194 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-11-28 10:59:27,194 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-11-28 10:59:27,197 [ scc.git] DEBUG Calling 'git fetch origin pull/21/head'
2024-11-28 10:59:27,598 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-11-28 10:59:27,599 [ scc.git] DEBUG * branch refs/pull/21/head -> FETCH_HEAD
2024-11-28 10:59:27,603 [ scc.git] DEBUG ## Unique users: []
2024-11-28 10:59:27,603 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:27,603 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:27,609 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-11-28 10:59:27,614 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:27,619 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-11-28 10:59:27,653 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-11-28 10:59:27,653 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-11-28 10:59:27,653 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-11-28 10:59:27,653 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-11-28 10:59:27,653 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-11-28 10:59:27,653 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-11-28 10:59:27,653 [ scc.git] DEBUG Auto-merging setup.py
2024-11-28 10:59:27,653 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-11-28 10:59:27,654 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-28 10:59:27,654 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-28 10:59:27,659 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-11-28 10:59:27,665 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-11-28 10:59:27,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 10:59:27,804 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-11-28 10:59:27,809 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-11-28 10:59:27,814 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#261](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/views.py
- omero_signup/urls.py
- setup.py
--conflicts
2024-11-28 10:59:27,819 [ scc.config] DEBUG Found github.token
2024-11-28 10:59:27,819 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-11-28 10:59:27,819 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8cd79097b8e36aef506d1589aa1bc281a0fc1b1'
2024-11-28 10:59:27,824 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:27,829 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 21 (Build) d8cd79097b8e36aef506d1589aa1bc281a0fc1b1'
2024-11-28 10:59:27,840 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-28 10:59:27,842 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-11-28 10:59:27,842 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2024-11-28 10:59:27,842 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2024-11-28 10:59:27,842 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2024-11-28 10:59:27,842 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2024-11-28 10:59:28,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 10:59:28,199 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-28 10:59:28,236 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:28,236 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:28,241 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-28 10:59:28,276 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-28 10:59:28,282 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe318352a90> has no local changes
2024-11-28 10:59:28,282 [ 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#261 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/)'
2024-11-28 10:59:28,290 [ scc.git] DEBUG [detached HEAD 232e608] merge master -Dorg -Ssuccess-only
2024-11-28 10:59:28,290 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 10:59:28,290 [ scc.repo] DEBUG ## PRs found:
2024-11-28 10:59:28,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-11-28 10:59:29,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-11-28 10:59:29,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-11-28 10:59:30,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-11-28 10:59:30,679 [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-11-28 10:59:31,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-11-28 10:59:31,568 [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-11-28 10:59:31,568 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-11-28 10:59:31,569 [ scc.repo] DEBUG ## Branches found:
2024-11-28 10:59:31,569 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-11-28 10:59:31,569 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:31,569 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:31,574 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-28 10:59:31,579 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-28 10:59:31,579 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-28 10:59:31,584 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-28 10:59:31,590 [ scc.git] DEBUG Already up to date.
2024-11-28 10:59:31,590 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-11-28 10:59:32,061 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-11-28 10:59:32,061 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-11-28 10:59:32,065 [ scc.git] DEBUG ## Unique users: []
2024-11-28 10:59:32,065 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:32,066 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:32,070 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-11-28 10:59:32,077 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:32,081 [ 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-11-28 10:59:32,120 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-28 10:59:32,123 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-11-28 10:59:32,123 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-11-28 10:59:32,123 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-11-28 10:59:32,123 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-11-28 10:59:32,123 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-11-28 10:59:32,123 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-11-28 10:59:32,123 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-11-28 10:59:32,125 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-11-28 10:59:32,125 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-11-28 10:59:32,125 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-11-28 10:59:32,125 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-11-28 10:59:32,125 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-11-28 10:59:32,125 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-11-28 10:59:32,125 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-11-28 10:59:32,125 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-11-28 10:59:32,125 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-11-28 10:59:32,125 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-11-28 10:59:32,125 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-11-28 10:59:32,125 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-11-28 10:59:32,125 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-11-28 10:59:32,125 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-11-28 10:59:32,126 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-11-28 10:59:32,126 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-11-28 10:59:32,126 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-11-28 10:59:32,126 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-11-28 10:59:32,126 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-11-28 10:59:32,126 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-11-28 10:59:32,126 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-11-28 10:59:32,126 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-11-28 10:59:32,126 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-11-28 10:59:32,126 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-11-28 10:59:32,126 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-11-28 10:59:32,126 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-11-28 10:59:32,126 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-11-28 10:59:32,126 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-11-28 10:59:32,126 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-11-28 10:59:32,126 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-11-28 10:59:32,126 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-11-28 10:59:32,126 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-11-28 10:59:32,126 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-11-28 10:59:32,126 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-11-28 10:59:32,126 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-11-28 10:59:32,126 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-11-28 10:59:32,126 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-11-28 10:59:32,126 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-11-28 10:59:32,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 10:59:32,274 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-28 10:59:32,311 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:32,311 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:32,316 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-28 10:59:32,351 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-28 10:59:32,357 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe31834a760> has no local changes
2024-11-28 10:59:32,357 [ 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#261 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/)'
2024-11-28 10:59:32,366 [ scc.git] DEBUG [detached HEAD 8448c0a] merge master -Dorg -Ssuccess-only
2024-11-28 10:59:32,366 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 10:59:32,366 [ scc.repo] DEBUG ## PRs found:
2024-11-28 10:59:32,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-11-28 10:59:32,685 [ scc.repo] DEBUG ## Branches found:
2024-11-28 10:59:32,685 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-11-28 10:59:32,685 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:32,685 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:32,689 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-28 10:59:32,694 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-28 10:59:32,694 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-28 10:59:32,699 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-28 10:59:32,707 [ scc.git] DEBUG Updating aca9e9c..100f6ae
2024-11-28 10:59:33,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls/13 HTTP/1.1" 200 None
2024-11-28 10:59:33,326 [ scc.git] DEBUG ## Unique users: []
2024-11-28 10:59:33,327 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:33,327 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:33,331 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-28 10:59:33,369 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:33,370 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:33,374 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-28 10:59:33,411 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-28 10:59:33,417 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe318393c10> has no local changes
2024-11-28 10:59:33,417 [ 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#261 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/)'
2024-11-28 10:59:33,425 [ scc.git] DEBUG [detached HEAD fcda09d] merge master -Dorg -Ssuccess-only
2024-11-28 10:59:33,425 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 10:59:33,426 [ scc.repo] DEBUG ## PRs found:
2024-11-28 10:59:33,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2024-11-28 10:59:34,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2024-11-28 10:59:34,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2024-11-28 10:59:35,461 [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-11-28 10:59:35,963 [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-11-28 10:59:36,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2024-11-28 10:59:36,914 [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-11-28 10:59:36,915 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2024-11-28 10:59:36,915 [ scc.repo] DEBUG ## Branches found:
2024-11-28 10:59:36,915 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-11-28 10:59:36,915 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:36,915 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:36,920 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-28 10:59:36,925 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-28 10:59:36,925 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-28 10:59:36,930 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-28 10:59:36,935 [ scc.git] DEBUG Already up to date.
2024-11-28 10:59:36,935 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2024-11-28 10:59:37,409 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2024-11-28 10:59:37,410 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2024-11-28 10:59:37,414 [ scc.git] DEBUG ## Unique users: []
2024-11-28 10:59:37,414 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:37,415 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:37,420 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2024-11-28 10:59:37,426 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:37,430 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2024-11-28 10:59:37,537 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-28 10:59:37,539 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-11-28 10:59:37,539 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2024-11-28 10:59:37,539 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2024-11-28 10:59:37,539 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2024-11-28 10:59:37,539 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2024-11-28 10:59:37,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 10:59:37,677 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-28 10:59:37,713 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:37,713 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:37,718 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-28 10:59:37,755 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-28 10:59:37,760 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe31833ff70> has no local changes
2024-11-28 10:59:37,760 [ 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#261 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/)'
2024-11-28 10:59:37,768 [ scc.git] DEBUG [detached HEAD 4591655] merge master -Dorg -Ssuccess-only
2024-11-28 10:59:37,768 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 10:59:37,769 [ scc.git] INFO Overriding base-branch from master to main
2024-11-28 10:59:37,769 [ scc.repo] DEBUG ## PRs found:
2024-11-28 10:59:38,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-11-28 10:59:38,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2024-11-28 10:59:39,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2024-11-28 10:59:39,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2024-11-28 10:59:40,138 [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-11-28 10:59:40,585 [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-11-28 10:59:41,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/17 HTTP/1.1" 200 None
2024-11-28 10:59:41,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/17/comments HTTP/1.1" 200 None
2024-11-28 10:59:42,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/020e85775bda54e9136b3fb9e699411e0d4f8c95 HTTP/1.1" 200 None
2024-11-28 10:59:42,525 [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-11-28 10:59:42,977 [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-11-28 10:59:43,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-11-28 10:59:43,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-11-28 10:59:44,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-11-28 10:59:44,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-11-28 10:59:45,451 [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-11-28 10:59:46,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-11-28 10:59:46,432 [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-11-28 10:59:46,432 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-11-28 10:59:46,433 [ scc.repo] DEBUG ## Branches found:
2024-11-28 10:59:46,433 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-11-28 10:59:46,433 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:46,433 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:46,438 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-11-28 10:59:46,443 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-28 10:59:46,443 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-11-28 10:59:46,448 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-11-28 10:59:46,454 [ scc.git] DEBUG Already up to date.
2024-11-28 10:59:46,455 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-11-28 10:59:46,836 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-11-28 10:59:46,836 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-11-28 10:59:46,840 [ scc.git] DEBUG ## Unique users: []
2024-11-28 10:59:46,840 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:46,840 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:46,845 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-11-28 10:59:46,850 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:46,856 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-11-28 10:59:46,954 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-11-28 10:59:46,954 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-11-28 10:59:46,954 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-28 10:59:46,955 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-28 10:59:46,959 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-11-28 10:59:46,965 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-11-28 10:59:47,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 10:59:47,114 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-11-28 10:59:47,119 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-11-28 10:59:47,124 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#261](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-11-28 10:59:47,128 [ scc.config] DEBUG Found github.token
2024-11-28 10:59:47,129 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-11-28 10:59:47,129 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-28 10:59:47,165 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:47,166 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:47,170 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-28 10:59:47,206 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-28 10:59:47,211 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe3182ebbb0> has no local changes
2024-11-28 10:59:47,211 [ 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#261 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/)'
2024-11-28 10:59:47,219 [ scc.git] DEBUG [detached HEAD a0bba3a] merge master -Dorg -Ssuccess-only
2024-11-28 10:59:47,219 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 10:59:47,219 [ scc.repo] DEBUG ## PRs found:
2024-11-28 10:59:47,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-11-28 10:59:47,553 [ scc.repo] DEBUG ## Branches found:
2024-11-28 10:59:47,553 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-11-28 10:59:47,553 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:47,553 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:47,557 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-28 10:59:47,562 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-28 10:59:47,562 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-28 10:59:47,567 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-28 10:59:47,576 [ scc.git] DEBUG Updating adfa132..70b01ed
2024-11-28 10:59:48,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls/24 HTTP/1.1" 200 None
2024-11-28 10:59:48,327 [ scc.git] DEBUG ## Unique users: []
2024-11-28 10:59:48,327 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:48,327 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:48,331 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-28 10:59:48,368 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:48,368 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:48,373 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-28 10:59:48,408 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-28 10:59:48,414 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe3182c1b80> has no local changes
2024-11-28 10:59:48,414 [ 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#261 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/)'
2024-11-28 10:59:48,421 [ scc.git] DEBUG [detached HEAD 8f9aa5a] merge master -Dorg -Ssuccess-only
2024-11-28 10:59:48,422 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 10:59:48,422 [ scc.repo] DEBUG ## PRs found:
2024-11-28 10:59:48,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-11-28 10:59:48,739 [ scc.repo] DEBUG ## Branches found:
2024-11-28 10:59:48,739 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-11-28 10:59:48,739 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:48,739 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:48,744 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-28 10:59:48,748 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-28 10:59:48,748 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-28 10:59:48,753 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-28 10:59:48,762 [ scc.git] DEBUG Updating 8da48e1..5bfef29
2024-11-28 10:59:49,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls/36 HTTP/1.1" 200 None
2024-11-28 10:59:49,410 [ scc.git] DEBUG ## Unique users: []
2024-11-28 10:59:49,410 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:49,410 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:49,415 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-28 10:59:49,451 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:49,451 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:49,456 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-28 10:59:49,492 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-28 10:59:49,497 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe3182658b0> has no local changes
2024-11-28 10:59:49,497 [ 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#261 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/)'
2024-11-28 10:59:49,505 [ scc.git] DEBUG [detached HEAD 71cf10b] merge master -Dorg -Ssuccess-only
2024-11-28 10:59:49,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 10:59:49,505 [ scc.repo] DEBUG ## PRs found:
2024-11-28 10:59:49,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-11-28 10:59:50,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-11-28 10:59:50,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-11-28 10:59:51,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-11-28 10:59:51,895 [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-11-28 10:59:52,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-11-28 10:59:52,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-11-28 10:59:52,743 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-11-28 10:59:52,743 [ scc.repo] DEBUG ## Branches found:
2024-11-28 10:59:52,744 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-11-28 10:59:52,744 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:52,744 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:52,749 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-28 10:59:52,754 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-28 10:59:52,754 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-28 10:59:52,759 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-28 10:59:52,764 [ scc.git] DEBUG Already up to date.
2024-11-28 10:59:52,764 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-11-28 10:59:53,080 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-11-28 10:59:53,080 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-11-28 10:59:53,084 [ scc.git] DEBUG ## Unique users: []
2024-11-28 10:59:53,084 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:53,084 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:53,089 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-11-28 10:59:53,094 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:53,099 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-11-28 10:59:53,114 [ scc.git] DEBUG Auto-merging Dockerfile
2024-11-28 10:59:53,114 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-11-28 10:59:53,114 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-28 10:59:53,115 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-28 10:59:53,120 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-11-28 10:59:53,126 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-11-28 10:59:53,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 10:59:53,274 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-11-28 10:59:53,279 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-11-28 10:59:53,284 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#261](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-11-28 10:59:53,289 [ scc.config] DEBUG Found github.token
2024-11-28 10:59:53,289 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-11-28 10:59:53,289 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-28 10:59:53,325 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 10:59:53,325 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 10:59:53,330 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-28 10:59:53,365 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-28 10:59:53,371 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe3182655b0> has no local changes
2024-11-28 10:59:53,371 [ 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#261 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/)'
2024-11-28 10:59:53,379 [ scc.git] DEBUG [detached HEAD 7490d04] merge master -Dorg -Ssuccess-only
2024-11-28 10:59:53,380 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 10:59:53,380 [ scc.git] INFO Overriding base-branch from master to develop
2024-11-28 10:59:53,380 [ scc.repo] DEBUG ## PRs found:
2024-11-28 10:59:53,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-11-28 10:59:54,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-11-28 10:59:54,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2024-11-28 10:59:55,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-28 10:59:55,947 [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-11-28 10:59:56,433 [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-11-28 10:59:56,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-28 10:59:57,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2024-11-28 10:59:57,360 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-28 10:59:57,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-11-28 10:59:58,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-11-28 10:59:58,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/4865545/issues/216/comments?page=2 HTTP/1.1" 200 None
2024-11-28 10:59:59,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-11-28 10:59:59,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-11-28 11:00:00,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-11-28 11:00:00,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-11-28 11:00:01,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-28 11:00:01,934 [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-11-28 11:00:02,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-28 11:00:02,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-11-28 11:00:02,874 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-28 11:00:03,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-11-28 11:00:03,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-11-28 11:00:04,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-11-28 11:00:04,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-11-28 11:00:04,949 [ scc.repo] DEBUG ## Branches found:
2024-11-28 11:00:04,949 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-11-28 11:00:04,949 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 11:00:04,949 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 11:00:04,955 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-11-28 11:00:04,960 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-28 11:00:04,960 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-11-28 11:00:04,965 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-11-28 11:00:04,970 [ scc.git] DEBUG Already up to date.
2024-11-28 11:00:04,970 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-11-28 11:00:05,567 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-11-28 11:00:05,568 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-11-28 11:00:05,572 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-11-28 11:00:06,007 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-11-28 11:00:06,008 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-11-28 11:00:06,012 [ scc.git] DEBUG ## Unique users: []
2024-11-28 11:00:06,012 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 11:00:06,012 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 11:00:06,018 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-28 11:00:06,024 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 11:00:06,029 [ 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-11-28 11:00:06,109 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-11-28 11:00:06,109 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-11-28 11:00:06,110 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-28 11:00:06,110 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-28 11:00:06,115 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-28 11:00:06,121 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-11-28 11:00:06,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 11:00:06,262 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-28 11:00:06,268 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-28 11:00:06,273 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#261](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-11-28 11:00:06,277 [ scc.config] DEBUG Found github.token
2024-11-28 11:00:06,278 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-11-28 11:00:06,278 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-11-28 11:00:06,283 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 11:00:06,288 [ 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-11-28 11:00:06,311 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-28 11:00:06,313 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-11-28 11:00:06,313 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-11-28 11:00:06,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 11:00:06,664 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-28 11:00:06,701 [ scc.git] DEBUG Get sha1 of %s
2024-11-28 11:00:06,702 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-28 11:00:06,706 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-28 11:00:06,742 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-28 11:00:06,748 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe31830bf10> has no local changes
2024-11-28 11:00:06,748 [ 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#261 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/)'
2024-11-28 11:00:06,756 [ scc.git] DEBUG [detached HEAD 6dc33dc] merge master -Dorg -Ssuccess-only
2024-11-28 11:00:06,757 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 11:00:06,757 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-28 11:00:06,827 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-11-28 11:00:07,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 11:00:07,090 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-11-28 11:00:07,095 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-11-28 11:00:07,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 11:00:07,473 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-11-28 11:00:07,478 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-11-28 11:00:07,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 11:00:07,878 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-11-28 11:00:07,882 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-11-28 11:00:08,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 11:00:08,279 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-11-28 11:00:08,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 11:00:08,715 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-11-28 11:00:08,720 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-11-28 11:00:09,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 11:00:09,116 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-11-28 11:00:09,120 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-11-28 11:00:09,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 11:00:09,518 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-11-28 11:00:09,522 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-11-28 11:00:09,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 11:00:09,914 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-11-28 11:00:09,919 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-11-28 11:00:10,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 11:00:10,304 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-11-28 11:00:10,309 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-11-28 11:00:10,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 11:00:10,698 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-11-28 11:00:10,703 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-11-28 11:00:11,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 11:00:11,098 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-11-28 11:00:11,103 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-11-28 11:00:11,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 11:00:11,491 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-11-28 11:00:11,495 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-11-28 11:00:11,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 11:00:11,891 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-11-28 11:00:12,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 11:00:12,317 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-11-28 11:00:12,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 11:00:12,742 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-11-28 11:00:12,746 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-11-28 11:00:13,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 11:00:13,153 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-11-28 11:00:13,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 11:00:13,551 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-11-28 11:00:13,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 11:00:13,947 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-11-28 11:00:13,951 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-11-28 11:00:14,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 11:00:14,342 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-11-28 11:00:14,346 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-11-28 11:00:14,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 11:00:14,726 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-11-28 11:00:14,731 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-11-28 11:00:15,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 11:00:15,141 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-11-28 11:00:15,145 [ scc.config] DEBUG Found submodule.scripts.url
2024-11-28 11:00:15,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-28 11:00:15,528 [ scc.config] DEBUG Found submodule.scripts.branch
2024-11-28 11:00:15,528 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-28 11:00:15,603 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe31d033e20> has local changes
2024-11-28 11:00:15,604 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 406 dependabot[bot] 'Bump omero-iviewer from `a8f380f` to `b4102d4`'
- PR 407 dependabot[bot] 'Bump omero-gallery from `56f4435` to `2a621da`'
- PR 408 dependabot[bot] 'Bump omero-cli-render from `173cac0` to `c0517ed`'
- PR 409 dependabot[bot] 'Bump omero-mapr from `3a505e4` to `0a557da`'
- PR 410 dependabot[bot] 'Bump omero-figure from `24444fe` to `1c67437`'
Repository: ome/minimal-omero-client
Updating 4628e82..ca8c2ea
Previously merged:
- PR 67 jburel 'Gateway 5.10.0'
- PR 68 jburel 'Bump action '
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Updating 027b3e6..4777ef8
Previously merged:
- PR 27 jburel 'Build'
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 59 will-moore 'Apply settings to Plate' (status: failure)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Updating 9b73dd9..11d3587
Previously merged:
- PR 165 jburel 'Build'
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 595 Rdornier 'Rotate image panel by 90°'
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.
Merged PRs:
- PR 89 jburel 'Build'
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)
Updating 5d441c2..fb5ae86
Previously merged:
- PR 133 jburel 'Build'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
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#261 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/261/)'
2024-11-28 11:00:15,617 [ scc.git] DEBUG [detached HEAD f19822a] merge master -Dorg -Ssuccess-only
2024-11-28 11:00:15,617 [ scc.merge] INFO Repository: ome/omero-plugins
2024-11-28 11:00:15,617 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-11-28 11:00:15,617 [ scc.merge] INFO Already up to date.
2024-11-28 11:00:15,617 [ scc.merge] INFO
2024-11-28 11:00:15,617 [ scc.merge] INFO Merged PRs:
2024-11-28 11:00:15,617 [ scc.merge] INFO - PR 406 dependabot[bot] 'Bump omero-iviewer from `a8f380f` to `b4102d4`'
2024-11-28 11:00:15,617 [ scc.merge] INFO - PR 407 dependabot[bot] 'Bump omero-gallery from `56f4435` to `2a621da`'
2024-11-28 11:00:15,617 [ scc.merge] INFO - PR 408 dependabot[bot] 'Bump omero-cli-render from `173cac0` to `c0517ed`'
2024-11-28 11:00:15,617 [ scc.merge] INFO - PR 409 dependabot[bot] 'Bump omero-mapr from `3a505e4` to `0a557da`'
2024-11-28 11:00:15,617 [ scc.merge] INFO - PR 410 dependabot[bot] 'Bump omero-figure from `24444fe` to `1c67437`'
2024-11-28 11:00:15,618 [ scc.merge] INFO
2024-11-28 11:00:15,618 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-11-28 11:00:15,618 [ scc.merge] INFO Updating 4628e82..ca8c2ea
2024-11-28 11:00:15,618 [ scc.merge] INFO Previously merged:
2024-11-28 11:00:15,618 [ scc.merge] INFO - PR 67 jburel 'Gateway 5.10.0'
2024-11-28 11:00:15,618 [ scc.merge] INFO - PR 68 jburel 'Bump action '
2024-11-28 11:00:15,618 [ scc.merge] INFO
2024-11-28 11:00:15,618 [ scc.merge] INFO
2024-11-28 11:00:15,618 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-11-28 11:00:15,618 [ scc.merge] INFO Excluded PRs:
2024-11-28 11:00:15,618 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-11-28 11:00:15,618 [ scc.merge] INFO Updating 027b3e6..4777ef8
2024-11-28 11:00:15,618 [ scc.merge] INFO Previously merged:
2024-11-28 11:00:15,618 [ scc.merge] INFO - PR 27 jburel 'Build'
2024-11-28 11:00:15,618 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-11-28 11:00:15,618 [ scc.merge] INFO
2024-11-28 11:00:15,618 [ scc.merge] INFO
2024-11-28 11:00:15,618 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-11-28 11:00:15,618 [ scc.merge] INFO Excluded PRs:
2024-11-28 11:00:15,618 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-11-28 11:00:15,618 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate' (status: failure)
2024-11-28 11:00:15,618 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-11-28 11:00:15,618 [ scc.merge] INFO Already up to date.
2024-11-28 11:00:15,618 [ scc.merge] INFO
2024-11-28 11:00:15,618 [ scc.merge] INFO
2024-11-28 11:00:15,618 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-11-28 11:00:15,618 [ scc.merge] INFO Excluded PRs:
2024-11-28 11:00:15,618 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-11-28 11:00:15,618 [ scc.merge] INFO Updating 9b73dd9..11d3587
2024-11-28 11:00:15,618 [ scc.merge] INFO Previously merged:
2024-11-28 11:00:15,618 [ scc.merge] INFO - PR 165 jburel 'Build'
2024-11-28 11:00:15,618 [ scc.merge] INFO
2024-11-28 11:00:15,618 [ scc.merge] INFO Merged PRs:
2024-11-28 11:00:15,618 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-11-28 11:00:15,618 [ scc.merge] INFO
2024-11-28 11:00:15,618 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-28 11:00:15,618 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-11-28 11:00:15,619 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-11-28 11:00:15,619 [ scc.merge] INFO
2024-11-28 11:00:15,619 [ scc.merge] INFO Repository: ome/omero-figure
2024-11-28 11:00:15,619 [ scc.merge] INFO Excluded PRs:
2024-11-28 11:00:15,619 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (user: Rdornier)
2024-11-28 11:00:15,619 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-11-28 11:00:15,619 [ scc.merge] INFO Already up to date.
2024-11-28 11:00:15,619 [ scc.merge] INFO
2024-11-28 11:00:15,619 [ scc.merge] INFO Merged PRs:
2024-11-28 11:00:15,619 [ scc.merge] INFO - PR 592 will-moore 'Filter owners and groups dropdown lists'
2024-11-28 11:00:15,619 [ scc.merge] INFO - PR 595 Rdornier 'Rotate image panel by 90°'
2024-11-28 11:00:15,619 [ scc.merge] INFO
2024-11-28 11:00:15,619 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-11-28 11:00:15,619 [ scc.merge] INFO Updating e5b3ca3..3b6c05a
2024-11-28 11:00:15,619 [ scc.merge] INFO Previously merged:
2024-11-28 11:00:15,619 [ scc.merge] INFO - PR 30 jburel 'Build'
2024-11-28 11:00:15,619 [ scc.merge] INFO
2024-11-28 11:00:15,619 [ scc.merge] INFO Merged PRs:
2024-11-28 11:00:15,619 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-11-28 11:00:15,619 [ scc.merge] INFO
2024-11-28 11:00:15,619 [ scc.merge] INFO Repository: ome/omero-gallery
2024-11-28 11:00:15,619 [ scc.merge] INFO Already up to date.
2024-11-28 11:00:15,619 [ scc.merge] INFO
2024-11-28 11:00:15,619 [ scc.merge] INFO Merged PRs:
2024-11-28 11:00:15,619 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2024-11-28 11:00:15,619 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2024-11-28 11:00:15,619 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2024-11-28 11:00:15,619 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2024-11-28 11:00:15,619 [ scc.merge] INFO
2024-11-28 11:00:15,619 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-28 11:00:15,619 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2024-11-28 11:00:15,619 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2024-11-28 11:00:15,619 [ scc.merge] INFO
2024-11-28 11:00:15,619 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-11-28 11:00:15,619 [ scc.merge] INFO Excluded PRs:
2024-11-28 11:00:15,619 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2024-11-28 11:00:15,619 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-11-28 11:00:15,619 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-11-28 11:00:15,620 [ scc.merge] INFO Already up to date.
2024-11-28 11:00:15,620 [ scc.merge] INFO
2024-11-28 11:00:15,620 [ scc.merge] INFO Merged PRs:
2024-11-28 11:00:15,620 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-11-28 11:00:15,620 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-11-28 11:00:15,620 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-11-28 11:00:15,620 [ scc.merge] INFO
2024-11-28 11:00:15,620 [ scc.merge] INFO Repository: ome/omero-mapr
2024-11-28 11:00:15,620 [ scc.merge] INFO Excluded PRs:
2024-11-28 11:00:15,620 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-11-28 11:00:15,620 [ scc.merge] INFO Already up to date.
2024-11-28 11:00:15,620 [ scc.merge] INFO
2024-11-28 11:00:15,620 [ scc.merge] INFO Merged PRs:
2024-11-28 11:00:15,620 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-11-28 11:00:15,620 [ scc.merge] INFO
2024-11-28 11:00:15,620 [ scc.merge] INFO Repository: ome/omero-metadata
2024-11-28 11:00:15,620 [ scc.merge] INFO Already up to date.
2024-11-28 11:00:15,620 [ scc.merge] INFO
2024-11-28 11:00:15,620 [ scc.merge] INFO Merged PRs:
2024-11-28 11:00:15,620 [ scc.merge] INFO - PR 89 jburel 'Build'
2024-11-28 11:00:15,620 [ scc.merge] INFO
2024-11-28 11:00:15,620 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-28 11:00:15,620 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-11-28 11:00:15,620 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-11-28 11:00:15,620 [ scc.merge] INFO
2024-11-28 11:00:15,620 [ scc.merge] INFO Repository: ome/omero-parade
2024-11-28 11:00:15,620 [ scc.merge] INFO Excluded PRs:
2024-11-28 11:00:15,620 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-11-28 11:00:15,620 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-11-28 11:00:15,620 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-11-28 11:00:15,620 [ scc.merge] INFO Updating 5d441c2..fb5ae86
2024-11-28 11:00:15,620 [ scc.merge] INFO Previously merged:
2024-11-28 11:00:15,620 [ scc.merge] INFO - PR 133 jburel 'Build'
2024-11-28 11:00:15,620 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-11-28 11:00:15,620 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-11-28 11:00:15,620 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-11-28 11:00:15,620 [ scc.merge] INFO
2024-11-28 11:00:15,620 [ scc.merge] INFO
2024-11-28 11:00:15,621 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-11-28 11:00:15,621 [ scc.merge] INFO Excluded PRs:
2024-11-28 11:00:15,621 [ scc.merge] INFO - PR 15 jburel 'Build' (status: failure)
2024-11-28 11:00:15,621 [ scc.merge] INFO Already up to date.
2024-11-28 11:00:15,621 [ scc.merge] INFO
2024-11-28 11:00:15,621 [ scc.merge] INFO Merged PRs:
2024-11-28 11:00:15,621 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-11-28 11:00:15,621 [ scc.merge] INFO
2024-11-28 11:00:15,621 [ scc.merge] INFO Repository: ome/omero-rois
2024-11-28 11:00:15,621 [ scc.merge] INFO Excluded PRs:
2024-11-28 11:00:15,621 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-11-28 11:00:15,621 [ scc.merge] INFO Already up to date.
2024-11-28 11:00:15,621 [ scc.merge] INFO
2024-11-28 11:00:15,621 [ scc.merge] INFO Merged PRs:
2024-11-28 11:00:15,621 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-11-28 11:00:15,621 [ scc.merge] INFO - PR 29 jburel 'Build'
2024-11-28 11:00:15,621 [ scc.merge] INFO
2024-11-28 11:00:15,621 [ scc.merge] INFO Repository: ome/omero-signup
2024-11-28 11:00:15,621 [ scc.merge] INFO Already up to date.
2024-11-28 11:00:15,621 [ scc.merge] INFO
2024-11-28 11:00:15,621 [ scc.merge] INFO Merged PRs:
2024-11-28 11:00:15,621 [ scc.merge] INFO - PR 21 jburel 'Build'
2024-11-28 11:00:15,621 [ scc.merge] INFO
2024-11-28 11:00:15,621 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-28 11:00:15,621 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-11-28 11:00:15,621 [ scc.merge] INFO
2024-11-28 11:00:15,621 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-11-28 11:00:15,621 [ scc.merge] INFO Already up to date.
2024-11-28 11:00:15,621 [ scc.merge] INFO
2024-11-28 11:00:15,621 [ scc.merge] INFO Merged PRs:
2024-11-28 11:00:15,621 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-11-28 11:00:15,621 [ scc.merge] INFO
2024-11-28 11:00:15,621 [ scc.merge] INFO Repository: ome/omero-upload
2024-11-28 11:00:15,621 [ scc.merge] INFO Updating aca9e9c..100f6ae
2024-11-28 11:00:15,621 [ scc.merge] INFO Previously merged:
2024-11-28 11:00:15,621 [ scc.merge] INFO - PR 13 jburel 'Build'
2024-11-28 11:00:15,621 [ scc.merge] INFO
2024-11-28 11:00:15,622 [ scc.merge] INFO
2024-11-28 11:00:15,622 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-11-28 11:00:15,622 [ scc.merge] INFO Already up to date.
2024-11-28 11:00:15,622 [ scc.merge] INFO
2024-11-28 11:00:15,622 [ scc.merge] INFO Merged PRs:
2024-11-28 11:00:15,622 [ scc.merge] INFO - PR 20 jburel 'Build'
2024-11-28 11:00:15,622 [ scc.merge] INFO
2024-11-28 11:00:15,622 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-11-28 11:00:15,622 [ scc.merge] INFO Excluded PRs:
2024-11-28 11:00:15,622 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2024-11-28 11:00:15,622 [ scc.merge] INFO - PR 17 jburel 'Build' (status: failure)
2024-11-28 11:00:15,622 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-11-28 11:00:15,622 [ scc.merge] INFO Already up to date.
2024-11-28 11:00:15,622 [ scc.merge] INFO
2024-11-28 11:00:15,622 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-28 11:00:15,622 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-11-28 11:00:15,622 [ scc.merge] INFO
2024-11-28 11:00:15,622 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-11-28 11:00:15,622 [ scc.merge] INFO Updating adfa132..70b01ed
2024-11-28 11:00:15,622 [ scc.merge] INFO Previously merged:
2024-11-28 11:00:15,622 [ scc.merge] INFO - PR 24 jburel 'Build'
2024-11-28 11:00:15,622 [ scc.merge] INFO
2024-11-28 11:00:15,622 [ scc.merge] INFO
2024-11-28 11:00:15,622 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-11-28 11:00:15,622 [ scc.merge] INFO Updating 8da48e1..5bfef29
2024-11-28 11:00:15,622 [ scc.merge] INFO Previously merged:
2024-11-28 11:00:15,622 [ scc.merge] INFO - PR 36 jburel 'Build'
2024-11-28 11:00:15,622 [ scc.merge] INFO
2024-11-28 11:00:15,622 [ scc.merge] INFO
2024-11-28 11:00:15,622 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-11-28 11:00:15,622 [ scc.merge] INFO Already up to date.
2024-11-28 11:00:15,622 [ scc.merge] INFO
2024-11-28 11:00:15,622 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-28 11:00:15,622 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-11-28 11:00:15,622 [ scc.merge] INFO
2024-11-28 11:00:15,622 [ scc.merge] INFO Repository: ome/scripts
2024-11-28 11:00:15,622 [ scc.merge] INFO Excluded PRs:
2024-11-28 11:00:15,622 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-11-28 11:00:15,623 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-11-28 11:00:15,623 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-11-28 11:00:15,623 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-11-28 11:00:15,623 [ scc.merge] INFO Already up to date.
2024-11-28 11:00:15,623 [ scc.merge] INFO
2024-11-28 11:00:15,623 [ scc.merge] INFO Merged PRs:
2024-11-28 11:00:15,623 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-28 11:00:15,623 [ scc.merge] INFO
2024-11-28 11:00:15,623 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-28 11:00:15,623 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-28 11:00:15,623 [ scc.merge] INFO
2024-11-28 11:00:15,623 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-11-28 11:00:15,623 [ scc.git] DEBUG Calling 'git remote'
2024-11-28 11:00:15,627 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-11-28 11:00:15,628 [ scc.git] DEBUG Calling 'git remote'
2024-11-28 11:00:15,632 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 11:00:15,632 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-11-28 11:00:15,632 [ scc.git] DEBUG Calling 'git remote'
2024-11-28 11:00:15,637 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 11:00:15,637 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-11-28 11:00:15,637 [ scc.git] DEBUG Calling 'git remote'
2024-11-28 11:00:15,641 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 11:00:15,642 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-11-28 11:00:15,642 [ scc.git] DEBUG Calling 'git remote'
2024-11-28 11:00:15,646 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 11:00:15,646 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-11-28 11:00:15,646 [ scc.git] DEBUG Calling 'git remote'
2024-11-28 11:00:15,651 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 11:00:15,651 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-11-28 11:00:15,651 [ scc.git] DEBUG Calling 'git remote'
2024-11-28 11:00:15,655 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 11:00:15,656 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-11-28 11:00:15,656 [ scc.git] DEBUG Calling 'git remote'
2024-11-28 11:00:15,660 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 11:00:15,660 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-11-28 11:00:15,661 [ scc.git] DEBUG Calling 'git remote'
2024-11-28 11:00:15,665 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 11:00:15,665 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-11-28 11:00:15,665 [ scc.git] DEBUG Calling 'git remote'
2024-11-28 11:00:15,670 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 11:00:15,670 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-11-28 11:00:15,670 [ scc.git] DEBUG Calling 'git remote'
2024-11-28 11:00:15,674 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 11:00:15,675 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-11-28 11:00:15,675 [ scc.git] DEBUG Calling 'git remote'
2024-11-28 11:00:15,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 11:00:15,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-11-28 11:00:15,679 [ scc.git] DEBUG Calling 'git remote'
2024-11-28 11:00:15,684 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 11:00:15,684 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-11-28 11:00:15,684 [ scc.git] DEBUG Calling 'git remote'
2024-11-28 11:00:15,688 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 11:00:15,688 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-11-28 11:00:15,689 [ scc.git] DEBUG Calling 'git remote'
2024-11-28 11:00:15,693 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 11:00:15,693 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-11-28 11:00:15,693 [ scc.git] DEBUG Calling 'git remote'
2024-11-28 11:00:15,698 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 11:00:15,698 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-11-28 11:00:15,698 [ scc.git] DEBUG Calling 'git remote'
2024-11-28 11:00:15,703 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 11:00:15,703 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-11-28 11:00:15,703 [ scc.git] DEBUG Calling 'git remote'
2024-11-28 11:00:15,707 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 11:00:15,708 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-11-28 11:00:15,708 [ scc.git] DEBUG Calling 'git remote'
2024-11-28 11:00:15,712 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 11:00:15,712 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-11-28 11:00:15,712 [ scc.git] DEBUG Calling 'git remote'
2024-11-28 11:00:15,717 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 11:00:15,717 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-11-28 11:00:15,717 [ scc.git] DEBUG Calling 'git remote'
2024-11-28 11:00:15,721 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 11:00:15,721 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-11-28 11:00:15,721 [ scc.git] DEBUG Calling 'git remote'
2024-11-28 11:00:15,726 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-28 11:00:15,726 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-11-28 11:00:15,726 [ scc.git] DEBUG Calling 'git remote'
2024-11-28 11:00:15,731 [ 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 2e24556] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from c0517ed
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 9b73dd9
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 1c674373
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 fc20959
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
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 ca884f0] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-11-28 11:01:03,070 [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-11-28 11:01:12,104 [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-11-28 11:01:14,506 [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-11-28 11:01:19,102 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-11-28 11:01:59,669 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/f6f303f9/images/svgs/logo.svg){kind=logo}
