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.

Sign up for GitHub

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

Jump to bottom

Merge branch 'develop' into 'master' #4

Closed
wants to merge 4 commits into from
Closed

Merge branch 'develop' into 'master' #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba39fa6
Merge branch 'develop' into 'master'
simon-jentzsch Nov 13, 2019
2890129
fix github actions
simon-jentzsch Nov 15, 2019
da3b576
fix os name
simon-jentzsch Nov 15, 2019
35eacfc
Merge branch 'master' of git.slock.it:in3/c/in3-core
simon-jentzsch Nov 15, 2019
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
55 changes: 24 additions & 31 deletions .github/workflows/ccpp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,36 @@
name: C/C++ CI
name: Build and Test C

on: [push]

jobs:
test_macos:
macos:
runs-on: macos-latest

runs-on: macOS-latest

steps:
- uses: actions/checkout@v1
- name: cmake
run: mkdir build; cd build; cmake -DTEST=true -DJAVA=false -DCMAKE_BUILD_TYPE=Debug ..
- name: make
run: cd build; make
- name: test
run: cd build; make test

test_ubuntu:
- uses: actions/checkout@v1
- name: cmake
run: mkdir build; cd build; cmake -DTEST=true -DJAVA=false -DCMAKE_BUILD_TYPE=Debug ..
- name: make
run: cd build; make
- name: test
run: cd build; make test

ubuntu:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- name: cmake
run: mkdir build; cd build; cmake -DTEST=true -DJAVA=false -DTRANSPORTS=false -DBUILD_DOC=false -DIN3API=true -DIN3_LIB=false -DCMD=false -DCMAKE_BUILD_TYPE=Debug ..
- name: make
run: cd build; make
- name: test
run: cd build; make test

test_win:
steps:
- uses: actions/checkout@v1
- name: cmake
run: mkdir build; cd build; cmake -DTEST=true -DJAVA=false -DTRANSPORTS=false -DBUILD_DOC=false -DIN3API=true -DIN3_LIB=false -DCMD=false -DCMAKE_BUILD_TYPE=Debug ..
- name: make
run: cd build; make
- name: test
run: cd build; make test

win:
runs-on: windows-latest

steps:
- uses: actions/checkout@v1
- name: cmake
run: mkdir build; cd build; cmake -DTEST=true -DJAVA=false -DTRANSPORTS=false -DBUILD_DOC=false -DIN3API=true -DIN3_LIB=false -DCMD=false -DCMAKE_BUILD_TYPE=Debug ..
- name: make
run: cd build; make tests
- name: test
run: cd build; make test
- uses: actions/checkout@v1
- name: cmake
run: mkdir build; cd build; cmake -DTEST=true -DJAVA=false -DTRANSPORTS=false -DBUILD_DOC=false -DIN3API=true -DIN3_LIB=false -DCMD=false -DCMAKE_BUILD_TYPE=Debug ..
12 changes: 12 additions & 0 deletions .github/workflows/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: Docker

on: [push]

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- name: Build the Docker image
run: docker build . --file Dockerfile --tag in3:$(date +%s)
28 changes: 28 additions & 0 deletions .github/workflows/wasm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: WASM

on: [push]

jobs:
wasm:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- name: Setup Emscripten
uses: lovasoa/setup-emscripten@v1
- name: configure
run: mkdir build; cd build; emconfigure cmake -DWASM=true -DTAG_VERSION=$CI_COMMIT_TAG -DTRANSPORTS=false -DIN3_LIB=false -DBUILD_DOC=false -DIN3API=true -DUSE_CURL=false -DCMD=false -DCMAKE_BUILD_TYPE=MINSIZEREL ..
- name: make
run: cd build; make

asmjs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- name: Setup Emscripten
uses: lovasoa/setup-emscripten@v1
- name: configure
run: mkdir build; cd build; emconfigure cmake -DWASM=true -DASMJS=true -DWASM_EMBED=true -DTAG_VERSION=$CI_COMMIT_TAG -DTRANSPORTS=false -DIN3_LIB=false -DBUILD_DOC=false -DIN3API=true -DUSE_CURL=false -DCMD=false -DCMAKE_BUILD_TYPE=MINSIZEREL ..
- name: make
run: cd build; make