aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiederick de Vries <diederick76@users.noreply.github.com>2017-05-20 22:42:29 +0200
committerGitHub <noreply@github.com>2017-05-20 22:42:29 +0200
commit483da8eb5cfeb67ee4230b20222e1b2575e53a0a (patch)
tree58656b30f30ac2af139d66433e69c60bd8833805
parent233bb76972e8ced857d9f83bf44dc9fee4d66025 (diff)
downloadaside-483da8eb5cfeb67ee4230b20222e1b2575e53a0a.tar.gz
aside-483da8eb5cfeb67ee4230b20222e1b2575e53a0a.tar.bz2
aside-483da8eb5cfeb67ee4230b20222e1b2575e53a0a.zip
Fix typos.HEADmaster
-rw-r--r--README.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/README.md b/README.md
index f95153d..0db207d 100644
--- a/README.md
+++ b/README.md
@@ -33,13 +33,13 @@ The monitoring script uses the name of the trigger to select the correct project
33When the systemd-unit is enabled, it is started by booting the build server. Then the flow is as follows: 33When the systemd-unit is enabled, it is started by booting the build server. Then the flow is as follows:
34 34
351. A developer pushes a change to `origin/master`. 351. A developer pushes a change to `origin/master`.
362. The post-update hook checkt that the branch is `master`. 362. The post-update hook checks that the branch is `master`.
373. The post-update hook clones the repository to `/var/home/builduser/projectname/work/`. 373. The post-update hook clones the repository to `/var/home/builduser/projectname/work/`.
384. The post-update hook creates an empty file with the name of the repository in `/var/home/builduser/trigger/` and deletes it immediately. 384. The post-update hook creates an empty file with the name of the repository in `/var/home/builduser/trigger/` and deletes it immediately.
395. The monitoring script notices the trigger and starts the build script in the repository with the name of the trigger. 395. The monitoring script notices the trigger and starts the build script in the repository with the name of the trigger.
406. Afterwards is emails the build script's output to the developer. 406. Afterwards it emails the build script's output to the developer.
41 41
42The example build script deploys a Java Maven project. It runs the unit tests and copies the test resources to the project to run the integration tests. It then packages the project and copies the artifcact to an installation directory, to which builduser must have write rights. At last, it emails the logs to the developer and empties the working directory. 42The example build script deploys a Java Maven project. It runs the unit tests and copies the test resources to the project to run the integration tests. It then packages the project and copies the artifact to an installation directory, to which builduser must have writing rights. At last, it emails the logs to the developer and empties the working directory.
43 43
44# Starting and stopping 44# Starting and stopping
45 45
@@ -60,7 +60,7 @@ Start, stop, enable and disable as you would any systemd unit. The unit is calle
60# mkdir -p /var/home/builduser/{bin,trigger,project1/{bin,log,resources/{test,prod},work}} 60# mkdir -p /var/home/builduser/{bin,trigger,project1/{bin,log,resources/{test,prod},work}}
61``` 61```
62 62
633. Put the scripts at the right location and adapt them to your needs. See the diagram above. 633. Put the scripts at the right locations and adapt them to your needs. See the diagram above.
64 64
654. Enable the triggers. 654. Enable the triggers.
66 66