Skip to content

Commit

Permalink
Merge pull request #27 from matrix-org/dmr/gha
Browse files Browse the repository at this point in the history
  • Loading branch information
David Robertson authored Nov 1, 2022
2 parents 80f9866 + 274b8c9 commit cc57cdb
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 2 deletions.
25 changes: 25 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: CI
on:
push:
branches: main
pull_request:
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
# When CI ran on BuildKite, we used to also run the following script to build a
# Synapse docker image from scratch.
# I leave it here for posterity and completeness.
# - name: Prepare the Docker image for Synapse `develop`
# run: test/before_test.sh
- name: Setup services and launch tests
run: docker-compose up --build --abort-on-container-exit


2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# A Dockerfile used for running tests.
# This Dockerfile should work for other plug-ins, too.

FROM matrixdotorg/synapse:latest
FROM matrixdotorg/synapse:develop

# Install extension.
WORKDIR /data
Expand Down
2 changes: 1 addition & 1 deletion test/before_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

\rm -Rf synapse
git clone https://github.com/matrix-org/synapse.git
docker build -t matrixdotorg/synapse -f synapse/docker/Dockerfile synapse
DOCKER_BUILDKIT=1 docker build -t matrixdotorg/synapse -f synapse/docker/Dockerfile synapse

0 comments on commit cc57cdb

Please sign in to comment.