Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

We do actually want CI to pass a branch #1123

Merged
merged 5 commits into from
Aug 23, 2021
Merged

Conversation

DMRobertson
Copy link
Contributor

this pr not from my fork but from the repo itself

Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks sensible, but we should document it - https://github.com/matrix-org/sytest/blob/7178c8bd53557c739e99771bf67c9116ec0d731f/docker/README.md lists all the other env vars that the docker image understands, so we should include this one

docker/README.md Outdated
Comment on lines 21 to 22
homeserver git repository to be mounted at `/src`; otherwise, the image will
try to fetch that repository from GitHub.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this correct? I thought that it would just fail if /src didn't exist.

docker/README.md Outdated
Comment on lines 35 to 36
* `SYTEST_BRANCH`: controls which branch of synapse or dendrite we fetch when `/src`
is missing. If omitted or if that branch doesn't exist, we'll fetch the appropriate development branch.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this isn't quite right. As above: if /src is missing, I don't think it works at all...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Argh! Thanks. I think I keep confusing /src and /sytest. It's the CI job that has to fetch the source

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No worries! It is pretty confusing.

I was confusing /sytest with /src, and bootstrap.sh with CI config.
Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm otherwise, thanks!

docker/README.md Outdated Show resolved Hide resolved
docker/README.md Show resolved Hide resolved
David Robertson and others added 2 commits August 23, 2021 13:24
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
@DMRobertson DMRobertson merged commit 2d1ce1e into develop Aug 23, 2021
@DMRobertson DMRobertson deleted the dmr/cross-repo-branches branch August 23, 2021 12:51
@DMRobertson
Copy link
Contributor Author

I'll run the docker build.sh and publish.sh scripts so that synapse's CI can pick this up.

neilalexander added a commit that referenced this pull request Nov 22, 2021
PR #1123 broke the `Trying to get same-named sytest branch` stage for Dendrite CI which is still in Buildkite.
neilalexander added a commit that referenced this pull request Nov 23, 2021
…#1170)

PR #1123 broke the `Trying to get same-named sytest branch` stage for Dendrite CI which is still in Buildkite.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants