Console Output
Skipping 114 KB..
Full Log] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-02 00:46:58,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-02 00:46:59,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2024-12-02 00:46:59,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/25020d66a7df4ec3cad5967706bb7d13b1493bb5?per_page=1 HTTP/1.1" 200 2
2024-12-02 00:46:59,878 [ scc.repo] DEBUG - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2024-12-02 00:47:00,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/114 HTTP/1.1" 200 None
2024-12-02 00:47:00,369 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-02 00:47:00,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2024-12-02 00:47:01,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-02 00:47:01,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-02 00:47:02,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2024-12-02 00:47:02,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/cf75d259b2882000d6be73bc1c11c99c27aa439b?per_page=1 HTTP/1.1" 200 2
2024-12-02 00:47:02,966 [ scc.repo] DEBUG - PR 114 dependabot[bot] 'Bump tar and fsevents'
2024-12-02 00:47:03,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/113 HTTP/1.1" 200 None
2024-12-02 00:47:03,421 [ scc.repo] DEBUG # ... Include label: dependencies
2024-12-02 00:47:03,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2024-12-02 00:47:04,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-02 00:47:04,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-02 00:47:05,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2024-12-02 00:47:05,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/6a657d7a4e0bbfaa3464e851023f29c63db15d4e?per_page=1 HTTP/1.1" 200 2
2024-12-02 00:47:05,989 [ scc.repo] DEBUG - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2024-12-02 00:47:05,990 [ scc.repo] DEBUG ## Branches found:
2024-12-02 00:47:05,990 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-12-02 00:47:05,990 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:47:05,990 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:05,998 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-02 00:47:06,004 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-02 00:47:06,004 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-02 00:47:06,010 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-02 00:47:06,015 [ scc.git] DEBUG Already up to date.
2024-12-02 00:47:06,016 [ scc.git] DEBUG Calling 'git fetch origin pull/113/head'
2024-12-02 00:47:06,339 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-02 00:47:06,339 [ scc.git] DEBUG * branch refs/pull/113/head -> FETCH_HEAD
2024-12-02 00:47:06,344 [ scc.git] DEBUG Calling 'git fetch origin pull/114/head'
2024-12-02 00:47:06,650 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-02 00:47:06,650 [ scc.git] DEBUG * branch refs/pull/114/head -> FETCH_HEAD
2024-12-02 00:47:06,656 [ scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2024-12-02 00:47:06,947 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-02 00:47:06,947 [ scc.git] DEBUG * branch refs/pull/115/head -> FETCH_HEAD
2024-12-02 00:47:06,955 [ scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2024-12-02 00:47:07,236 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-02 00:47:07,236 [ scc.git] DEBUG * branch refs/pull/116/head -> FETCH_HEAD
2024-12-02 00:47:07,242 [ scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2024-12-02 00:47:07,546 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-02 00:47:07,546 [ scc.git] DEBUG * branch refs/pull/117/head -> FETCH_HEAD
2024-12-02 00:47:07,558 [ scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2024-12-02 00:47:07,889 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-12-02 00:47:07,889 [ scc.git] DEBUG * branch refs/pull/118/head -> FETCH_HEAD
2024-12-02 00:47:07,894 [ scc.git] DEBUG ## Unique users: []
2024-12-02 00:47:07,895 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:47:07,895 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:07,902 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2024-12-02 00:47:07,963 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:07,972 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 113 (Bump elliptic from 6.5.4 to 6.6.1) 6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2024-12-02 00:47:08,033 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-02 00:47:08,038 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2024-12-02 00:47:08,038 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2024-12-02 00:47:08,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:47:08,191 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2024-12-02 00:47:08,249 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:08,267 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2024-12-02 00:47:08,401 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-02 00:47:08,402 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-02 00:47:08,408 [ scc.git] DEBUG package-lock.json | 625 +++---------------------------------------------------
2024-12-02 00:47:08,408 [ scc.git] DEBUG 1 file changed, 29 insertions(+), 596 deletions(-)
2024-12-02 00:47:08,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:47:08,584 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-12-02 00:47:08,594 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:08,602 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 115 (Bump micromatch, webpack-cli and webpack) 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-12-02 00:47:08,741 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-02 00:47:08,741 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2024-12-02 00:47:08,741 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-02 00:47:08,742 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-02 00:47:08,751 [ scc.git] DEBUG Calling 'git reset --hard bb554e11e4ba1ce2d790ba52f0ea0dae1105fdd9'
2024-12-02 00:47:08,760 [ scc.git] DEBUG HEAD is now at bb554e1 merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2024-12-02 00:47:09,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:47:09,019 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2024-12-02 00:47:09,026 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2024-12-02 00:47:09,032 [ scc.git] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#265](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/consoleText) for more details.
Possible conflicts:
- PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- package-lock.json
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
--conflicts
2024-12-02 00:47:09,037 [ scc.config] DEBUG Found github.token
2024-12-02 00:47:09,037 [ scc.git] DEBUG Not adding comment to issue #115, already --conflicts.
2024-12-02 00:47:09,037 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2024-12-02 00:47:09,098 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:09,104 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 116 (Bump browserify-sign from 4.0.4 to 4.2.3) 42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2024-12-02 00:47:09,281 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-02 00:47:09,315 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-02 00:47:09,321 [ scc.git] DEBUG package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2024-12-02 00:47:09,321 [ scc.git] DEBUG 1 file changed, 108 insertions(+), 11 deletions(-)
2024-12-02 00:47:09,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:47:09,460 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2024-12-02 00:47:09,514 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:09,523 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6) 155d7ddab4f04c4a91bffc5736ba0741003c566c'
2024-12-02 00:47:09,611 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-02 00:47:09,657 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-02 00:47:09,663 [ scc.git] DEBUG package-lock.json | 6 +++---
2024-12-02 00:47:09,663 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-12-02 00:47:09,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:47:09,845 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-12-02 00:47:09,857 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:09,865 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 118 (Bump braces, webpack-cli and webpack) 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-12-02 00:47:09,987 [ scc.git] DEBUG Auto-merging package-lock.json
2024-12-02 00:47:09,987 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2024-12-02 00:47:09,987 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-02 00:47:09,988 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-02 00:47:09,994 [ scc.git] DEBUG Calling 'git reset --hard 9cbfa1d47ed8e1a080ec6bcbd4c0c87da68287a6'
2024-12-02 00:47:10,002 [ scc.git] DEBUG HEAD is now at 9cbfa1d merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2024-12-02 00:47:10,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:47:10,242 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2024-12-02 00:47:10,249 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2024-12-02 00:47:10,258 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#265](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/consoleText) for more details.
Possible conflicts:
- PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- package-lock.json
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
- PR #115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- package-lock.json
- PR #116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- package-lock.json
- PR #117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
- package-lock.json
--conflicts
2024-12-02 00:47:10,266 [ scc.config] DEBUG Found github.token
2024-12-02 00:47:10,266 [ scc.git] DEBUG Adding comment to issue #118.
2024-12-02 00:47:11,070 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 201 2394
2024-12-02 00:47:11,072 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-02 00:47:11,115 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:47:11,115 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:11,122 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-02 00:47:11,163 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-02 00:47:11,171 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3acb31af40> has no local changes
2024-12-02 00:47:11,172 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Generated by OMERO-plugins-push#265 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/)'
2024-12-02 00:47:11,184 [ scc.git] DEBUG [detached HEAD bef2ed0] merge master -Dorg -Ssuccess-only
2024-12-02 00:47:11,184 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:47:11,184 [ scc.repo] DEBUG ## PRs found:
2024-12-02 00:47:11,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-12-02 00:47:12,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2024-12-02 00:47:12,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2024-12-02 00:47:13,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-12-02 00:47:13,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-12-02 00:47:14,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-12-02 00:47:14,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-02 00:47:15,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-02 00:47:15,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-12-02 00:47:16,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-12-02 00:47:16,048 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-12-02 00:47:16,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-12-02 00:47:17,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-12-02 00:47:17,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-12-02 00:47:18,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-02 00:47:18,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-02 00:47:18,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-12-02 00:47:19,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-12-02 00:47:19,352 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-12-02 00:47:19,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-12-02 00:47:20,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-12-02 00:47:20,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-12-02 00:47:21,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-02 00:47:21,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-12-02 00:47:22,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-12-02 00:47:22,153 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-12-02 00:47:22,153 [ scc.repo] DEBUG ## Branches found:
2024-12-02 00:47:22,153 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-12-02 00:47:22,153 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:47:22,153 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:22,160 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-02 00:47:22,166 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-02 00:47:22,166 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-02 00:47:22,181 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-02 00:47:22,215 [ scc.git] DEBUG Already up to date.
2024-12-02 00:47:22,216 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-12-02 00:47:24,251 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-02 00:47:24,251 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-12-02 00:47:24,256 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-12-02 00:47:25,269 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-02 00:47:25,269 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-12-02 00:47:25,276 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-12-02 00:47:25,640 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-12-02 00:47:25,640 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-12-02 00:47:25,646 [ scc.git] DEBUG ## Unique users: []
2024-12-02 00:47:25,646 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:47:25,646 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:25,653 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-12-02 00:47:25,663 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:25,670 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-12-02 00:47:25,696 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-12-02 00:47:25,697 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-02 00:47:25,701 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-12-02 00:47:25,701 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-12-02 00:47:25,701 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-12-02 00:47:25,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:47:25,838 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-12-02 00:47:25,848 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:25,854 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-12-02 00:47:26,526 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-12-02 00:47:26,526 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-12-02 00:47:26,526 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-12-02 00:47:26,526 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-12-02 00:47:26,526 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-02 00:47:26,533 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-12-02 00:47:26,533 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-12-02 00:47:26,533 [ scc.git] DEBUG src/app/header.html | 5 +
2024-12-02 00:47:26,533 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-12-02 00:47:26,533 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-12-02 00:47:26,533 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-12-02 00:47:26,533 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-12-02 00:47:26,533 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-12-02 00:47:26,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:47:26,673 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-12-02 00:47:26,681 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:26,686 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-12-02 00:47:27,293 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-12-02 00:47:27,294 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-02 00:47:27,297 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-12-02 00:47:27,297 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-12-02 00:47:27,297 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-12-02 00:47:27,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:47:27,472 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-02 00:47:27,517 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:47:27,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:27,525 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-02 00:47:27,566 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-02 00:47:27,575 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ac82845e0> has no local changes
2024-12-02 00:47:27,576 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
Generated by OMERO-plugins-push#265 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/)'
2024-12-02 00:47:27,587 [ scc.git] DEBUG [detached HEAD 67db1c2] merge master -Dorg -Ssuccess-only
2024-12-02 00:47:27,587 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:47:27,588 [ scc.repo] DEBUG ## PRs found:
2024-12-02 00:47:28,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-12-02 00:47:28,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-12-02 00:47:28,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-12-02 00:47:29,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-12-02 00:47:29,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-02 00:47:30,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-12-02 00:47:30,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-12-02 00:47:30,963 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-12-02 00:47:30,964 [ scc.repo] DEBUG ## Branches found:
2024-12-02 00:47:30,964 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-12-02 00:47:30,964 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:47:30,964 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:30,972 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-02 00:47:30,982 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-02 00:47:30,983 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-02 00:47:30,995 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-02 00:47:31,010 [ scc.git] DEBUG Already up to date.
2024-12-02 00:47:31,011 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-12-02 00:47:31,396 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-12-02 00:47:31,396 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-12-02 00:47:31,401 [ scc.git] DEBUG ## Unique users: []
2024-12-02 00:47:31,401 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:47:31,401 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:31,408 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-12-02 00:47:31,415 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:31,421 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-12-02 00:47:31,431 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-02 00:47:31,434 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-12-02 00:47:31,434 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-12-02 00:47:31,434 [ scc.git] DEBUG requirements.txt | 2 +-
2024-12-02 00:47:31,434 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-12-02 00:47:31,434 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-12-02 00:47:31,434 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-12-02 00:47:31,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:47:31,582 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-02 00:47:31,622 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:47:31,622 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:31,628 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-02 00:47:31,667 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-02 00:47:31,674 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ac8297bb0> has no local changes
2024-12-02 00:47:31,675 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Generated by OMERO-plugins-push#265 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/)'
2024-12-02 00:47:31,683 [ scc.git] DEBUG [detached HEAD 4dcb8a7] merge master -Dorg -Ssuccess-only
2024-12-02 00:47:31,684 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:47:31,684 [ scc.repo] DEBUG ## PRs found:
2024-12-02 00:47:32,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-12-02 00:47:32,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/89 HTTP/1.1" 200 None
2024-12-02 00:47:33,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/dfc227486da13c78bc278fc534e59b40cbc97175 HTTP/1.1" 200 None
2024-12-02 00:47:33,655 [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-12-02 00:47:34,144 [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-12-02 00:47:34,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/dfc227486da13c78bc278fc534e59b40cbc97175 HTTP/1.1" 200 None
2024-12-02 00:47:35,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/dfc227486da13c78bc278fc534e59b40cbc97175?per_page=1 HTTP/1.1" 200 2
2024-12-02 00:47:35,058 [ scc.repo] DEBUG - PR 89 jburel 'Build'
2024-12-02 00:47:35,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-12-02 00:47:36,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-12-02 00:47:36,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-12-02 00:47:37,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-02 00:47:37,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-12-02 00:47:37,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-12-02 00:47:37,925 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-12-02 00:47:38,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-12-02 00:47:38,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-12-02 00:47:39,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-12-02 00:47:39,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-02 00:47:40,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-12-02 00:47:40,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-12-02 00:47:40,781 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-12-02 00:47:40,781 [ scc.repo] DEBUG ## Branches found:
2024-12-02 00:47:40,781 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-12-02 00:47:40,782 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:47:40,782 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:40,793 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-02 00:47:40,801 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-02 00:47:40,801 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-02 00:47:40,808 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-02 00:47:40,816 [ scc.git] DEBUG Already up to date.
2024-12-02 00:47:40,816 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-12-02 00:47:41,430 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-12-02 00:47:41,431 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-12-02 00:47:41,436 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-12-02 00:47:42,162 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-12-02 00:47:42,163 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-12-02 00:47:42,168 [ scc.git] DEBUG Calling 'git fetch origin pull/89/head'
2024-12-02 00:47:42,737 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-12-02 00:47:42,737 [ scc.git] DEBUG * branch refs/pull/89/head -> FETCH_HEAD
2024-12-02 00:47:42,742 [ scc.git] DEBUG ## Unique users: []
2024-12-02 00:47:42,742 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:47:42,742 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:42,749 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-12-02 00:47:42,755 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:42,761 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-12-02 00:47:42,856 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-12-02 00:47:42,856 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-12-02 00:47:42,856 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-12-02 00:47:42,856 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-12-02 00:47:42,857 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-02 00:47:42,857 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-02 00:47:42,864 [ scc.git] DEBUG Calling 'git reset --hard fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-12-02 00:47:42,871 [ scc.git] DEBUG HEAD is now at fc20959 Bump version: 0.13.0 → 0.13.1.dev0
2024-12-02 00:47:43,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:47:43,020 [ scc.git] DEBUG Calling 'git merge-base fc2095901f5dfd24ecd29a99092283f136de04d5 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-12-02 00:47:43,028 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-12-02 00:47:43,106 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#265](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-12-02 00:47:43,112 [ scc.config] DEBUG Found github.token
2024-12-02 00:47:43,112 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-12-02 00:47:43,112 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-12-02 00:47:43,120 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:43,125 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-12-02 00:47:43,166 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-12-02 00:47:43,167 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-12-02 00:47:43,167 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-12-02 00:47:43,167 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-02 00:47:43,167 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-02 00:47:43,174 [ scc.git] DEBUG Calling 'git reset --hard fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-12-02 00:47:43,181 [ scc.git] DEBUG HEAD is now at fc20959 Bump version: 0.13.0 → 0.13.1.dev0
2024-12-02 00:47:43,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:47:43,418 [ scc.git] DEBUG Calling 'git merge-base fc2095901f5dfd24ecd29a99092283f136de04d5 78e55539b68e351ed5ef202854718b49a37729a7'
2024-12-02 00:47:43,426 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..fc2095901f5dfd24ecd29a99092283f136de04d5'
2024-12-02 00:47:43,432 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#265](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-12-02 00:47:43,437 [ scc.config] DEBUG Found github.token
2024-12-02 00:47:43,438 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-12-02 00:47:43,438 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dfc227486da13c78bc278fc534e59b40cbc97175'
2024-12-02 00:47:43,444 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:43,449 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 89 (Build) dfc227486da13c78bc278fc534e59b40cbc97175'
2024-12-02 00:47:43,461 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-02 00:47:43,463 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2024-12-02 00:47:43,463 [ scc.git] DEBUG 1 file changed, 7 insertions(+), 5 deletions(-)
2024-12-02 00:47:43,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:47:43,813 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-02 00:47:43,860 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:47:43,860 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:43,867 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-02 00:47:43,912 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-02 00:47:43,919 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ac823c880> has no local changes
2024-12-02 00:47:43,920 [ 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#265 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/)'
2024-12-02 00:47:43,930 [ scc.git] DEBUG [detached HEAD 81a734a] merge master -Dorg -Ssuccess-only
2024-12-02 00:47:43,931 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:47:43,931 [ scc.repo] DEBUG ## PRs found:
2024-12-02 00:47:44,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-12-02 00:47:44,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-12-02 00:47:45,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-12-02 00:47:45,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-12-02 00:47:46,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-12-02 00:47:46,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-12-02 00:47:47,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-12-02 00:47:47,233 [ scc.repo] DEBUG ## Branches found:
2024-12-02 00:47:47,233 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-12-02 00:47:47,233 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:47:47,233 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:47,241 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-02 00:47:47,247 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-02 00:47:47,247 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-02 00:47:47,254 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-02 00:47:47,270 [ scc.git] DEBUG Updating 5d441c2..fb5ae86
2024-12-02 00:47:47,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls/133 HTTP/1.1" 200 None
2024-12-02 00:47:48,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls/129 HTTP/1.1" 200 None
2024-12-02 00:47:49,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls/131 HTTP/1.1" 200 None
2024-12-02 00:47:49,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls/128 HTTP/1.1" 200 None
2024-12-02 00:47:49,893 [ scc.git] DEBUG ## Unique users: []
2024-12-02 00:47:49,893 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:47:49,893 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:49,900 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-02 00:47:49,951 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:47:49,952 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:49,958 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-02 00:47:50,000 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-02 00:47:50,008 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ac823c670> has no local changes
2024-12-02 00:47:50,008 [ 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#265 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/)'
2024-12-02 00:47:50,018 [ scc.git] DEBUG [detached HEAD 7832494] merge master -Dorg -Ssuccess-only
2024-12-02 00:47:50,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:47:50,018 [ scc.repo] DEBUG ## PRs found:
2024-12-02 00:47:50,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-12-02 00:47:50,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/15 HTTP/1.1" 200 None
2024-12-02 00:47:51,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/b5d953edc0b64a1bba13e9d5d90f3f9e68b7a332 HTTP/1.1" 200 None
2024-12-02 00:47:52,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/b5d953edc0b64a1bba13e9d5d90f3f9e68b7a332/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-02 00:47:52,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/b5d953edc0b64a1bba13e9d5d90f3f9e68b7a332/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-02 00:47:53,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-12-02 00:47:53,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-12-02 00:47:54,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-02 00:47:54,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-12-02 00:47:54,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-12-02 00:47:54,935 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-12-02 00:47:54,935 [ scc.repo] DEBUG ## Branches found:
2024-12-02 00:47:54,935 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-12-02 00:47:54,935 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:47:54,935 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:54,942 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-02 00:47:54,948 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-02 00:47:54,948 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-02 00:47:54,954 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-02 00:47:54,962 [ scc.git] DEBUG Already up to date.
2024-12-02 00:47:54,962 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-12-02 00:47:55,288 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-12-02 00:47:55,289 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-12-02 00:47:55,293 [ scc.git] DEBUG ## Unique users: []
2024-12-02 00:47:55,293 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:47:55,293 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:55,299 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-12-02 00:47:55,306 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:55,311 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-12-02 00:47:55,321 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-02 00:47:55,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:47:55,476 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-02 00:47:55,519 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:47:55,520 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:47:55,526 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-02 00:47:55,568 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-02 00:47:55,577 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ac82b0e80> has no local changes
2024-12-02 00:47:55,577 [ 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#265 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/)'
2024-12-02 00:47:55,587 [ scc.git] DEBUG [detached HEAD 78c2ed9] merge master -Dorg -Ssuccess-only
2024-12-02 00:47:55,588 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:47:55,588 [ scc.repo] DEBUG ## PRs found:
2024-12-02 00:47:56,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-12-02 00:47:56,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/29 HTTP/1.1" 200 None
2024-12-02 00:47:57,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24 HTTP/1.1" 200 None
2024-12-02 00:47:57,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-02 00:47:57,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24 HTTP/1.1" 200 None
2024-12-02 00:47:58,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24?per_page=1 HTTP/1.1" 200 None
2024-12-02 00:47:58,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24 HTTP/1.1" 200 None
2024-12-02 00:47:59,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24/status HTTP/1.1" 200 None
2024-12-02 00:47:59,316 [ scc.repo] DEBUG - PR 29 jburel 'Build'
2024-12-02 00:47:59,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-12-02 00:48:00,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-12-02 00:48:00,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-12-02 00:48:01,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-12-02 00:48:01,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-02 00:48:02,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-12-02 00:48:02,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-12-02 00:48:02,693 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-12-02 00:48:02,693 [ scc.repo] DEBUG ## Branches found:
2024-12-02 00:48:02,693 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-12-02 00:48:02,693 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:02,693 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:02,701 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-02 00:48:02,707 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-02 00:48:02,707 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-02 00:48:02,713 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-02 00:48:02,720 [ scc.git] DEBUG Already up to date.
2024-12-02 00:48:02,720 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-12-02 00:48:03,062 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-12-02 00:48:03,062 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-12-02 00:48:03,067 [ scc.git] DEBUG Calling 'git fetch origin pull/29/head'
2024-12-02 00:48:03,603 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-12-02 00:48:03,604 [ scc.git] DEBUG * branch refs/pull/29/head -> FETCH_HEAD
2024-12-02 00:48:03,608 [ scc.git] DEBUG ## Unique users: []
2024-12-02 00:48:03,608 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:03,608 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:03,615 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-12-02 00:48:03,622 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:03,628 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-12-02 00:48:03,639 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-12-02 00:48:03,640 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-02 00:48:03,643 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-12-02 00:48:03,643 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-12-02 00:48:03,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:03,784 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24'
2024-12-02 00:48:03,793 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:03,802 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 29 (Build) 92f4771ebb5da70c8bfef5cf9c24bcef7fe8db24'
2024-12-02 00:48:03,923 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-02 00:48:03,926 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-12-02 00:48:03,926 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2024-12-02 00:48:03,926 [ scc.git] DEBUG 2 files changed, 8 insertions(+), 6 deletions(-)
2024-12-02 00:48:04,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:04,208 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-02 00:48:04,259 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:04,260 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:04,268 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-02 00:48:04,320 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-02 00:48:04,330 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ac8255730> has no local changes
2024-12-02 00:48:04,330 [ 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#265 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/)'
2024-12-02 00:48:04,340 [ scc.git] DEBUG [detached HEAD ad11c45] merge master -Dorg -Ssuccess-only
2024-12-02 00:48:04,341 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:04,341 [ scc.repo] DEBUG ## PRs found:
2024-12-02 00:48:04,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-12-02 00:48:05,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/21 HTTP/1.1" 200 None
2024-12-02 00:48:05,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/d8cd79097b8e36aef506d1589aa1bc281a0fc1b1 HTTP/1.1" 200 None
2024-12-02 00:48:06,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/d8cd79097b8e36aef506d1589aa1bc281a0fc1b1/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-02 00:48:06,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/d8cd79097b8e36aef506d1589aa1bc281a0fc1b1/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-02 00:48:07,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/d8cd79097b8e36aef506d1589aa1bc281a0fc1b1 HTTP/1.1" 200 None
2024-12-02 00:48:07,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/d8cd79097b8e36aef506d1589aa1bc281a0fc1b1?per_page=1 HTTP/1.1" 200 2
2024-12-02 00:48:07,640 [ scc.repo] DEBUG - PR 21 jburel 'Build'
2024-12-02 00:48:08,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-12-02 00:48:08,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-12-02 00:48:09,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-12-02 00:48:09,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-02 00:48:10,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-12-02 00:48:10,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-12-02 00:48:10,519 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-12-02 00:48:10,519 [ scc.repo] DEBUG ## Branches found:
2024-12-02 00:48:10,520 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-12-02 00:48:10,520 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:10,520 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:10,527 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-02 00:48:10,532 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-02 00:48:10,533 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-02 00:48:10,539 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-02 00:48:10,547 [ scc.git] DEBUG Already up to date.
2024-12-02 00:48:10,547 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-12-02 00:48:10,958 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-12-02 00:48:10,958 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-12-02 00:48:10,963 [ scc.git] DEBUG Calling 'git fetch origin pull/21/head'
2024-12-02 00:48:11,501 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-12-02 00:48:11,502 [ scc.git] DEBUG * branch refs/pull/21/head -> FETCH_HEAD
2024-12-02 00:48:11,507 [ scc.git] DEBUG ## Unique users: []
2024-12-02 00:48:11,507 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:11,507 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:11,513 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-02 00:48:11,520 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:11,526 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-02 00:48:11,576 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-12-02 00:48:11,577 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-12-02 00:48:11,577 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-12-02 00:48:11,577 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-12-02 00:48:11,577 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-12-02 00:48:11,577 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-12-02 00:48:11,577 [ scc.git] DEBUG Auto-merging setup.py
2024-12-02 00:48:11,577 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-12-02 00:48:11,577 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-02 00:48:11,578 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-02 00:48:11,586 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-12-02 00:48:11,593 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-12-02 00:48:11,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:11,736 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-12-02 00:48:11,742 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-12-02 00:48:11,748 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#265](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
- omero_signup/views.py
--conflicts
2024-12-02 00:48:11,753 [ scc.config] DEBUG Found github.token
2024-12-02 00:48:11,754 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-12-02 00:48:11,754 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8cd79097b8e36aef506d1589aa1bc281a0fc1b1'
2024-12-02 00:48:11,759 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:11,764 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 21 (Build) d8cd79097b8e36aef506d1589aa1bc281a0fc1b1'
2024-12-02 00:48:11,775 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-02 00:48:11,778 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-12-02 00:48:11,778 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2024-12-02 00:48:11,778 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2024-12-02 00:48:11,778 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2024-12-02 00:48:11,778 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2024-12-02 00:48:12,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:12,121 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-02 00:48:12,165 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:12,166 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:12,172 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-02 00:48:12,216 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-02 00:48:12,226 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ac8255610> has no local changes
2024-12-02 00:48:12,226 [ 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#265 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/)'
2024-12-02 00:48:12,237 [ scc.git] DEBUG [detached HEAD 36587c4] merge master -Dorg -Ssuccess-only
2024-12-02 00:48:12,238 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:12,238 [ scc.repo] DEBUG ## PRs found:
2024-12-02 00:48:12,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-12-02 00:48:13,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-12-02 00:48:13,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-12-02 00:48:14,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-12-02 00:48:14,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-02 00:48:15,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-12-02 00:48:15,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-12-02 00:48:15,548 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-12-02 00:48:15,548 [ scc.repo] DEBUG ## Branches found:
2024-12-02 00:48:15,548 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-12-02 00:48:15,549 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:15,549 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:15,556 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-02 00:48:15,562 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-02 00:48:15,562 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-02 00:48:15,568 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-02 00:48:15,574 [ scc.git] DEBUG Already up to date.
2024-12-02 00:48:15,575 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-12-02 00:48:15,943 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-12-02 00:48:15,943 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-12-02 00:48:15,948 [ scc.git] DEBUG ## Unique users: []
2024-12-02 00:48:15,949 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:15,949 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:15,956 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-12-02 00:48:15,965 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:15,972 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-12-02 00:48:15,998 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-02 00:48:16,002 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-12-02 00:48:16,002 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-12-02 00:48:16,002 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-12-02 00:48:16,002 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-12-02 00:48:16,004 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-12-02 00:48:16,004 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-12-02 00:48:16,004 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-12-02 00:48:16,004 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-12-02 00:48:16,004 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-12-02 00:48:16,004 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-12-02 00:48:16,004 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-12-02 00:48:16,005 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-12-02 00:48:16,005 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-12-02 00:48:16,005 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-12-02 00:48:16,005 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-12-02 00:48:16,005 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-12-02 00:48:16,005 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-12-02 00:48:16,005 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-12-02 00:48:16,005 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-12-02 00:48:16,005 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-12-02 00:48:16,005 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-12-02 00:48:16,005 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-12-02 00:48:16,005 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-12-02 00:48:16,005 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-12-02 00:48:16,005 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-12-02 00:48:16,005 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-12-02 00:48:16,005 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-12-02 00:48:16,005 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-12-02 00:48:16,005 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-12-02 00:48:16,005 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-12-02 00:48:16,005 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-12-02 00:48:16,005 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-12-02 00:48:16,005 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-12-02 00:48:16,005 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-12-02 00:48:16,005 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-12-02 00:48:16,005 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-12-02 00:48:16,005 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-12-02 00:48:16,005 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-12-02 00:48:16,005 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-12-02 00:48:16,005 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-12-02 00:48:16,005 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-12-02 00:48:16,005 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-12-02 00:48:16,005 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-12-02 00:48:16,005 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-12-02 00:48:16,005 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-12-02 00:48:16,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:16,135 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-02 00:48:16,177 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:16,177 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:16,183 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-02 00:48:16,224 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-02 00:48:16,232 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ac8269c40> has no local changes
2024-12-02 00:48:16,232 [ 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#265 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/)'
2024-12-02 00:48:16,243 [ scc.git] DEBUG [detached HEAD 02652c6] merge master -Dorg -Ssuccess-only
2024-12-02 00:48:16,244 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:16,244 [ scc.repo] DEBUG ## PRs found:
2024-12-02 00:48:16,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-12-02 00:48:16,545 [ scc.repo] DEBUG ## Branches found:
2024-12-02 00:48:16,545 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-12-02 00:48:16,545 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:16,545 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:16,551 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-02 00:48:16,557 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-02 00:48:16,557 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-02 00:48:16,564 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-02 00:48:16,575 [ scc.git] DEBUG Updating aca9e9c..100f6ae
2024-12-02 00:48:17,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls/13 HTTP/1.1" 200 None
2024-12-02 00:48:17,216 [ scc.git] DEBUG ## Unique users: []
2024-12-02 00:48:17,216 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:17,216 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:17,224 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-02 00:48:17,263 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:17,263 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:17,268 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-02 00:48:17,311 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-02 00:48:17,318 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ac82901c0> has no local changes
2024-12-02 00:48:17,318 [ 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#265 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/)'
2024-12-02 00:48:17,327 [ scc.git] DEBUG [detached HEAD de675b2] merge master -Dorg -Ssuccess-only
2024-12-02 00:48:17,327 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:17,328 [ scc.repo] DEBUG ## PRs found:
2024-12-02 00:48:17,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2024-12-02 00:48:18,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2024-12-02 00:48:18,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2024-12-02 00:48:19,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-02 00:48:19,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-02 00:48:20,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2024-12-02 00:48:20,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2024-12-02 00:48:20,716 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2024-12-02 00:48:20,716 [ scc.repo] DEBUG ## Branches found:
2024-12-02 00:48:20,716 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-12-02 00:48:20,716 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:20,716 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:20,723 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-02 00:48:20,729 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-02 00:48:20,729 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-02 00:48:20,736 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-02 00:48:20,745 [ scc.git] DEBUG Already up to date.
2024-12-02 00:48:20,745 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2024-12-02 00:48:21,155 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2024-12-02 00:48:21,155 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2024-12-02 00:48:21,160 [ scc.git] DEBUG ## Unique users: []
2024-12-02 00:48:21,160 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:21,160 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:21,167 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2024-12-02 00:48:21,174 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:21,180 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2024-12-02 00:48:21,221 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-02 00:48:21,224 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-12-02 00:48:21,224 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2024-12-02 00:48:21,224 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2024-12-02 00:48:21,224 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2024-12-02 00:48:21,224 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2024-12-02 00:48:21,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:21,387 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-02 00:48:21,430 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:21,430 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:21,437 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-02 00:48:21,477 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-02 00:48:21,485 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ac8264f70> has no local changes
2024-12-02 00:48:21,485 [ 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#265 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/)'
2024-12-02 00:48:21,495 [ scc.git] DEBUG [detached HEAD 5ae535b] merge master -Dorg -Ssuccess-only
2024-12-02 00:48:21,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:21,496 [ scc.git] INFO Overriding base-branch from master to main
2024-12-02 00:48:21,496 [ scc.repo] DEBUG ## PRs found:
2024-12-02 00:48:21,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-12-02 00:48:22,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2024-12-02 00:48:22,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2024-12-02 00:48:23,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2024-12-02 00:48:23,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-02 00:48:24,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-02 00:48:24,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/17 HTTP/1.1" 200 None
2024-12-02 00:48:25,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/17/comments HTTP/1.1" 200 None
2024-12-02 00:48:25,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/020e85775bda54e9136b3fb9e699411e0d4f8c95 HTTP/1.1" 200 None
2024-12-02 00:48:26,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/020e85775bda54e9136b3fb9e699411e0d4f8c95/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-02 00:48:26,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/020e85775bda54e9136b3fb9e699411e0d4f8c95/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-02 00:48:27,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-12-02 00:48:27,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-12-02 00:48:28,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-12-02 00:48:28,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-12-02 00:48:29,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-02 00:48:29,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-12-02 00:48:30,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-12-02 00:48:30,130 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-12-02 00:48:30,131 [ scc.repo] DEBUG ## Branches found:
2024-12-02 00:48:30,131 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-12-02 00:48:30,131 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:30,131 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:30,139 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-12-02 00:48:30,144 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-02 00:48:30,145 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-12-02 00:48:30,151 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-12-02 00:48:30,157 [ scc.git] DEBUG Already up to date.
2024-12-02 00:48:30,157 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-12-02 00:48:30,525 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-12-02 00:48:30,525 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-12-02 00:48:30,530 [ scc.git] DEBUG ## Unique users: []
2024-12-02 00:48:30,530 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:30,530 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:30,537 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-02 00:48:30,543 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:30,549 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-02 00:48:30,573 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-12-02 00:48:30,573 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-12-02 00:48:30,573 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-02 00:48:30,574 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-02 00:48:30,581 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-12-02 00:48:30,588 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-12-02 00:48:30,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:30,756 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-12-02 00:48:30,764 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-12-02 00:48:30,770 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#265](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-12-02 00:48:30,776 [ scc.config] DEBUG Found github.token
2024-12-02 00:48:30,777 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-12-02 00:48:30,777 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-02 00:48:30,819 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:30,819 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:30,826 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-02 00:48:30,865 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-02 00:48:30,872 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ac81dcaf0> has no local changes
2024-12-02 00:48:30,873 [ 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#265 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/)'
2024-12-02 00:48:30,882 [ scc.git] DEBUG [detached HEAD cb1fcba] merge master -Dorg -Ssuccess-only
2024-12-02 00:48:30,882 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:30,883 [ scc.repo] DEBUG ## PRs found:
2024-12-02 00:48:31,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-12-02 00:48:31,168 [ scc.repo] DEBUG ## Branches found:
2024-12-02 00:48:31,168 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-12-02 00:48:31,168 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:31,168 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:31,175 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-02 00:48:31,180 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-02 00:48:31,181 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-02 00:48:31,186 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-02 00:48:31,197 [ scc.git] DEBUG Updating adfa132..70b01ed
2024-12-02 00:48:31,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls/24 HTTP/1.1" 200 None
2024-12-02 00:48:31,803 [ scc.git] DEBUG ## Unique users: []
2024-12-02 00:48:31,803 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:31,803 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:31,810 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-02 00:48:31,856 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:31,857 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:31,864 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-02 00:48:31,907 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-02 00:48:31,914 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ac81dca30> has no local changes
2024-12-02 00:48:31,914 [ 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#265 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/)'
2024-12-02 00:48:31,924 [ scc.git] DEBUG [detached HEAD 0fac260] merge master -Dorg -Ssuccess-only
2024-12-02 00:48:31,924 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:31,924 [ scc.repo] DEBUG ## PRs found:
2024-12-02 00:48:32,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-12-02 00:48:32,216 [ scc.repo] DEBUG ## Branches found:
2024-12-02 00:48:32,216 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-12-02 00:48:32,217 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:32,217 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:32,223 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-02 00:48:32,228 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-02 00:48:32,229 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-02 00:48:32,234 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-02 00:48:32,246 [ scc.git] DEBUG Updating 8da48e1..5bfef29
2024-12-02 00:48:32,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls/36 HTTP/1.1" 200 None
2024-12-02 00:48:32,871 [ scc.git] DEBUG ## Unique users: []
2024-12-02 00:48:32,871 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:32,871 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:32,878 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-02 00:48:32,918 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:32,918 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:32,924 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-02 00:48:32,964 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-02 00:48:32,971 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ac81838b0> has no local changes
2024-12-02 00:48:32,971 [ 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#265 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/)'
2024-12-02 00:48:32,980 [ scc.git] DEBUG [detached HEAD dad54a8] merge master -Dorg -Ssuccess-only
2024-12-02 00:48:32,980 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:32,980 [ scc.repo] DEBUG ## PRs found:
2024-12-02 00:48:33,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-12-02 00:48:33,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-12-02 00:48:34,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-12-02 00:48:34,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-12-02 00:48:35,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-02 00:48:35,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-12-02 00:48:36,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-12-02 00:48:36,162 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-12-02 00:48:36,162 [ scc.repo] DEBUG ## Branches found:
2024-12-02 00:48:36,162 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-12-02 00:48:36,162 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:36,162 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:36,168 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-12-02 00:48:36,174 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-02 00:48:36,174 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-12-02 00:48:36,179 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-12-02 00:48:36,185 [ scc.git] DEBUG Already up to date.
2024-12-02 00:48:36,185 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-12-02 00:48:36,832 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-12-02 00:48:36,833 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-12-02 00:48:36,837 [ scc.git] DEBUG ## Unique users: []
2024-12-02 00:48:36,838 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:36,838 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:36,844 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-02 00:48:36,851 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:36,858 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-02 00:48:36,922 [ scc.git] DEBUG Auto-merging Dockerfile
2024-12-02 00:48:36,922 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-12-02 00:48:36,922 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-02 00:48:36,923 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-02 00:48:36,930 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-12-02 00:48:36,938 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-12-02 00:48:37,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:37,082 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-12-02 00:48:37,089 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-12-02 00:48:37,095 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#265](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-12-02 00:48:37,101 [ scc.config] DEBUG Found github.token
2024-12-02 00:48:37,101 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-12-02 00:48:37,101 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-02 00:48:37,143 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:37,144 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:37,149 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-02 00:48:37,192 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-02 00:48:37,200 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ac81835b0> has no local changes
2024-12-02 00:48:37,200 [ 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#265 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/)'
2024-12-02 00:48:37,211 [ scc.git] DEBUG [detached HEAD 73ee9b8] merge master -Dorg -Ssuccess-only
2024-12-02 00:48:37,211 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:37,211 [ scc.git] INFO Overriding base-branch from master to develop
2024-12-02 00:48:37,211 [ scc.repo] DEBUG ## PRs found:
2024-12-02 00:48:37,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-12-02 00:48:38,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2024-12-02 00:48:38,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2024-12-02 00:48:38,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-12-02 00:48:39,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-02 00:48:39,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-12-02 00:48:40,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2024-12-02 00:48:40,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2024-12-02 00:48:40,799 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-12-02 00:48:41,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-12-02 00:48:41,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-12-02 00:48:42,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/4865545/issues/216/comments?page=2 HTTP/1.1" 200 None
2024-12-02 00:48:42,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-12-02 00:48:43,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-12-02 00:48:43,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-12-02 00:48:44,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-12-02 00:48:44,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-12-02 00:48:45,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-12-02 00:48:45,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-12-02 00:48:45,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-12-02 00:48:45,906 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-12-02 00:48:46,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-12-02 00:48:46,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-12-02 00:48:47,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-12-02 00:48:47,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-12-02 00:48:47,815 [ scc.repo] DEBUG ## Branches found:
2024-12-02 00:48:47,815 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-12-02 00:48:47,815 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:47,815 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:47,821 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-12-02 00:48:47,827 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-12-02 00:48:47,827 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-12-02 00:48:47,834 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-12-02 00:48:47,840 [ scc.git] DEBUG Already up to date.
2024-12-02 00:48:47,841 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-12-02 00:48:48,535 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-12-02 00:48:48,536 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-12-02 00:48:48,541 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2024-12-02 00:48:49,099 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-12-02 00:48:49,099 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2024-12-02 00:48:49,105 [ scc.git] DEBUG ## Unique users: []
2024-12-02 00:48:49,105 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:49,105 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:49,112 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-02 00:48:49,120 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:49,126 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-02 00:48:49,217 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-12-02 00:48:49,218 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-12-02 00:48:49,218 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-12-02 00:48:49,218 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-12-02 00:48:49,225 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-12-02 00:48:49,233 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-12-02 00:48:49,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:49,388 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-12-02 00:48:49,397 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-12-02 00:48:49,405 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#265](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-12-02 00:48:49,412 [ scc.config] DEBUG Found github.token
2024-12-02 00:48:49,412 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-12-02 00:48:49,412 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-12-02 00:48:49,419 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:49,425 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2024-12-02 00:48:49,446 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-12-02 00:48:49,449 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2024-12-02 00:48:49,449 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-12-02 00:48:49,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:49,784 [ scc.git] DEBUG Calling 'git submodule update'
2024-12-02 00:48:49,824 [ scc.git] DEBUG Get sha1 of %s
2024-12-02 00:48:49,825 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-12-02 00:48:49,830 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-02 00:48:49,875 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-02 00:48:49,884 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ac81f9f10> has no local changes
2024-12-02 00:48:49,884 [ 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#265 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/)'
2024-12-02 00:48:49,896 [ scc.git] DEBUG [detached HEAD 9aa895e] merge master -Dorg -Ssuccess-only
2024-12-02 00:48:49,897 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:49,898 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-12-02 00:48:49,999 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-12-02 00:48:50,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:50,202 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-12-02 00:48:50,207 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-12-02 00:48:50,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:50,595 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-12-02 00:48:50,601 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-12-02 00:48:51,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:51,014 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-12-02 00:48:51,020 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-12-02 00:48:51,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:51,418 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-12-02 00:48:51,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:51,818 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-12-02 00:48:51,823 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-12-02 00:48:52,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:52,210 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-12-02 00:48:52,215 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-12-02 00:48:52,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:52,639 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-12-02 00:48:52,643 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-12-02 00:48:53,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:53,039 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-12-02 00:48:53,044 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-12-02 00:48:53,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:53,432 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-12-02 00:48:53,436 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-12-02 00:48:53,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:53,816 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-12-02 00:48:53,821 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-12-02 00:48:54,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:54,210 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-12-02 00:48:54,215 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-12-02 00:48:54,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:54,603 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-12-02 00:48:54,609 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-12-02 00:48:54,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:54,990 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-12-02 00:48:55,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:55,415 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-12-02 00:48:55,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:55,796 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-12-02 00:48:55,801 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-12-02 00:48:56,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:56,193 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-12-02 00:48:56,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:56,601 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-12-02 00:48:56,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:56,983 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-12-02 00:48:56,988 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-12-02 00:48:57,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:57,389 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-12-02 00:48:57,394 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-12-02 00:48:57,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:57,787 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-12-02 00:48:57,795 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-12-02 00:48:58,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:58,176 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-12-02 00:48:58,183 [ scc.config] DEBUG Found submodule.scripts.url
2024-12-02 00:48:58,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-12-02 00:48:58,567 [ scc.config] DEBUG Found submodule.scripts.branch
2024-12-02 00:48:58,567 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-12-02 00:48:58,662 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3ace752ee0> has local changes
2024-12-02 00:48:58,663 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 406 dependabot[bot] 'Bump omero-iviewer from `a8f380f` to `b4102d4`'
- PR 407 dependabot[bot] 'Bump omero-gallery from `56f4435` to `2a621da`'
- PR 408 dependabot[bot] 'Bump omero-cli-render from `173cac0` to `c0517ed`'
- PR 409 dependabot[bot] 'Bump omero-mapr from `3a505e4` to `0a557da`'
- PR 411 dependabot[bot] 'Bump omero-figure from `24444fe` to `1dfb138`'
Repository: ome/minimal-omero-client
Updating 4628e82..ca8c2ea
Previously merged:
- PR 67 jburel 'Gateway 5.10.0'
- PR 68 jburel 'Bump action '
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Updating 027b3e6..4777ef8
Previously merged:
- PR 27 jburel 'Build'
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 59 will-moore 'Apply settings to Plate' (status: failure)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Updating 9b73dd9..11d3587
Previously merged:
- PR 165 jburel 'Build'
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 600 Rdornier 'Label on rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 592 will-moore 'Filter owners and groups dropdown lists'
- PR 602 will-moore 'Changelog 7.2.0'
- PR 603 will-moore 'Inset bugfixes'
Repository: ome/omero-fpbioimage
Updating e5b3ca3..3b6c05a
Previously merged:
- PR 30 jburel 'Build'
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
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#265 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/265/)'
2024-12-02 00:48:58,678 [ scc.git] DEBUG [detached HEAD 0cb88a1] merge master -Dorg -Ssuccess-only
2024-12-02 00:48:58,678 [ scc.merge] INFO Repository: ome/omero-plugins
2024-12-02 00:48:58,678 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-12-02 00:48:58,679 [ scc.merge] INFO Already up to date.
2024-12-02 00:48:58,679 [ scc.merge] INFO
2024-12-02 00:48:58,679 [ scc.merge] INFO Merged PRs:
2024-12-02 00:48:58,679 [ scc.merge] INFO - PR 406 dependabot[bot] 'Bump omero-iviewer from `a8f380f` to `b4102d4`'
2024-12-02 00:48:58,679 [ scc.merge] INFO - PR 407 dependabot[bot] 'Bump omero-gallery from `56f4435` to `2a621da`'
2024-12-02 00:48:58,679 [ scc.merge] INFO - PR 408 dependabot[bot] 'Bump omero-cli-render from `173cac0` to `c0517ed`'
2024-12-02 00:48:58,679 [ scc.merge] INFO - PR 409 dependabot[bot] 'Bump omero-mapr from `3a505e4` to `0a557da`'
2024-12-02 00:48:58,679 [ scc.merge] INFO - PR 411 dependabot[bot] 'Bump omero-figure from `24444fe` to `1dfb138`'
2024-12-02 00:48:58,679 [ scc.merge] INFO
2024-12-02 00:48:58,679 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-12-02 00:48:58,679 [ scc.merge] INFO Updating 4628e82..ca8c2ea
2024-12-02 00:48:58,679 [ scc.merge] INFO Previously merged:
2024-12-02 00:48:58,679 [ scc.merge] INFO - PR 67 jburel 'Gateway 5.10.0'
2024-12-02 00:48:58,679 [ scc.merge] INFO - PR 68 jburel 'Bump action '
2024-12-02 00:48:58,679 [ scc.merge] INFO
2024-12-02 00:48:58,679 [ scc.merge] INFO
2024-12-02 00:48:58,679 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-12-02 00:48:58,679 [ scc.merge] INFO Excluded PRs:
2024-12-02 00:48:58,679 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-12-02 00:48:58,679 [ scc.merge] INFO Updating 027b3e6..4777ef8
2024-12-02 00:48:58,679 [ scc.merge] INFO Previously merged:
2024-12-02 00:48:58,679 [ scc.merge] INFO - PR 27 jburel 'Build'
2024-12-02 00:48:58,679 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-12-02 00:48:58,679 [ scc.merge] INFO
2024-12-02 00:48:58,679 [ scc.merge] INFO
2024-12-02 00:48:58,679 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-12-02 00:48:58,679 [ scc.merge] INFO Excluded PRs:
2024-12-02 00:48:58,679 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-12-02 00:48:58,679 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate' (status: failure)
2024-12-02 00:48:58,679 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-12-02 00:48:58,679 [ scc.merge] INFO Already up to date.
2024-12-02 00:48:58,679 [ scc.merge] INFO
2024-12-02 00:48:58,679 [ scc.merge] INFO
2024-12-02 00:48:58,680 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-12-02 00:48:58,680 [ scc.merge] INFO Excluded PRs:
2024-12-02 00:48:58,680 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-12-02 00:48:58,680 [ scc.merge] INFO Updating 9b73dd9..11d3587
2024-12-02 00:48:58,680 [ scc.merge] INFO Previously merged:
2024-12-02 00:48:58,680 [ scc.merge] INFO - PR 165 jburel 'Build'
2024-12-02 00:48:58,680 [ scc.merge] INFO
2024-12-02 00:48:58,680 [ scc.merge] INFO Merged PRs:
2024-12-02 00:48:58,680 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-12-02 00:48:58,680 [ scc.merge] INFO
2024-12-02 00:48:58,680 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-02 00:48:58,680 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-12-02 00:48:58,680 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-12-02 00:48:58,680 [ scc.merge] INFO
2024-12-02 00:48:58,680 [ scc.merge] INFO Repository: ome/omero-figure
2024-12-02 00:48:58,680 [ scc.merge] INFO Excluded PRs:
2024-12-02 00:48:58,680 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (user: Rdornier)
2024-12-02 00:48:58,680 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-12-02 00:48:58,680 [ scc.merge] INFO Already up to date.
2024-12-02 00:48:58,680 [ scc.merge] INFO
2024-12-02 00:48:58,680 [ scc.merge] INFO Merged PRs:
2024-12-02 00:48:58,680 [ scc.merge] INFO - PR 592 will-moore 'Filter owners and groups dropdown lists'
2024-12-02 00:48:58,680 [ scc.merge] INFO - PR 602 will-moore 'Changelog 7.2.0'
2024-12-02 00:48:58,680 [ scc.merge] INFO - PR 603 will-moore 'Inset bugfixes'
2024-12-02 00:48:58,680 [ scc.merge] INFO
2024-12-02 00:48:58,680 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-12-02 00:48:58,680 [ scc.merge] INFO Updating e5b3ca3..3b6c05a
2024-12-02 00:48:58,680 [ scc.merge] INFO Previously merged:
2024-12-02 00:48:58,680 [ scc.merge] INFO - PR 30 jburel 'Build'
2024-12-02 00:48:58,680 [ scc.merge] INFO
2024-12-02 00:48:58,680 [ scc.merge] INFO Merged PRs:
2024-12-02 00:48:58,680 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-12-02 00:48:58,680 [ scc.merge] INFO
2024-12-02 00:48:58,680 [ scc.merge] INFO Repository: ome/omero-gallery
2024-12-02 00:48:58,680 [ scc.merge] INFO Already up to date.
2024-12-02 00:48:58,680 [ scc.merge] INFO
2024-12-02 00:48:58,680 [ scc.merge] INFO Merged PRs:
2024-12-02 00:48:58,680 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2024-12-02 00:48:58,681 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2024-12-02 00:48:58,681 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2024-12-02 00:48:58,681 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2024-12-02 00:48:58,681 [ scc.merge] INFO
2024-12-02 00:48:58,681 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-02 00:48:58,681 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2024-12-02 00:48:58,681 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2024-12-02 00:48:58,681 [ scc.merge] INFO
2024-12-02 00:48:58,681 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-12-02 00:48:58,681 [ scc.merge] INFO Excluded PRs:
2024-12-02 00:48:58,681 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2024-12-02 00:48:58,681 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-12-02 00:48:58,681 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-12-02 00:48:58,681 [ scc.merge] INFO Already up to date.
2024-12-02 00:48:58,681 [ scc.merge] INFO
2024-12-02 00:48:58,681 [ scc.merge] INFO Merged PRs:
2024-12-02 00:48:58,681 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-12-02 00:48:58,681 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-12-02 00:48:58,681 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-12-02 00:48:58,681 [ scc.merge] INFO
2024-12-02 00:48:58,681 [ scc.merge] INFO Repository: ome/omero-mapr
2024-12-02 00:48:58,681 [ scc.merge] INFO Excluded PRs:
2024-12-02 00:48:58,681 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-12-02 00:48:58,681 [ scc.merge] INFO Already up to date.
2024-12-02 00:48:58,681 [ scc.merge] INFO
2024-12-02 00:48:58,681 [ scc.merge] INFO Merged PRs:
2024-12-02 00:48:58,681 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-12-02 00:48:58,681 [ scc.merge] INFO
2024-12-02 00:48:58,681 [ scc.merge] INFO Repository: ome/omero-metadata
2024-12-02 00:48:58,681 [ scc.merge] INFO Already up to date.
2024-12-02 00:48:58,681 [ scc.merge] INFO
2024-12-02 00:48:58,681 [ scc.merge] INFO Merged PRs:
2024-12-02 00:48:58,681 [ scc.merge] INFO - PR 89 jburel 'Build'
2024-12-02 00:48:58,681 [ scc.merge] INFO
2024-12-02 00:48:58,681 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-02 00:48:58,681 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-12-02 00:48:58,681 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-12-02 00:48:58,682 [ scc.merge] INFO
2024-12-02 00:48:58,682 [ scc.merge] INFO Repository: ome/omero-parade
2024-12-02 00:48:58,682 [ scc.merge] INFO Excluded PRs:
2024-12-02 00:48:58,682 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-12-02 00:48:58,682 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-12-02 00:48:58,682 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-12-02 00:48:58,682 [ scc.merge] INFO Updating 5d441c2..fb5ae86
2024-12-02 00:48:58,682 [ scc.merge] INFO Previously merged:
2024-12-02 00:48:58,682 [ scc.merge] INFO - PR 133 jburel 'Build'
2024-12-02 00:48:58,682 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-12-02 00:48:58,682 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-12-02 00:48:58,682 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-12-02 00:48:58,682 [ scc.merge] INFO
2024-12-02 00:48:58,682 [ scc.merge] INFO
2024-12-02 00:48:58,682 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-12-02 00:48:58,682 [ scc.merge] INFO Excluded PRs:
2024-12-02 00:48:58,682 [ scc.merge] INFO - PR 15 jburel 'Build' (status: failure)
2024-12-02 00:48:58,682 [ scc.merge] INFO Already up to date.
2024-12-02 00:48:58,682 [ scc.merge] INFO
2024-12-02 00:48:58,682 [ scc.merge] INFO Merged PRs:
2024-12-02 00:48:58,682 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-12-02 00:48:58,682 [ scc.merge] INFO
2024-12-02 00:48:58,682 [ scc.merge] INFO Repository: ome/omero-rois
2024-12-02 00:48:58,682 [ scc.merge] INFO Excluded PRs:
2024-12-02 00:48:58,682 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-12-02 00:48:58,682 [ scc.merge] INFO Already up to date.
2024-12-02 00:48:58,682 [ scc.merge] INFO
2024-12-02 00:48:58,682 [ scc.merge] INFO Merged PRs:
2024-12-02 00:48:58,682 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-12-02 00:48:58,682 [ scc.merge] INFO - PR 29 jburel 'Build'
2024-12-02 00:48:58,682 [ scc.merge] INFO
2024-12-02 00:48:58,682 [ scc.merge] INFO Repository: ome/omero-signup
2024-12-02 00:48:58,682 [ scc.merge] INFO Already up to date.
2024-12-02 00:48:58,682 [ scc.merge] INFO
2024-12-02 00:48:58,682 [ scc.merge] INFO Merged PRs:
2024-12-02 00:48:58,682 [ scc.merge] INFO - PR 21 jburel 'Build'
2024-12-02 00:48:58,682 [ scc.merge] INFO
2024-12-02 00:48:58,683 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-02 00:48:58,683 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-12-02 00:48:58,683 [ scc.merge] INFO
2024-12-02 00:48:58,683 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-12-02 00:48:58,683 [ scc.merge] INFO Already up to date.
2024-12-02 00:48:58,683 [ scc.merge] INFO
2024-12-02 00:48:58,683 [ scc.merge] INFO Merged PRs:
2024-12-02 00:48:58,683 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-12-02 00:48:58,683 [ scc.merge] INFO
2024-12-02 00:48:58,683 [ scc.merge] INFO Repository: ome/omero-upload
2024-12-02 00:48:58,683 [ scc.merge] INFO Updating aca9e9c..100f6ae
2024-12-02 00:48:58,683 [ scc.merge] INFO Previously merged:
2024-12-02 00:48:58,683 [ scc.merge] INFO - PR 13 jburel 'Build'
2024-12-02 00:48:58,683 [ scc.merge] INFO
2024-12-02 00:48:58,683 [ scc.merge] INFO
2024-12-02 00:48:58,683 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-12-02 00:48:58,683 [ scc.merge] INFO Already up to date.
2024-12-02 00:48:58,683 [ scc.merge] INFO
2024-12-02 00:48:58,683 [ scc.merge] INFO Merged PRs:
2024-12-02 00:48:58,683 [ scc.merge] INFO - PR 20 jburel 'Build'
2024-12-02 00:48:58,683 [ scc.merge] INFO
2024-12-02 00:48:58,683 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-12-02 00:48:58,683 [ scc.merge] INFO Excluded PRs:
2024-12-02 00:48:58,683 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2024-12-02 00:48:58,683 [ scc.merge] INFO - PR 17 jburel 'Build' (status: failure)
2024-12-02 00:48:58,683 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-12-02 00:48:58,683 [ scc.merge] INFO Already up to date.
2024-12-02 00:48:58,683 [ scc.merge] INFO
2024-12-02 00:48:58,683 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-02 00:48:58,683 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-12-02 00:48:58,683 [ scc.merge] INFO
2024-12-02 00:48:58,683 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-12-02 00:48:58,683 [ scc.merge] INFO Updating adfa132..70b01ed
2024-12-02 00:48:58,683 [ scc.merge] INFO Previously merged:
2024-12-02 00:48:58,683 [ scc.merge] INFO - PR 24 jburel 'Build'
2024-12-02 00:48:58,683 [ scc.merge] INFO
2024-12-02 00:48:58,683 [ scc.merge] INFO
2024-12-02 00:48:58,683 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-12-02 00:48:58,684 [ scc.merge] INFO Updating 8da48e1..5bfef29
2024-12-02 00:48:58,684 [ scc.merge] INFO Previously merged:
2024-12-02 00:48:58,684 [ scc.merge] INFO - PR 36 jburel 'Build'
2024-12-02 00:48:58,684 [ scc.merge] INFO
2024-12-02 00:48:58,684 [ scc.merge] INFO
2024-12-02 00:48:58,684 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-12-02 00:48:58,684 [ scc.merge] INFO Already up to date.
2024-12-02 00:48:58,684 [ scc.merge] INFO
2024-12-02 00:48:58,684 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-02 00:48:58,684 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-12-02 00:48:58,684 [ scc.merge] INFO
2024-12-02 00:48:58,684 [ scc.merge] INFO Repository: ome/scripts
2024-12-02 00:48:58,684 [ scc.merge] INFO Excluded PRs:
2024-12-02 00:48:58,684 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-12-02 00:48:58,684 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-12-02 00:48:58,684 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-12-02 00:48:58,684 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-12-02 00:48:58,684 [ scc.merge] INFO Already up to date.
2024-12-02 00:48:58,684 [ scc.merge] INFO
2024-12-02 00:48:58,684 [ scc.merge] INFO Merged PRs:
2024-12-02 00:48:58,684 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2024-12-02 00:48:58,684 [ scc.merge] INFO
2024-12-02 00:48:58,684 [ scc.merge] INFO Conflicting PRs (not included):
2024-12-02 00:48:58,684 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-12-02 00:48:58,684 [ scc.merge] INFO
2024-12-02 00:48:58,684 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-12-02 00:48:58,684 [ scc.git] DEBUG Calling 'git remote'
2024-12-02 00:48:58,691 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-12-02 00:48:58,691 [ scc.git] DEBUG Calling 'git remote'
2024-12-02 00:48:58,697 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:58,697 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-12-02 00:48:58,697 [ scc.git] DEBUG Calling 'git remote'
2024-12-02 00:48:58,703 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:58,704 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-12-02 00:48:58,704 [ scc.git] DEBUG Calling 'git remote'
2024-12-02 00:48:58,709 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:58,709 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-12-02 00:48:58,709 [ scc.git] DEBUG Calling 'git remote'
2024-12-02 00:48:58,715 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:58,715 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-12-02 00:48:58,715 [ scc.git] DEBUG Calling 'git remote'
2024-12-02 00:48:58,721 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:58,721 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-12-02 00:48:58,721 [ scc.git] DEBUG Calling 'git remote'
2024-12-02 00:48:58,727 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:58,727 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-12-02 00:48:58,727 [ scc.git] DEBUG Calling 'git remote'
2024-12-02 00:48:58,732 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:58,733 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-12-02 00:48:58,733 [ scc.git] DEBUG Calling 'git remote'
2024-12-02 00:48:58,738 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:58,738 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-12-02 00:48:58,738 [ scc.git] DEBUG Calling 'git remote'
2024-12-02 00:48:58,744 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:58,745 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-12-02 00:48:58,745 [ scc.git] DEBUG Calling 'git remote'
2024-12-02 00:48:58,751 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:58,752 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-12-02 00:48:58,752 [ scc.git] DEBUG Calling 'git remote'
2024-12-02 00:48:58,759 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:58,760 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-12-02 00:48:58,760 [ scc.git] DEBUG Calling 'git remote'
2024-12-02 00:48:58,766 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:58,766 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-12-02 00:48:58,766 [ scc.git] DEBUG Calling 'git remote'
2024-12-02 00:48:58,773 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:58,773 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-12-02 00:48:58,773 [ scc.git] DEBUG Calling 'git remote'
2024-12-02 00:48:58,780 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:58,780 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-12-02 00:48:58,780 [ scc.git] DEBUG Calling 'git remote'
2024-12-02 00:48:58,786 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:58,787 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-12-02 00:48:58,787 [ scc.git] DEBUG Calling 'git remote'
2024-12-02 00:48:58,793 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:58,794 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-12-02 00:48:58,794 [ scc.git] DEBUG Calling 'git remote'
2024-12-02 00:48:58,802 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:58,803 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-12-02 00:48:58,803 [ scc.git] DEBUG Calling 'git remote'
2024-12-02 00:48:58,811 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:58,811 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-12-02 00:48:58,811 [ scc.git] DEBUG Calling 'git remote'
2024-12-02 00:48:58,817 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:58,817 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-12-02 00:48:58,817 [ scc.git] DEBUG Calling 'git remote'
2024-12-02 00:48:58,824 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:58,824 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-12-02 00:48:58,824 [ scc.git] DEBUG Calling 'git remote'
2024-12-02 00:48:58,831 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-12-02 00:48:58,831 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-12-02 00:48:58,831 [ scc.git] DEBUG Calling 'git remote'
2024-12-02 00:48:58,839 [ 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 7b8dc9e] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from c0517ed
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 9b73dd9
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from 1dfb1389
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 2a621da
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from b4102d4
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 0a557da
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from 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 7a32842] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-12-02 00:49:48,604 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-12-02 00:49:57,567 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-12-02 00:49:59,880 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-12-02 00:50:04,362 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-12-02 00:50:43,446 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/f5fa13f0/images/svgs/logo.svg){kind=logo}
