Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VENOM-497: Fix compile errors #498

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ commands:
- run:
name: Build and install toxcore
command: |
wget "https://github.com/TokTok/c-toxcore/archive/v0.2.9.tar.gz"
tar -xzf v0.2.9.tar.gz
cd c-toxcore-0.2.9
wget "https://github.com/TokTok/c-toxcore/archive/v0.2.11.tar.gz"
tar -xzf v0.2.11.tar.gz
cd c-toxcore-0.2.11
cmake -DCMAKE_INSTALL_PREFIX=/usr
make
make install
Expand Down Expand Up @@ -108,9 +108,9 @@ jobs:
- debian-install-deps
- install-toxcore
- install-venom
"Ubuntu 18-10":
"Ubuntu 19-10":
docker:
- image: ubuntu:18.10
- image: ubuntu:19.10
steps:
- checkout
- debian-install-deps
Expand All @@ -133,17 +133,17 @@ jobs:
- debian-install-deps
- install-toxcore
- install-venom
"Fedora 28":
"Fedora 30":
docker:
- image: fedora:28
- image: fedora:30
steps:
- checkout
- fedora-install-deps
- install-toxcore
- install-venom
"Fedora 29":
"Fedora 31":
docker:
- image: fedora:29
- image: fedora:31
steps:
- checkout
- fedora-install-deps
Expand Down Expand Up @@ -187,9 +187,9 @@ workflows:
build:
jobs:
- "Ubuntu 18-04"
- "Ubuntu 18-10"
- "Ubuntu 19-10"
- "Debian 9"
- "Debian 10"
- "Fedora 28"
- "Fedora 29"
- "Fedora 30"
- "Fedora 31"
- "Flatpak"
54 changes: 54 additions & 0 deletions .github/workflows/ci-workflow.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: VALA/C CI
on: pull_request
push:
branches:
- develop
- master
- 'release-*'
jobs:
native:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v1
- name: Install meson
run: |
sudo python3 -m pip install --upgrade pip
sudo pip3 install meson ninja
- name: Install dependencies
run: >
sudo apt-get -qq install -y
clang
cmake
libconfig-dev
libgtest-dev
libopus-dev
libsodium-dev
libvpx-dev
pkg-config
libgee-0.8-dev
libgspell-1-dev
libgtk-3-dev
libjson-glib-dev
libsoup2.4-dev
libsqlcipher-dev
libcanberra-dev
libgstreamer1.0-dev
libgstreamer-plugins-base1.0-dev
valac
wget
- name: Build and install ToxCore
run: |
wget "https://github.com/TokTok/c-toxcore/archive/v0.2.11.tar.gz"
tar -xzf v0.2.11.tar.gz
cd c-toxcore-0.2.11
cmake -DCMAKE_INSTALL_PREFIX=/usr
make
sudo make install
cd ..
- name: Build
run: meson build && ninja -C build
- name: Test
run: ninja -C build test
- name: Install
run: sudo ninja -C build install
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ matrix:
include:
- name: "Ubuntu 18.04"
env: DOCKER_IMAGE=ubuntu:18.04
- name: "Ubuntu 18.10"
- name: "Ubuntu 19.10"
env: DOCKER_IMAGE=ubuntu:18.10
- name: "Debian 10"
env: DOCKER_IMAGE=debian:buster
Expand Down Expand Up @@ -52,9 +52,9 @@ install:
wget
> /dev/null
- docker exec image pip3 install meson ninja
- docker exec image bash -c "wget 'https://github.com/TokTok/c-toxcore/archive/v0.2.9.tar.gz'
&& tar -xzf v0.2.9.tar.gz
&& cd c-toxcore-0.2.9
- docker exec image bash -c "wget 'https://github.com/TokTok/c-toxcore/archive/v0.2.11.tar.gz'
&& tar -xzf v0.2.11.tar.gz
&& cd c-toxcore-0.2.11
&& cmake -DCMAKE_INSTALL_PREFIX=/usr
&& make
&& make install"
Expand Down
2 changes: 1 addition & 1 deletion src/tox/ToxSessionThread.vala
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ namespace Venom {
protected GLib.MainContext worker_context;
protected GLib.MainLoop worker_loop;

public ToxBaseThread(string name, Logger logger) {
protected ToxBaseThread(string name, Logger logger) {
this.name = name;
this.logger = logger;
}
Expand Down