Skip to content

Commit 760fc99

Browse files
authored
Minor doc tweaks (#188)
1 parent 7dc646b commit 760fc99

File tree

2 files changed

+23
-17
lines changed

2 files changed

+23
-17
lines changed

README.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ A [Buildkite plugin](https://buildkite.com/docs/agent/v3/plugins) that lets you
44

55
1. Configure at least `P4PORT` and `P4USER` (see examples below)
66
2. Provision with credentials - a `P4TICKETS` file is recommended
7-
3. Optionally customise workspace mapping.
7+
3. Optionally customise workspace mapping with `stream`, `sync` or `view` settings.
88

99
The `P4CLIENT`, `P4USER` and `P4PORT` used by the plugin are written to a [`P4CONFIG`](https://www.perforce.com/manuals/v16.2/cmdref/P4CONFIG.html) file at the workspace root and the `P4CONFIG` env var is set, so build scripts are able to automatically pick up configuration for any further interactions with Perforce.
1010

1111
## Examples
1212

13-
### Configuration via env vars:
13+
### Configuration via env vars
1414

1515
```yaml
1616
env:
@@ -22,7 +22,7 @@ steps:
2222
- improbable-eng/perforce: ~
2323
```
2424
25-
### Configuration via the plugin:
25+
### Configuration via plugin
2626
2727
```yaml
2828
steps:
@@ -122,16 +122,18 @@ Relies on people within your team manually clicking `New Build` within the Build
122122

123123
### Schedule
124124

125-
Schedule builds with a cron in buildkite - this requires no additional setup, but provides the worst response time as changes are made
125+
[Scheduled builds](https://buildkite.com/docs/pipelines/scheduled-builds) with a cron in buildkite - this requires no additional setup, but provides the slowest response time between a change being made and a build triggered.
126126

127127
### Polling
128128

129129
A service polls your perforce for the current head revision and POSTs to the Buildkite API to trigger builds for any new changes. Note that you will need to store state to avoid duplicate and skipped builds.
130130

131-
### `p4 trigger`
131+
### P4 Trigger
132132

133133
Set up a `p4 trigger` which POSTs to the buildkite API to trigger a build. See [p4 triggers](https://www.perforce.com/manuals/v18.1/cmdref/Content/CmdRef/p4_triggers.html) for more information. Note that this will require admin access to the Perforce server.
134134

135+
See [examples](./examples) for sample p4 trigger scripts.
136+
135137
## Contributing
136138

137139
### OSX
@@ -142,7 +144,7 @@ Python [virtualenv](https://docs.python.org/3/tutorial/venv.html) `.dev-venv` fo
142144

143145
Run the `test_fixture` unit test to check everything is setup correctly:
144146

145-
```
147+
```bash
146148
source .dev-venv/bin/activate
147149
pytest python/test_perforce.py -k test_fixture
148150
```

plugin.yml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,29 @@ description: Checks out a perforce repository instead of git.
33
author: https://github.com/ca-johnson
44
configuration:
55
properties:
6-
p4port:
6+
backup_changelists:
7+
type: bool
8+
client_options:
79
type: string
8-
p4user:
10+
client_type:
11+
type: string
12+
p4port:
913
type: string
1014
p4tickets:
1115
type: string
1216
p4trust:
13-
type: string
14-
view:
1517
type: string
16-
stream:
18+
p4user:
1719
type: string
18-
sync:
19-
type: array
2020
parallel:
2121
type: string
22-
client_options:
23-
type: string
24-
client_type:
22+
share_workspace:
23+
type: bool
24+
stream:
2525
type: string
26-
backup_changelists:
26+
stream_switching:
2727
type: bool
28+
sync:
29+
type: array
30+
view:
31+
type: string

0 commit comments

Comments
 (0)