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

chore: Remove all references to Travis CI. #1862

Merged
merged 1 commit into from
Jan 10, 2022
Merged
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
2 changes: 1 addition & 1 deletion .circleci/cmake-asan
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -eu

CACHEDIR="$HOME/cache"

. ".travis/flags-$CC.sh"
. ".github/scripts/flags-$CC.sh"
add_flag -Werror
add_flag -fdiagnostics-color=always
add_flag -fno-omit-frame-pointer
Expand Down
2 changes: 1 addition & 1 deletion .circleci/cmake-tsan
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -eu

CACHEDIR="$HOME/cache"

. ".travis/flags-$CC.sh"
. ".github/scripts/flags-$CC.sh"
add_flag -Werror
add_flag -fdiagnostics-color=always
add_flag -fno-omit-frame-pointer
Expand Down
10 changes: 5 additions & 5 deletions .travis/autotools-linux → .github/scripts/autotools-linux
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set -eu
CACHEDIR="$HOME/cache"
NPROC=$(nproc)

travis_install() {
ci_install() {
# Install vanilla NaCl only.
[ -f "$CACHEDIR/lib/amd64/libnacl.a" ] || {
curl https://hyperelliptic.org/nacl/nacl-20110221.tar.bz2 | tar jx
Expand All @@ -22,8 +22,8 @@ travis_install() {
}
}

travis_script() {
. ".travis/flags-$CC.sh"
ci_script() {
. ".github/scripts/flags-$CC.sh"

add_ld_flag -Wl,-z,defs

Expand All @@ -47,7 +47,7 @@ travis_script() {
}

if [ "-z" "$ACTION" ]; then
"travis_script"
"ci_script"
else
"travis_$ACTION"
"ci_$ACTION"
fi
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ gunzip "$IMAGE_NAME.gz"

start_vm

# Copy over toxcore code from Travis to qemu
# Copy over toxcore code from host to qemu
scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -P "$SSH_PORT" -r /c-toxcore root@localhost:~

RUN ls -lh

cd /c-toxcore
CACHEDIR=/opt/cache
mkdir "$CACHEDIR"
. ".travis/flags-clang.sh"
. ".github/scripts/flags-clang.sh"

add_ld_flag -Wl,-z,defs

Expand Down
2 changes: 1 addition & 1 deletion .travis/cmake-linux → .github/scripts/cmake-linux
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ NPROC=$(nproc)

sudo apt-get install -y --no-install-recommends libopus-dev libsodium-dev libvpx-dev ninja-build

. ".travis/flags-$CC.sh"
. ".github/scripts/flags-$CC.sh"

add_ld_flag -Wl,-z,defs

Expand Down
2 changes: 1 addition & 1 deletion .travis/cmake-osx → .github/scripts/cmake-osx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ brew update

brew install libconfig libsodium libvpx opus

. ".travis/flags-clang.sh"
. ".github/scripts/flags-clang.sh"

add_ld_flag -undefined error

Expand Down
2 changes: 1 addition & 1 deletion .travis/cmake-win32 → .github/scripts/cmake-win32
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ i686=true
x86_64=false
WINDOWS_ARCH=win32

. .travis/cmake-windows.sh
. .github/scripts/cmake-windows.sh
2 changes: 1 addition & 1 deletion .travis/cmake-win64 → .github/scripts/cmake-win64
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ i686=false
x86_64=true
WINDOWS_ARCH=win64

. .travis/cmake-windows.sh
. .github/scripts/cmake-windows.sh
10 changes: 5 additions & 5 deletions .travis/cmake-windows.sh → .github/scripts/cmake-windows.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set -eu
CACHEDIR="$HOME/cache"
NPROC=$(nproc)

travis_install() {
ci_install() {
cd other/docker/windows

docker build \
Expand All @@ -18,8 +18,8 @@ travis_install() {
.
}

travis_script() {
. ".travis/flags-gcc.sh"
ci_script() {
. ".github/scripts/flags-gcc.sh"

# Allows wine to display source code file names and line numbers on crash in
# its backtrace.
Expand All @@ -45,7 +45,7 @@ travis_script() {
}

if [ "-z" "$ACTION" ]; then
"travis_script"
"ci_script"
else
"travis_$ACTION"
"ci_$ACTION"
fi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

. .travis/flags.sh
. .github/scripts/flags.sh

# Add all warning flags we can.
add_flag -Wall
Expand Down
2 changes: 1 addition & 1 deletion .travis/flags-gcc.sh → .github/scripts/flags-gcc.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

. .travis/flags.sh
. .github/scripts/flags.sh

# Add all warning flags we can.
add_flag -Wall
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ jobs:
uses: docker/setup-buildx-action@v1
- uses: actions/checkout@v2
- name: Docker Build
run: .travis/cmake-win32 install
run: .github/scripts/cmake-win32 install
- name: Cross compilation
run: .travis/cmake-win32 script
run: .github/scripts/cmake-win32 script

build-win64:
runs-on: ubuntu-latest
Expand All @@ -33,36 +33,36 @@ jobs:
uses: docker/setup-buildx-action@v1
- uses: actions/checkout@v2
- name: Docker Build
run: .travis/cmake-win64 install
run: .github/scripts/cmake-win64 install
- name: Cross compilation
run: .travis/cmake-win64 script
run: .github/scripts/cmake-win64 script

build-freebsd:
runs-on: ubuntu-latest
container: toxchat/freebsd
steps:
- uses: actions/checkout@v2
- name: Build on FreeBSD
run: .travis/cmake-freebsd-stage2
run: .github/scripts/cmake-freebsd-stage2

build-macos:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- name: Build and test
run: .travis/cmake-osx
run: .github/scripts/cmake-osx

coverage-linux:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Build and test
run: .travis/cmake-linux
run: .github/scripts/cmake-linux
env:
CC: gcc
CXX: g++
- name: Upload coverage
run: .travis/upload-coverage
run: .github/scripts/upload-coverage

build-tcc:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
password: ${{ secrets.DOCKERHUB_TOKEN }}
- uses: actions/checkout@v2
- name: Docker Build
run: .travis/tox-bootstrapd-docker local
run: .github/scripts/tox-bootstrapd-docker local
- name: Push latest image to DockerHub
if: ${{ github.event_name == 'push' }}
run: docker push toxchat/bootstrap-node:latest
Expand Down
90 changes: 0 additions & 90 deletions .travis.yml

This file was deleted.

6 changes: 3 additions & 3 deletions other/docker/autotools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ USER builder
# rebuilding nacl and other things when only source files change.
RUN mkdir -p /home/builder/build/c-toxcore /home/builder/cache
WORKDIR /home/builder/build/c-toxcore
COPY --chown=builder:builder .travis/ /home/builder/build/c-toxcore/.travis/
RUN .travis/autotools-linux install
COPY --chown=builder:builder .github/scripts/ /home/builder/build/c-toxcore/.github/scripts/
RUN .github/scripts/autotools-linux install

# Now copy the rest of the sources and run the build.
COPY --chown=builder:builder . /home/builder/build/c-toxcore/
RUN CC=gcc .travis/autotools-linux script
RUN CC=gcc .github/scripts/autotools-linux script