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

Move scripts which aren't in docker out of docker #752

Merged
merged 1 commit into from
Nov 27, 2019
Merged

Conversation

richvdh
Copy link
Member

@richvdh richvdh commented Nov 26, 2019

Since these scripts were in the docker directory, I thought they would be in the docker image. Turns out, not so much.

bootstrap.sh, which is in the docker image, is updated to cope with the scripts being either in the old place or the new, so that we can bump the docker image without breaking existing branches.

Also a couple of bits of cleanup.

Since these scripts were in the docker directory, I thought they would be in
the docker image. Turns out, not so much.

Also a couple of bits of cleanup.
@richvdh
Copy link
Member Author

richvdh commented Nov 26, 2019

(of course CI on this branch is going to fail until we update the docker image)

@richvdh richvdh requested a review from a team November 26, 2019 18:56
@richvdh
Copy link
Member Author

richvdh commented Nov 27, 2019

now passing modulo flaky worker tests, for which see matrix-org/synapse#6429

@richvdh richvdh merged commit 28f2f7d into develop Nov 27, 2019
anoadragon453 added a commit that referenced this pull request Mar 18, 2020
…ase-v1.6.x

* origin/release-v1.6.1: (32 commits)
  Move scripts which aren't in docker out of `docker` (#752)
  README.md: don't forget to update dendrite:latest
  fix another results.tap
  Fix path to results.tap for dendrite build
  remove redundant (and failing) tap-to-junit
  Don't modify source volumes when running in docker (#748)
  Fix a flaky cross-signing test (#749)
  Add tests for 3PID registration (#695)
  Update the SyTest Docker files (#744)
  rejected state test (#742)
  Add test for rooms transferring on groups after room upgrade (#737)
  test pushes of rejected events (#738)
  Tests for room tags and push rules after upgrading a remote room (#721)
  Test that a room is depublished from the public rooms list upon room upgrade (#729)
  Review comments
  Tests for signatures and auth on /send_join etc (#734)
  Wrap in retry loop as room dir is updated async
  Tests room dir search
  Wrap numbers in JSON bodies (#733)
  Add frontend proxy worker
  ...
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