Console Output
+ export BASE_REPO=omero-zarr-pixel-buffer.git
+ BASE_REPO=omero-zarr-pixel-buffer.git
+ export BASE_BRANCH=master
+ BASE_BRANCH=master
+ export VERSION_LOG=/home/omero/workspace/OMERO-zarr-pixel-buffer-push/build/version.tsv
+ VERSION_LOG=/home/omero/workspace/OMERO-zarr-pixel-buffer-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/OMERO-zarr-pixel-buffer-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/OMERO-zarr-pixel-buffer-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-07-15 11:56:04,842 [ scc.config] DEBUG Found github.token
2025-07-15 11:56:04,843 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-15 11:56:05,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-15 11:56:05,292 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-15 11:56:05,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-15 11:56:05,721 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-15 11:56:05,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2025-07-15 11:56:05,908 [ scc.gh] DEBUG 4984 remaining from 5000 (Reset at 11:07
2025-07-15 11:56:05,909 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-07-15 11:56:05,911 [ scc.git] DEBUG Check current status
2025-07-15 11:56:05,911 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-07-15 11:56:05,914 [ scc.git] DEBUG 7b25b24 Bump version to 0.5.1-SNAPSHOT
2025-07-15 11:56:05,914 [ scc.git] DEBUG Calling 'git submodule status'
2025-07-15 11:56:05,958 [ scc.config] DEBUG Found remote.origin.url
2025-07-15 11:56:06,159 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-15 11:56:06,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-zarr-pixel-buffer HTTP/1.1" 200 None
2025-07-15 11:56:06,759 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-15 11:56:07,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-07-15 11:56:07,252 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-15 11:56:07,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-07-15 11:56:07,753 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-15 11:56:07,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-07-15 11:56:08,198 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-15 11:56:08,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-07-15 11:56:08,386 [ scc.git] DEBUG Resetting...
2025-07-15 11:56:08,386 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2025-07-15 11:56:08,392 [ scc.git] DEBUG HEAD is now at 7b25b24 Bump version to 0.5.1-SNAPSHOT
2025-07-15 11:56:08,392 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2025-07-15 11:56:08,433 [ scc.git] DEBUG Check current status
2025-07-15 11:56:08,433 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-07-15 11:56:08,436 [ scc.git] DEBUG 7b25b24 Bump version to 0.5.1-SNAPSHOT
2025-07-15 11:56:08,436 [ scc.git] DEBUG Calling 'git submodule status'
2025-07-15 11:56:08,476 [ scc.merge] INFO Merging Pull Request(s) based on master
2025-07-15 11:56:08,476 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2025-07-15 11:56:08,476 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2025-07-15 11:56:08,476 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2025-07-15 11:56:08,476 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2025-07-15 11:56:08,476 [ scc.repo] DEBUG ## PRs found:
2025-07-15 11:56:08,636 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-15 11:56:08,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-zarr-pixel-buffer/pulls HTTP/1.1" 200 None
2025-07-15 11:56:09,203 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-15 11:56:09,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-zarr-pixel-buffer/issues/5 HTTP/1.1" 200 None
2025-07-15 11:56:09,471 [ scc.repo] DEBUG ## Branches found:
2025-07-15 11:56:09,471 [ scc.git] DEBUG Get sha1 of %s
2025-07-15 11:56:09,471 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-15 11:56:09,474 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-15 11:56:09,476 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-15 11:56:09,477 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-15 11:56:09,479 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-15 11:56:09,482 [ scc.git] DEBUG Already up to date.
2025-07-15 11:56:09,482 [ scc.git] DEBUG ## Unique users: []
2025-07-15 11:56:09,482 [ scc.git] DEBUG Get sha1 of %s
2025-07-15 11:56:09,482 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-15 11:56:09,484 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-15 11:56:09,524 [ scc.git] DEBUG Get sha1 of %s
2025-07-15 11:56:09,524 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-15 11:56:09,526 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-15 11:56:09,530 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7017f52b50> has local changes
2025-07-15 11:56:09,530 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Snone
Repository: ome/omero-zarr-pixel-buffer
Excluded PRs:
- PR 5 dominikl 'Add script to merge feature branches' (stage: draft)
Already up to date.
Generated by OMERO-zarr-pixel-buffer-push#2 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-zarr-pixel-buffer-push/2/)'
2025-07-15 11:56:09,533 [ scc.git] DEBUG HEAD detached at 7b25b24
2025-07-15 11:56:09,533 [ scc.git] DEBUG Untracked files:
2025-07-15 11:56:09,533 [ scc.git] DEBUG (use "git add <file>..." to include in what will be committed)
2025-07-15 11:56:09,533 [ scc.git] DEBUG build/
2025-07-15 11:56:09,533 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-07-15 11:56:09,533 [ scc.git] DEBUG
2025-07-15 11:56:09,533 [ scc.git] DEBUG Calling 'git remote'
2025-07-15 11:56:09,533 [ scc.git] DEBUG nothing added to commit but untracked files present (use "git add" to track)
Traceback (most recent call last):
File "/home/omero/workspace/OMERO-zarr-pixel-buffer-push/build/venv/lib64/python3.11/site-packages/scc/main.py", line 64, in entry_point
main("scc", items=[
File "/home/omero/workspace/OMERO-zarr-pixel-buffer-push/build/venv/lib64/python3.11/site-packages/yaclifw/framework.py", line 188, in main
ns.func(ns)
File "/home/omero/workspace/OMERO-zarr-pixel-buffer-push/build/venv/lib64/python3.11/site-packages/scc/git.py", line 3332, in __call__
self.merge(args, self.main_repo)
File "/home/omero/workspace/OMERO-zarr-pixel-buffer-push/build/venv/lib64/python3.11/site-packages/scc/git.py", line 3357, in merge
updated, merge_msg = main_repo.rmerge(
^^^^^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-zarr-pixel-buffer-push/build/venv/lib64/python3.11/site-packages/scc/git.py", line 1861, in rmerge
summary_update = self.summary_commit(
^^^^^^^^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-zarr-pixel-buffer-push/build/venv/lib64/python3.11/site-packages/scc/git.py", line 1924, in summary_commit
self.call("git", "commit", "-a", "-n", "-m", commit_message)
File "/home/omero/workspace/OMERO-zarr-pixel-buffer-push/build/venv/lib64/python3.11/site-packages/scc/git.py", line 1162, in call
return self.wrap_call(self.debugWrap, *command, **kwargs)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-zarr-pixel-buffer-push/build/venv/lib64/python3.11/site-packages/scc/git.py", line 1187, in wrap_call
raise Exception("rc=%s" % rc)
Exception: rc=1