Skip to content

Commit 0c54a96

Browse files
committed
chore: Disable branch builds; only build tags and nightly builds.
1 parent f4dd84c commit 0c54a96

File tree

3 files changed

+37
-34
lines changed

3 files changed

+37
-34
lines changed

.circleci/config.yml

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,37 +15,39 @@ jobs:
1515

1616
steps:
1717
- checkout
18-
- run: apt update
19-
- run: apt install -y --no-install-recommends
20-
gcc
21-
g++
22-
cmake
23-
git
24-
libopus-dev
25-
libsodium-dev
26-
libvpx-dev
27-
ninja-build
28-
pkg-config
29-
python3.6-dev
30-
python3-setuptools
18+
- run: apt-get update
19+
- run: DEBIAN_FRONTEND=noninteractive
20+
apt-get install -y --no-install-recommends
21+
gcc
22+
g++
23+
cmake
24+
git
25+
libopus-dev
26+
libsodium-dev
27+
libvpx-dev
28+
ninja-build
29+
pkg-config
30+
python3-dev
31+
python3-setuptools
3132
- run: git clone --depth=1 git://github.com/TokTok/c-toxcore
3233
- run: cd c-toxcore;
33-
. .travis/flags-gcc.sh;
34-
add_flag -fsanitize=address;
35-
cmake -H. -B_build -GNinja
36-
-DCMAKE_C_FLAGS="$C_FLAGS"
37-
-DCMAKE_CXX_FLAGS="$CXX_FLAGS"
38-
-DCMAKE_EXE_LINKER_FLAGS="$LD_FLAGS"
39-
-DCMAKE_SHARED_LINKER_FLAGS="$LD_FLAGS"
40-
-DCMAKE_INSTALL_PREFIX:PATH="$PWD/_install"
41-
-DENABLE_STATIC=OFF
42-
-DTRACE=ON
43-
-DMUST_BUILD_TOXAV=ON
34+
. .travis/flags-gcc.sh;
35+
add_flag -fsanitize=address;
36+
cmake -H. -B_build -GNinja
37+
-DCMAKE_C_FLAGS="$C_FLAGS"
38+
-DCMAKE_CXX_FLAGS="$CXX_FLAGS"
39+
-DCMAKE_EXE_LINKER_FLAGS="$LD_FLAGS"
40+
-DCMAKE_SHARED_LINKER_FLAGS="$LD_FLAGS"
41+
-DCMAKE_INSTALL_PREFIX:PATH="$PWD/_install"
42+
-DENABLE_STATIC=OFF
43+
-DTRACE=ON
44+
-DMUST_BUILD_TOXAV=ON
4445
- run: cd c-toxcore/_build && ninja install -j$(nproc)
45-
- run: export CFLAGS="-I$PWD/c-toxcore/_install/include -fsanitize=address";
46-
export LDFLAGS="-L$PWD/c-toxcore/_install/lib -Wl,-rpath,$PWD/c-toxcore/_install/lib";
47-
python3 setup.py build_ext --inplace
46+
- run:
47+
export CFLAGS="-I$PWD/c-toxcore/_install/include -fsanitize=address";
48+
export LDFLAGS="-L$PWD/c-toxcore/_install/lib -Wl,-rpath,$PWD/c-toxcore/_install/lib";
49+
python3 setup.py build_ext --inplace
4850
- run: ASAN_OPTIONS=detect_leaks=0
49-
LD_PRELOAD=libasan.so.4
50-
PYTHONPATH=.
51-
python3 tests/tests.py
51+
LD_PRELOAD=libasan.so.5
52+
PYTHONPATH=.
53+
python3 tests/tests.py

.github/settings.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
---
2-
_extends: template
2+
_extends: .github
33

44
repository:
55
name: py-toxcore-c
66
description: Python binding for Project-Tox the skype replacement.
77
topics: toxcore, python, ffi
8-
has_issues: true
98

109
branches:
1110
- name: "master"
@@ -16,7 +15,5 @@ branches:
1615
- CodeFactor
1716
- Docker Build
1817
- Travis CI - Pull Request
19-
- WIP
2018
- code-review/reviewable
2119
- coverage/coveralls
22-
- license/cla

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,7 @@ jobs:
5858
script:
5959
- python setup.py build_ext --inplace
6060
- PYTHONPATH=. python tests/tests.py
61+
62+
# Only build pull requests and releases, don't build master on pushes,
63+
# except through api or cron.
64+
if: type IN (pull_request, api, cron) OR tag IS present

0 commit comments

Comments
 (0)