Console Output
+ export BASE_REPO=www.openmicroscopy.org
+ BASE_REPO=www.openmicroscopy.org
+ export BASE_BRANCH=master
+ BASE_BRANCH=master
+ export VERSION_LOG=/home/omero/workspace/WEBSITE-push/build/version.tsv
+ VERSION_LOG=/home/omero/workspace/WEBSITE-push/build/version.tsv
+ . build/venv/bin/activate
++ deactivate nondestructive
++ '[' -n '' ']'
++ '[' -n '' ']'
++ hash -r
++ '[' -n '' ']'
++ unset VIRTUAL_ENV
++ unset VIRTUAL_ENV_PROMPT
++ '[' '!' nondestructive = nondestructive ']'
++ VIRTUAL_ENV=/home/omero/workspace/WEBSITE-push/build/venv
++ export VIRTUAL_ENV
++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ PATH=/home/omero/workspace/WEBSITE-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ export PATH
++ '[' -n '' ']'
++ '[' -z '' ']'
++ _OLD_VIRTUAL_PS1=
++ PS1='(venv) '
++ export PS1
++ VIRTUAL_ENV_PROMPT='(venv) '
++ export VIRTUAL_ENV_PROMPT
++ hash -r
+ '[' merge_ci '!=' null ']'
+ export PUSH_BRANCH=merge_ci
+ PUSH_BRANCH=merge_ci
+ '[' null '!=' null ']'
+ export STATUS=success-only 'MERGE_OPTIONS=-vvv --no-ask --reset --comment'
+ STATUS=success-only
+ MERGE_OPTIONS='-vvv --no-ask --reset --comment'
+ bash build/build-infra-master/recursive-merge
Merge base repository (no submodule updates)
2025-10-09 11:48:39,205 [ scc.config] DEBUG Found github.token
2025-10-09 11:48:39,206 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-10-09 11:48:39,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-09 11:48:39,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-09 11:48:40,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2025-10-09 11:48:40,178 [ scc.gh] DEBUG 4996 remaining from 5000 (Reset at 12:10
2025-10-09 11:48:40,179 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-10-09 11:48:40,181 [ scc.git] DEBUG Check current status
2025-10-09 11:48:40,181 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-10-09 11:48:40,183 [ scc.git] DEBUG 973782bf Merge pull request #829 from ome/dependabot/submodules/Schemas-c4e38d1
2025-10-09 11:48:40,183 [ scc.git] DEBUG Calling 'git submodule status'
2025-10-09 11:48:40,228 [ scc.git] DEBUG c4e38d11898c252abbdc714fbc7e76165979658e Schemas (remotes/origin/HEAD)
2025-10-09 11:48:40,236 [ scc.git] DEBUG 72e9cee5f5933bfe46f32f387121df029cd289e5 _minutes (remotes/origin/HEAD)
2025-10-09 11:48:40,239 [ scc.config] DEBUG Found remote.origin.url
2025-10-09 11:48:40,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org HTTP/1.1" 200 None
2025-10-09 11:48:41,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-10-09 11:48:41,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-10-09 11:48:42,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-10-09 11:48:42,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-10-09 11:48:42,589 [ scc.git] DEBUG Resetting...
2025-10-09 11:48:42,589 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2025-10-09 11:48:42,596 [ scc.git] DEBUG HEAD is now at 973782bf Merge pull request #829 from ome/dependabot/submodules/Schemas-c4e38d1
2025-10-09 11:48:42,597 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2025-10-09 11:48:42,637 [ scc.git] DEBUG Check current status
2025-10-09 11:48:42,637 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-10-09 11:48:42,639 [ scc.git] DEBUG 973782bf Merge pull request #829 from ome/dependabot/submodules/Schemas-c4e38d1
2025-10-09 11:48:42,639 [ scc.git] DEBUG Calling 'git submodule status'
2025-10-09 11:48:42,682 [ scc.git] DEBUG c4e38d11898c252abbdc714fbc7e76165979658e Schemas (remotes/origin/HEAD)
2025-10-09 11:48:42,690 [ scc.git] DEBUG 72e9cee5f5933bfe46f32f387121df029cd289e5 _minutes (remotes/origin/HEAD)
2025-10-09 11:48:42,691 [ scc.merge] INFO Merging Pull Request(s) based on master
2025-10-09 11:48:42,691 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2025-10-09 11:48:42,691 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2025-10-09 11:48:42,691 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2025-10-09 11:48:42,691 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2025-10-09 11:48:42,691 [ scc.repo] DEBUG ## PRs found:
2025-10-09 11:48:43,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/pulls HTTP/1.1" 200 None
2025-10-09 11:48:43,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/831 HTTP/1.1" 200 None
2025-10-09 11:48:44,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/831/comments HTTP/1.1" 200 None
2025-10-09 11:48:44,062 [ scc.repo] DEBUG - PR 831 joshmoore 'Initial OME2026 page'
2025-10-09 11:48:44,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/830 HTTP/1.1" 200 None
2025-10-09 11:48:45,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/830/comments HTTP/1.1" 200 None
2025-10-09 11:48:45,035 [ scc.repo] DEBUG - PR 830 joshmoore 'Update Josh headshot 🌳'
2025-10-09 11:48:45,035 [ scc.repo] DEBUG ## Branches found:
2025-10-09 11:48:45,035 [ scc.git] DEBUG Get sha1 of %s
2025-10-09 11:48:45,035 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-09 11:48:45,037 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-09 11:48:45,039 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-09 11:48:45,039 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-09 11:48:45,042 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-09 11:48:45,044 [ scc.git] DEBUG Already up to date.
2025-10-09 11:48:45,045 [ scc.git] DEBUG Calling 'git fetch origin pull/830/head'
2025-10-09 11:48:45,381 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2025-10-09 11:48:45,381 [ scc.git] DEBUG * branch refs/pull/830/head -> FETCH_HEAD
2025-10-09 11:48:45,399 [ scc.git] DEBUG Calling 'git fetch origin pull/831/head'
2025-10-09 11:48:45,900 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2025-10-09 11:48:45,900 [ scc.git] DEBUG * branch refs/pull/831/head -> FETCH_HEAD
2025-10-09 11:48:45,904 [ scc.git] DEBUG ## Unique users: []
2025-10-09 11:48:45,904 [ scc.git] DEBUG Get sha1 of %s
2025-10-09 11:48:45,904 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-09 11:48:45,906 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...39dabf0916ab32bafaac42868b9295eabb10a7be'
2025-10-09 11:48:45,908 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-09 11:48:45,910 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 830 (Update Josh headshot 🌳) 39dabf0916ab32bafaac42868b9295eabb10a7be'
2025-10-09 11:48:45,921 [ scc.git] DEBUG Failed to merge submodule Schemas (commits don't follow merge-base)
2025-10-09 11:48:45,921 [ scc.git] DEBUG CONFLICT (submodule): Merge conflict in Schemas
2025-10-09 11:48:45,921 [ scc.git] DEBUG Recursive merging with submodules currently only supports trivial cases.
2025-10-09 11:48:45,921 [ scc.git] DEBUG Please manually handle the merging of each conflicted submodule.
2025-10-09 11:48:45,921 [ scc.git] DEBUG This can be accomplished with the following steps:
2025-10-09 11:48:45,921 [ scc.git] DEBUG - go to submodule (Schemas), and either merge commit 9dc8459
2025-10-09 11:48:45,921 [ scc.git] DEBUG or update to an existing commit which has merged those changes
2025-10-09 11:48:45,921 [ scc.git] DEBUG - come back to superproject and run:
2025-10-09 11:48:45,921 [ scc.git] DEBUG
2025-10-09 11:48:45,921 [ scc.git] DEBUG git add Schemas
2025-10-09 11:48:45,921 [ scc.git] DEBUG
2025-10-09 11:48:45,921 [ scc.git] DEBUG to record the above merge or update
2025-10-09 11:48:45,921 [ scc.git] DEBUG - resolve any other conflicts in the superproject
2025-10-09 11:48:45,921 [ scc.git] DEBUG - commit the resulting index in the superproject
2025-10-09 11:48:45,922 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-10-09 11:48:45,922 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-10-09 11:48:45,933 [ scc.git] DEBUG Calling 'git reset --hard 973782bf14a10b70f9b8f14dea648c69be684b25'
2025-10-09 11:48:45,939 [ scc.git] DEBUG HEAD is now at 973782bf Merge pull request #829 from ome/dependabot/submodules/Schemas-c4e38d1
2025-10-09 11:48:46,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-09 11:48:46,090 [ scc.git] DEBUG Calling 'git merge-base 973782bf14a10b70f9b8f14dea648c69be684b25 39dabf0916ab32bafaac42868b9295eabb10a7be'
2025-10-09 11:48:46,092 [ scc.git] DEBUG Calling 'git diff --name-only f3f69839a5b5cca7c070e7d3542fc6ef66528462..973782bf14a10b70f9b8f14dea648c69be684b25'
2025-10-09 11:48:46,094 [ scc.git] INFO - PR 830 joshmoore 'Update Josh headshot 🌳'
Conflicting PR. Removed from build [WEBSITE-push#626](https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/626/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/626/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Schemas
--conflicts
2025-10-09 11:48:46,096 [ scc.config] DEBUG Found github.token
2025-10-09 11:48:46,096 [ scc.git] DEBUG Not adding comment to issue #830, already --conflicts.
2025-10-09 11:48:46,096 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...60b362d6a74597cb783f1ce7bee363cb54cb4e28'
2025-10-09 11:48:46,099 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-09 11:48:46,101 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 831 (Initial OME2026 page) 60b362d6a74597cb783f1ce7bee363cb54cb4e28'
2025-10-09 11:48:46,112 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-09 11:48:46,115 [ scc.git] DEBUG events/index.html | 6 ++++++
2025-10-09 11:48:46,115 [ scc.git] DEBUG events/ome-community-meeting-2026.html | 38 ++++++++++++++++++++++++++++++++++
2025-10-09 11:48:46,115 [ scc.git] DEBUG 2 files changed, 44 insertions(+)
2025-10-09 11:48:46,115 [ scc.git] DEBUG create mode 100644 events/ome-community-meeting-2026.html
2025-10-09 11:48:46,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-09 11:48:46,503 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-09 11:48:46,539 [ scc.git] DEBUG Get sha1 of %s
2025-10-09 11:48:46,539 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-09 11:48:46,541 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-09 11:48:46,554 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fccd578bd50> has no local changes
2025-10-09 11:48:46,554 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone
Repository: ome/www.openmicroscopy.org
Already up to date.
Merged PRs:
- PR 831 joshmoore 'Initial OME2026 page'
Conflicting PRs (not included):
- PR 830 joshmoore 'Update Josh headshot 🌳'
Generated by WEBSITE-push#626 (https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/626/)'
2025-10-09 11:48:46,567 [ scc.git] DEBUG [detached HEAD 8aef1ebf] merge master -Dorg -Snone
2025-10-09 11:48:46,568 [ scc.merge] INFO Repository: ome/www.openmicroscopy.org
2025-10-09 11:48:46,568 [ scc.merge] INFO Already up to date.
2025-10-09 11:48:46,568 [ scc.merge] INFO
2025-10-09 11:48:46,568 [ scc.merge] INFO Merged PRs:
2025-10-09 11:48:46,568 [ scc.merge] INFO - PR 831 joshmoore 'Initial OME2026 page'
2025-10-09 11:48:46,568 [ scc.merge] INFO
2025-10-09 11:48:46,568 [ scc.merge] INFO Conflicting PRs (not included):
2025-10-09 11:48:46,568 [ scc.merge] INFO - PR 830 joshmoore 'Update Josh headshot 🌳'
2025-10-09 11:48:46,568 [ scc.merge] INFO
2025-10-09 11:48:46,568 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-10-09 11:48:46,568 [ scc.git] DEBUG Calling 'git remote'
Synchronizing submodule url for 'Schemas'
Synchronizing submodule url for '_minutes'
Merge all submodules2025-10-09 11:48:47,710 [ scc.config] DEBUG Found github.token
2025-10-09 11:48:47,711 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-10-09 11:48:47,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-09 11:48:48,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-09 11:48:48,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2025-10-09 11:48:48,713 [ scc.gh] DEBUG 4982 remaining from 5000 (Reset at 12:10
2025-10-09 11:48:48,714 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-10-09 11:48:48,716 [ scc.git] DEBUG Check current status
2025-10-09 11:48:48,716 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-10-09 11:48:48,719 [ scc.git] DEBUG 8aef1ebf merge master -Dorg -Snone
2025-10-09 11:48:48,719 [ scc.git] DEBUG Calling 'git submodule status'
2025-10-09 11:48:48,765 [ scc.git] DEBUG c4e38d11898c252abbdc714fbc7e76165979658e Schemas (remotes/origin/HEAD)
2025-10-09 11:48:48,773 [ scc.git] DEBUG 72e9cee5f5933bfe46f32f387121df029cd289e5 _minutes (remotes/origin/HEAD)
2025-10-09 11:48:48,775 [ scc.config] DEBUG Found remote.origin.url
2025-10-09 11:48:49,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org HTTP/1.1" 200 None
2025-10-09 11:48:49,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-10-09 11:48:50,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-10-09 11:48:50,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-10-09 11:48:51,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-10-09 11:48:51,079 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-09 11:48:51,121 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/Schemas
2025-10-09 11:48:51,121 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-10-09 11:48:51,123 [ scc.git] DEBUG Check current status
2025-10-09 11:48:51,123 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-10-09 11:48:51,125 [ scc.git] DEBUG c4e38d1 Merge pull request #19 from ome/dependabot/maven/org.codehaus.mojo-exec-maven-plugin-3.6.1
2025-10-09 11:48:51,125 [ scc.git] DEBUG Calling 'git submodule status'
2025-10-09 11:48:51,163 [ scc.config] DEBUG Found remote.origin.url
2025-10-09 11:48:51,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas HTTP/1.1" 200 None
2025-10-09 11:48:52,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-10-09 11:48:52,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-10-09 11:48:52,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-10-09 11:48:53,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-10-09 11:48:53,295 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-09 11:48:53,331 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push
2025-10-09 11:48:53,332 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/_minutes
2025-10-09 11:48:53,332 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-10-09 11:48:53,334 [ scc.git] DEBUG Check current status
2025-10-09 11:48:53,334 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-10-09 11:48:53,336 [ scc.git] DEBUG 72e9cee Fix title date in 2025-08-26.md
2025-10-09 11:48:53,336 [ scc.git] DEBUG Calling 'git submodule status'
2025-10-09 11:48:53,372 [ scc.config] DEBUG Found remote.origin.url
2025-10-09 11:48:53,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/meeting-minutes HTTP/1.1" 200 None
2025-10-09 11:48:54,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-10-09 11:48:54,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-10-09 11:48:55,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-10-09 11:48:55,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-10-09 11:48:55,630 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-09 11:48:55,665 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push
2025-10-09 11:48:55,665 [ scc.git] DEBUG Resetting...
2025-10-09 11:48:55,665 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2025-10-09 11:48:55,672 [ scc.git] DEBUG HEAD is now at 8aef1ebf merge master -Dorg -Snone
2025-10-09 11:48:55,673 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2025-10-09 11:48:55,713 [ scc.git] DEBUG Check current status
2025-10-09 11:48:55,713 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-10-09 11:48:55,715 [ scc.git] DEBUG 8aef1ebf merge master -Dorg -Snone
2025-10-09 11:48:55,715 [ scc.git] DEBUG Calling 'git submodule status'
2025-10-09 11:48:55,758 [ scc.git] DEBUG c4e38d11898c252abbdc714fbc7e76165979658e Schemas (remotes/origin/HEAD)
2025-10-09 11:48:55,766 [ scc.git] DEBUG 72e9cee5f5933bfe46f32f387121df029cd289e5 _minutes (remotes/origin/HEAD)
2025-10-09 11:48:55,767 [ scc.merge] INFO Merging Pull Request(s) based on master
2025-10-09 11:48:55,767 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2025-10-09 11:48:55,767 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2025-10-09 11:48:55,767 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2025-10-09 11:48:55,767 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2025-10-09 11:48:55,767 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2025-10-09 11:48:55,767 [ scc.repo] DEBUG ## PRs found:
2025-10-09 11:48:56,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/pulls HTTP/1.1" 200 None
2025-10-09 11:48:56,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/831 HTTP/1.1" 200 None
2025-10-09 11:48:57,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/831/comments HTTP/1.1" 200 None
2025-10-09 11:48:57,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/60b362d6a74597cb783f1ce7bee363cb54cb4e28 HTTP/1.1" 200 None
2025-10-09 11:48:58,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/60b362d6a74597cb783f1ce7bee363cb54cb4e28/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-09 11:48:58,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/60b362d6a74597cb783f1ce7bee363cb54cb4e28/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-09 11:48:59,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/60b362d6a74597cb783f1ce7bee363cb54cb4e28 HTTP/1.1" 200 None
2025-10-09 11:48:59,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/statuses/60b362d6a74597cb783f1ce7bee363cb54cb4e28?per_page=1 HTTP/1.1" 200 2
2025-10-09 11:48:59,554 [ scc.repo] DEBUG - PR 831 joshmoore 'Initial OME2026 page'
2025-10-09 11:49:00,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/830 HTTP/1.1" 200 None
2025-10-09 11:49:00,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/830/comments HTTP/1.1" 200 None
2025-10-09 11:49:01,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/39dabf0916ab32bafaac42868b9295eabb10a7be HTTP/1.1" 200 None
2025-10-09 11:49:01,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/39dabf0916ab32bafaac42868b9295eabb10a7be/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-09 11:49:02,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/39dabf0916ab32bafaac42868b9295eabb10a7be/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-09 11:49:02,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/39dabf0916ab32bafaac42868b9295eabb10a7be HTTP/1.1" 200 None
2025-10-09 11:49:02,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/statuses/39dabf0916ab32bafaac42868b9295eabb10a7be?per_page=1 HTTP/1.1" 200 2
2025-10-09 11:49:02,992 [ scc.repo] DEBUG - PR 830 joshmoore 'Update Josh headshot 🌳'
2025-10-09 11:49:02,993 [ scc.repo] DEBUG ## Branches found:
2025-10-09 11:49:02,993 [ scc.git] DEBUG Get sha1 of %s
2025-10-09 11:49:02,993 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-09 11:49:02,995 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-09 11:49:02,997 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-09 11:49:02,997 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-09 11:49:03,000 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-09 11:49:03,002 [ scc.git] DEBUG Already up to date.
2025-10-09 11:49:03,002 [ scc.git] DEBUG Calling 'git fetch origin pull/830/head'
2025-10-09 11:49:03,331 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2025-10-09 11:49:03,331 [ scc.git] DEBUG * branch refs/pull/830/head -> FETCH_HEAD
2025-10-09 11:49:03,352 [ scc.git] DEBUG Calling 'git fetch origin pull/831/head'
2025-10-09 11:49:03,669 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2025-10-09 11:49:03,669 [ scc.git] DEBUG * branch refs/pull/831/head -> FETCH_HEAD
2025-10-09 11:49:03,684 [ scc.git] DEBUG ## Unique users: []
2025-10-09 11:49:03,684 [ scc.git] DEBUG Get sha1 of %s
2025-10-09 11:49:03,684 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-09 11:49:03,686 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...39dabf0916ab32bafaac42868b9295eabb10a7be'
2025-10-09 11:49:03,689 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-09 11:49:03,691 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 830 (Update Josh headshot 🌳) 39dabf0916ab32bafaac42868b9295eabb10a7be'
2025-10-09 11:49:03,702 [ scc.git] DEBUG Failed to merge submodule Schemas (commits don't follow merge-base)
2025-10-09 11:49:03,702 [ scc.git] DEBUG CONFLICT (submodule): Merge conflict in Schemas
2025-10-09 11:49:03,702 [ scc.git] DEBUG Recursive merging with submodules currently only supports trivial cases.
2025-10-09 11:49:03,702 [ scc.git] DEBUG Please manually handle the merging of each conflicted submodule.
2025-10-09 11:49:03,702 [ scc.git] DEBUG This can be accomplished with the following steps:
2025-10-09 11:49:03,702 [ scc.git] DEBUG - go to submodule (Schemas), and either merge commit 9dc8459
2025-10-09 11:49:03,702 [ scc.git] DEBUG or update to an existing commit which has merged those changes
2025-10-09 11:49:03,702 [ scc.git] DEBUG - come back to superproject and run:
2025-10-09 11:49:03,702 [ scc.git] DEBUG
2025-10-09 11:49:03,702 [ scc.git] DEBUG git add Schemas
2025-10-09 11:49:03,703 [ scc.git] DEBUG
2025-10-09 11:49:03,703 [ scc.git] DEBUG to record the above merge or update
2025-10-09 11:49:03,703 [ scc.git] DEBUG - resolve any other conflicts in the superproject
2025-10-09 11:49:03,703 [ scc.git] DEBUG - commit the resulting index in the superproject
2025-10-09 11:49:03,703 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-10-09 11:49:03,703 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-10-09 11:49:03,714 [ scc.git] DEBUG Calling 'git reset --hard 8aef1ebfa3e3f42e6bef339dd3082cfe5ce6d06f'
2025-10-09 11:49:03,720 [ scc.git] DEBUG HEAD is now at 8aef1ebf merge master -Dorg -Snone
2025-10-09 11:49:03,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-09 11:49:03,873 [ scc.git] DEBUG Calling 'git merge-base 8aef1ebfa3e3f42e6bef339dd3082cfe5ce6d06f 39dabf0916ab32bafaac42868b9295eabb10a7be'
2025-10-09 11:49:03,875 [ scc.git] DEBUG Calling 'git diff --name-only f3f69839a5b5cca7c070e7d3542fc6ef66528462..8aef1ebfa3e3f42e6bef339dd3082cfe5ce6d06f'
2025-10-09 11:49:03,878 [ scc.git] INFO - PR 830 joshmoore 'Update Josh headshot 🌳'
Conflicting PR. Removed from build [WEBSITE-push#626](https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/626/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/626/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Schemas
--conflicts
2025-10-09 11:49:03,879 [ scc.config] DEBUG Found github.token
2025-10-09 11:49:03,879 [ scc.git] DEBUG Not adding comment to issue #830, already --conflicts.
2025-10-09 11:49:03,880 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...60b362d6a74597cb783f1ce7bee363cb54cb4e28'
2025-10-09 11:49:03,882 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-09 11:49:03,884 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 831 (Initial OME2026 page) 60b362d6a74597cb783f1ce7bee363cb54cb4e28'
2025-10-09 11:49:03,886 [ scc.git] DEBUG Already up to date.
2025-10-09 11:49:04,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-09 11:49:04,286 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-09 11:49:04,321 [ scc.git] DEBUG Get sha1 of %s
2025-10-09 11:49:04,321 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-09 11:49:04,323 [ scc.repo] DEBUG ## PRs found:
2025-10-09 11:49:04,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas/pulls HTTP/1.1" 200 None
2025-10-09 11:49:05,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas/issues/12 HTTP/1.1" 200 None
2025-10-09 11:49:05,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas/issues/12/comments HTTP/1.1" 200 None
2025-10-09 11:49:05,744 [ scc.repo] DEBUG ## Branches found:
2025-10-09 11:49:05,744 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/Schemas
2025-10-09 11:49:05,744 [ scc.git] DEBUG Get sha1 of %s
2025-10-09 11:49:05,744 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-09 11:49:05,747 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-09 11:49:05,749 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-09 11:49:05,749 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-09 11:49:05,752 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-09 11:49:05,754 [ scc.git] DEBUG Already up to date.
2025-10-09 11:49:05,754 [ scc.git] DEBUG ## Unique users: []
2025-10-09 11:49:05,754 [ scc.git] DEBUG Get sha1 of %s
2025-10-09 11:49:05,754 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-09 11:49:05,756 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-09 11:49:05,792 [ scc.git] DEBUG Get sha1 of %s
2025-10-09 11:49:05,792 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-09 11:49:05,794 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-09 11:49:05,828 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-09 11:49:05,832 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f59482c6f50> has no local changes
2025-10-09 11:49:05,832 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/schemas
Excluded PRs:
- PR 12 joshmoore 'Update schemas doc pages' (stage: draft)
Already up to date.
Generated by WEBSITE-push#626 (https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/626/)'
2025-10-09 11:49:05,838 [ scc.git] DEBUG [detached HEAD 64f390c] merge master -Dorg -Ssuccess-only
2025-10-09 11:49:05,838 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push
2025-10-09 11:49:05,838 [ scc.repo] DEBUG ## PRs found:
2025-10-09 11:49:06,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/meeting-minutes/pulls HTTP/1.1" 200 2
2025-10-09 11:49:06,164 [ scc.repo] DEBUG ## Branches found:
2025-10-09 11:49:06,164 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/_minutes
2025-10-09 11:49:06,164 [ scc.git] DEBUG Get sha1 of %s
2025-10-09 11:49:06,164 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-09 11:49:06,166 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-09 11:49:06,168 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-09 11:49:06,168 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-09 11:49:06,170 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-09 11:49:06,173 [ scc.git] DEBUG Already up to date.
2025-10-09 11:49:06,173 [ scc.git] DEBUG ## Unique users: []
2025-10-09 11:49:06,173 [ scc.git] DEBUG Get sha1 of %s
2025-10-09 11:49:06,173 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-09 11:49:06,175 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-09 11:49:06,209 [ scc.git] DEBUG Get sha1 of %s
2025-10-09 11:49:06,210 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-09 11:49:06,211 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-09 11:49:06,244 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-09 11:49:06,247 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f59485b08d0> has no local changes
2025-10-09 11:49:06,247 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/meeting-minutes
Already up to date.
Generated by WEBSITE-push#626 (https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/626/)'
2025-10-09 11:49:06,253 [ scc.git] DEBUG [detached HEAD fba60bd] merge master -Dorg -Ssuccess-only
2025-10-09 11:49:06,253 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push
2025-10-09 11:49:06,253 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-09 11:49:06,292 [ scc.config] DEBUG Found submodule.Schemas.url
2025-10-09 11:49:06,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-09 11:49:06,594 [ scc.config] DEBUG Found submodule._minutes.url
2025-10-09 11:49:07,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-09 11:49:07,016 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-09 11:49:07,030 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f594a947e50> has local changes
2025-10-09 11:49:07,030 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/www.openmicroscopy.org
Already up to date.
Merged PRs:
- PR 831 joshmoore 'Initial OME2026 page'
Conflicting PRs (not included):
- PR 830 joshmoore 'Update Josh headshot 🌳'
Repository: ome/schemas
Excluded PRs:
- PR 12 joshmoore 'Update schemas doc pages' (stage: draft)
Already up to date.
Repository: ome/meeting-minutes
Already up to date.
Generated by WEBSITE-push#626 (https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/626/)'
2025-10-09 11:49:07,038 [ scc.git] DEBUG [detached HEAD 0390a368] merge master -Dorg -Ssuccess-only
2025-10-09 11:49:07,038 [ scc.git] DEBUG 3 files changed, 4 insertions(+), 4 deletions(-)
2025-10-09 11:49:07,038 [ scc.merge] INFO Repository: ome/www.openmicroscopy.org
2025-10-09 11:49:07,038 [ scc.merge] INFO Already up to date.
2025-10-09 11:49:07,038 [ scc.merge] INFO
2025-10-09 11:49:07,038 [ scc.merge] INFO Merged PRs:
2025-10-09 11:49:07,038 [ scc.merge] INFO - PR 831 joshmoore 'Initial OME2026 page'
2025-10-09 11:49:07,038 [ scc.merge] INFO
2025-10-09 11:49:07,038 [ scc.merge] INFO Conflicting PRs (not included):
2025-10-09 11:49:07,038 [ scc.merge] INFO - PR 830 joshmoore 'Update Josh headshot 🌳'
2025-10-09 11:49:07,038 [ scc.merge] INFO
2025-10-09 11:49:07,038 [ scc.merge] INFO Repository: ome/schemas
2025-10-09 11:49:07,038 [ scc.merge] INFO Excluded PRs:
2025-10-09 11:49:07,038 [ scc.merge] INFO - PR 12 joshmoore 'Update schemas doc pages' (stage: draft)
2025-10-09 11:49:07,038 [ scc.merge] INFO Already up to date.
2025-10-09 11:49:07,038 [ scc.merge] INFO
2025-10-09 11:49:07,038 [ scc.merge] INFO
2025-10-09 11:49:07,038 [ scc.merge] INFO Repository: ome/meeting-minutes
2025-10-09 11:49:07,039 [ scc.merge] INFO Already up to date.
2025-10-09 11:49:07,039 [ scc.merge] INFO
2025-10-09 11:49:07,039 [ scc.merge] INFO
2025-10-09 11:49:07,039 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-10-09 11:49:07,039 [ scc.git] DEBUG Calling 'git remote'
2025-10-09 11:49:07,040 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/Schemas
2025-10-09 11:49:07,040 [ scc.git] DEBUG Calling 'git remote'
2025-10-09 11:49:07,042 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push
2025-10-09 11:49:07,043 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/_minutes
2025-10-09 11:49:07,043 [ scc.git] DEBUG Calling 'git remote'
2025-10-09 11:49:07,045 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push
Update component versions
python3.11: can't open file '/home/omero/workspace/WEBSITE-push/Schemas/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/WEBSITE-push/Schemas/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/WEBSITE-push/_minutes/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/WEBSITE-push/_minutes/setup.py': [Errno 2] No such file or directory
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'Schemas'
Entering '_minutes'
Entering 'Schemas'
HEAD detached from c4e38d1
nothing to commit, working tree clean
Entering '_minutes'
HEAD detached from 72e9cee
nothing to commit, working tree clean
HEAD detached from 973782bf
nothing to commit, working tree clean
2025-10-09 11:49:21,232 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/www.openmicroscopy.org/tree/merge_ci
![[Jenkins]](/jenkins/static/0cb5541d/images/svgs/logo.svg){kind=logo}
