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 '' ']'
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
++ '[' -n '' ']'
++ unset VIRTUAL_ENV
++ '[' '!' 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
++ '[' -n /bin/bash -o -n '' ']'
++ 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)
2024-09-13 04:42:23,331 [ scc.config] DEBUG Found github.token
2024-09-13 04:42:23,334 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-09-13 04:42:23,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-13 04:42:23,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-13 04:42:24,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-09-13 04:42:24,284 [ scc.gh] DEBUG 4992 remaining from 5000 (Reset at 05:09
2024-09-13 04:42:24,284 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-13 04:42:24,288 [ scc.git] DEBUG Check current status
2024-09-13 04:42:24,288 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-13 04:42:24,291 [ scc.git] DEBUG f154feef Merge pull request #748 from knabar/release-omero-web-5.27.2
2024-09-13 04:42:24,292 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-13 04:42:24,333 [ scc.git] DEBUG 9dc84594733f6fd3485711a7b369dcef9e431c21 Schemas (heads/master)
2024-09-13 04:42:24,341 [ scc.git] DEBUG 6c1e198e00a4156fe9d3c8ebd9b51a616062614c _minutes (remotes/origin/HEAD)
2024-09-13 04:42:24,344 [ scc.config] DEBUG Found remote.origin.url
2024-09-13 04:42:24,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org HTTP/1.1" 200 None
2024-09-13 04:42:25,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-13 04:42:25,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-13 04:42:26,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-13 04:42:26,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-13 04:42:26,554 [ scc.git] DEBUG Resetting...
2024-09-13 04:42:26,554 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-09-13 04:42:26,562 [ scc.git] DEBUG HEAD is now at f154feef Merge pull request #748 from knabar/release-omero-web-5.27.2
2024-09-13 04:42:26,562 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-09-13 04:42:26,600 [ scc.git] DEBUG Check current status
2024-09-13 04:42:26,601 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-13 04:42:26,604 [ scc.git] DEBUG f154feef Merge pull request #748 from knabar/release-omero-web-5.27.2
2024-09-13 04:42:26,604 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-13 04:42:26,644 [ scc.git] DEBUG 9dc84594733f6fd3485711a7b369dcef9e431c21 Schemas (heads/master)
2024-09-13 04:42:26,651 [ scc.git] DEBUG 6c1e198e00a4156fe9d3c8ebd9b51a616062614c _minutes (remotes/origin/HEAD)
2024-09-13 04:42:26,652 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-09-13 04:42:26,652 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-09-13 04:42:26,652 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-09-13 04:42:26,652 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-09-13 04:42:26,652 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-09-13 04:42:26,652 [ scc.repo] DEBUG ## PRs found:
2024-09-13 04:42:27,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/pulls HTTP/1.1" 200 None
2024-09-13 04:42:27,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/751 HTTP/1.1" 200 None
2024-09-13 04:42:27,541 [ scc.repo] DEBUG - PR 751 sbesson 'GitHub Actions version upgrade'
2024-09-13 04:42:28,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/750 HTTP/1.1" 200 None
2024-09-13 04:42:28,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/750/comments HTTP/1.1" 200 None
2024-09-13 04:42:28,438 [ scc.repo] DEBUG - PR 750 chris-allan 'Revised security page'
2024-09-13 04:42:28,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/747 HTTP/1.1" 200 None
2024-09-13 04:42:29,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/747/comments HTTP/1.1" 200 None
2024-09-13 04:42:29,291 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-13 04:42:29,291 [ scc.repo] DEBUG - PR 747 dependabot[bot] 'Bump actions/download-artifact from 3 to 4.1.7 in /.github/workflows'
2024-09-13 04:42:29,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/545 HTTP/1.1" 200 None
2024-09-13 04:42:30,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/545/comments HTTP/1.1" 200 None
2024-09-13 04:42:30,203 [ scc.repo] DEBUG - PR 545 sbesson 'Regenerate IDR PNG logos with transparent background'
2024-09-13 04:42:30,203 [ scc.repo] DEBUG ## Branches found:
2024-09-13 04:42:30,203 [ scc.git] DEBUG Get sha1 of %s
2024-09-13 04:42:30,203 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-13 04:42:30,207 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-13 04:42:30,210 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-13 04:42:30,210 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-13 04:42:30,214 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-13 04:42:30,217 [ scc.git] DEBUG Already up to date.
2024-09-13 04:42:30,218 [ scc.git] DEBUG Calling 'git fetch origin pull/545/head'
2024-09-13 04:42:30,623 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2024-09-13 04:42:30,623 [ scc.git] DEBUG * branch refs/pull/545/head -> FETCH_HEAD
2024-09-13 04:42:30,640 [ scc.git] DEBUG Calling 'git fetch origin pull/747/head'
2024-09-13 04:42:30,934 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2024-09-13 04:42:30,935 [ scc.git] DEBUG * branch refs/pull/747/head -> FETCH_HEAD
2024-09-13 04:42:30,945 [ scc.git] DEBUG Calling 'git fetch origin pull/750/head'
2024-09-13 04:42:31,369 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2024-09-13 04:42:31,369 [ scc.git] DEBUG * branch refs/pull/750/head -> FETCH_HEAD
2024-09-13 04:42:31,381 [ scc.git] DEBUG Calling 'git fetch origin pull/751/head'
2024-09-13 04:42:31,919 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2024-09-13 04:42:31,919 [ scc.git] DEBUG * branch refs/pull/751/head -> FETCH_HEAD
2024-09-13 04:42:31,922 [ scc.git] DEBUG ## Unique users: []
2024-09-13 04:42:31,922 [ scc.git] DEBUG Get sha1 of %s
2024-09-13 04:42:31,922 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-13 04:42:31,926 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f3b02a9cd75d1c017d06a12bde07c6adce10cabd'
2024-09-13 04:42:32,028 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-13 04:42:32,031 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 545 (Regenerate IDR PNG logos with transparent background) f3b02a9cd75d1c017d06a12bde07c6adce10cabd'
2024-09-13 04:42:32,259 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-13 04:42:32,262 [ scc.git] DEBUG img/logos/idr-logos.zip | Bin 17681 -> 16406 bytes
2024-09-13 04:42:32,262 [ scc.git] DEBUG 1 file changed, 0 insertions(+), 0 deletions(-)
2024-09-13 04:42:32,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-13 04:42:32,393 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b05d344d909804cd204d3865072c97d28a452799'
2024-09-13 04:42:32,595 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-13 04:42:32,598 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 747 (Bump actions/download-artifact from 3 to 4.1.7 in /.github/workflows) b05d344d909804cd204d3865072c97d28a452799'
2024-09-13 04:42:32,626 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-13 04:42:32,628 [ scc.git] DEBUG .github/workflows/build.yml | 2 +-
2024-09-13 04:42:32,628 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-09-13 04:42:32,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-13 04:42:32,781 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d5b32275b4d1ed7c6a60d7a42f9b2d7f9a3479c6'
2024-09-13 04:42:32,792 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-13 04:42:32,795 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 750 (Revised security page) d5b32275b4d1ed7c6a60d7a42f9b2d7f9a3479c6'
2024-09-13 04:42:32,966 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-13 04:42:32,968 [ scc.git] DEBUG security/index.html | 11 ++++++++++-
2024-09-13 04:42:32,968 [ scc.git] DEBUG 1 file changed, 10 insertions(+), 1 deletion(-)
2024-09-13 04:42:33,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-13 04:42:33,162 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9b3c9c31663d537feafa6e72de21fe44b38ea9ef'
2024-09-13 04:42:33,173 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-13 04:42:33,176 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 751 (GitHub Actions version upgrade) 9b3c9c31663d537feafa6e72de21fe44b38ea9ef'
2024-09-13 04:42:33,195 [ scc.git] DEBUG Auto-merging .github/workflows/build.yml
2024-09-13 04:42:33,195 [ scc.git] DEBUG CONFLICT (content): Merge conflict in .github/workflows/build.yml
2024-09-13 04:42:33,195 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-13 04:42:33,196 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-13 04:42:33,351 [ scc.git] DEBUG Calling 'git reset --hard 318a78ef6eefb886e9b1c4e1594b19c3c62b2411'
2024-09-13 04:42:33,358 [ scc.git] DEBUG HEAD is now at 318a78ef merge master -Dorg -Snone: PR 750 (Revised security page)
2024-09-13 04:42:33,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-13 04:42:33,552 [ scc.git] DEBUG Calling 'git merge-base f154feef0495d70ab2232299d2eee862bc0205e9 9b3c9c31663d537feafa6e72de21fe44b38ea9ef'
2024-09-13 04:42:33,556 [ scc.git] DEBUG Calling 'git diff --name-only f154feef0495d70ab2232299d2eee862bc0205e9..f154feef0495d70ab2232299d2eee862bc0205e9'
2024-09-13 04:42:33,559 [ scc.git] INFO - PR 751 sbesson 'GitHub Actions version upgrade'
Conflicting PR. Removed from build [WEBSITE-push#221](https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/221/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/221/consoleText) for more details.
Possible conflicts:
- PR #747 dependabot[bot] 'Bump actions/download-artifact from 3 to 4.1.7 in /.github/workflows'
- .github/workflows/build.yml
--conflicts
2024-09-13 04:42:33,562 [ scc.config] DEBUG Found github.token
2024-09-13 04:42:33,562 [ scc.git] DEBUG Adding comment to issue #751.
2024-09-13 04:42:34,300 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/www.openmicroscopy.org/issues/751/comments HTTP/1.1" 201 2066
2024-09-13 04:42:34,302 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-13 04:42:34,337 [ scc.git] DEBUG Get sha1 of %s
2024-09-13 04:42:34,337 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-13 04:42:34,340 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-13 04:42:34,764 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f742fb6b340> has no local changes
2024-09-13 04:42:34,764 [ 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 545 sbesson 'Regenerate IDR PNG logos with transparent background'
- PR 747 dependabot[bot] 'Bump actions/download-artifact from 3 to 4.1.7 in /.github/workflows'
- PR 750 chris-allan 'Revised security page'
Conflicting PRs (not included):
- PR 751 sbesson 'GitHub Actions version upgrade'
Generated by WEBSITE-push#221 (https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/221/)'
2024-09-13 04:42:34,780 [ scc.git] DEBUG [detached HEAD 43d517c7] merge master -Dorg -Snone
2024-09-13 04:42:34,780 [ scc.merge] INFO Repository: ome/www.openmicroscopy.org
2024-09-13 04:42:34,780 [ scc.merge] INFO Already up to date.
2024-09-13 04:42:34,780 [ scc.merge] INFO
2024-09-13 04:42:34,780 [ scc.merge] INFO Merged PRs:
2024-09-13 04:42:34,780 [ scc.merge] INFO - PR 545 sbesson 'Regenerate IDR PNG logos with transparent background'
2024-09-13 04:42:34,780 [ scc.merge] INFO - PR 747 dependabot[bot] 'Bump actions/download-artifact from 3 to 4.1.7 in /.github/workflows'
2024-09-13 04:42:34,780 [ scc.merge] INFO - PR 750 chris-allan 'Revised security page'
2024-09-13 04:42:34,780 [ scc.merge] INFO
2024-09-13 04:42:34,780 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-13 04:42:34,780 [ scc.merge] INFO - PR 751 sbesson 'GitHub Actions version upgrade'
2024-09-13 04:42:34,780 [ scc.merge] INFO
2024-09-13 04:42:34,780 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-09-13 04:42:34,780 [ scc.git] DEBUG Calling 'git remote'
Synchronizing submodule url for 'Schemas'
Synchronizing submodule url for '_minutes'
Merge all submodules2024-09-13 04:42:35,850 [ scc.config] DEBUG Found github.token
2024-09-13 04:42:35,852 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-09-13 04:42:36,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-13 04:42:36,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-13 04:42:36,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-09-13 04:42:36,805 [ scc.gh] DEBUG 4970 remaining from 5000 (Reset at 05:09
2024-09-13 04:42:36,805 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-13 04:42:36,809 [ scc.git] DEBUG Check current status
2024-09-13 04:42:36,809 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-13 04:42:36,813 [ scc.git] DEBUG 43d517c7 merge master -Dorg -Snone
2024-09-13 04:42:36,813 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-13 04:42:36,854 [ scc.git] DEBUG 9dc84594733f6fd3485711a7b369dcef9e431c21 Schemas (heads/master)
2024-09-13 04:42:36,862 [ scc.git] DEBUG 6c1e198e00a4156fe9d3c8ebd9b51a616062614c _minutes (remotes/origin/HEAD)
2024-09-13 04:42:36,865 [ scc.config] DEBUG Found remote.origin.url
2024-09-13 04:42:37,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org HTTP/1.1" 200 None
2024-09-13 04:42:37,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-13 04:42:38,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-13 04:42:38,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-13 04:42:38,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-13 04:42:38,977 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-13 04:42:39,015 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/Schemas
2024-09-13 04:42:39,015 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-13 04:42:39,018 [ scc.git] DEBUG Check current status
2024-09-13 04:42:39,018 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-13 04:42:39,022 [ scc.git] DEBUG 9dc8459 Generate Schemas pages
2024-09-13 04:42:39,022 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-13 04:42:39,060 [ scc.config] DEBUG Found remote.origin.url
2024-09-13 04:42:39,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas HTTP/1.1" 200 None
2024-09-13 04:42:39,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-13 04:42:40,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-13 04:42:40,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-13 04:42:41,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-13 04:42:41,107 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-13 04:42:41,143 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push
2024-09-13 04:42:41,143 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/_minutes
2024-09-13 04:42:41,144 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-13 04:42:41,147 [ scc.git] DEBUG Check current status
2024-09-13 04:42:41,147 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-13 04:42:41,150 [ scc.git] DEBUG 6c1e198 minutes from August/Sept 2024
2024-09-13 04:42:41,151 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-13 04:42:41,187 [ scc.config] DEBUG Found remote.origin.url
2024-09-13 04:42:41,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/meeting-minutes HTTP/1.1" 200 None
2024-09-13 04:42:42,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-13 04:42:42,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-13 04:42:42,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-13 04:42:43,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-13 04:42:43,194 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-13 04:42:43,230 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push
2024-09-13 04:42:43,230 [ scc.git] DEBUG Resetting...
2024-09-13 04:42:43,231 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-09-13 04:42:43,238 [ scc.git] DEBUG HEAD is now at 43d517c7 merge master -Dorg -Snone
2024-09-13 04:42:43,238 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-09-13 04:42:43,277 [ scc.git] DEBUG Check current status
2024-09-13 04:42:43,277 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-13 04:42:43,280 [ scc.git] DEBUG 43d517c7 merge master -Dorg -Snone
2024-09-13 04:42:43,280 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-13 04:42:43,320 [ scc.git] DEBUG 9dc84594733f6fd3485711a7b369dcef9e431c21 Schemas (heads/master)
2024-09-13 04:42:43,328 [ scc.git] DEBUG 6c1e198e00a4156fe9d3c8ebd9b51a616062614c _minutes (remotes/origin/HEAD)
2024-09-13 04:42:43,329 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-09-13 04:42:43,329 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-09-13 04:42:43,329 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-09-13 04:42:43,329 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-09-13 04:42:43,329 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-09-13 04:42:43,329 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-09-13 04:42:43,329 [ scc.repo] DEBUG ## PRs found:
2024-09-13 04:42:43,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/pulls HTTP/1.1" 200 None
2024-09-13 04:42:44,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/751 HTTP/1.1" 200 None
2024-09-13 04:42:44,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/751/comments HTTP/1.1" 200 None
2024-09-13 04:42:45,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/9b3c9c31663d537feafa6e72de21fe44b38ea9ef HTTP/1.1" 200 None
2024-09-13 04:42:45,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/9b3c9c31663d537feafa6e72de21fe44b38ea9ef/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-13 04:42:46,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/9b3c9c31663d537feafa6e72de21fe44b38ea9ef/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-13 04:42:46,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/9b3c9c31663d537feafa6e72de21fe44b38ea9ef HTTP/1.1" 200 None
2024-09-13 04:42:46,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/statuses/9b3c9c31663d537feafa6e72de21fe44b38ea9ef?per_page=1 HTTP/1.1" 200 2
2024-09-13 04:42:46,943 [ scc.repo] DEBUG - PR 751 sbesson 'GitHub Actions version upgrade'
2024-09-13 04:42:47,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/750 HTTP/1.1" 200 None
2024-09-13 04:42:47,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/750/comments HTTP/1.1" 200 None
2024-09-13 04:42:48,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/d5b32275b4d1ed7c6a60d7a42f9b2d7f9a3479c6 HTTP/1.1" 200 None
2024-09-13 04:42:48,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/d5b32275b4d1ed7c6a60d7a42f9b2d7f9a3479c6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-13 04:42:49,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/d5b32275b4d1ed7c6a60d7a42f9b2d7f9a3479c6/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-13 04:42:49,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/d5b32275b4d1ed7c6a60d7a42f9b2d7f9a3479c6 HTTP/1.1" 200 None
2024-09-13 04:42:50,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/statuses/d5b32275b4d1ed7c6a60d7a42f9b2d7f9a3479c6?per_page=1 HTTP/1.1" 200 2
2024-09-13 04:42:50,161 [ scc.repo] DEBUG - PR 750 chris-allan 'Revised security page'
2024-09-13 04:42:50,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/747 HTTP/1.1" 200 None
2024-09-13 04:42:51,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/747/comments HTTP/1.1" 200 None
2024-09-13 04:42:51,040 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-13 04:42:51,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/b05d344d909804cd204d3865072c97d28a452799 HTTP/1.1" 200 None
2024-09-13 04:42:52,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/b05d344d909804cd204d3865072c97d28a452799/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-13 04:42:52,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/b05d344d909804cd204d3865072c97d28a452799/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-13 04:42:52,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/b05d344d909804cd204d3865072c97d28a452799 HTTP/1.1" 200 None
2024-09-13 04:42:53,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/statuses/b05d344d909804cd204d3865072c97d28a452799?per_page=1 HTTP/1.1" 200 2
2024-09-13 04:42:53,391 [ scc.repo] DEBUG - PR 747 dependabot[bot] 'Bump actions/download-artifact from 3 to 4.1.7 in /.github/workflows'
2024-09-13 04:42:53,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/545 HTTP/1.1" 200 None
2024-09-13 04:42:54,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/issues/545/comments HTTP/1.1" 200 None
2024-09-13 04:42:54,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/f3b02a9cd75d1c017d06a12bde07c6adce10cabd HTTP/1.1" 200 None
2024-09-13 04:42:55,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/f3b02a9cd75d1c017d06a12bde07c6adce10cabd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-13 04:42:55,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/commits/f3b02a9cd75d1c017d06a12bde07c6adce10cabd HTTP/1.1" 200 None
2024-09-13 04:42:56,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/www.openmicroscopy.org/statuses/f3b02a9cd75d1c017d06a12bde07c6adce10cabd?per_page=1 HTTP/1.1" 200 2
2024-09-13 04:42:56,143 [ scc.repo] DEBUG - PR 545 sbesson 'Regenerate IDR PNG logos with transparent background'
2024-09-13 04:42:56,143 [ scc.repo] DEBUG ## Branches found:
2024-09-13 04:42:56,143 [ scc.git] DEBUG Get sha1 of %s
2024-09-13 04:42:56,143 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-13 04:42:56,147 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-13 04:42:56,150 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-13 04:42:56,151 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-13 04:42:56,154 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-13 04:42:56,165 [ scc.git] DEBUG Already up to date.
2024-09-13 04:42:56,166 [ scc.git] DEBUG Calling 'git fetch origin pull/545/head'
2024-09-13 04:42:56,491 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2024-09-13 04:42:56,491 [ scc.git] DEBUG * branch refs/pull/545/head -> FETCH_HEAD
2024-09-13 04:42:56,507 [ scc.git] DEBUG Calling 'git fetch origin pull/747/head'
2024-09-13 04:42:56,821 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2024-09-13 04:42:56,822 [ scc.git] DEBUG * branch refs/pull/747/head -> FETCH_HEAD
2024-09-13 04:42:56,833 [ scc.git] DEBUG Calling 'git fetch origin pull/750/head'
2024-09-13 04:42:57,132 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2024-09-13 04:42:57,132 [ scc.git] DEBUG * branch refs/pull/750/head -> FETCH_HEAD
2024-09-13 04:42:57,144 [ scc.git] DEBUG Calling 'git fetch origin pull/751/head'
2024-09-13 04:42:57,447 [ scc.git] DEBUG From https://github.com/ome/www.openmicroscopy.org
2024-09-13 04:42:57,447 [ scc.git] DEBUG * branch refs/pull/751/head -> FETCH_HEAD
2024-09-13 04:42:57,458 [ scc.git] DEBUG ## Unique users: []
2024-09-13 04:42:57,458 [ scc.git] DEBUG Get sha1 of %s
2024-09-13 04:42:57,458 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-13 04:42:57,462 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f3b02a9cd75d1c017d06a12bde07c6adce10cabd'
2024-09-13 04:42:57,473 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-13 04:42:57,476 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 545 (Regenerate IDR PNG logos with transparent background) f3b02a9cd75d1c017d06a12bde07c6adce10cabd'
2024-09-13 04:42:57,487 [ scc.git] DEBUG Already up to date.
2024-09-13 04:42:57,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-13 04:42:57,627 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b05d344d909804cd204d3865072c97d28a452799'
2024-09-13 04:42:57,638 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-13 04:42:57,641 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 747 (Bump actions/download-artifact from 3 to 4.1.7 in /.github/workflows) b05d344d909804cd204d3865072c97d28a452799'
2024-09-13 04:42:57,651 [ scc.git] DEBUG Already up to date.
2024-09-13 04:42:58,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-13 04:42:58,005 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d5b32275b4d1ed7c6a60d7a42f9b2d7f9a3479c6'
2024-09-13 04:42:58,016 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-13 04:42:58,020 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 750 (Revised security page) d5b32275b4d1ed7c6a60d7a42f9b2d7f9a3479c6'
2024-09-13 04:42:58,030 [ scc.git] DEBUG Already up to date.
2024-09-13 04:42:58,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-13 04:42:58,390 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9b3c9c31663d537feafa6e72de21fe44b38ea9ef'
2024-09-13 04:42:58,401 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-13 04:42:58,404 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 751 (GitHub Actions version upgrade) 9b3c9c31663d537feafa6e72de21fe44b38ea9ef'
2024-09-13 04:42:58,421 [ scc.git] DEBUG Auto-merging .github/workflows/build.yml
2024-09-13 04:42:58,422 [ scc.git] DEBUG CONFLICT (content): Merge conflict in .github/workflows/build.yml
2024-09-13 04:42:58,422 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-13 04:42:58,422 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-13 04:42:58,434 [ scc.git] DEBUG Calling 'git reset --hard 43d517c7e4926fbaca94d231431aaf0506282568'
2024-09-13 04:42:58,440 [ scc.git] DEBUG HEAD is now at 43d517c7 merge master -Dorg -Snone
2024-09-13 04:42:58,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-13 04:42:58,816 [ scc.git] DEBUG Calling 'git merge-base 43d517c7e4926fbaca94d231431aaf0506282568 9b3c9c31663d537feafa6e72de21fe44b38ea9ef'
2024-09-13 04:42:58,827 [ scc.git] DEBUG Calling 'git diff --name-only f154feef0495d70ab2232299d2eee862bc0205e9..43d517c7e4926fbaca94d231431aaf0506282568'
2024-09-13 04:42:58,831 [ scc.git] INFO - PR 751 sbesson 'GitHub Actions version upgrade'
Conflicting PR. Removed from build [WEBSITE-push#221](https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/221/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/221/consoleText) for more details.
Possible conflicts:
- Upstream changes
- .github/workflows/build.yml
--conflicts
2024-09-13 04:42:58,834 [ scc.config] DEBUG Found github.token
2024-09-13 04:42:58,834 [ scc.git] DEBUG Adding comment to issue #751.
2024-09-13 04:42:59,494 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/www.openmicroscopy.org/issues/751/comments HTTP/1.1" 201 1988
2024-09-13 04:42:59,495 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-13 04:42:59,530 [ scc.git] DEBUG Get sha1 of %s
2024-09-13 04:42:59,531 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-13 04:42:59,534 [ scc.repo] DEBUG ## PRs found:
2024-09-13 04:42:59,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas/pulls HTTP/1.1" 200 None
2024-09-13 04:43:00,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas/issues/10 HTTP/1.1" 200 None
2024-09-13 04:43:00,437 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-13 04:43:01,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas/commits/e1257555be50189441800592768cdfbb3e9dc48c HTTP/1.1" 200 None
2024-09-13 04:43:01,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas/commits/e1257555be50189441800592768cdfbb3e9dc48c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-13 04:43:02,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas/commits/e1257555be50189441800592768cdfbb3e9dc48c HTTP/1.1" 200 None
2024-09-13 04:43:02,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/schemas/statuses/e1257555be50189441800592768cdfbb3e9dc48c?per_page=1 HTTP/1.1" 200 2
2024-09-13 04:43:02,415 [ scc.repo] DEBUG - PR 10 dependabot[bot] 'Bump specification from 6.3.1 to 6.3.3'
2024-09-13 04:43:02,415 [ scc.repo] DEBUG ## Branches found:
2024-09-13 04:43:02,415 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/Schemas
2024-09-13 04:43:02,415 [ scc.git] DEBUG Get sha1 of %s
2024-09-13 04:43:02,415 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-13 04:43:02,419 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-13 04:43:02,422 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-13 04:43:02,423 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-13 04:43:02,426 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-13 04:43:02,430 [ scc.git] DEBUG Already up to date.
2024-09-13 04:43:02,430 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-09-13 04:43:02,744 [ scc.git] DEBUG From https://github.com/ome/schemas
2024-09-13 04:43:02,744 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-09-13 04:43:02,748 [ scc.git] DEBUG ## Unique users: []
2024-09-13 04:43:02,748 [ scc.git] DEBUG Get sha1 of %s
2024-09-13 04:43:02,748 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-13 04:43:02,752 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e1257555be50189441800592768cdfbb3e9dc48c'
2024-09-13 04:43:02,755 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-13 04:43:02,759 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Bump specification from 6.3.1 to 6.3.3) e1257555be50189441800592768cdfbb3e9dc48c'
2024-09-13 04:43:02,831 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-13 04:43:02,834 [ scc.git] DEBUG pom.xml | 2 +-
2024-09-13 04:43:02,834 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-09-13 04:43:02,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-13 04:43:02,974 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-13 04:43:03,009 [ scc.git] DEBUG Get sha1 of %s
2024-09-13 04:43:03,009 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-13 04:43:03,012 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-13 04:43:03,048 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-13 04:43:03,053 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0097e28640> has no local changes
2024-09-13 04:43:03,053 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/schemas
Already up to date.
Merged PRs:
- PR 10 dependabot[bot] 'Bump specification from 6.3.1 to 6.3.3'
Generated by WEBSITE-push#221 (https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/221/)'
2024-09-13 04:43:03,060 [ scc.git] DEBUG [detached HEAD 764f243] merge master -Dorg -Ssuccess-only
2024-09-13 04:43:03,060 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push
2024-09-13 04:43:03,061 [ scc.repo] DEBUG ## PRs found:
2024-09-13 04:43:03,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/meeting-minutes/pulls HTTP/1.1" 200 2
2024-09-13 04:43:03,385 [ scc.repo] DEBUG ## Branches found:
2024-09-13 04:43:03,385 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/_minutes
2024-09-13 04:43:03,385 [ scc.git] DEBUG Get sha1 of %s
2024-09-13 04:43:03,385 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-13 04:43:03,388 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-13 04:43:03,392 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-13 04:43:03,392 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-13 04:43:03,395 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-13 04:43:03,399 [ scc.git] DEBUG Already up to date.
2024-09-13 04:43:03,399 [ scc.git] DEBUG ## Unique users: []
2024-09-13 04:43:03,400 [ scc.git] DEBUG Get sha1 of %s
2024-09-13 04:43:03,400 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-13 04:43:03,403 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-13 04:43:03,437 [ scc.git] DEBUG Get sha1 of %s
2024-09-13 04:43:03,437 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-13 04:43:03,441 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-13 04:43:03,474 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-13 04:43:03,479 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0096da2f40> has no local changes
2024-09-13 04:43:03,479 [ 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#221 (https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/221/)'
2024-09-13 04:43:03,486 [ scc.git] DEBUG [detached HEAD 50cdcc9] merge master -Dorg -Ssuccess-only
2024-09-13 04:43:03,486 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push
2024-09-13 04:43:03,486 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-13 04:43:03,525 [ scc.config] DEBUG Found submodule.Schemas.url
2024-09-13 04:43:03,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-13 04:43:03,805 [ scc.config] DEBUG Found submodule._minutes.url
2024-09-13 04:43:04,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-13 04:43:04,206 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-13 04:43:04,221 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0097e8c580> has local changes
2024-09-13 04:43:04,221 [ 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 545 sbesson 'Regenerate IDR PNG logos with transparent background'
- PR 747 dependabot[bot] 'Bump actions/download-artifact from 3 to 4.1.7 in /.github/workflows'
- PR 750 chris-allan 'Revised security page'
Conflicting PRs (not included):
- PR 751 sbesson 'GitHub Actions version upgrade'
Repository: ome/schemas
Already up to date.
Merged PRs:
- PR 10 dependabot[bot] 'Bump specification from 6.3.1 to 6.3.3'
Repository: ome/meeting-minutes
Already up to date.
Generated by WEBSITE-push#221 (https://merge-ci.openmicroscopy.org/jenkins/job/WEBSITE-push/221/)'
2024-09-13 04:43:04,247 [ scc.git] DEBUG [detached HEAD 959ae2f1] merge master -Dorg -Ssuccess-only
2024-09-13 04:43:04,247 [ scc.git] DEBUG 3 files changed, 4 insertions(+), 4 deletions(-)
2024-09-13 04:43:04,247 [ scc.merge] INFO Repository: ome/www.openmicroscopy.org
2024-09-13 04:43:04,247 [ scc.merge] INFO Already up to date.
2024-09-13 04:43:04,247 [ scc.merge] INFO
2024-09-13 04:43:04,248 [ scc.merge] INFO Merged PRs:
2024-09-13 04:43:04,248 [ scc.merge] INFO - PR 545 sbesson 'Regenerate IDR PNG logos with transparent background'
2024-09-13 04:43:04,248 [ scc.merge] INFO - PR 747 dependabot[bot] 'Bump actions/download-artifact from 3 to 4.1.7 in /.github/workflows'
2024-09-13 04:43:04,248 [ scc.merge] INFO - PR 750 chris-allan 'Revised security page'
2024-09-13 04:43:04,248 [ scc.merge] INFO
2024-09-13 04:43:04,248 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-13 04:43:04,248 [ scc.merge] INFO - PR 751 sbesson 'GitHub Actions version upgrade'
2024-09-13 04:43:04,248 [ scc.merge] INFO
2024-09-13 04:43:04,248 [ scc.merge] INFO Repository: ome/schemas
2024-09-13 04:43:04,248 [ scc.merge] INFO Already up to date.
2024-09-13 04:43:04,248 [ scc.merge] INFO
2024-09-13 04:43:04,248 [ scc.merge] INFO Merged PRs:
2024-09-13 04:43:04,248 [ scc.merge] INFO - PR 10 dependabot[bot] 'Bump specification from 6.3.1 to 6.3.3'
2024-09-13 04:43:04,248 [ scc.merge] INFO
2024-09-13 04:43:04,248 [ scc.merge] INFO Repository: ome/meeting-minutes
2024-09-13 04:43:04,248 [ scc.merge] INFO Already up to date.
2024-09-13 04:43:04,248 [ scc.merge] INFO
2024-09-13 04:43:04,248 [ scc.merge] INFO
2024-09-13 04:43:04,248 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-09-13 04:43:04,248 [ scc.git] DEBUG Calling 'git remote'
2024-09-13 04:43:04,251 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/Schemas
2024-09-13 04:43:04,251 [ scc.git] DEBUG Calling 'git remote'
2024-09-13 04:43:04,255 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push
2024-09-13 04:43:04,255 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push/_minutes
2024-09-13 04:43:04,255 [ scc.git] DEBUG Calling 'git remote'
2024-09-13 04:43:04,258 [ scc.git] DEBUG cd /home/omero/workspace/WEBSITE-push
Update component versions
python3: can't open file '/home/omero/workspace/WEBSITE-push/Schemas/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/WEBSITE-push/Schemas/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/WEBSITE-push/_minutes/setup.py': [Errno 2] No such file or directory
python3: 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 9dc8459
nothing to commit, working tree clean
Entering '_minutes'
HEAD detached from 6c1e198
nothing to commit, working tree clean
HEAD detached from f154feef
nothing to commit, working tree clean
2024-09-13 04:43:18,721 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/www.openmicroscopy.org/tree/merge_ci
![[Jenkins]](/jenkins/static/9ed1fe1f/images/svgs/logo.svg){kind=logo}
