Skip to content

Commit

Permalink
Fix Linux build script
Browse files Browse the repository at this point in the history
  • Loading branch information
adamgrimm99 committed Dec 11, 2018
2 parents 4a33406 + 958dd29 commit 9ff35b4
Show file tree
Hide file tree
Showing 5 changed files with 75 additions and 2 deletions.
52 changes: 52 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,55 @@ release:
paths:
- release\killerbeez-*.zip
expire_in: 1 week

release-linux:
script:
- git config --global http.sslCAInfo "${CI_SERVER_TLS_CA_FILE}"
- pushd ..
- for url in "${KILLERBEEZ_MUTATORS_URL}" "${KILLERBEEZ_UTILS_URL}"; do
- git clone "${url}"
- done
- for repo in killerbeez-mutators killerbeez-utils; do
- cd $repo
- git checkout $CI_COMMIT_REF_NAME || true
- cd ..
- done
- popd
- mkdir build
- cd build
- cmake ..
- make release
image: killerbeez-builder:latest
variables:
GIT_STRATEGY: clone
GIT_SUBMODULE_STRATEGY: normal
tags:
- linux
only:
- web
artifacts:
paths:
- build/killerbeez-*.zip
expire_in: 1 week

# TODO: figure out why this is failing, and remove the . to re-enable it
.smoketest-linux:
script:
- git config --global http.sslCAInfo "${CI_SERVER_TLS_CA_FILE}"
- cd ..
- for url in "${KILLERBEEZ_MUTATORS_URL}" "${KILLERBEEZ_UTILS_URL}"; do
- git clone "${url}"
- done
- for repo in killerbeez-mutators killerbeez-utils; do
- cd $repo
- git checkout $CI_COMMIT_REF_NAME || true
- cd ..
- done
- killerbeez/tests/smoke_test.sh
image: killerbeez-builder:latest
variables:
GIT_STRATEGY: clone
tags:
- linux
only:
- web
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ endif ()
if (UNIX)
SET(BOINC_WRAPPER ${CMAKE_SOURCE_DIR}/server/boinc/samples/wrapper/wrapper)
ExternalProject_Add(boinc-wrapper
GIT_SUBMODULES server/boinc
SOURCE_DIR ${CMAKE_SOURCE_DIR}/server/boinc
DOWNLOAD_COMMAND cd <SOURCE_DIR> && git submodule update --init .
BUILD_IN_SOURCE true
CONFIGURE_COMMAND ./_autosetup
COMMAND ./configure --disable-server --disable-client --disable-manager --enable-boinczip
Expand Down
2 changes: 1 addition & 1 deletion picker/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ int main(int argc, char ** argv)
{
if (module_infos[prev_pos + i] != module_infos[cur_pos + i])
{
if (!ignore_bytes[i])
if (ignore_bytes[i])
total_ignore_count++;
ignore_bytes[i] = 0x00;
ignore_count++;
Expand Down
5 changes: 5 additions & 0 deletions tools/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM ubuntu:18.04
RUN apt update && apt -y upgrade
RUN apt -y install git cmake build-essential m4 pkg-config autoconf \
libtool libtool-bin libssl-dev libmysqlclient-dev libcurl4-openssl-dev wget \
llvm clang bison libglib2.0-dev libc6-dev-i386
16 changes: 16 additions & 0 deletions tools/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Build/CI Tools

## Windows
* **setup_build_env.ps1** - script that installs build dependencies on a Windows machine (to set it up as a CI runner)
* **update_repos.bat** - script run by CI to ensure associated repos are present and at the right version
* **release.bat** - script run by CI to build a binary release of Killerbeez for windows
* **release_excludes.txt** - file used by release.bat during packaging step

## Linux
Files:
* **Dockerfile** - build environment for killerbeez

Setting up a CI runner:
```
docker build -t killerbeez-builder .
```

0 comments on commit 9ff35b4

Please sign in to comment.