Skipping 229 KB..
Full Log2025-04-04 00:48:09,718 [ scc.git] DEBUG package.json | 2 +-
2025-04-04 00:48:09,718 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-04-04 00:48:09,933 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:10,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:48:10,096 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-04 00:48:10,102 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:10,105 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-04 00:48:10,140 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-04 00:48:10,140 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-04-04 00:48:10,141 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-04 00:48:10,141 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-04 00:48:10,144 [ scc.git] DEBUG Calling 'git reset --hard 6869eb8313b2bdc3b2b03f41b5d2905747ead254'
2025-04-04 00:48:10,151 [ scc.git] DEBUG HEAD is now at 6869eb8 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-04-04 00:48:10,347 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:10,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:48:10,516 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-04-04 00:48:10,519 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-04-04 00:48:10,522 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#377](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-04-04 00:48:10,524 [ scc.config] DEBUG Found github.token
2025-04-04 00:48:10,524 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-04-04 00:48:10,524 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7705b58a7a2049651eb10142e2260cf73dcc29fe'
2025-04-04 00:48:10,531 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:10,533 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 506 (Use the release/v1 branch for the PyPA action publishing to PyPI) 7705b58a7a2049651eb10142e2260cf73dcc29fe'
2025-04-04 00:48:10,550 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-04 00:48:10,553 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-04 00:48:10,553 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-04 00:48:10,767 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:10,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:48:10,936 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-04 00:48:10,974 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:48:10,975 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:10,977 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-04 00:48:11,016 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-04 00:48:11,023 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3adcd11250> has no local changes
2025-04-04 00:48:11,023 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- 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)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
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'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Generated by OMERO-plugins-push#377 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/)'
2025-04-04 00:48:11,030 [ scc.git] DEBUG [detached HEAD 8197b9a] merge master -Dorg -Ssuccess-only
2025-04-04 00:48:11,031 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:48:11,031 [ scc.repo] DEBUG ## PRs found:
2025-04-04 00:48:11,187 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:11,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-04-04 00:48:11,747 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:11,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-04-04 00:48:12,229 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:12,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-04 00:48:12,752 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:12,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-04 00:48:13,218 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:13,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-04 00:48:13,787 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:13,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-04-04 00:48:13,966 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-04 00:48:14,217 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:14,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-04-04 00:48:14,731 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:15,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-04-04 00:48:15,264 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:15,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-04 00:48:15,819 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:16,037 [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
2025-04-04 00:48:16,289 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:16,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-04 00:48:16,805 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:16,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-04-04 00:48:16,988 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-04-04 00:48:16,988 [ scc.repo] DEBUG ## Branches found:
2025-04-04 00:48:16,989 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-04 00:48:16,989 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:48:16,989 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:16,991 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-04 00:48:16,994 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-04 00:48:16,994 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-04 00:48:16,997 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-04 00:48:17,000 [ scc.git] DEBUG Already up to date.
2025-04-04 00:48:17,000 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-04-04 00:48:17,277 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-04 00:48:17,277 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-04-04 00:48:17,281 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-04-04 00:48:17,571 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-04 00:48:17,571 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-04-04 00:48:17,575 [ scc.git] DEBUG ## Unique users: []
2025-04-04 00:48:17,575 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:48:17,576 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:17,578 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-04 00:48:17,582 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:17,584 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-04 00:48:17,593 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-04 00:48:17,596 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-04-04 00:48:17,596 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-04-04 00:48:17,596 [ scc.git] DEBUG requirements.txt | 2 +-
2025-04-04 00:48:17,596 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-04-04 00:48:17,596 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-04-04 00:48:17,596 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-04-04 00:48:17,598 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:17,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:48:17,772 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-04 00:48:17,775 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:17,778 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 94 (Use the release/v1 branch for the PyPA action publishing to PyPI) 1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-04 00:48:17,845 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-04 00:48:17,848 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-04 00:48:17,848 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-04 00:48:18,022 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:18,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:48:18,176 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-04 00:48:18,215 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:48:18,216 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:18,218 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-04 00:48:18,255 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-04 00:48:18,260 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3adde8fa50> has no local changes
2025-04-04 00:48:18,260 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Generated by OMERO-plugins-push#377 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/)'
2025-04-04 00:48:18,266 [ scc.git] DEBUG [detached HEAD 72164ac] merge master -Dorg -Ssuccess-only
2025-04-04 00:48:18,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:48:18,267 [ scc.repo] DEBUG ## PRs found:
2025-04-04 00:48:18,427 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:18,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-04-04 00:48:18,955 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:19,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-04-04 00:48:19,462 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:19,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-04-04 00:48:19,996 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:20,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-04 00:48:20,534 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:20,768 [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
2025-04-04 00:48:21,019 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:21,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-04 00:48:21,557 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:21,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-04-04 00:48:21,736 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-04 00:48:21,987 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:22,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-04-04 00:48:22,511 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:22,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-04-04 00:48:22,975 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:23,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-04 00:48:23,504 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:23,746 [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
2025-04-04 00:48:23,997 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:24,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-04 00:48:24,541 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:24,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-04-04 00:48:24,707 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-04 00:48:24,707 [ scc.repo] DEBUG ## Branches found:
2025-04-04 00:48:24,707 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-04 00:48:24,708 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:48:24,708 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:24,710 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-04 00:48:24,713 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-04 00:48:24,713 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-04 00:48:24,716 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-04 00:48:24,723 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-04-04 00:48:24,958 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:25,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-04-04 00:48:25,387 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-04-04 00:48:25,677 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-04 00:48:25,677 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-04-04 00:48:25,681 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-04-04 00:48:25,937 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-04 00:48:25,937 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-04-04 00:48:25,941 [ scc.git] DEBUG ## Unique users: []
2025-04-04 00:48:25,941 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:48:25,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:25,943 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-04 00:48:25,948 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:25,950 [ 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'
2025-04-04 00:48:25,963 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-04-04 00:48:25,963 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-04-04 00:48:25,963 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-04 00:48:25,963 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-04 00:48:25,963 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-04 00:48:25,963 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-04 00:48:25,966 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-04 00:48:25,970 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-04 00:48:25,972 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:26,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:48:26,139 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-04 00:48:26,143 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-04 00:48:26,147 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#377](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-04-04 00:48:26,149 [ scc.config] DEBUG Found github.token
2025-04-04 00:48:26,149 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-04-04 00:48:26,149 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-04 00:48:26,153 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:26,155 [ 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'
2025-04-04 00:48:26,170 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-04 00:48:26,170 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-04 00:48:26,170 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-04-04 00:48:26,170 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-04 00:48:26,171 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-04 00:48:26,174 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-04 00:48:26,178 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-04 00:48:26,390 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:26,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:48:26,600 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-04 00:48:26,605 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-04 00:48:26,608 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#377](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/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
2025-04-04 00:48:26,610 [ scc.config] DEBUG Found github.token
2025-04-04 00:48:26,610 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-04-04 00:48:26,610 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-04 00:48:26,650 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:48:26,650 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:26,653 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-04 00:48:26,690 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-04 00:48:26,695 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3add9b9e90> has no local changes
2025-04-04 00:48:26,695 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
- PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
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#377 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/)'
2025-04-04 00:48:26,702 [ scc.git] DEBUG [detached HEAD 0d9cbf6] merge master -Dorg -Ssuccess-only
2025-04-04 00:48:26,702 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:48:26,702 [ scc.repo] DEBUG ## PRs found:
2025-04-04 00:48:26,851 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:27,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-04-04 00:48:27,435 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:27,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-04-04 00:48:27,975 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:28,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-04 00:48:28,497 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:28,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-04 00:48:28,984 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:29,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-04 00:48:29,500 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:29,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-04 00:48:29,945 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:30,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-04-04 00:48:30,113 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-04 00:48:30,364 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:30,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-04-04 00:48:30,607 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-04 00:48:30,857 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:31,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-04 00:48:31,413 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:31,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-04 00:48:31,917 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:32,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-04 00:48:32,440 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:32,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-04 00:48:33,008 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:33,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-04-04 00:48:33,172 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-04 00:48:33,423 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:33,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-04-04 00:48:33,688 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-04 00:48:33,939 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:34,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-04 00:48:34,515 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:34,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-04 00:48:35,016 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:35,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-04 00:48:35,550 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:35,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-04 00:48:36,092 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:36,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-04-04 00:48:36,256 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-04 00:48:36,507 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:36,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-04-04 00:48:37,001 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:37,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-04-04 00:48:37,494 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:37,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-04-04 00:48:37,978 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:38,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-04-04 00:48:38,554 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:38,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-04-04 00:48:39,059 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:39,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-04-04 00:48:39,521 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:39,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-04-04 00:48:39,810 [ scc.repo] DEBUG ## Branches found:
2025-04-04 00:48:39,810 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-04 00:48:39,810 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:48:39,810 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:39,813 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-04 00:48:39,816 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-04 00:48:39,816 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-04 00:48:39,819 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-04 00:48:39,822 [ scc.git] DEBUG Already up to date.
2025-04-04 00:48:39,822 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-04-04 00:48:40,088 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-04 00:48:40,089 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-04-04 00:48:40,092 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-04-04 00:48:40,363 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-04 00:48:40,363 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-04-04 00:48:40,367 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-04-04 00:48:40,621 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-04 00:48:40,621 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-04-04 00:48:40,625 [ scc.git] DEBUG ## Unique users: []
2025-04-04 00:48:40,625 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:48:40,625 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:40,627 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-04-04 00:48:40,630 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:40,632 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 140 (Bump vite from 4.2.3 to 4.5.9) 6301bc61b0a877104173846d526382bf15cc70a0'
2025-04-04 00:48:40,640 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-04 00:48:40,644 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-04-04 00:48:40,644 [ scc.git] DEBUG package.json | 2 +-
2025-04-04 00:48:40,644 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-04-04 00:48:40,645 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:40,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:48:40,811 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-04-04 00:48:40,814 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:40,816 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 141 (Bump axios from 1.6.0 to 1.8.2) de7db17cd62b498179713df276cff151a1f36d80'
2025-04-04 00:48:40,827 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-04 00:48:40,827 [ scc.git] DEBUG Auto-merging package.json
2025-04-04 00:48:40,827 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-04 00:48:40,831 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-04-04 00:48:40,831 [ scc.git] DEBUG package.json | 2 +-
2025-04-04 00:48:40,831 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-04-04 00:48:41,062 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:41,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:48:41,236 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-04 00:48:41,239 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:41,241 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 142 (Use the release/v1 branch for the PyPA action publishing to PyPI) 16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-04 00:48:41,250 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-04 00:48:41,252 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-04 00:48:41,253 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-04 00:48:41,487 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:41,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:48:41,654 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-04 00:48:41,693 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:48:41,693 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:41,695 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-04 00:48:41,732 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-04 00:48:41,736 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3adc3fd8d0> has no local changes
2025-04-04 00:48:41,737 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
- PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Generated by OMERO-plugins-push#377 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/)'
2025-04-04 00:48:41,744 [ scc.git] DEBUG [detached HEAD 7aeee1e] merge master -Dorg -Ssuccess-only
2025-04-04 00:48:41,744 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:48:41,744 [ scc.repo] DEBUG ## PRs found:
2025-04-04 00:48:41,905 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:42,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-04-04 00:48:42,099 [ scc.repo] DEBUG ## Branches found:
2025-04-04 00:48:42,099 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-04 00:48:42,099 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:48:42,099 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:42,102 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-04 00:48:42,104 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-04 00:48:42,104 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-04 00:48:42,107 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-04 00:48:42,110 [ scc.git] DEBUG Already up to date.
2025-04-04 00:48:42,110 [ scc.git] DEBUG ## Unique users: []
2025-04-04 00:48:42,110 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:48:42,110 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:42,112 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-04 00:48:42,150 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:48:42,150 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:42,153 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-04 00:48:42,190 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-04 00:48:42,193 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3adcda0710> has no local changes
2025-04-04 00:48:42,193 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-prometheus-tools
Already up to date.
Generated by OMERO-plugins-push#377 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/)'
2025-04-04 00:48:42,200 [ scc.git] DEBUG [detached HEAD c43c2bd] merge master -Dorg -Ssuccess-only
2025-04-04 00:48:42,201 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:48:42,201 [ scc.repo] DEBUG ## PRs found:
2025-04-04 00:48:42,350 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:42,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-04-04 00:48:42,911 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:43,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-04-04 00:48:43,408 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:43,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-04-04 00:48:43,876 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:44,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-04-04 00:48:44,141 [ scc.repo] DEBUG ## Branches found:
2025-04-04 00:48:44,141 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-04 00:48:44,141 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:48:44,141 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:44,143 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-04 00:48:44,146 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-04 00:48:44,146 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-04 00:48:44,149 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-04 00:48:44,152 [ scc.git] DEBUG Already up to date.
2025-04-04 00:48:44,152 [ scc.git] DEBUG ## Unique users: []
2025-04-04 00:48:44,152 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:48:44,152 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:44,154 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-04 00:48:44,193 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:48:44,193 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:44,195 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-04 00:48:44,232 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-04 00:48:44,235 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3adc4105d0> has no local changes
2025-04-04 00:48:44,235 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Generated by OMERO-plugins-push#377 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/)'
2025-04-04 00:48:44,242 [ scc.git] DEBUG [detached HEAD 34d3232] merge master -Dorg -Ssuccess-only
2025-04-04 00:48:44,242 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:48:44,242 [ scc.repo] DEBUG ## PRs found:
2025-04-04 00:48:44,392 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:44,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-04-04 00:48:44,930 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:45,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-04-04 00:48:45,389 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:45,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-04-04 00:48:45,861 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:46,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-04 00:48:46,464 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:46,689 [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
2025-04-04 00:48:46,940 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:47,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-04 00:48:47,489 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:47,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-04-04 00:48:47,657 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-04 00:48:47,657 [ scc.repo] DEBUG ## Branches found:
2025-04-04 00:48:47,657 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-04 00:48:47,657 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:48:47,657 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:47,660 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-04 00:48:47,662 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-04 00:48:47,662 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-04 00:48:47,665 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-04 00:48:47,668 [ scc.git] DEBUG Already up to date.
2025-04-04 00:48:47,668 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-04-04 00:48:47,960 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-04-04 00:48:47,960 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-04-04 00:48:47,964 [ scc.git] DEBUG ## Unique users: []
2025-04-04 00:48:47,964 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:48:47,964 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:47,966 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-04 00:48:47,970 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:47,972 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-04 00:48:47,981 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-04-04 00:48:47,981 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-04-04 00:48:47,981 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-04-04 00:48:47,981 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-04-04 00:48:47,981 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-04-04 00:48:47,981 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-04-04 00:48:47,981 [ scc.git] DEBUG Auto-merging setup.py
2025-04-04 00:48:47,981 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-04-04 00:48:47,981 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-04 00:48:47,981 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-04 00:48:47,984 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-04 00:48:47,988 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-04-04 00:48:47,990 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:48,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:48:48,185 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-04 00:48:48,188 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-04 00:48:48,191 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#377](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- setup.py
- omero_signup/signup_settings.py
- omero_signup/views.py
--conflicts
2025-04-04 00:48:48,193 [ scc.config] DEBUG Found github.token
2025-04-04 00:48:48,193 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-04-04 00:48:48,193 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-04 00:48:48,233 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:48:48,233 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:48,235 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-04 00:48:48,273 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-04 00:48:48,277 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3adcfe2dd0> has no local changes
2025-04-04 00:48:48,277 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Generated by OMERO-plugins-push#377 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/)'
2025-04-04 00:48:48,284 [ scc.git] DEBUG [detached HEAD 3c27629] merge master -Dorg -Ssuccess-only
2025-04-04 00:48:48,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:48:48,284 [ scc.repo] DEBUG ## PRs found:
2025-04-04 00:48:48,436 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:48,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-04-04 00:48:48,973 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:49,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-04-04 00:48:49,464 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:49,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-04-04 00:48:49,951 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:50,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-04-04 00:48:50,494 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:50,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-04 00:48:50,974 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:51,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-04 00:48:51,429 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:51,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-04-04 00:48:51,932 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:52,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-04-04 00:48:52,409 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:52,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-04-04 00:48:52,909 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:53,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-04-04 00:48:53,384 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:53,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-04 00:48:53,912 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:54,111 [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
2025-04-04 00:48:54,362 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:54,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-04 00:48:54,816 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:54,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2025-04-04 00:48:54,993 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-04 00:48:54,993 [ scc.repo] DEBUG ## Branches found:
2025-04-04 00:48:54,993 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-04 00:48:54,993 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:48:54,993 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:54,996 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-04 00:48:54,998 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-04 00:48:54,999 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-04 00:48:55,001 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-04 00:48:55,004 [ scc.git] DEBUG Already up to date.
2025-04-04 00:48:55,005 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-04-04 00:48:55,290 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-04 00:48:55,290 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-04-04 00:48:55,294 [ scc.git] DEBUG ## Unique users: []
2025-04-04 00:48:55,294 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:48:55,294 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:55,296 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-04-04 00:48:55,300 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:55,302 [ 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'
2025-04-04 00:48:55,314 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-04 00:48:55,319 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-04-04 00:48:55,319 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-04-04 00:48:55,319 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-04-04 00:48:55,319 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-04-04 00:48:55,319 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-04-04 00:48:55,319 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-04-04 00:48:55,319 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-04-04 00:48:55,319 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-04-04 00:48:55,319 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-04-04 00:48:55,320 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:55,320 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-04-04 00:48:55,320 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-04-04 00:48:55,320 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-04-04 00:48:55,320 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-04-04 00:48:55,320 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-04-04 00:48:55,320 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-04-04 00:48:55,320 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-04-04 00:48:55,320 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-04-04 00:48:55,320 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-04-04 00:48:55,320 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-04-04 00:48:55,320 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-04-04 00:48:55,320 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-04-04 00:48:55,320 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-04-04 00:48:55,320 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-04-04 00:48:55,320 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-04-04 00:48:55,320 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-04-04 00:48:55,320 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-04-04 00:48:55,320 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-04-04 00:48:55,320 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-04-04 00:48:55,320 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-04-04 00:48:55,320 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-04-04 00:48:55,321 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-04-04 00:48:55,321 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-04-04 00:48:55,321 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-04-04 00:48:55,321 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-04-04 00:48:55,321 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-04-04 00:48:55,321 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-04-04 00:48:55,321 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-04-04 00:48:55,321 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-04-04 00:48:55,321 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-04-04 00:48:55,321 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-04-04 00:48:55,321 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-04-04 00:48:55,321 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-04-04 00:48:55,321 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-04-04 00:48:55,321 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-04-04 00:48:55,321 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-04-04 00:48:55,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:48:55,470 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-04 00:48:55,508 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:48:55,508 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:55,510 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-04 00:48:55,548 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-04 00:48:55,552 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3adcfd3010> has no local changes
2025-04-04 00:48:55,552 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Generated by OMERO-plugins-push#377 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/)'
2025-04-04 00:48:55,560 [ scc.git] DEBUG [detached HEAD 544a468] merge master -Dorg -Ssuccess-only
2025-04-04 00:48:55,560 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:48:55,560 [ scc.repo] DEBUG ## PRs found:
2025-04-04 00:48:55,721 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:55,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-04-04 00:48:55,910 [ scc.repo] DEBUG ## Branches found:
2025-04-04 00:48:55,910 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-04 00:48:55,910 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:48:55,910 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:55,912 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-04 00:48:55,915 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-04 00:48:55,915 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-04 00:48:55,917 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-04 00:48:55,920 [ scc.git] DEBUG Already up to date.
2025-04-04 00:48:55,920 [ scc.git] DEBUG ## Unique users: []
2025-04-04 00:48:55,920 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:48:55,920 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:55,922 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-04 00:48:55,960 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:48:55,960 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:55,962 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-04 00:48:55,999 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-04 00:48:56,003 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3adc445c50> has no local changes
2025-04-04 00:48:56,003 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-upload
Already up to date.
Generated by OMERO-plugins-push#377 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/)'
2025-04-04 00:48:56,010 [ scc.git] DEBUG [detached HEAD db96763] merge master -Dorg -Ssuccess-only
2025-04-04 00:48:56,010 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:48:56,010 [ scc.repo] DEBUG ## PRs found:
2025-04-04 00:48:56,161 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:56,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-04-04 00:48:56,701 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:56,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-04-04 00:48:57,202 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:57,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-04-04 00:48:57,683 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:57,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-04 00:48:58,213 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:58,439 [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
2025-04-04 00:48:58,690 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:58,949 [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
2025-04-04 00:48:59,201 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:59,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-04 00:48:59,711 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:48:59,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2025-04-04 00:48:59,895 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-04-04 00:48:59,896 [ scc.repo] DEBUG ## Branches found:
2025-04-04 00:48:59,896 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-04 00:48:59,896 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:48:59,896 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:48:59,898 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-04 00:48:59,901 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-04 00:48:59,901 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-04 00:48:59,904 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-04 00:48:59,907 [ scc.git] DEBUG Already up to date.
2025-04-04 00:48:59,907 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-04-04 00:49:00,171 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-04-04 00:49:00,172 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-04-04 00:49:00,176 [ scc.git] DEBUG ## Unique users: []
2025-04-04 00:49:00,176 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:49:00,176 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:49:00,178 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-04-04 00:49:00,181 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:49:00,183 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-04-04 00:49:00,191 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-04 00:49:00,194 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-04-04 00:49:00,194 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-04-04 00:49:00,194 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-04-04 00:49:00,194 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-04-04 00:49:00,194 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-04-04 00:49:00,195 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:00,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:49:00,366 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-04 00:49:00,405 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:49:00,405 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:49:00,407 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-04 00:49:00,445 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-04 00:49:00,449 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3adc41f810> has no local changes
2025-04-04 00:49:00,449 [ 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#377 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/)'
2025-04-04 00:49:00,455 [ scc.git] DEBUG [detached HEAD 64455d7] merge master -Dorg -Ssuccess-only
2025-04-04 00:49:00,455 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:49:00,455 [ scc.git] INFO Overriding base-branch from master to main
2025-04-04 00:49:00,456 [ scc.repo] DEBUG ## PRs found:
2025-04-04 00:49:00,617 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:00,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-04-04 00:49:01,177 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:01,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-04-04 00:49:01,667 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:01,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-04-04 00:49:02,194 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:02,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-04-04 00:49:02,717 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:02,980 [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
2025-04-04 00:49:03,231 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:03,480 [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
2025-04-04 00:49:03,731 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:03,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-04-04 00:49:04,188 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:04,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-04-04 00:49:04,652 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:04,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-04-04 00:49:05,147 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:05,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-04 00:49:05,655 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:05,884 [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
2025-04-04 00:49:06,135 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:06,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-04 00:49:06,652 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:06,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2025-04-04 00:49:06,831 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-04 00:49:06,831 [ scc.repo] DEBUG ## Branches found:
2025-04-04 00:49:06,831 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-04 00:49:06,831 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:49:06,831 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:49:06,834 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-04-04 00:49:06,836 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-04 00:49:06,836 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-04-04 00:49:06,839 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-04-04 00:49:06,842 [ scc.git] DEBUG Already up to date.
2025-04-04 00:49:06,842 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-04-04 00:49:07,145 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-04-04 00:49:07,145 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-04-04 00:49:07,149 [ scc.git] DEBUG ## Unique users: []
2025-04-04 00:49:07,149 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:49:07,149 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:49:07,151 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-04 00:49:07,154 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:49:07,156 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-04 00:49:07,164 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-04-04 00:49:07,164 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-04-04 00:49:07,164 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-04 00:49:07,164 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-04 00:49:07,167 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-04 00:49:07,171 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-04-04 00:49:07,172 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:07,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:49:07,324 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-04 00:49:07,327 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-04 00:49:07,330 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#377](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-04-04 00:49:07,333 [ scc.config] DEBUG Found github.token
2025-04-04 00:49:07,333 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-04-04 00:49:07,333 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-04 00:49:07,371 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:49:07,371 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:49:07,374 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-04 00:49:07,411 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-04 00:49:07,414 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3adc446210> has no local changes
2025-04-04 00:49:07,414 [ 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 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#377 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/)'
2025-04-04 00:49:07,421 [ scc.git] DEBUG [detached HEAD 93b001a] merge master -Dorg -Ssuccess-only
2025-04-04 00:49:07,422 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:49:07,422 [ scc.repo] DEBUG ## PRs found:
2025-04-04 00:49:07,575 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:07,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-04-04 00:49:07,751 [ scc.repo] DEBUG ## Branches found:
2025-04-04 00:49:07,751 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-04 00:49:07,751 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:49:07,751 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:49:07,753 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-04 00:49:07,756 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-04 00:49:07,756 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-04 00:49:07,759 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-04 00:49:07,762 [ scc.git] DEBUG Already up to date.
2025-04-04 00:49:07,762 [ scc.git] DEBUG ## Unique users: []
2025-04-04 00:49:07,762 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:49:07,762 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:49:07,764 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-04 00:49:07,802 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:49:07,802 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:49:07,804 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-04 00:49:07,843 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-04 00:49:07,846 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3adcec0cd0> has no local changes
2025-04-04 00:49:07,846 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-weberror
Already up to date.
Generated by OMERO-plugins-push#377 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/)'
2025-04-04 00:49:07,852 [ scc.git] DEBUG [detached HEAD 413602f] merge master -Dorg -Ssuccess-only
2025-04-04 00:49:07,852 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:49:07,852 [ scc.repo] DEBUG ## PRs found:
2025-04-04 00:49:08,002 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:08,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-04-04 00:49:08,179 [ scc.repo] DEBUG ## Branches found:
2025-04-04 00:49:08,179 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-04 00:49:08,179 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:49:08,179 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:49:08,182 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-04 00:49:08,184 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-04 00:49:08,184 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-04 00:49:08,187 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-04 00:49:08,190 [ scc.git] DEBUG Already up to date.
2025-04-04 00:49:08,190 [ scc.git] DEBUG ## Unique users: []
2025-04-04 00:49:08,190 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:49:08,190 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:49:08,193 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-04 00:49:08,231 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:49:08,231 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:49:08,233 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-04 00:49:08,271 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-04 00:49:08,274 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3adc3e8b50> has no local changes
2025-04-04 00:49:08,274 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-webtest
Already up to date.
Generated by OMERO-plugins-push#377 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/)'
2025-04-04 00:49:08,281 [ scc.git] DEBUG [detached HEAD cfa33ce] merge master -Dorg -Ssuccess-only
2025-04-04 00:49:08,281 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:49:08,281 [ scc.repo] DEBUG ## PRs found:
2025-04-04 00:49:08,430 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:08,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-04-04 00:49:08,965 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:09,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-04-04 00:49:09,445 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:09,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-04-04 00:49:09,905 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:10,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-04 00:49:10,436 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:10,652 [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
2025-04-04 00:49:10,903 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:11,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-04 00:49:11,431 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:11,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-04-04 00:49:11,601 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-04-04 00:49:11,601 [ scc.repo] DEBUG ## Branches found:
2025-04-04 00:49:11,601 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-04 00:49:11,602 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:49:11,602 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:49:11,604 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-04 00:49:11,607 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-04 00:49:11,607 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-04 00:49:11,609 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-04 00:49:11,613 [ scc.git] DEBUG Already up to date.
2025-04-04 00:49:11,613 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-04-04 00:49:11,893 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-04-04 00:49:11,893 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-04-04 00:49:11,897 [ scc.git] DEBUG ## Unique users: []
2025-04-04 00:49:11,897 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:49:11,897 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:49:11,900 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-04 00:49:11,902 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:49:11,905 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-04 00:49:11,913 [ scc.git] DEBUG Auto-merging Dockerfile
2025-04-04 00:49:11,913 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-04-04 00:49:11,913 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-04 00:49:11,914 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-04 00:49:11,916 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-04 00:49:11,921 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-04-04 00:49:11,923 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:12,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:49:12,093 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-04 00:49:12,096 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-04 00:49:12,099 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#377](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-04-04 00:49:12,101 [ scc.config] DEBUG Found github.token
2025-04-04 00:49:12,101 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-04-04 00:49:12,101 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-04 00:49:12,140 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:49:12,140 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:49:12,142 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-04 00:49:12,181 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-04 00:49:12,185 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3adcfe20d0> has no local changes
2025-04-04 00:49:12,185 [ 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#377 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/)'
2025-04-04 00:49:12,191 [ scc.git] DEBUG [detached HEAD bb3cc13] merge master -Dorg -Ssuccess-only
2025-04-04 00:49:12,191 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:49:12,191 [ scc.git] INFO Overriding base-branch from master to develop
2025-04-04 00:49:12,192 [ scc.repo] DEBUG ## PRs found:
2025-04-04 00:49:12,345 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:12,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-04-04 00:49:12,898 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:13,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-04-04 00:49:13,388 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:13,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-04-04 00:49:13,906 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:14,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-04 00:49:14,366 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:14,590 [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
2025-04-04 00:49:14,842 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:15,080 [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
2025-04-04 00:49:15,331 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:15,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-04 00:49:15,818 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:16,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-04-04 00:49:16,197 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-04 00:49:16,448 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:16,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-04-04 00:49:16,947 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:17,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-04-04 00:49:17,436 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:17,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-04 00:49:17,959 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:18,183 [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
2025-04-04 00:49:18,434 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:18,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-04 00:49:18,898 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:19,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-04-04 00:49:19,064 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-04 00:49:19,314 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:19,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-04-04 00:49:19,801 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:20,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-04-04 00:49:20,341 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:20,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-04-04 00:49:20,859 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:21,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-04-04 00:49:21,128 [ scc.repo] DEBUG ## Branches found:
2025-04-04 00:49:21,128 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-04 00:49:21,128 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:49:21,128 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:49:21,131 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-04-04 00:49:21,133 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-04 00:49:21,133 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-04-04 00:49:21,136 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-04-04 00:49:21,145 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-04-04 00:49:21,378 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:21,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-04-04 00:49:21,849 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-04-04 00:49:22,163 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-04 00:49:22,163 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-04-04 00:49:22,167 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-04-04 00:49:22,460 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-04 00:49:22,460 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-04-04 00:49:22,465 [ scc.git] DEBUG ## Unique users: []
2025-04-04 00:49:22,465 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:49:22,465 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:49:22,467 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-04 00:49:22,473 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:49:22,475 [ 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'
2025-04-04 00:49:22,486 [ scc.git] DEBUG CONFLICT (modify/delete): omero/annotation_scripts/KeyVal_to_csv.py deleted in HEAD and modified in 1fd6030669613cdb8879cfe6395db8c820fdcf19. Version 1fd6030669613cdb8879cfe6395db8c820fdcf19 of omero/annotation_scripts/KeyVal_to_csv.py left in tree.
2025-04-04 00:49:22,486 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-04 00:49:22,487 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-04 00:49:22,489 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-04 00:49:22,493 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-04-04 00:49:22,494 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:22,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:49:22,652 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-04 00:49:22,658 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-04 00:49:22,662 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#377](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-04-04 00:49:22,664 [ scc.config] DEBUG Found github.token
2025-04-04 00:49:22,664 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-04-04 00:49:22,664 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-04-04 00:49:22,668 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:49:22,670 [ 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'
2025-04-04 00:49:22,680 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-04 00:49:22,683 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-04-04 00:49:22,683 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-04-04 00:49:22,903 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:23,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:49:23,062 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-04 00:49:23,102 [ scc.git] DEBUG Get sha1 of %s
2025-04-04 00:49:23,102 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-04 00:49:23,104 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-04 00:49:23,143 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-04 00:49:23,147 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3adf219190> has no local changes
2025-04-04 00:49:23,147 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- 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)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
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#377 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/)'
2025-04-04 00:49:23,153 [ scc.git] DEBUG [detached HEAD ebda04b] merge master -Dorg -Ssuccess-only
2025-04-04 00:49:23,154 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:49:23,154 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-04 00:49:23,229 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-04-04 00:49:23,313 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:23,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:49:23,484 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-04-04 00:49:23,486 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-04-04 00:49:23,730 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:23,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:49:23,896 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-04-04 00:49:23,898 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-04-04 00:49:24,142 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:24,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:49:24,309 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-04-04 00:49:24,311 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-04-04 00:49:24,556 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:24,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:49:24,724 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-04-04 00:49:24,968 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:25,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:49:25,136 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-04-04 00:49:25,138 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-04-04 00:49:25,383 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:25,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:49:25,565 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-04-04 00:49:25,567 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-04-04 00:49:25,811 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:25,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:49:25,991 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-04-04 00:49:25,993 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-04-04 00:49:26,238 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:26,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:49:26,404 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-04-04 00:49:26,406 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-04-04 00:49:26,651 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:26,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:49:26,814 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-04-04 00:49:26,816 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-04-04 00:49:27,061 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:27,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:49:27,242 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-04-04 00:49:27,245 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-04-04 00:49:27,489 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:27,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:49:27,654 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-04-04 00:49:27,656 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-04-04 00:49:27,900 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:28,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:49:28,062 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-04-04 00:49:28,064 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-04-04 00:49:28,309 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:28,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:49:28,468 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-04-04 00:49:28,712 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:28,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:49:28,878 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-04-04 00:49:29,122 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:29,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:49:29,299 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-04-04 00:49:29,301 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-04-04 00:49:29,545 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:29,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:49:29,702 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-04-04 00:49:29,946 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:30,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:49:30,114 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-04-04 00:49:30,358 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:30,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:49:30,526 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-04-04 00:49:30,528 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-04-04 00:49:30,772 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:30,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:49:30,940 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-04-04 00:49:30,941 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-04-04 00:49:31,186 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:31,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:49:31,352 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-04-04 00:49:31,354 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-04-04 00:49:31,598 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:31,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:49:31,787 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-04-04 00:49:31,789 [ scc.config] DEBUG Found submodule.scripts.url
2025-04-04 00:49:32,034 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-04 00:49:32,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-04 00:49:32,225 [ scc.config] DEBUG Found submodule.scripts.branch
2025-04-04 00:49:32,225 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-04 00:49:32,312 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3adf731950> has local changes
2025-04-04 00:49:32,312 [ 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 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 170 will-moore 'Use ome zarr models py' (stage: draft)
- PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
- PR 167 dominikl 'Add extinfo command'
Conflicting PRs (not included):
- PR 123 will-moore 'Support export of Fileset:ID'
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
- PR 171 will-moore 'Initial addition of integration tests'
Repository: ome/omero-figure
Excluded PRs:
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 600 Rdornier 'Label on rois'
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
- PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
Repository: ome/omero-fpbioimage
Already up to date.
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'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- 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)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
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'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
- PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
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 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
- PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
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 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
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- 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)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
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#377 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/377/)'
2025-04-04 00:49:32,325 [ scc.git] DEBUG [detached HEAD b915d94] merge master -Dorg -Ssuccess-only
2025-04-04 00:49:32,326 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-04-04 00:49:32,326 [ scc.merge] INFO Repository: ome/omero-plugins
2025-04-04 00:49:32,326 [ scc.merge] INFO Already up to date.
2025-04-04 00:49:32,326 [ scc.merge] INFO
2025-04-04 00:49:32,326 [ scc.merge] INFO Merged PRs:
2025-04-04 00:49:32,326 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-04-04 00:49:32,326 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-04-04 00:49:32,326 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-04-04 00:49:32,326 [ scc.merge] INFO
2025-04-04 00:49:32,326 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-04-04 00:49:32,326 [ scc.merge] INFO Already up to date.
2025-04-04 00:49:32,326 [ scc.merge] INFO
2025-04-04 00:49:32,326 [ scc.merge] INFO
2025-04-04 00:49:32,326 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-04-04 00:49:32,326 [ scc.merge] INFO Excluded PRs:
2025-04-04 00:49:32,326 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-04-04 00:49:32,326 [ scc.merge] INFO Already up to date.
2025-04-04 00:49:32,326 [ scc.merge] INFO
2025-04-04 00:49:32,326 [ scc.merge] INFO
2025-04-04 00:49:32,326 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-04-04 00:49:32,326 [ scc.merge] INFO Excluded PRs:
2025-04-04 00:49:32,326 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-04-04 00:49:32,326 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-04-04 00:49:32,326 [ scc.merge] INFO Already up to date.
2025-04-04 00:49:32,326 [ scc.merge] INFO
2025-04-04 00:49:32,326 [ scc.merge] INFO Merged PRs:
2025-04-04 00:49:32,326 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-04-04 00:49:32,326 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-04-04 00:49:32,326 [ scc.merge] INFO
2025-04-04 00:49:32,326 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-04-04 00:49:32,326 [ scc.merge] INFO Excluded PRs:
2025-04-04 00:49:32,326 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-04-04 00:49:32,326 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-04-04 00:49:32,326 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-04-04 00:49:32,327 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-04 00:49:32,327 [ scc.merge] INFO Already up to date.
2025-04-04 00:49:32,327 [ scc.merge] INFO
2025-04-04 00:49:32,327 [ scc.merge] INFO Merged PRs:
2025-04-04 00:49:32,327 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-04-04 00:49:32,327 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-04-04 00:49:32,327 [ scc.merge] INFO
2025-04-04 00:49:32,327 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-04 00:49:32,327 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-04-04 00:49:32,327 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-04 00:49:32,327 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-04-04 00:49:32,327 [ scc.merge] INFO
2025-04-04 00:49:32,327 [ scc.merge] INFO Repository: ome/omero-figure
2025-04-04 00:49:32,327 [ scc.merge] INFO Excluded PRs:
2025-04-04 00:49:32,327 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-04-04 00:49:32,327 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-04-04 00:49:32,327 [ scc.merge] INFO Already up to date.
2025-04-04 00:49:32,327 [ scc.merge] INFO
2025-04-04 00:49:32,327 [ scc.merge] INFO Merged PRs:
2025-04-04 00:49:32,327 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-04-04 00:49:32,327 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-04-04 00:49:32,327 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-04-04 00:49:32,327 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-04-04 00:49:32,327 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-04-04 00:49:32,327 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-04 00:49:32,327 [ scc.merge] INFO
2025-04-04 00:49:32,327 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-04 00:49:32,327 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-04-04 00:49:32,327 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-04-04 00:49:32,327 [ scc.merge] INFO
2025-04-04 00:49:32,327 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-04-04 00:49:32,327 [ scc.merge] INFO Already up to date.
2025-04-04 00:49:32,327 [ scc.merge] INFO
2025-04-04 00:49:32,327 [ scc.merge] INFO Merged PRs:
2025-04-04 00:49:32,327 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-04-04 00:49:32,327 [ scc.merge] INFO
2025-04-04 00:49:32,327 [ scc.merge] INFO Repository: ome/omero-gallery
2025-04-04 00:49:32,327 [ scc.merge] INFO Already up to date.
2025-04-04 00:49:32,327 [ scc.merge] INFO
2025-04-04 00:49:32,327 [ scc.merge] INFO Merged PRs:
2025-04-04 00:49:32,327 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-04-04 00:49:32,328 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-04-04 00:49:32,328 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-04-04 00:49:32,328 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-04-04 00:49:32,328 [ scc.merge] INFO
2025-04-04 00:49:32,328 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-04 00:49:32,328 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-04-04 00:49:32,328 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-04-04 00:49:32,328 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-04-04 00:49:32,328 [ scc.merge] INFO
2025-04-04 00:49:32,328 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-04-04 00:49:32,328 [ scc.merge] INFO Excluded PRs:
2025-04-04 00:49:32,328 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-04-04 00:49:32,328 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-04-04 00:49:32,328 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-04-04 00:49:32,328 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-04-04 00:49:32,328 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-04-04 00:49:32,328 [ scc.merge] INFO Already up to date.
2025-04-04 00:49:32,328 [ scc.merge] INFO
2025-04-04 00:49:32,328 [ scc.merge] INFO Merged PRs:
2025-04-04 00:49:32,328 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-04-04 00:49:32,328 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-04-04 00:49:32,328 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-04-04 00:49:32,328 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-04-04 00:49:32,328 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-04 00:49:32,328 [ scc.merge] INFO
2025-04-04 00:49:32,328 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-04 00:49:32,328 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-04-04 00:49:32,328 [ scc.merge] INFO
2025-04-04 00:49:32,328 [ scc.merge] INFO Repository: ome/omero-mapr
2025-04-04 00:49:32,328 [ scc.merge] INFO Excluded PRs:
2025-04-04 00:49:32,328 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-04-04 00:49:32,328 [ scc.merge] INFO Already up to date.
2025-04-04 00:49:32,328 [ scc.merge] INFO
2025-04-04 00:49:32,328 [ scc.merge] INFO Merged PRs:
2025-04-04 00:49:32,328 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-04-04 00:49:32,328 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-04 00:49:32,328 [ scc.merge] INFO
2025-04-04 00:49:32,328 [ scc.merge] INFO Repository: ome/omero-metadata
2025-04-04 00:49:32,328 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-04-04 00:49:32,328 [ scc.merge] INFO Previously merged:
2025-04-04 00:49:32,328 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-04 00:49:32,328 [ scc.merge] INFO
2025-04-04 00:49:32,329 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-04 00:49:32,329 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-04 00:49:32,329 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-04 00:49:32,329 [ scc.merge] INFO
2025-04-04 00:49:32,329 [ scc.merge] INFO Repository: ome/omero-parade
2025-04-04 00:49:32,329 [ scc.merge] INFO Excluded PRs:
2025-04-04 00:49:32,329 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-04-04 00:49:32,329 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-04-04 00:49:32,329 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-04-04 00:49:32,329 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-04-04 00:49:32,329 [ scc.merge] INFO Already up to date.
2025-04-04 00:49:32,329 [ scc.merge] INFO
2025-04-04 00:49:32,329 [ scc.merge] INFO Merged PRs:
2025-04-04 00:49:32,329 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-04 00:49:32,329 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-04 00:49:32,329 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-04 00:49:32,329 [ scc.merge] INFO
2025-04-04 00:49:32,329 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-04-04 00:49:32,329 [ scc.merge] INFO Already up to date.
2025-04-04 00:49:32,329 [ scc.merge] INFO
2025-04-04 00:49:32,329 [ scc.merge] INFO
2025-04-04 00:49:32,329 [ scc.merge] INFO Repository: ome/omero-rois
2025-04-04 00:49:32,329 [ scc.merge] INFO Excluded PRs:
2025-04-04 00:49:32,329 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-04-04 00:49:32,329 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-04 00:49:32,329 [ scc.merge] INFO Already up to date.
2025-04-04 00:49:32,329 [ scc.merge] INFO
2025-04-04 00:49:32,329 [ scc.merge] INFO
2025-04-04 00:49:32,329 [ scc.merge] INFO Repository: ome/omero-signup
2025-04-04 00:49:32,329 [ scc.merge] INFO Already up to date.
2025-04-04 00:49:32,329 [ scc.merge] INFO
2025-04-04 00:49:32,329 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-04 00:49:32,329 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-04 00:49:32,329 [ scc.merge] INFO
2025-04-04 00:49:32,329 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-04-04 00:49:32,329 [ scc.merge] INFO Excluded PRs:
2025-04-04 00:49:32,329 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-04-04 00:49:32,329 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-04-04 00:49:32,329 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-04-04 00:49:32,329 [ scc.merge] INFO Already up to date.
2025-04-04 00:49:32,329 [ scc.merge] INFO
2025-04-04 00:49:32,329 [ scc.merge] INFO Merged PRs:
2025-04-04 00:49:32,329 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-04 00:49:32,330 [ scc.merge] INFO
2025-04-04 00:49:32,330 [ scc.merge] INFO Repository: ome/omero-upload
2025-04-04 00:49:32,330 [ scc.merge] INFO Already up to date.
2025-04-04 00:49:32,330 [ scc.merge] INFO
2025-04-04 00:49:32,330 [ scc.merge] INFO
2025-04-04 00:49:32,330 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-04-04 00:49:32,330 [ scc.merge] INFO Already up to date.
2025-04-04 00:49:32,330 [ scc.merge] INFO
2025-04-04 00:49:32,330 [ scc.merge] INFO Merged PRs:
2025-04-04 00:49:32,330 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-04-04 00:49:32,330 [ scc.merge] INFO
2025-04-04 00:49:32,330 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-04-04 00:49:32,330 [ scc.merge] INFO Excluded PRs:
2025-04-04 00:49:32,330 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-04-04 00:49:32,330 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-04-04 00:49:32,330 [ scc.merge] INFO Already up to date.
2025-04-04 00:49:32,330 [ scc.merge] INFO
2025-04-04 00:49:32,330 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-04 00:49:32,330 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-04 00:49:32,330 [ scc.merge] INFO
2025-04-04 00:49:32,330 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-04-04 00:49:32,330 [ scc.merge] INFO Already up to date.
2025-04-04 00:49:32,330 [ scc.merge] INFO
2025-04-04 00:49:32,330 [ scc.merge] INFO
2025-04-04 00:49:32,330 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-04-04 00:49:32,330 [ scc.merge] INFO Already up to date.
2025-04-04 00:49:32,330 [ scc.merge] INFO
2025-04-04 00:49:32,330 [ scc.merge] INFO
2025-04-04 00:49:32,330 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-04-04 00:49:32,330 [ scc.merge] INFO Already up to date.
2025-04-04 00:49:32,330 [ scc.merge] INFO
2025-04-04 00:49:32,330 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-04 00:49:32,330 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-04-04 00:49:32,330 [ scc.merge] INFO
2025-04-04 00:49:32,330 [ scc.merge] INFO Repository: ome/scripts
2025-04-04 00:49:32,330 [ scc.merge] INFO Excluded PRs:
2025-04-04 00:49:32,330 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-04-04 00:49:32,330 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-04-04 00:49:32,330 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-04-04 00:49:32,330 [ scc.merge] INFO Previously merged:
2025-04-04 00:49:32,330 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-04-04 00:49:32,330 [ scc.merge] INFO
2025-04-04 00:49:32,331 [ scc.merge] INFO Merged PRs:
2025-04-04 00:49:32,331 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-04 00:49:32,331 [ scc.merge] INFO
2025-04-04 00:49:32,331 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-04 00:49:32,331 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-04 00:49:32,331 [ scc.merge] INFO
2025-04-04 00:49:32,331 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-04-04 00:49:32,331 [ scc.git] DEBUG Calling 'git remote'
2025-04-04 00:49:32,333 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-04-04 00:49:32,333 [ scc.git] DEBUG Calling 'git remote'
2025-04-04 00:49:32,335 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:49:32,335 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-04-04 00:49:32,335 [ scc.git] DEBUG Calling 'git remote'
2025-04-04 00:49:32,337 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:49:32,337 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-04-04 00:49:32,337 [ scc.git] DEBUG Calling 'git remote'
2025-04-04 00:49:32,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:49:32,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-04-04 00:49:32,340 [ scc.git] DEBUG Calling 'git remote'
2025-04-04 00:49:32,342 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:49:32,342 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-04-04 00:49:32,342 [ scc.git] DEBUG Calling 'git remote'
2025-04-04 00:49:32,344 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:49:32,344 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-04-04 00:49:32,344 [ scc.git] DEBUG Calling 'git remote'
2025-04-04 00:49:32,346 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:49:32,346 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-04-04 00:49:32,346 [ scc.git] DEBUG Calling 'git remote'
2025-04-04 00:49:32,348 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:49:32,348 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-04-04 00:49:32,348 [ scc.git] DEBUG Calling 'git remote'
2025-04-04 00:49:32,351 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:49:32,351 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-04 00:49:32,351 [ scc.git] DEBUG Calling 'git remote'
2025-04-04 00:49:32,353 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:49:32,353 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-04 00:49:32,353 [ scc.git] DEBUG Calling 'git remote'
2025-04-04 00:49:32,355 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:49:32,355 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-04 00:49:32,355 [ scc.git] DEBUG Calling 'git remote'
2025-04-04 00:49:32,357 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:49:32,357 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-04 00:49:32,357 [ scc.git] DEBUG Calling 'git remote'
2025-04-04 00:49:32,359 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:49:32,360 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-04 00:49:32,360 [ scc.git] DEBUG Calling 'git remote'
2025-04-04 00:49:32,362 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:49:32,362 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-04 00:49:32,362 [ scc.git] DEBUG Calling 'git remote'
2025-04-04 00:49:32,364 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:49:32,364 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-04 00:49:32,364 [ scc.git] DEBUG Calling 'git remote'
2025-04-04 00:49:32,366 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:49:32,366 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-04 00:49:32,366 [ scc.git] DEBUG Calling 'git remote'
2025-04-04 00:49:32,368 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:49:32,369 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-04 00:49:32,369 [ scc.git] DEBUG Calling 'git remote'
2025-04-04 00:49:32,371 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:49:32,371 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-04 00:49:32,371 [ scc.git] DEBUG Calling 'git remote'
2025-04-04 00:49:32,373 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:49:32,373 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-04 00:49:32,373 [ scc.git] DEBUG Calling 'git remote'
2025-04-04 00:49:32,375 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:49:32,375 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-04 00:49:32,375 [ scc.git] DEBUG Calling 'git remote'
2025-04-04 00:49:32,377 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:49:32,377 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-04 00:49:32,377 [ scc.git] DEBUG Calling 'git remote'
2025-04-04 00:49:32,379 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-04 00:49:32,379 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-04 00:49:32,379 [ scc.git] DEBUG Calling 'git remote'
2025-04-04 00:49:32,382 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/installer.py:27: SetuptoolsDeprecationWarning: setuptools.installer is deprecated. Requirements should be satisfied by a PEP 517 installer.
warnings.warn(
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/installer.py:27: SetuptoolsDeprecationWarning: setuptools.installer is deprecated. Requirements should be satisfied by a PEP 517 installer.
warnings.warn(
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:530: 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.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:530: 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.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
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
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3.11: 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
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3.11: 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.3-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 7cf6287] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 4777ef8
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from ce6e13c
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 11d3587
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from 9cc36cde
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from 3b6c05a
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 7a798ce
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 0a557da
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from 3cd120c
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from fb5ae86
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from eb47378
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from bdfeb5e
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from be76813
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 100f6ae
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 8f3c313
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from 70b01ed
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 5bfef29
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 4b4c755
nothing to commit, working tree clean
[detached HEAD f3e7462] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-04-04 00:50:19,371 [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
2025-04-04 00:50:28,714 [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
2025-04-04 00:50:31,205 [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
2025-04-04 00:50:36,023 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-04-04 00:51:15,329 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts (hide)
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/861d2fbf/images/svgs/logo.svg){kind=logo}
