Skip to content

Commit 5f04078

Browse files
authored
Merge branch 'production' into nicola/seattle
2 parents 0b31af5 + ab7a76b commit 5f04078

File tree

5 files changed

+44
-7
lines changed

5 files changed

+44
-7
lines changed

.github/workflows/main.yml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: CI
2+
3+
on: [push]
4+
5+
jobs:
6+
build:
7+
8+
runs-on: ubuntu-latest
9+
10+
steps:
11+
- uses: actions/checkout@v1
12+
- name: Run a one-line script
13+
run: echo Hello, world!
14+
- name: Run a multi-line script
15+
run: |
16+
echo Add other actions to build,
17+
echo test, and deploy your project.
18+
- name: npm audit action
19+
uses: oke-py/[email protected]
20+
with:
21+
github_token: ${{ secrets.GITHUB_TOKEN }}
22+
issue_assignees: deweydell
23+
issue_labels: bug

.travis.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
# TODO (Nicola): Re-enable travis when we have tests to run
12
language: node_js
23
node_js:
34
- '10.15.3'
5+
# script:
6+
# the `audit-level` is at `moderate` to avoid https://www.npmjs.com/advisories/836, which has no resolution at time of writing
7+
# consider swapping from `moderate` to `low` whenever this is possible and / reasonable (ex: when issue in the link above is fixed)
48

5-
script:
6-
# the `audit-level` is at `moderate` to avoid https://www.npmjs.com/advisories/836, which has no resolution at time of writing
7-
# consider swapping from `moderate` to `low` whenever this is possible and / reasonable (ex: when issue in the link above is fixed)
8-
- npm audit --audit-level=moderate
9+
# - npm audit --audit-level=moderate

content/organizers/lynn-cyrin.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"name": "Lynn Cyrin",
3+
"headshot": "/images/lynn-cyrin.jpg",
4+
"pronouns": "they/them",
5+
"roles": ["Chapter Lead"]
6+
}

static/admin/config.yml

+10-3
Original file line numberDiff line numberDiff line change
@@ -223,18 +223,25 @@ collections:
223223
name: 'pronouns'
224224
widget: 'string'
225225
required: false
226-
- label: 'Role'
227-
name: 'role'
226+
- label: 'Roles'
227+
name: 'roles'
228228
widget: 'select'
229229
multiple: true
230230
options:
231231
[
232232
'Board Member',
233-
'Chapter Organizer',
234233
'Conference Organizer',
235234
'Website Contributor',
235+
'Chapter Lead',
236236
]
237237
required: true
238+
- label: 'Chapter'
239+
name: 'chapter'
240+
widget: 'relation'
241+
collection: 'chapters'
242+
required: false
243+
searchFields: ['city']
244+
valueField: 'city'
238245
- label: 'Social Links'
239246
name: 'links'
240247
widget: 'list'

static/images/lynn-cyrin.jpg

102 KB
Loading

0 commit comments

Comments
 (0)