From db7a909430486a97008161e703227a64a7443022 Mon Sep 17 00:00:00 2001 From: Vladimir Agafonkin Date: Wed, 26 Jun 2024 10:34:36 +0300 Subject: [PATCH] switch to GH acitons --- .github/workflows/test.yml | 27 ++++++++++++++++++++++++ .travis.yml | 42 -------------------------------------- Makefile | 11 ++++++---- 3 files changed, 34 insertions(+), 46 deletions(-) create mode 100644 .github/workflows/test.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..0a82688 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,27 @@ +name: CI +on: [push, pull_request] +jobs: + node: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Setup Node + uses: actions/setup-node@v1 + with: + node-version: 20 + + - name: Install dependencies + run: npm ci + + - name: Run tests + run: npm test + cpp: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Test C++ + run: make test diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 76c57d5..0000000 --- a/.travis.yml +++ /dev/null @@ -1,42 +0,0 @@ -cache: apt - -matrix: - include: - - language: generic - env: CXX=g++-4.9 - addons: - apt: - sources: [ 'ubuntu-toolchain-r-test' ] - packages: [ 'g++-4.9' ] - script: - - make test - - - language: generic - env: CXX=g++-5 - addons: - apt: - sources: [ 'ubuntu-toolchain-r-test' ] - packages: [ 'g++-5' ] - script: - - make test - - - language: generic - env: CXX=clang++-3.8 - addons: - apt: - sources: [ 'ubuntu-toolchain-r-test' ] - packages: [ 'clang-3.8', 'libstdc++-5-dev', 'libstdc++6' ] - script: - - make test - - - language: node - node_js: 20 - script: - - npm install - - npm test - - - language: node - node_js: node - script: - - npm install - - npm test diff --git a/Makefile b/Makefile index 964470e..ef73718 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,18 @@ -CXXFLAGS += -Iinclude -std=c++14 -Wall -Wextra -Wshadow -Werror -g -fPIC +CXXFLAGS += -Iinclude -std=c++14 -Wall -Wextra -Wshadow -Werror -Wno-class-memaccess -g -fPIC MASON ?= .mason/mason VARIANT = variant 1.1.4 GEOMETRY = geometry 0.9.2 RAPIDJSON = rapidjson 1.1.0 +$(MASON): + git submodule update --init + DEPS = `$(MASON) cflags $(VARIANT)` \ - `$(MASON) cflags $(GEOMETRY)` \ - `$(MASON) cflags $(RAPIDJSON)` + `$(MASON) cflags $(GEOMETRY)` \ + `$(MASON) cflags $(RAPIDJSON)` -mason_packages/headers/geometry: +mason_packages/headers/geometry: $(MASON) $(MASON) install $(VARIANT) $(MASON) install $(GEOMETRY) $(MASON) install $(RAPIDJSON)