Skip to content

Commit c64c5ce

Browse files
author
Hubert Jaremko
committed
Deploy releases
Close #13
1 parent 822ec2d commit c64c5ce

6 files changed

Lines changed: 62 additions & 22 deletions

File tree

.travis.yml

Lines changed: 54 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,58 @@
11
language: cpp
2-
dist: bionic
3-
compiler:
4-
- gcc
5-
- clang
6-
os:
7-
- linux
82

9-
addons:
10-
apt:
11-
packages:
12-
- gcc-8
13-
- g++-8
3+
stages:
4+
- build
145

15-
before_install:
16-
- if [[ "$TRAVIS_COMPILER" == "gcc" ]]; then export CC=gcc-8; export CXX=g++-8; fi
6+
jobs:
7+
include:
8+
- stage: build
9+
os: linux
10+
dist: bionic
11+
compiler: gcc
12+
addons:
13+
apt:
14+
packages:
15+
- gcc-8
16+
- g++-8
17+
before_install:
18+
- if [[ "$TRAVIS_COMPILER" == "gcc" ]]; then export CC=gcc-8; export CXX=g++-8; fi
19+
script:
20+
- mkdir build
21+
- cd build
22+
- cmake -DCMAKE_BUILD_TYPE=Release ..
23+
- cmake --build .
24+
- cd ../bin
25+
- mv von-neumann von-neumann-linux
26+
- stage: build
27+
os: windows
28+
script:
29+
- mkdir build
30+
- cd build
31+
- cmake ..
32+
- cmake --build . --config Release
33+
- cd ../bin/Release
34+
- mv von-neumann.exe von-neumann-windows.exe
35+
# - stage: build
36+
# os: osx
37+
# script:
38+
# - mkdir build
39+
# - cd build
40+
# - cmake ..
41+
# - cmake --build .
42+
# - mv ../bin/von-neumann ../bin/von-neumann-macos
1743

18-
script:
19-
- mkdir build
20-
- cd build
21-
- cmake ..
22-
- cmake --build .
23-
- ../bin/tests
44+
before_deploy:
45+
- git config --local user.name "hjaremko"
46+
- git config --local user.email "hjaremko@outlook.com"
47+
48+
deploy:
49+
provider: releases
50+
api_key: $github_token
51+
file_glob: true
52+
file:
53+
- von-neumann*
54+
skip_cleanup: true
55+
overwrite: true
56+
on:
57+
tags: true
58+
branch: master

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.12)
1+
cmake_minimum_required(VERSION 3.10)
22
project(von-neumann LANGUAGES CXX VERSION 0.1.0)
33

44
set(CMAKE_CXX_STANDARD 17)

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Von Neumann machine emulator [![Build Status](https://travis-ci.org/hjaremko/von-neumann.svg?branch=master)](https://travis-ci.org/hjaremko/von-neumann)
22

3+
### Downloading
4+
5+
Build for Windows and Linux are available [here](https://github.com/hjaremko/von-neumann/releases).
6+
37
### Building
48
```
59
$ mkdir build && cd build

include/word.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class word
2020
{
2121
}
2222

23-
constexpr word( const std::string& code, const std::string& mode, type arg )
23+
word( const std::string& code, const std::string& mode, type arg )
2424
: word_( arg & 0b0'0000'00'111111111 ), is_instruction_( true )
2525
{
2626
word_ |= static_cast<type>( instructions_from_str.at( code ) );

src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.12)
1+
cmake_minimum_required(VERSION 3.10)
22
project(von-neumann)
33

44
add_executable(${PROJECT_NAME}

test/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
cmake_minimum_required(VERSION 3.10)
12
project(von_neumann_test)
23

34
set(CATCH_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../extern/catch)

0 commit comments

Comments
 (0)