Console Output
Skipping 137 KB..
Full Log refs/pull/114/head -> FETCH_HEAD
2024-11-27 00:44:34,214 [ scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2024-11-27 00:44:34,497 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-11-27 00:44:34,497 [ scc.git] DEBUG * branch refs/pull/115/head -> FETCH_HEAD
2024-11-27 00:44:34,501 [ scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2024-11-27 00:44:34,807 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-11-27 00:44:34,808 [ scc.git] DEBUG * branch refs/pull/116/head -> FETCH_HEAD
2024-11-27 00:44:34,812 [ scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2024-11-27 00:44:35,113 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-11-27 00:44:35,114 [ scc.git] DEBUG * branch refs/pull/117/head -> FETCH_HEAD
2024-11-27 00:44:35,118 [ scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2024-11-27 00:44:35,432 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-11-27 00:44:35,432 [ scc.git] DEBUG * branch refs/pull/118/head -> FETCH_HEAD
2024-11-27 00:44:35,436 [ scc.git] DEBUG ## Unique users: []
2024-11-27 00:44:35,436 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:44:35,437 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:44:35,443 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2024-11-27 00:44:35,449 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:44:35,454 [ 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-27 00:44:35,466 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-27 00:44:35,470 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2024-11-27 00:44:35,470 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2024-11-27 00:44:35,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:44:35,617 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2024-11-27 00:44:35,623 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:44:35,627 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2024-11-27 00:44:35,650 [ scc.git] DEBUG Auto-merging package-lock.json
2024-11-27 00:44:35,650 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-27 00:44:35,655 [ scc.git] DEBUG package-lock.json | 625 +++---------------------------------------------------
2024-11-27 00:44:35,655 [ scc.git] DEBUG 1 file changed, 29 insertions(+), 596 deletions(-)
2024-11-27 00:44:36,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:44:36,019 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-11-27 00:44:36,025 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:44:36,030 [ 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-27 00:44:36,050 [ scc.git] DEBUG Auto-merging package-lock.json
2024-11-27 00:44:36,051 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2024-11-27 00:44:36,051 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-27 00:44:36,051 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-27 00:44:36,057 [ scc.git] DEBUG Calling 'git reset --hard 4d5bfa17190b33c82884207f6ff8395bf1090eb7'
2024-11-27 00:44:36,066 [ scc.git] DEBUG HEAD is now at 4d5bfa1 merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2024-11-27 00:44:36,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:44:36,405 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-11-27 00:44:36,413 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2024-11-27 00:44:36,420 [ scc.git] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#259](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/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-27 00:44:36,427 [ scc.config] DEBUG Found github.token
2024-11-27 00:44:36,428 [ scc.git] DEBUG Adding comment to issue #115.
2024-11-27 00:44:37,352 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-gallery/issues/115/comments HTTP/1.1" 201 2107
2024-11-27 00:44:37,353 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2024-11-27 00:44:37,360 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:44:37,366 [ 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-27 00:44:37,388 [ scc.git] DEBUG Auto-merging package-lock.json
2024-11-27 00:44:37,389 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-27 00:44:37,394 [ scc.git] DEBUG package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2024-11-27 00:44:37,394 [ scc.git] DEBUG 1 file changed, 108 insertions(+), 11 deletions(-)
2024-11-27 00:44:37,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:44:37,787 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2024-11-27 00:44:37,794 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:44:37,799 [ 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-27 00:44:37,822 [ scc.git] DEBUG Auto-merging package-lock.json
2024-11-27 00:44:37,823 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-27 00:44:37,827 [ scc.git] DEBUG package-lock.json | 6 +++---
2024-11-27 00:44:37,827 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-11-27 00:44:38,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:44:38,165 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-11-27 00:44:38,171 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:44:38,177 [ 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-27 00:44:38,197 [ scc.git] DEBUG Auto-merging package-lock.json
2024-11-27 00:44:38,197 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2024-11-27 00:44:38,197 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-27 00:44:38,197 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-27 00:44:38,203 [ scc.git] DEBUG Calling 'git reset --hard 0be66f85dab792f017e9a79575ff91e310452102'
2024-11-27 00:44:38,211 [ scc.git] DEBUG HEAD is now at 0be66f8 merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2024-11-27 00:44:38,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:44:38,558 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-11-27 00:44:38,564 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2024-11-27 00:44:38,570 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#259](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/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-27 00:44:38,574 [ scc.config] DEBUG Found github.token
2024-11-27 00:44:38,575 [ scc.git] DEBUG Adding comment to issue #118.
2024-11-27 00:44:39,555 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 201 2394
2024-11-27 00:44:39,556 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-27 00:44:39,597 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:44:39,597 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:44:39,603 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-27 00:44:39,643 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-27 00:44:39,651 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfaafc2eb0> has no local changes
2024-11-27 00:44:39,651 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-gallery
Updating acd798d..2a621da
Previously merged:
- PR 112 jburel 'Build'
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#259 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/)'
2024-11-27 00:44:39,660 [ scc.git] DEBUG [detached HEAD e792801] merge master -Dorg -Ssuccess-only
2024-11-27 00:44:39,660 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:44:39,661 [ scc.repo] DEBUG ## PRs found:
2024-11-27 00:44:40,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-11-27 00:44:40,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2024-11-27 00:44:41,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2024-11-27 00:44:41,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-11-27 00:44:42,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-11-27 00:44:42,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-11-27 00:44:43,230 [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-27 00:44:43,878 [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-27 00:44:44,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-11-27 00:44:45,078 [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-27 00:44:45,079 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-11-27 00:44:45,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-11-27 00:44:46,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-11-27 00:44:46,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-11-27 00:44:47,249 [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-27 00:44:47,719 [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-27 00:44:48,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-11-27 00:44:48,578 [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-27 00:44:48,579 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-11-27 00:44:49,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-11-27 00:44:49,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-11-27 00:44:50,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-11-27 00:44:50,580 [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-27 00:44:50,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-11-27 00:44:51,416 [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-27 00:44:51,417 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-11-27 00:44:51,417 [ scc.repo] DEBUG ## Branches found:
2024-11-27 00:44:51,417 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-11-27 00:44:51,418 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:44:51,418 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:44:51,424 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-27 00:44:51,431 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-27 00:44:51,431 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-27 00:44:51,438 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-27 00:44:51,450 [ scc.git] DEBUG Updating 6f1597f..b4102d4
2024-11-27 00:44:52,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls/496 HTTP/1.1" 200 None
2024-11-27 00:44:52,036 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-11-27 00:44:52,912 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-27 00:44:52,912 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-11-27 00:44:52,917 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-11-27 00:44:54,627 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-27 00:44:54,627 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-11-27 00:44:54,632 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-11-27 00:44:55,458 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-11-27 00:44:55,458 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-11-27 00:44:55,462 [ scc.git] DEBUG ## Unique users: []
2024-11-27 00:44:55,463 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:44:55,463 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:44:55,469 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-11-27 00:44:55,477 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:44:55,483 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-11-27 00:44:55,501 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-11-27 00:44:55,502 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-27 00:44:55,506 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-11-27 00:44:55,506 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-11-27 00:44:55,506 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-11-27 00:44:55,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:44:55,652 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-11-27 00:44:55,667 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:44:55,673 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-11-27 00:44:55,999 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-11-27 00:44:55,999 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-11-27 00:44:55,999 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-11-27 00:44:55,999 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-11-27 00:44:55,999 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-27 00:44:56,005 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-11-27 00:44:56,005 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-11-27 00:44:56,005 [ scc.git] DEBUG src/app/header.html | 5 +
2024-11-27 00:44:56,005 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-11-27 00:44:56,005 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-11-27 00:44:56,005 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-11-27 00:44:56,008 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-11-27 00:44:56,008 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-11-27 00:44:56,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:44:56,135 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-11-27 00:44:56,143 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:44:56,148 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-11-27 00:44:56,175 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-11-27 00:44:56,175 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-27 00:44:56,179 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-11-27 00:44:56,179 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-11-27 00:44:56,179 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-11-27 00:44:56,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:44:56,564 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-27 00:44:56,610 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:44:56,610 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:44:56,616 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-27 00:44:56,659 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-27 00:44:56,667 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfa873d580> has no local changes
2024-11-27 00:44:56,667 [ 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)
Updating 6f1597f..b4102d4
Previously merged:
- PR 496 will-moore 'Add changelog 0.15.0'
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#259 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/)'
2024-11-27 00:44:56,677 [ scc.git] DEBUG [detached HEAD 3b4c2d2] merge master -Dorg -Ssuccess-only
2024-11-27 00:44:56,678 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:44:56,678 [ scc.repo] DEBUG ## PRs found:
2024-11-27 00:44:57,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-11-27 00:44:57,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/93 HTTP/1.1" 200 None
2024-11-27 00:44:58,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/93/comments HTTP/1.1" 200 None
2024-11-27 00:44:58,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/4585fcd2bf424623bba63f97686c965a9e90782c HTTP/1.1" 200 None
2024-11-27 00:44:59,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/4585fcd2bf424623bba63f97686c965a9e90782c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-11-27 00:44:59,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/4585fcd2bf424623bba63f97686c965a9e90782c/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-11-27 00:45:00,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/4585fcd2bf424623bba63f97686c965a9e90782c HTTP/1.1" 200 None
2024-11-27 00:45:00,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/4585fcd2bf424623bba63f97686c965a9e90782c?per_page=1 HTTP/1.1" 200 2
2024-11-27 00:45:00,419 [ scc.repo] DEBUG - PR 93 will-moore 'changelog 0.5.3'
2024-11-27 00:45:00,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-11-27 00:45:01,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-11-27 00:45:02,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-11-27 00:45:02,676 [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-27 00:45:03,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-11-27 00:45:03,677 [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-27 00:45:03,678 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-11-27 00:45:03,678 [ scc.repo] DEBUG ## Branches found:
2024-11-27 00:45:03,678 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-11-27 00:45:03,679 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:45:03,679 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:03,685 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-27 00:45:03,690 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-27 00:45:03,690 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-27 00:45:03,696 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-27 00:45:03,701 [ scc.git] DEBUG Already up to date.
2024-11-27 00:45:03,701 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-11-27 00:45:05,197 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-11-27 00:45:05,198 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-11-27 00:45:05,202 [ scc.git] DEBUG Calling 'git fetch origin pull/93/head'
2024-11-27 00:45:05,719 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-11-27 00:45:05,720 [ scc.git] DEBUG * branch refs/pull/93/head -> FETCH_HEAD
2024-11-27 00:45:05,724 [ scc.git] DEBUG ## Unique users: []
2024-11-27 00:45:05,724 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:45:05,724 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:05,729 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-11-27 00:45:05,736 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:05,740 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-11-27 00:45:05,751 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-27 00:45:05,754 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-11-27 00:45:05,754 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-11-27 00:45:05,754 [ scc.git] DEBUG requirements.txt | 2 +-
2024-11-27 00:45:05,754 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-11-27 00:45:05,754 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-11-27 00:45:05,754 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-11-27 00:45:05,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:45:05,904 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4585fcd2bf424623bba63f97686c965a9e90782c'
2024-11-27 00:45:05,911 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:05,916 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 93 (changelog 0.5.3) 4585fcd2bf424623bba63f97686c965a9e90782c'
2024-11-27 00:45:05,925 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-27 00:45:05,928 [ scc.git] DEBUG CHANGELOG.md | 12 ++++++++++++
2024-11-27 00:45:05,928 [ scc.git] DEBUG 1 file changed, 12 insertions(+)
2024-11-27 00:45:06,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:45:06,308 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-27 00:45:06,346 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:45:06,347 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:06,352 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-27 00:45:06,388 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-27 00:45:06,395 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfa874f6a0> has no local changes
2024-11-27 00:45:06,395 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 93 will-moore 'changelog 0.5.3'
Generated by OMERO-plugins-push#259 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/)'
2024-11-27 00:45:06,403 [ scc.git] DEBUG [detached HEAD 376c246] merge master -Dorg -Ssuccess-only
2024-11-27 00:45:06,403 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:45:06,403 [ scc.repo] DEBUG ## PRs found:
2024-11-27 00:45:06,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-11-27 00:45:07,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/89 HTTP/1.1" 200 None
2024-11-27 00:45:07,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/dfc227486da13c78bc278fc534e59b40cbc97175 HTTP/1.1" 200 None
2024-11-27 00:45:08,385 [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-27 00:45:08,871 [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-27 00:45:09,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/dfc227486da13c78bc278fc534e59b40cbc97175 HTTP/1.1" 200 None
2024-11-27 00:45:09,711 [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-27 00:45:09,712 [ scc.repo] DEBUG - PR 89 jburel 'Build'
2024-11-27 00:45:10,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-11-27 00:45:11,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-11-27 00:45:11,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-11-27 00:45:12,013 [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-27 00:45:12,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-11-27 00:45:12,949 [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-27 00:45:12,950 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-11-27 00:45:13,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-11-27 00:45:14,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-11-27 00:45:14,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-11-27 00:45:15,147 [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-27 00:45:15,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-11-27 00:45:16,047 [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-27 00:45:16,047 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-11-27 00:45:16,047 [ scc.repo] DEBUG ## Branches found:
2024-11-27 00:45:16,047 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-11-27 00:45:16,048 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:45:16,048 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:16,053 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-27 00:45:16,058 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-27 00:45:16,058 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-27 00:45:16,063 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-27 00:45:16,068 [ scc.git] DEBUG Already up to date.
2024-11-27 00:45:16,069 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-11-27 00:45:16,870 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-11-27 00:45:16,871 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-11-27 00:45:16,876 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-11-27 00:45:17,495 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-11-27 00:45:17,495 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-11-27 00:45:17,500 [ scc.git] DEBUG Calling 'git fetch origin pull/89/head'
2024-11-27 00:45:18,029 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-11-27 00:45:18,029 [ scc.git] DEBUG * branch refs/pull/89/head -> FETCH_HEAD
2024-11-27 00:45:18,033 [ scc.git] DEBUG ## Unique users: []
2024-11-27 00:45:18,034 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:45:18,034 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:18,039 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-11-27 00:45:18,046 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:18,051 [ 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-27 00:45:18,268 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-11-27 00:45:18,268 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-11-27 00:45:18,268 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-11-27 00:45:18,269 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-11-27 00:45:18,269 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-27 00:45:18,269 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-27 00:45:18,275 [ scc.git] DEBUG Calling 'git reset --hard fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-11-27 00:45:18,282 [ scc.git] DEBUG HEAD is now at fc20959 Bump version: 0.13.0 → 0.13.1.dev0
2024-11-27 00:45:18,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:45:18,471 [ scc.git] DEBUG Calling 'git merge-base fc2095901f5dfd24ecd29a99092283f136de04d5 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-11-27 00:45:18,479 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-11-27 00:45:18,485 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#259](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-11-27 00:45:18,490 [ scc.config] DEBUG Found github.token
2024-11-27 00:45:18,490 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-11-27 00:45:18,490 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-11-27 00:45:18,497 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:18,502 [ 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-27 00:45:18,531 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-11-27 00:45:18,531 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-11-27 00:45:18,531 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-11-27 00:45:18,531 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-27 00:45:18,532 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-27 00:45:18,538 [ scc.git] DEBUG Calling 'git reset --hard fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-11-27 00:45:18,546 [ scc.git] DEBUG HEAD is now at fc20959 Bump version: 0.13.0 → 0.13.1.dev0
2024-11-27 00:45:18,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:45:18,878 [ scc.git] DEBUG Calling 'git merge-base fc2095901f5dfd24ecd29a99092283f136de04d5 78e55539b68e351ed5ef202854718b49a37729a7'
2024-11-27 00:45:18,885 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-11-27 00:45:18,891 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#259](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/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-27 00:45:18,896 [ scc.config] DEBUG Found github.token
2024-11-27 00:45:18,896 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-11-27 00:45:18,896 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dfc227486da13c78bc278fc534e59b40cbc97175'
2024-11-27 00:45:18,901 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:18,906 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 89 (Build) dfc227486da13c78bc278fc534e59b40cbc97175'
2024-11-27 00:45:18,917 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-27 00:45:18,919 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2024-11-27 00:45:18,919 [ scc.git] DEBUG 1 file changed, 7 insertions(+), 5 deletions(-)
2024-11-27 00:45:19,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:45:19,290 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-27 00:45:19,332 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:45:19,333 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:19,338 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-27 00:45:19,380 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-27 00:45:19,387 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfa86f6700> has no local changes
2024-11-27 00:45:19,387 [ 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#259 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/)'
2024-11-27 00:45:19,396 [ scc.git] DEBUG [detached HEAD 2c2018d] merge master -Dorg -Ssuccess-only
2024-11-27 00:45:19,396 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:45:19,396 [ scc.repo] DEBUG ## PRs found:
2024-11-27 00:45:19,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-11-27 00:45:20,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-11-27 00:45:20,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-11-27 00:45:21,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-11-27 00:45:21,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-11-27 00:45:22,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-11-27 00:45:22,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-11-27 00:45:22,929 [ scc.repo] DEBUG ## Branches found:
2024-11-27 00:45:22,929 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-11-27 00:45:22,929 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:45:22,929 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:22,935 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-27 00:45:22,940 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-27 00:45:22,940 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-27 00:45:22,945 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-27 00:45:22,957 [ scc.git] DEBUG Updating 5d441c2..fb5ae86
2024-11-27 00:45:23,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls/133 HTTP/1.1" 200 None
2024-11-27 00:45:24,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls/129 HTTP/1.1" 200 None
2024-11-27 00:45:24,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls/131 HTTP/1.1" 200 None
2024-11-27 00:45:25,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls/128 HTTP/1.1" 200 None
2024-11-27 00:45:25,640 [ scc.git] DEBUG ## Unique users: []
2024-11-27 00:45:25,640 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:45:25,640 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:25,645 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-27 00:45:25,683 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:45:25,683 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:25,688 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-27 00:45:25,728 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-27 00:45:25,735 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfa86f65e0> has no local changes
2024-11-27 00:45:25,735 [ 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#259 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/)'
2024-11-27 00:45:25,744 [ scc.git] DEBUG [detached HEAD 3a9ee78] merge master -Dorg -Ssuccess-only
2024-11-27 00:45:25,744 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:45:25,745 [ scc.repo] DEBUG ## PRs found:
2024-11-27 00:45:26,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-11-27 00:45:26,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/15 HTTP/1.1" 200 None
2024-11-27 00:45:27,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/b5d953edc0b64a1bba13e9d5d90f3f9e68b7a332 HTTP/1.1" 200 None
2024-11-27 00:45:27,641 [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-27 00:45:28,135 [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-27 00:45:28,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-11-27 00:45:29,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-11-27 00:45:29,630 [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-27 00:45:30,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-11-27 00:45:30,575 [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-27 00:45:30,575 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-11-27 00:45:30,576 [ scc.repo] DEBUG ## Branches found:
2024-11-27 00:45:30,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-11-27 00:45:30,576 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:45:30,576 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:30,582 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-27 00:45:30,587 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-27 00:45:30,588 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-27 00:45:30,593 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-27 00:45:30,599 [ scc.git] DEBUG Already up to date.
2024-11-27 00:45:30,599 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-11-27 00:45:30,918 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-11-27 00:45:30,918 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-11-27 00:45:30,922 [ scc.git] DEBUG ## Unique users: []
2024-11-27 00:45:30,923 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:45:30,923 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:30,928 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-11-27 00:45:30,934 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:30,940 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-11-27 00:45:30,949 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-27 00:45:31,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:45:31,091 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-27 00:45:31,130 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:45:31,130 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:31,135 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-27 00:45:31,176 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-27 00:45:31,182 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfa8744b20> has no local changes
2024-11-27 00:45:31,182 [ 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#259 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/)'
2024-11-27 00:45:31,191 [ scc.git] DEBUG [detached HEAD ea10258] merge master -Dorg -Ssuccess-only
2024-11-27 00:45:31,191 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:45:31,191 [ scc.repo] DEBUG ## PRs found:
2024-11-27 00:45:31,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-11-27 00:45:32,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/29 HTTP/1.1" 200 None
2024-11-27 00:45:32,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24 HTTP/1.1" 200 None
2024-11-27 00:45:33,292 [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-27 00:45:33,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24 HTTP/1.1" 200 None
2024-11-27 00:45:34,273 [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-27 00:45:34,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24 HTTP/1.1" 200 None
2024-11-27 00:45:35,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24/status HTTP/1.1" 200 None
2024-11-27 00:45:35,357 [ scc.repo] DEBUG - PR 29 jburel 'Build'
2024-11-27 00:45:35,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-11-27 00:45:36,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-11-27 00:45:36,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-11-27 00:45:37,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-11-27 00:45:37,825 [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-27 00:45:38,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-11-27 00:45:38,798 [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-27 00:45:38,798 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-11-27 00:45:38,799 [ scc.repo] DEBUG ## Branches found:
2024-11-27 00:45:38,799 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-11-27 00:45:38,799 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:45:38,799 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:38,805 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-27 00:45:38,810 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-27 00:45:38,810 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-27 00:45:38,815 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-27 00:45:38,821 [ scc.git] DEBUG Already up to date.
2024-11-27 00:45:38,821 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-11-27 00:45:39,230 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-11-27 00:45:39,231 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-11-27 00:45:39,235 [ scc.git] DEBUG Calling 'git fetch origin pull/29/head'
2024-11-27 00:45:39,937 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-11-27 00:45:39,938 [ scc.git] DEBUG * branch refs/pull/29/head -> FETCH_HEAD
2024-11-27 00:45:39,942 [ scc.git] DEBUG ## Unique users: []
2024-11-27 00:45:39,942 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:45:39,942 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:39,948 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-11-27 00:45:39,953 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:39,958 [ 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-27 00:45:39,967 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-11-27 00:45:39,968 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-27 00:45:39,970 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-11-27 00:45:39,970 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-11-27 00:45:40,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:45:40,106 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24'
2024-11-27 00:45:40,113 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:40,118 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 29 (Build) 92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24'
2024-11-27 00:45:40,128 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-27 00:45:40,130 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-11-27 00:45:40,130 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2024-11-27 00:45:40,130 [ scc.git] DEBUG 2 files changed, 8 insertions(+), 6 deletions(-)
2024-11-27 00:45:40,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:45:40,509 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-27 00:45:40,550 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:45:40,550 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:40,556 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-27 00:45:40,596 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-27 00:45:40,603 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfa86b0940> has no local changes
2024-11-27 00:45:40,603 [ 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#259 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/)'
2024-11-27 00:45:40,612 [ scc.git] DEBUG [detached HEAD 090b79e] merge master -Dorg -Ssuccess-only
2024-11-27 00:45:40,612 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:45:40,613 [ scc.repo] DEBUG ## PRs found:
2024-11-27 00:45:41,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-11-27 00:45:41,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/21 HTTP/1.1" 200 None
2024-11-27 00:45:42,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/d8cd79097b8e36aef506d1589aa1bc281a0fc1b1 HTTP/1.1" 200 None
2024-11-27 00:45:42,763 [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-27 00:45:43,232 [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-27 00:45:43,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/d8cd79097b8e36aef506d1589aa1bc281a0fc1b1 HTTP/1.1" 200 None
2024-11-27 00:45:44,212 [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-27 00:45:44,212 [ scc.repo] DEBUG - PR 21 jburel 'Build'
2024-11-27 00:45:44,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-11-27 00:45:45,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-11-27 00:45:45,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-11-27 00:45:46,128 [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-27 00:45:46,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-11-27 00:45:47,098 [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-27 00:45:47,099 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-11-27 00:45:47,099 [ scc.repo] DEBUG ## Branches found:
2024-11-27 00:45:47,099 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-11-27 00:45:47,099 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:45:47,099 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:47,105 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-27 00:45:47,111 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-27 00:45:47,112 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-27 00:45:47,118 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-27 00:45:47,125 [ scc.git] DEBUG Already up to date.
2024-11-27 00:45:47,126 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-11-27 00:45:47,480 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-11-27 00:45:47,480 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-11-27 00:45:47,485 [ scc.git] DEBUG Calling 'git fetch origin pull/21/head'
2024-11-27 00:45:48,209 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-11-27 00:45:48,209 [ scc.git] DEBUG * branch refs/pull/21/head -> FETCH_HEAD
2024-11-27 00:45:48,214 [ scc.git] DEBUG ## Unique users: []
2024-11-27 00:45:48,215 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:45:48,215 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:48,221 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-11-27 00:45:48,226 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:48,232 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-11-27 00:45:48,280 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-11-27 00:45:48,280 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-11-27 00:45:48,280 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-11-27 00:45:48,280 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-11-27 00:45:48,280 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-11-27 00:45:48,280 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-11-27 00:45:48,280 [ scc.git] DEBUG Auto-merging setup.py
2024-11-27 00:45:48,280 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-11-27 00:45:48,280 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-27 00:45:48,281 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-27 00:45:48,287 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-11-27 00:45:48,293 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-11-27 00:45:48,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:45:48,466 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-11-27 00:45:48,472 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-11-27 00:45:48,477 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#259](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/views.py
- setup.py
- omero_signup/urls.py
--conflicts
2024-11-27 00:45:48,482 [ scc.config] DEBUG Found github.token
2024-11-27 00:45:48,482 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-11-27 00:45:48,482 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8cd79097b8e36aef506d1589aa1bc281a0fc1b1'
2024-11-27 00:45:48,488 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:48,492 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 21 (Build) d8cd79097b8e36aef506d1589aa1bc281a0fc1b1'
2024-11-27 00:45:48,502 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-27 00:45:48,504 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-11-27 00:45:48,504 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2024-11-27 00:45:48,504 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2024-11-27 00:45:48,504 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2024-11-27 00:45:48,504 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2024-11-27 00:45:48,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:45:48,848 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-27 00:45:48,891 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:45:48,891 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:48,896 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-27 00:45:48,939 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-27 00:45:48,945 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfa8708bb0> has no local changes
2024-11-27 00:45:48,945 [ 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#259 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/)'
2024-11-27 00:45:48,954 [ scc.git] DEBUG [detached HEAD c029f1b] merge master -Dorg -Ssuccess-only
2024-11-27 00:45:48,954 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:45:48,954 [ scc.repo] DEBUG ## PRs found:
2024-11-27 00:45:49,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-11-27 00:45:49,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-11-27 00:45:50,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-11-27 00:45:50,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-11-27 00:45:51,236 [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-27 00:45:51,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-11-27 00:45:52,202 [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-27 00:45:52,202 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-11-27 00:45:52,203 [ scc.repo] DEBUG ## Branches found:
2024-11-27 00:45:52,203 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-11-27 00:45:52,203 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:45:52,203 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:52,208 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-27 00:45:52,213 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-27 00:45:52,213 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-27 00:45:52,218 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-27 00:45:52,224 [ scc.git] DEBUG Already up to date.
2024-11-27 00:45:52,224 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-11-27 00:45:52,528 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-11-27 00:45:52,528 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-11-27 00:45:52,532 [ scc.git] DEBUG ## Unique users: []
2024-11-27 00:45:52,532 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:45:52,532 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:52,538 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-11-27 00:45:52,545 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:52,550 [ 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-27 00:45:52,563 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-27 00:45:52,566 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-11-27 00:45:52,566 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-11-27 00:45:52,566 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-11-27 00:45:52,566 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-11-27 00:45:52,566 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-11-27 00:45:52,566 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-11-27 00:45:52,568 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-11-27 00:45:52,568 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-11-27 00:45:52,568 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-11-27 00:45:52,568 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-11-27 00:45:52,568 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-11-27 00:45:52,568 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-11-27 00:45:52,568 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-11-27 00:45:52,568 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-11-27 00:45:52,568 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-11-27 00:45:52,568 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-11-27 00:45:52,568 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-11-27 00:45:52,569 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-11-27 00:45:52,569 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-11-27 00:45:52,569 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-11-27 00:45:52,569 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-11-27 00:45:52,569 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-11-27 00:45:52,569 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-11-27 00:45:52,569 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-11-27 00:45:52,569 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-11-27 00:45:52,569 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-11-27 00:45:52,569 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-11-27 00:45:52,569 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-11-27 00:45:52,569 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-11-27 00:45:52,569 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-11-27 00:45:52,569 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-11-27 00:45:52,569 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-11-27 00:45:52,569 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-11-27 00:45:52,569 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-11-27 00:45:52,569 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-11-27 00:45:52,569 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-11-27 00:45:52,569 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-11-27 00:45:52,569 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-11-27 00:45:52,569 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-11-27 00:45:52,569 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-11-27 00:45:52,569 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-11-27 00:45:52,569 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-11-27 00:45:52,569 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-11-27 00:45:52,569 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-11-27 00:45:52,569 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-11-27 00:45:52,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:45:52,706 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-27 00:45:52,753 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:45:52,754 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:52,759 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-27 00:45:52,797 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-27 00:45:52,803 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfa86c1b80> has no local changes
2024-11-27 00:45:52,803 [ 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#259 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/)'
2024-11-27 00:45:52,813 [ scc.git] DEBUG [detached HEAD 1cd18e3] merge master -Dorg -Ssuccess-only
2024-11-27 00:45:52,814 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:45:52,814 [ scc.repo] DEBUG ## PRs found:
2024-11-27 00:45:53,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-11-27 00:45:53,119 [ scc.repo] DEBUG ## Branches found:
2024-11-27 00:45:53,119 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-11-27 00:45:53,119 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:45:53,119 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:53,124 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-27 00:45:53,129 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-27 00:45:53,129 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-27 00:45:53,134 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-27 00:45:53,142 [ scc.git] DEBUG Updating aca9e9c..100f6ae
2024-11-27 00:45:53,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls/13 HTTP/1.1" 200 None
2024-11-27 00:45:53,855 [ scc.git] DEBUG ## Unique users: []
2024-11-27 00:45:53,855 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:45:53,855 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:53,860 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-27 00:45:53,900 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:45:53,900 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:53,905 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-27 00:45:53,949 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-27 00:45:53,957 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfa8686370> has no local changes
2024-11-27 00:45:53,957 [ 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#259 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/)'
2024-11-27 00:45:53,968 [ scc.git] DEBUG [detached HEAD ff6c533] merge master -Dorg -Ssuccess-only
2024-11-27 00:45:53,968 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:45:53,969 [ scc.repo] DEBUG ## PRs found:
2024-11-27 00:45:54,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2024-11-27 00:45:54,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2024-11-27 00:45:55,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2024-11-27 00:45:55,901 [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-27 00:45:56,347 [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-27 00:45:56,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2024-11-27 00:45:57,223 [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-27 00:45:57,223 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2024-11-27 00:45:57,223 [ scc.repo] DEBUG ## Branches found:
2024-11-27 00:45:57,223 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-11-27 00:45:57,223 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:45:57,224 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:57,229 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-27 00:45:57,234 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-27 00:45:57,234 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-27 00:45:57,239 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-27 00:45:57,244 [ scc.git] DEBUG Already up to date.
2024-11-27 00:45:57,244 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2024-11-27 00:45:57,994 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2024-11-27 00:45:57,994 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2024-11-27 00:45:57,999 [ scc.git] DEBUG ## Unique users: []
2024-11-27 00:45:57,999 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:45:57,999 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:58,004 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2024-11-27 00:45:58,010 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:58,016 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2024-11-27 00:45:58,025 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-27 00:45:58,028 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-11-27 00:45:58,028 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2024-11-27 00:45:58,028 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2024-11-27 00:45:58,028 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2024-11-27 00:45:58,028 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2024-11-27 00:45:58,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:45:58,175 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-27 00:45:58,219 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:45:58,219 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:45:58,224 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-27 00:45:58,263 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-27 00:45:58,269 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfa872eee0> has no local changes
2024-11-27 00:45:58,269 [ 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#259 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/)'
2024-11-27 00:45:58,277 [ scc.git] DEBUG [detached HEAD efb140c] merge master -Dorg -Ssuccess-only
2024-11-27 00:45:58,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:45:58,278 [ scc.git] INFO Overriding base-branch from master to main
2024-11-27 00:45:58,278 [ scc.repo] DEBUG ## PRs found:
2024-11-27 00:45:58,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-11-27 00:45:59,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2024-11-27 00:45:59,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2024-11-27 00:46:00,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2024-11-27 00:46:00,839 [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-27 00:46:01,300 [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-27 00:46:01,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/17 HTTP/1.1" 200 None
2024-11-27 00:46:02,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/17/comments HTTP/1.1" 200 None
2024-11-27 00:46:02,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/020e85775bda54e9136b3fb9e699411e0d4f8c95 HTTP/1.1" 200 None
2024-11-27 00:46:03,264 [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-27 00:46:03,781 [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-27 00:46:04,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-11-27 00:46:04,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-11-27 00:46:05,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-11-27 00:46:05,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-11-27 00:46:06,166 [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-27 00:46:06,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-11-27 00:46:07,019 [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-27 00:46:07,019 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-11-27 00:46:07,020 [ scc.repo] DEBUG ## Branches found:
2024-11-27 00:46:07,020 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-11-27 00:46:07,020 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:46:07,020 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:46:07,025 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-11-27 00:46:07,030 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-27 00:46:07,030 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-11-27 00:46:07,035 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-11-27 00:46:07,040 [ scc.git] DEBUG Already up to date.
2024-11-27 00:46:07,040 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-11-27 00:46:07,519 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-11-27 00:46:07,520 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-11-27 00:46:07,524 [ scc.git] DEBUG ## Unique users: []
2024-11-27 00:46:07,524 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:46:07,524 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:46:07,530 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-11-27 00:46:07,536 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:46:07,541 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-11-27 00:46:07,603 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-11-27 00:46:07,603 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-11-27 00:46:07,603 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-27 00:46:07,604 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-27 00:46:07,610 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-11-27 00:46:07,616 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-11-27 00:46:07,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:46:07,757 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-11-27 00:46:07,762 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-11-27 00:46:07,767 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#259](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-11-27 00:46:07,772 [ scc.config] DEBUG Found github.token
2024-11-27 00:46:07,772 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-11-27 00:46:07,772 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-27 00:46:07,811 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:46:07,811 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:46:07,816 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-27 00:46:07,853 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-27 00:46:07,859 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfa872abe0> has no local changes
2024-11-27 00:46:07,859 [ 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#259 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/)'
2024-11-27 00:46:07,867 [ scc.git] DEBUG [detached HEAD d934a4f] merge master -Dorg -Ssuccess-only
2024-11-27 00:46:07,867 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:46:07,867 [ scc.repo] DEBUG ## PRs found:
2024-11-27 00:46:08,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-11-27 00:46:08,163 [ scc.repo] DEBUG ## Branches found:
2024-11-27 00:46:08,163 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-11-27 00:46:08,163 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:46:08,163 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:46:08,168 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-27 00:46:08,173 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-27 00:46:08,173 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-27 00:46:08,179 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-27 00:46:08,188 [ scc.git] DEBUG Updating adfa132..70b01ed
2024-11-27 00:46:08,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls/24 HTTP/1.1" 200 None
2024-11-27 00:46:08,889 [ scc.git] DEBUG ## Unique users: []
2024-11-27 00:46:08,889 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:46:08,889 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:46:08,897 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-27 00:46:08,937 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:46:08,938 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:46:08,943 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-27 00:46:08,982 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-27 00:46:08,988 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfa8696fa0> has no local changes
2024-11-27 00:46:08,988 [ 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#259 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/)'
2024-11-27 00:46:08,997 [ scc.git] DEBUG [detached HEAD a0f543d] merge master -Dorg -Ssuccess-only
2024-11-27 00:46:08,997 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:46:08,997 [ scc.repo] DEBUG ## PRs found:
2024-11-27 00:46:09,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-11-27 00:46:09,293 [ scc.repo] DEBUG ## Branches found:
2024-11-27 00:46:09,293 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-11-27 00:46:09,293 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:46:09,293 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:46:09,298 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-27 00:46:09,303 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-27 00:46:09,303 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-27 00:46:09,308 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-27 00:46:09,317 [ scc.git] DEBUG Updating 8da48e1..5bfef29
2024-11-27 00:46:10,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls/36 HTTP/1.1" 200 None
2024-11-27 00:46:10,032 [ scc.git] DEBUG ## Unique users: []
2024-11-27 00:46:10,032 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:46:10,032 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:46:10,038 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-27 00:46:10,075 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:46:10,075 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:46:10,080 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-27 00:46:10,118 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-27 00:46:10,124 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfa86e4eb0> has no local changes
2024-11-27 00:46:10,124 [ 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#259 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/)'
2024-11-27 00:46:10,132 [ scc.git] DEBUG [detached HEAD 77f220b] merge master -Dorg -Ssuccess-only
2024-11-27 00:46:10,132 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:46:10,132 [ scc.repo] DEBUG ## PRs found:
2024-11-27 00:46:10,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-11-27 00:46:11,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-11-27 00:46:11,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-11-27 00:46:12,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-11-27 00:46:12,502 [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-27 00:46:12,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-11-27 00:46:13,388 [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-27 00:46:13,389 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-11-27 00:46:13,389 [ scc.repo] DEBUG ## Branches found:
2024-11-27 00:46:13,389 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-11-27 00:46:13,389 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:46:13,390 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:46:13,395 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-11-27 00:46:13,400 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-27 00:46:13,400 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-11-27 00:46:13,406 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-11-27 00:46:13,412 [ scc.git] DEBUG Already up to date.
2024-11-27 00:46:13,413 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-11-27 00:46:13,777 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-11-27 00:46:13,777 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-11-27 00:46:13,782 [ scc.git] DEBUG ## Unique users: []
2024-11-27 00:46:13,782 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:46:13,782 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:46:13,787 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-11-27 00:46:13,792 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:46:13,798 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-11-27 00:46:13,919 [ scc.git] DEBUG Auto-merging Dockerfile
2024-11-27 00:46:13,920 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-11-27 00:46:13,920 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-27 00:46:13,920 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-27 00:46:13,927 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-11-27 00:46:13,935 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-11-27 00:46:14,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:46:14,087 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-11-27 00:46:14,093 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-11-27 00:46:14,099 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#259](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-11-27 00:46:14,104 [ scc.config] DEBUG Found github.token
2024-11-27 00:46:14,104 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-11-27 00:46:14,104 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-27 00:46:14,143 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:46:14,143 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:46:14,149 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-27 00:46:14,190 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-27 00:46:14,197 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfa863d7f0> has no local changes
2024-11-27 00:46:14,197 [ 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#259 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/)'
2024-11-27 00:46:14,206 [ scc.git] DEBUG [detached HEAD 1c54f68] merge master -Dorg -Ssuccess-only
2024-11-27 00:46:14,206 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:46:14,207 [ scc.git] INFO Overriding base-branch from master to develop
2024-11-27 00:46:14,207 [ scc.repo] DEBUG ## PRs found:
2024-11-27 00:46:14,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-11-27 00:46:15,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-11-27 00:46:15,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2024-11-27 00:46:16,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-27 00:46:16,519 [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-27 00:46:16,971 [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-27 00:46:17,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-11-27 00:46:17,811 [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-27 00:46:17,812 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-27 00:46:18,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-11-27 00:46:18,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-11-27 00:46:19,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/4865545/issues/216/comments?page=2 HTTP/1.1" 200 None
2024-11-27 00:46:19,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-11-27 00:46:20,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-11-27 00:46:20,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-11-27 00:46:21,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-11-27 00:46:21,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-27 00:46:22,200 [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-27 00:46:22,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-11-27 00:46:23,097 [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-27 00:46:23,097 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-27 00:46:23,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-11-27 00:46:24,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-11-27 00:46:24,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-11-27 00:46:25,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-11-27 00:46:25,116 [ scc.repo] DEBUG ## Branches found:
2024-11-27 00:46:25,116 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-11-27 00:46:25,116 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:46:25,116 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:46:25,122 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-11-27 00:46:25,128 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-11-27 00:46:25,128 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-11-27 00:46:25,134 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-11-27 00:46:25,140 [ scc.git] DEBUG Already up to date.
2024-11-27 00:46:25,140 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-11-27 00:46:25,743 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-11-27 00:46:25,743 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-11-27 00:46:25,748 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-11-27 00:46:26,338 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-11-27 00:46:26,339 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-11-27 00:46:26,343 [ scc.git] DEBUG ## Unique users: []
2024-11-27 00:46:26,343 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:46:26,344 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:46:26,349 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-27 00:46:26,357 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:46:26,362 [ 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-27 00:46:26,445 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-11-27 00:46:26,445 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-11-27 00:46:26,445 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-11-27 00:46:26,446 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-11-27 00:46:26,452 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-27 00:46:26,458 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-11-27 00:46:26,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:46:26,603 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-11-27 00:46:26,611 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-11-27 00:46:26,617 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#259](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-11-27 00:46:26,622 [ scc.config] DEBUG Found github.token
2024-11-27 00:46:26,623 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-11-27 00:46:26,623 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-11-27 00:46:26,629 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:46:26,635 [ 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-27 00:46:26,644 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-11-27 00:46:26,647 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-11-27 00:46:26,647 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-11-27 00:46:26,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:46:26,997 [ scc.git] DEBUG Calling 'git submodule update'
2024-11-27 00:46:27,037 [ scc.git] DEBUG Get sha1 of %s
2024-11-27 00:46:27,037 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-11-27 00:46:27,042 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-27 00:46:27,083 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-27 00:46:27,091 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfa869ccd0> has no local changes
2024-11-27 00:46:27,092 [ 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#259 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/)'
2024-11-27 00:46:27,100 [ scc.git] DEBUG [detached HEAD 63da9bd] merge master -Dorg -Ssuccess-only
2024-11-27 00:46:27,101 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:46:27,101 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-11-27 00:46:27,180 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-11-27 00:46:27,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:46:27,392 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-11-27 00:46:27,398 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-11-27 00:46:27,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:46:27,774 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-11-27 00:46:27,779 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-11-27 00:46:28,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:46:28,168 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-11-27 00:46:28,174 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-11-27 00:46:28,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:46:28,567 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-11-27 00:46:28,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:46:28,965 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-11-27 00:46:28,969 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-11-27 00:46:29,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:46:29,357 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-11-27 00:46:29,362 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-11-27 00:46:29,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:46:29,752 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-11-27 00:46:29,757 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-11-27 00:46:30,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:46:30,135 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-11-27 00:46:30,140 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-11-27 00:46:30,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:46:30,527 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-11-27 00:46:30,533 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-11-27 00:46:30,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:46:30,923 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-11-27 00:46:30,928 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-11-27 00:46:31,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:46:31,316 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-11-27 00:46:31,320 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-11-27 00:46:31,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:46:31,702 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-11-27 00:46:31,707 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-11-27 00:46:32,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:46:32,107 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-11-27 00:46:32,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:46:32,507 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-11-27 00:46:32,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:46:32,891 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-11-27 00:46:32,896 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-11-27 00:46:33,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:46:33,288 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-11-27 00:46:33,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:46:33,678 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-11-27 00:46:34,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:46:34,082 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-11-27 00:46:34,086 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-11-27 00:46:34,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:46:34,489 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-11-27 00:46:34,494 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-11-27 00:46:34,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:46:34,883 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-11-27 00:46:34,888 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-11-27 00:46:35,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:46:35,279 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-11-27 00:46:35,284 [ scc.config] DEBUG Found submodule.scripts.url
2024-11-27 00:46:35,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-11-27 00:46:35,683 [ scc.config] DEBUG Found submodule.scripts.branch
2024-11-27 00:46:35,683 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-11-27 00:46:35,762 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfac2ce220> has local changes
2024-11-27 00:46:35,762 [ 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 400 dependabot[bot] 'Bump omero-figure from `24444fe` to `e0b0d1a`'
- PR 402 dependabot[bot] 'Bump omero-cli-render from `173cac0` to `369753f`'
- PR 403 dependabot[bot] 'Bump omero-gallery from `56f4435` to `acd798d`'
- PR 404 dependabot[bot] 'Bump omero-mapr from `3a505e4` to `c45d76c`'
- PR 405 dependabot[bot] 'Bump omero-iviewer from `a8f380f` to `6f1597f`'
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.
Merged PRs:
- PR 67 sbesson 'omero render set: clarify help around settings for disabled channels'
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 597 Rdornier 'Rounding zoom label in pdf' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 578 Rdornier 'Image outline'
- PR 591 MinaEnayat 'Add Horizontal and Vertical Image Flipping Functionality'
- PR 592 will-moore 'Filter owners and groups dropdown lists'
- PR 596 Tom-TBT 'Dynamic lut for figure'
- PR 598 Tom-TBT 'Query timestamps from all planes when C or Z dimensions are not filled'
- PR 599 Tom-TBT 'Patch label text selection and cue for dragging'
Conflicting PRs (not included):
- 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
Updating acd798d..2a621da
Previously merged:
- PR 112 jburel 'Build'
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)
Updating 6f1597f..b4102d4
Previously merged:
- PR 496 will-moore 'Add changelog 0.15.0'
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'
- PR 93 will-moore 'changelog 0.5.3'
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#259 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/259/)'
2024-11-27 00:46:35,776 [ scc.git] DEBUG [detached HEAD 9254234] merge master -Dorg -Ssuccess-only
2024-11-27 00:46:35,776 [ scc.merge] INFO Repository: ome/omero-plugins
2024-11-27 00:46:35,776 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-11-27 00:46:35,776 [ scc.merge] INFO Already up to date.
2024-11-27 00:46:35,776 [ scc.merge] INFO
2024-11-27 00:46:35,777 [ scc.merge] INFO Merged PRs:
2024-11-27 00:46:35,777 [ scc.merge] INFO - PR 400 dependabot[bot] 'Bump omero-figure from `24444fe` to `e0b0d1a`'
2024-11-27 00:46:35,777 [ scc.merge] INFO - PR 402 dependabot[bot] 'Bump omero-cli-render from `173cac0` to `369753f`'
2024-11-27 00:46:35,777 [ scc.merge] INFO - PR 403 dependabot[bot] 'Bump omero-gallery from `56f4435` to `acd798d`'
2024-11-27 00:46:35,777 [ scc.merge] INFO - PR 404 dependabot[bot] 'Bump omero-mapr from `3a505e4` to `c45d76c`'
2024-11-27 00:46:35,777 [ scc.merge] INFO - PR 405 dependabot[bot] 'Bump omero-iviewer from `a8f380f` to `6f1597f`'
2024-11-27 00:46:35,777 [ scc.merge] INFO
2024-11-27 00:46:35,777 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-11-27 00:46:35,777 [ scc.merge] INFO Updating 4628e82..ca8c2ea
2024-11-27 00:46:35,777 [ scc.merge] INFO Previously merged:
2024-11-27 00:46:35,777 [ scc.merge] INFO - PR 67 jburel 'Gateway 5.10.0'
2024-11-27 00:46:35,777 [ scc.merge] INFO - PR 68 jburel 'Bump action '
2024-11-27 00:46:35,777 [ scc.merge] INFO
2024-11-27 00:46:35,777 [ scc.merge] INFO
2024-11-27 00:46:35,777 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-11-27 00:46:35,777 [ scc.merge] INFO Excluded PRs:
2024-11-27 00:46:35,777 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-11-27 00:46:35,777 [ scc.merge] INFO Updating 027b3e6..4777ef8
2024-11-27 00:46:35,777 [ scc.merge] INFO Previously merged:
2024-11-27 00:46:35,777 [ scc.merge] INFO - PR 27 jburel 'Build'
2024-11-27 00:46:35,777 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-11-27 00:46:35,777 [ scc.merge] INFO
2024-11-27 00:46:35,777 [ scc.merge] INFO
2024-11-27 00:46:35,777 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-11-27 00:46:35,777 [ scc.merge] INFO Excluded PRs:
2024-11-27 00:46:35,777 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-11-27 00:46:35,777 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate' (status: failure)
2024-11-27 00:46:35,777 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-11-27 00:46:35,777 [ scc.merge] INFO Already up to date.
2024-11-27 00:46:35,777 [ scc.merge] INFO
2024-11-27 00:46:35,777 [ scc.merge] INFO Merged PRs:
2024-11-27 00:46:35,777 [ scc.merge] INFO - PR 67 sbesson 'omero render set: clarify help around settings for disabled channels'
2024-11-27 00:46:35,777 [ scc.merge] INFO
2024-11-27 00:46:35,777 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-11-27 00:46:35,777 [ scc.merge] INFO Excluded PRs:
2024-11-27 00:46:35,777 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-11-27 00:46:35,777 [ scc.merge] INFO Updating 9b73dd9..11d3587
2024-11-27 00:46:35,777 [ scc.merge] INFO Previously merged:
2024-11-27 00:46:35,778 [ scc.merge] INFO - PR 165 jburel 'Build'
2024-11-27 00:46:35,778 [ scc.merge] INFO
2024-11-27 00:46:35,778 [ scc.merge] INFO Merged PRs:
2024-11-27 00:46:35,778 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-11-27 00:46:35,778 [ scc.merge] INFO
2024-11-27 00:46:35,778 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-27 00:46:35,778 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-11-27 00:46:35,778 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-11-27 00:46:35,778 [ scc.merge] INFO
2024-11-27 00:46:35,778 [ scc.merge] INFO Repository: ome/omero-figure
2024-11-27 00:46:35,778 [ scc.merge] INFO Excluded PRs:
2024-11-27 00:46:35,778 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (user: Rdornier)
2024-11-27 00:46:35,778 [ scc.merge] INFO - PR 597 Rdornier 'Rounding zoom label in pdf' (user: Rdornier)
2024-11-27 00:46:35,778 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-11-27 00:46:35,778 [ scc.merge] INFO Already up to date.
2024-11-27 00:46:35,778 [ scc.merge] INFO
2024-11-27 00:46:35,778 [ scc.merge] INFO Merged PRs:
2024-11-27 00:46:35,778 [ scc.merge] INFO - PR 578 Rdornier 'Image outline'
2024-11-27 00:46:35,778 [ scc.merge] INFO - PR 591 MinaEnayat 'Add Horizontal and Vertical Image Flipping Functionality'
2024-11-27 00:46:35,778 [ scc.merge] INFO - PR 592 will-moore 'Filter owners and groups dropdown lists'
2024-11-27 00:46:35,778 [ scc.merge] INFO - PR 596 Tom-TBT 'Dynamic lut for figure'
2024-11-27 00:46:35,778 [ scc.merge] INFO - PR 598 Tom-TBT 'Query timestamps from all planes when C or Z dimensions are not filled'
2024-11-27 00:46:35,778 [ scc.merge] INFO - PR 599 Tom-TBT 'Patch label text selection and cue for dragging'
2024-11-27 00:46:35,778 [ scc.merge] INFO
2024-11-27 00:46:35,778 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-27 00:46:35,778 [ scc.merge] INFO - PR 595 Rdornier 'Rotate image panel by 90°'
2024-11-27 00:46:35,778 [ scc.merge] INFO
2024-11-27 00:46:35,778 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-11-27 00:46:35,778 [ scc.merge] INFO Updating e5b3ca3..3b6c05a
2024-11-27 00:46:35,778 [ scc.merge] INFO Previously merged:
2024-11-27 00:46:35,778 [ scc.merge] INFO - PR 30 jburel 'Build'
2024-11-27 00:46:35,778 [ scc.merge] INFO
2024-11-27 00:46:35,778 [ scc.merge] INFO Merged PRs:
2024-11-27 00:46:35,778 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-11-27 00:46:35,778 [ scc.merge] INFO
2024-11-27 00:46:35,778 [ scc.merge] INFO Repository: ome/omero-gallery
2024-11-27 00:46:35,778 [ scc.merge] INFO Updating acd798d..2a621da
2024-11-27 00:46:35,779 [ scc.merge] INFO Previously merged:
2024-11-27 00:46:35,779 [ scc.merge] INFO - PR 112 jburel 'Build'
2024-11-27 00:46:35,779 [ scc.merge] INFO
2024-11-27 00:46:35,779 [ scc.merge] INFO Merged PRs:
2024-11-27 00:46:35,779 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2024-11-27 00:46:35,779 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2024-11-27 00:46:35,779 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2024-11-27 00:46:35,779 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2024-11-27 00:46:35,779 [ scc.merge] INFO
2024-11-27 00:46:35,779 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-27 00:46:35,779 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2024-11-27 00:46:35,779 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2024-11-27 00:46:35,779 [ scc.merge] INFO
2024-11-27 00:46:35,779 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-11-27 00:46:35,779 [ scc.merge] INFO Excluded PRs:
2024-11-27 00:46:35,779 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2024-11-27 00:46:35,779 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-11-27 00:46:35,779 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-11-27 00:46:35,779 [ scc.merge] INFO Updating 6f1597f..b4102d4
2024-11-27 00:46:35,779 [ scc.merge] INFO Previously merged:
2024-11-27 00:46:35,779 [ scc.merge] INFO - PR 496 will-moore 'Add changelog 0.15.0'
2024-11-27 00:46:35,779 [ scc.merge] INFO
2024-11-27 00:46:35,779 [ scc.merge] INFO Merged PRs:
2024-11-27 00:46:35,779 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-11-27 00:46:35,779 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-11-27 00:46:35,779 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-11-27 00:46:35,779 [ scc.merge] INFO
2024-11-27 00:46:35,779 [ scc.merge] INFO Repository: ome/omero-mapr
2024-11-27 00:46:35,779 [ scc.merge] INFO Excluded PRs:
2024-11-27 00:46:35,779 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-11-27 00:46:35,779 [ scc.merge] INFO Already up to date.
2024-11-27 00:46:35,779 [ scc.merge] INFO
2024-11-27 00:46:35,779 [ scc.merge] INFO Merged PRs:
2024-11-27 00:46:35,779 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-11-27 00:46:35,779 [ scc.merge] INFO - PR 93 will-moore 'changelog 0.5.3'
2024-11-27 00:46:35,779 [ scc.merge] INFO
2024-11-27 00:46:35,779 [ scc.merge] INFO Repository: ome/omero-metadata
2024-11-27 00:46:35,779 [ scc.merge] INFO Already up to date.
2024-11-27 00:46:35,780 [ scc.merge] INFO
2024-11-27 00:46:35,780 [ scc.merge] INFO Merged PRs:
2024-11-27 00:46:35,780 [ scc.merge] INFO - PR 89 jburel 'Build'
2024-11-27 00:46:35,780 [ scc.merge] INFO
2024-11-27 00:46:35,780 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-27 00:46:35,780 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-11-27 00:46:35,780 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-11-27 00:46:35,780 [ scc.merge] INFO
2024-11-27 00:46:35,780 [ scc.merge] INFO Repository: ome/omero-parade
2024-11-27 00:46:35,780 [ scc.merge] INFO Excluded PRs:
2024-11-27 00:46:35,780 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-11-27 00:46:35,780 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-11-27 00:46:35,780 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-11-27 00:46:35,780 [ scc.merge] INFO Updating 5d441c2..fb5ae86
2024-11-27 00:46:35,780 [ scc.merge] INFO Previously merged:
2024-11-27 00:46:35,780 [ scc.merge] INFO - PR 133 jburel 'Build'
2024-11-27 00:46:35,780 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-11-27 00:46:35,780 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-11-27 00:46:35,780 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-11-27 00:46:35,780 [ scc.merge] INFO
2024-11-27 00:46:35,780 [ scc.merge] INFO
2024-11-27 00:46:35,780 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-11-27 00:46:35,780 [ scc.merge] INFO Excluded PRs:
2024-11-27 00:46:35,780 [ scc.merge] INFO - PR 15 jburel 'Build' (status: failure)
2024-11-27 00:46:35,780 [ scc.merge] INFO Already up to date.
2024-11-27 00:46:35,780 [ scc.merge] INFO
2024-11-27 00:46:35,780 [ scc.merge] INFO Merged PRs:
2024-11-27 00:46:35,780 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-11-27 00:46:35,780 [ scc.merge] INFO
2024-11-27 00:46:35,780 [ scc.merge] INFO Repository: ome/omero-rois
2024-11-27 00:46:35,780 [ scc.merge] INFO Excluded PRs:
2024-11-27 00:46:35,780 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-11-27 00:46:35,780 [ scc.merge] INFO Already up to date.
2024-11-27 00:46:35,780 [ scc.merge] INFO
2024-11-27 00:46:35,780 [ scc.merge] INFO Merged PRs:
2024-11-27 00:46:35,780 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-11-27 00:46:35,780 [ scc.merge] INFO - PR 29 jburel 'Build'
2024-11-27 00:46:35,780 [ scc.merge] INFO
2024-11-27 00:46:35,781 [ scc.merge] INFO Repository: ome/omero-signup
2024-11-27 00:46:35,781 [ scc.merge] INFO Already up to date.
2024-11-27 00:46:35,781 [ scc.merge] INFO
2024-11-27 00:46:35,781 [ scc.merge] INFO Merged PRs:
2024-11-27 00:46:35,781 [ scc.merge] INFO - PR 21 jburel 'Build'
2024-11-27 00:46:35,781 [ scc.merge] INFO
2024-11-27 00:46:35,781 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-27 00:46:35,781 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-11-27 00:46:35,781 [ scc.merge] INFO
2024-11-27 00:46:35,781 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-11-27 00:46:35,781 [ scc.merge] INFO Already up to date.
2024-11-27 00:46:35,781 [ scc.merge] INFO
2024-11-27 00:46:35,781 [ scc.merge] INFO Merged PRs:
2024-11-27 00:46:35,781 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-11-27 00:46:35,781 [ scc.merge] INFO
2024-11-27 00:46:35,781 [ scc.merge] INFO Repository: ome/omero-upload
2024-11-27 00:46:35,781 [ scc.merge] INFO Updating aca9e9c..100f6ae
2024-11-27 00:46:35,781 [ scc.merge] INFO Previously merged:
2024-11-27 00:46:35,781 [ scc.merge] INFO - PR 13 jburel 'Build'
2024-11-27 00:46:35,781 [ scc.merge] INFO
2024-11-27 00:46:35,781 [ scc.merge] INFO
2024-11-27 00:46:35,781 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-11-27 00:46:35,781 [ scc.merge] INFO Already up to date.
2024-11-27 00:46:35,781 [ scc.merge] INFO
2024-11-27 00:46:35,781 [ scc.merge] INFO Merged PRs:
2024-11-27 00:46:35,781 [ scc.merge] INFO - PR 20 jburel 'Build'
2024-11-27 00:46:35,781 [ scc.merge] INFO
2024-11-27 00:46:35,781 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-11-27 00:46:35,781 [ scc.merge] INFO Excluded PRs:
2024-11-27 00:46:35,781 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2024-11-27 00:46:35,781 [ scc.merge] INFO - PR 17 jburel 'Build' (status: failure)
2024-11-27 00:46:35,781 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-11-27 00:46:35,781 [ scc.merge] INFO Already up to date.
2024-11-27 00:46:35,781 [ scc.merge] INFO
2024-11-27 00:46:35,781 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-27 00:46:35,781 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-11-27 00:46:35,781 [ scc.merge] INFO
2024-11-27 00:46:35,781 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-11-27 00:46:35,782 [ scc.merge] INFO Updating adfa132..70b01ed
2024-11-27 00:46:35,782 [ scc.merge] INFO Previously merged:
2024-11-27 00:46:35,782 [ scc.merge] INFO - PR 24 jburel 'Build'
2024-11-27 00:46:35,782 [ scc.merge] INFO
2024-11-27 00:46:35,782 [ scc.merge] INFO
2024-11-27 00:46:35,782 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-11-27 00:46:35,782 [ scc.merge] INFO Updating 8da48e1..5bfef29
2024-11-27 00:46:35,782 [ scc.merge] INFO Previously merged:
2024-11-27 00:46:35,782 [ scc.merge] INFO - PR 36 jburel 'Build'
2024-11-27 00:46:35,782 [ scc.merge] INFO
2024-11-27 00:46:35,782 [ scc.merge] INFO
2024-11-27 00:46:35,782 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-11-27 00:46:35,782 [ scc.merge] INFO Already up to date.
2024-11-27 00:46:35,782 [ scc.merge] INFO
2024-11-27 00:46:35,782 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-27 00:46:35,782 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-11-27 00:46:35,782 [ scc.merge] INFO
2024-11-27 00:46:35,782 [ scc.merge] INFO Repository: ome/scripts
2024-11-27 00:46:35,782 [ scc.merge] INFO Excluded PRs:
2024-11-27 00:46:35,782 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-11-27 00:46:35,782 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-11-27 00:46:35,782 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-11-27 00:46:35,782 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-11-27 00:46:35,782 [ scc.merge] INFO Already up to date.
2024-11-27 00:46:35,782 [ scc.merge] INFO
2024-11-27 00:46:35,782 [ scc.merge] INFO Merged PRs:
2024-11-27 00:46:35,782 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-11-27 00:46:35,782 [ scc.merge] INFO
2024-11-27 00:46:35,782 [ scc.merge] INFO Conflicting PRs (not included):
2024-11-27 00:46:35,782 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-11-27 00:46:35,782 [ scc.merge] INFO
2024-11-27 00:46:35,782 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-11-27 00:46:35,782 [ scc.git] DEBUG Calling 'git remote'
2024-11-27 00:46:35,788 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-11-27 00:46:35,788 [ scc.git] DEBUG Calling 'git remote'
2024-11-27 00:46:35,793 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:46:35,793 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-11-27 00:46:35,794 [ scc.git] DEBUG Calling 'git remote'
2024-11-27 00:46:35,798 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:46:35,798 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-11-27 00:46:35,798 [ scc.git] DEBUG Calling 'git remote'
2024-11-27 00:46:35,804 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:46:35,804 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-11-27 00:46:35,804 [ scc.git] DEBUG Calling 'git remote'
2024-11-27 00:46:35,809 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:46:35,809 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-11-27 00:46:35,809 [ scc.git] DEBUG Calling 'git remote'
2024-11-27 00:46:35,814 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:46:35,814 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-11-27 00:46:35,814 [ scc.git] DEBUG Calling 'git remote'
2024-11-27 00:46:35,819 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:46:35,819 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-11-27 00:46:35,819 [ scc.git] DEBUG Calling 'git remote'
2024-11-27 00:46:35,823 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:46:35,823 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-11-27 00:46:35,824 [ scc.git] DEBUG Calling 'git remote'
2024-11-27 00:46:35,829 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:46:35,829 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-11-27 00:46:35,829 [ scc.git] DEBUG Calling 'git remote'
2024-11-27 00:46:35,834 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:46:35,834 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-11-27 00:46:35,834 [ scc.git] DEBUG Calling 'git remote'
2024-11-27 00:46:35,840 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:46:35,840 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-11-27 00:46:35,840 [ scc.git] DEBUG Calling 'git remote'
2024-11-27 00:46:35,845 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:46:35,845 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-11-27 00:46:35,845 [ scc.git] DEBUG Calling 'git remote'
2024-11-27 00:46:35,851 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:46:35,851 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-11-27 00:46:35,851 [ scc.git] DEBUG Calling 'git remote'
2024-11-27 00:46:35,856 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:46:35,856 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-11-27 00:46:35,856 [ scc.git] DEBUG Calling 'git remote'
2024-11-27 00:46:35,861 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:46:35,861 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-11-27 00:46:35,862 [ scc.git] DEBUG Calling 'git remote'
2024-11-27 00:46:35,867 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:46:35,867 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-11-27 00:46:35,867 [ scc.git] DEBUG Calling 'git remote'
2024-11-27 00:46:35,873 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:46:35,873 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-11-27 00:46:35,873 [ scc.git] DEBUG Calling 'git remote'
2024-11-27 00:46:35,877 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:46:35,878 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-11-27 00:46:35,878 [ scc.git] DEBUG Calling 'git remote'
2024-11-27 00:46:35,883 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:46:35,883 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-11-27 00:46:35,883 [ scc.git] DEBUG Calling 'git remote'
2024-11-27 00:46:35,888 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:46:35,888 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-11-27 00:46:35,889 [ scc.git] DEBUG Calling 'git remote'
2024-11-27 00:46:35,894 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:46:35,894 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-11-27 00:46:35,894 [ scc.git] DEBUG Calling 'git remote'
2024-11-27 00:46:35,899 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-11-27 00:46:35,900 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-11-27 00:46:35,900 [ scc.git] DEBUG Calling 'git remote'
2024-11-27 00:46:35,904 [ 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 d26497d] 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 369753f
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 e0b0d1ae
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 acd798d
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from 6f1597f
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from c45d76c
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 f6cf7de] 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-27 00:47:22,943 [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-27 00:47:31,898 [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-27 00:47:34,220 [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-27 00:47:38,675 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-11-27 00:48:19,766 [ 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}
