From 9a6f052bd77cc3ea7ea50eee3c2cac102d6f1c74 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Wed, 13 Mar 2019 00:18:48 +0100 Subject: [PATCH 01/11] Create config.yml --- .circleci/config.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 000000000..acf5661c7 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,13 @@ +version: 2 +jobs: + build: + docker: + - image: debian:stretch + working_directory: ~/repo + steps: + - checkout + - run: apt-get install cmake g++-multilib libsdl2-dev:i386 libsdl2-mixer-dev:i386 libsdl2-ttf-dev:i386 libsodium-dev libsodium-dev:i386 + - run: mkdir build32 + - run: cd build32 + - run: linux32 cmake -DCMAKE_TOOLCHAIN_FILE=../CMake/32bit.cmake .. + - run: linux32 make -j$(nproc) From 5e054d33824d8a42a99d090ad9b0cc103795a204 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Wed, 13 Mar 2019 00:24:03 +0100 Subject: [PATCH 02/11] Update config.yml --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index acf5661c7..0fc0f628e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,8 +6,8 @@ jobs: working_directory: ~/repo steps: - checkout - - run: apt-get install cmake g++-multilib libsdl2-dev:i386 libsdl2-mixer-dev:i386 libsdl2-ttf-dev:i386 libsodium-dev libsodium-dev:i386 + - run: apt-get update -y + - run: apt-get install -y --no-install-recommends cmake g++-multilib libsdl2-dev:i386 libsdl2-mixer-dev:i386 libsdl2-ttf-dev:i386 libsodium-dev libsodium-dev:i386 - run: mkdir build32 - - run: cd build32 - - run: linux32 cmake -DCMAKE_TOOLCHAIN_FILE=../CMake/32bit.cmake .. - - run: linux32 make -j$(nproc) + - run: cd build32 && linux32 cmake -DCMAKE_TOOLCHAIN_FILE=../CMake/32bit.cmake .. + - run: cd build32 && linux32 make -j$(nproc) From 1c32ceb0889c760e8adc052d914adf4616ef3de7 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Wed, 13 Mar 2019 00:27:48 +0100 Subject: [PATCH 03/11] Update config.yml --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0fc0f628e..6970feae0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ jobs: steps: - checkout - run: apt-get update -y - - run: apt-get install -y --no-install-recommends cmake g++-multilib libsdl2-dev:i386 libsdl2-mixer-dev:i386 libsdl2-ttf-dev:i386 libsodium-dev libsodium-dev:i386 + - run: apt-get install -y --no-install-recommends cmake libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev libsodium-dev - run: mkdir build32 - - run: cd build32 && linux32 cmake -DCMAKE_TOOLCHAIN_FILE=../CMake/32bit.cmake .. - - run: cd build32 && linux32 make -j$(nproc) + - run: cd build32 && cmake .. + - run: cd build32 && make -j$(nproc) From 71bfdad0c20729f8d553b1e34060b441bd05b6c6 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Wed, 13 Mar 2019 00:31:41 +0100 Subject: [PATCH 04/11] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6970feae0..bdb35fb82 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ jobs: steps: - checkout - run: apt-get update -y - - run: apt-get install -y --no-install-recommends cmake libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev libsodium-dev + - run: apt-get install -y cmake libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev libsodium-dev - run: mkdir build32 - run: cd build32 && cmake .. - run: cd build32 && make -j$(nproc) From 0bca839837a4044ed666a392b1d6455eebc752ac Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Wed, 13 Mar 2019 00:35:12 +0100 Subject: [PATCH 05/11] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bdb35fb82..29e179d4d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ jobs: steps: - checkout - run: apt-get update -y - - run: apt-get install -y cmake libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev libsodium-dev + - run: apt-get install -y g++ cmake libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev libsodium-dev - run: mkdir build32 - run: cd build32 && cmake .. - run: cd build32 && make -j$(nproc) From 538f3dba9b742307830c30e02c19ce19f3765ded Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Wed, 13 Mar 2019 00:36:39 +0100 Subject: [PATCH 06/11] Update config.yml --- .circleci/config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 29e179d4d..70236ff37 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,5 +9,6 @@ jobs: - run: apt-get update -y - run: apt-get install -y g++ cmake libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev libsodium-dev - run: mkdir build32 - - run: cd build32 && cmake .. - - run: cd build32 && make -j$(nproc) + - run: cd build && cmake .. + - run: cd build && make -j$(nproc) + - store_artifacts: {path: ./build/devilutionx, destination: devilutionx_linux_x64} From 48ff9eb10ebbfbc0dd208fd5d8d787c7d578c010 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Wed, 13 Mar 2019 00:38:06 +0100 Subject: [PATCH 07/11] Update config.yml --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 70236ff37..5fd669c0e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,8 +7,8 @@ jobs: steps: - checkout - run: apt-get update -y - - run: apt-get install -y g++ cmake libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev libsodium-dev - - run: mkdir build32 + - run: apt-get install -y cmake g++ libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev libsodium-dev + - run: mkdir build - run: cd build && cmake .. - run: cd build && make -j$(nproc) - store_artifacts: {path: ./build/devilutionx, destination: devilutionx_linux_x64} From 625d4a7c56c54a5435c66b9717e41263cf697618 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Wed, 13 Mar 2019 00:42:43 +0100 Subject: [PATCH 08/11] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 2dccbbd76..1ef283937 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +[![CircleCI](https://circleci.com/gh/diasurgical/devilutionX.svg?style=svg)](https://circleci.com/gh/diasurgical/devilutionX) [![Build Status](https://travis-ci.org/diasurgical/devilutionX.svg?branch=master)](https://travis-ci.org/diasurgical/devilutionX) [![Downloads](https://img.shields.io/github/downloads/diasurgical/devilutionX/total.svg)](https://github.com/diasurgical/devilutionX/releases) From 8a6a78b3534122806b790a5694d722ac909d4e40 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Wed, 13 Mar 2019 00:48:19 +0100 Subject: [PATCH 09/11] Update config.yml --- .circleci/config.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5fd669c0e..2d825c9cb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,4 +11,17 @@ jobs: - run: mkdir build - run: cd build && cmake .. - run: cd build && make -j$(nproc) - - store_artifacts: {path: ./build/devilutionx, destination: devilutionx_linux_x64} + - store_artifacts: {path: ./build/devilutionx, destination: devilutionx_linux_x86_64} + build32: + docker: + - image: debian:stretch + working_directory: ~/repo + steps: + - checkout + - run: dpkg --add-architecture i386 + - run: apt-get update -y + - run: apt-get install -y cmake g++-multilib libsdl2-dev:i386 libsdl2-mixer-dev:i386 libsdl2-ttf-dev:i386 libsodium-dev libsodium-dev:i386 + - run: mkdir build32 + - run: cd build32 && cmake -DCMAKE_TOOLCHAIN_FILE=../CMake/32bit.cmake .. + - run: cd build32 && make -j$(nproc) + - store_artifacts: {path: ./build32/devilutionx, destination: devilutionx_linux_x86} From 7a79867c1f7fa2265171451b3f05e12a78726510 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Wed, 13 Mar 2019 00:48:40 +0100 Subject: [PATCH 10/11] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1ef283937..091656549 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Note: Since 64-bit builds are currently not in a playable state, it is advised t Install the dependencies on your machine: ``` -sudo apt-get install cmake libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev libsodium-dev +sudo apt-get install cmake g++ libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev libsodium-dev ``` Now run the following commands: From 196b3345c832c78833c4b90cf2f0062ecdf9aaa8 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Wed, 13 Mar 2019 00:51:07 +0100 Subject: [PATCH 11/11] Update config.yml --- .circleci/config.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2d825c9cb..a834be56c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,3 +25,10 @@ jobs: - run: cd build32 && cmake -DCMAKE_TOOLCHAIN_FILE=../CMake/32bit.cmake .. - run: cd build32 && make -j$(nproc) - store_artifacts: {path: ./build32/devilutionx, destination: devilutionx_linux_x86} + +workflows: + version: 2 + testflow: + jobs: + - build + - build32