Skip to content

Commit 49a020f

Browse files
committed
chore: Require CI to pass before merging PRs.
1 parent acfdda2 commit 49a020f

File tree

3 files changed

+12
-32
lines changed

3 files changed

+12
-32
lines changed

.github/settings.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ branches:
1111
protection:
1212
required_status_checks:
1313
contexts:
14-
- Codacy/PR Quality Review
15-
- DeepScan
16-
- Travis CI - Pull Request
17-
- code-review/reviewable
18-
- codecov/patch
19-
- codecov/project
20-
- security/snyk (TokTok)
14+
- "build"
15+
- "DeepScan"
16+
- "security/snyk (TokTok)"

.github/workflows/ci.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1+
---
12
on:
23
push:
3-
branches-ignore:
4-
- 'master'
4+
branches: [master]
55
pull_request:
6+
branches: [master]
67
schedule:
78
- cron: '0 4 * * *' # Run at 04:00 every day.
89

910
jobs:
1011
build:
11-
12-
runs-on: ubuntu-16.04
12+
runs-on: ubuntu-18.04
1313

1414
strategy:
1515
matrix:
16-
node-version: [8.x, 9.x, 10.x, 12.x, 13.x]
16+
node-version: [10.x, 12.x, 13.x]
1717

1818
steps:
1919
- uses: actions/checkout@v2
2020
- name: Use Node.js ${{ matrix.node-version }}
2121
uses: actions/setup-node@v1
2222
with:
2323
node-version: ${{ matrix.node-version }}
24-
- run: sudo apt-get install libopus-dev libvpx-dev
24+
- run: sudo apt-get install libopus-dev libsodium-dev libvpx-dev
2525
- name: Set up environment variables
2626
run: |
2727
# GITHUB_ENV doesn't update the env vars in the current step, so export this one too.

tools/install-deps.sh

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,15 @@
22

33
set -eux
44

5-
# install libsodium, needed for crypto
6-
if ! [ -d libsodium ]; then
7-
git clone --depth=1 --branch=1.0.3 https://github.com/jedisct1/libsodium.git
8-
fi
9-
cd libsodium
10-
git rev-parse HEAD > libsodium.sha
11-
if ! ([ -f "$CACHE_DIR/libsodium.sha" ] && diff "$CACHE_DIR/libsodium.sha" libsodium.sha); then
12-
./autogen.sh
13-
./configure --prefix="$CACHE_DIR/usr"
14-
make -j`nproc`
15-
make install
16-
mv libsodium.sha "$CACHE_DIR/libsodium.sha"
17-
fi
18-
cd ..
19-
rm -rf libsodium
20-
215
# install toxcore
226
if ! [ -d toxcore ]; then
237
git clone --depth=1 --branch=master https://github.com/TokTok/toxcore.git toxcore
248
fi
259
cd toxcore
26-
git rev-parse HEAD > toxcore.sha
10+
git rev-parse HEAD >toxcore.sha
2711
if ! ([ -f "$CACHE_DIR/toxcore.sha" ] && diff "$CACHE_DIR/toxcore.sha" toxcore.sha); then
28-
cmake -B_build -H. -DCMAKE_INSTALL_PREFIX:PATH=$HOME/cache/usr
29-
make -C_build -j`nproc`
12+
cmake -B_build -H. -DCMAKE_INSTALL_PREFIX:PATH="$HOME/cache/usr"
13+
make -C_build -j"$(nproc)"
3014
make -C_build install
3115
mv toxcore.sha "$CACHE_DIR/toxcore.sha"
3216
fi

0 commit comments

Comments
 (0)