Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
jharwell committed Mar 28, 2023
2 parents 630aa5d + d571be7 commit e259ec6
Show file tree
Hide file tree
Showing 1,146 changed files with 2,109 additions and 173,784 deletions.
86 changes: 49 additions & 37 deletions .dir-locals.el
@@ -1,41 +1,53 @@
;;; .dir-locals.el --
;;; Directory Local Variables
;;; For more information see (info "(emacs) Directory Variables")

;;; Commentary:
((c++-mode . ((eval . (progn
(let
((includes-list
(list
(substitute-in-file-name "$rcsw/include")
(concat
(projectile-project-root)
"include")
"/usr/include/lua5.2")))
(setq flycheck-clang-include-path includes-list)
(add-to-list 'flycheck-clang-args "-fPIC")
(add-to-list 'flycheck-clang-args "-std=c++17")
(add-to-list 'flycheck-clang-args "-std=c++17")
(add-to-list 'flycheck-clang-args "-Wno-pragma-once-outside-header")
(add-to-list 'flycheck-clang-args
(concat "-isystem"
(substitute-in-file-name "$localroot/system/include")))
(add-to-list 'flycheck-clang-definitions "LIBRA_ER=LIBRA_ER_ALL")
(setq flycheck-gcc-include-path includes-list)
(add-to-list 'flycheck-gcc-args "-fPIC")
(add-to-list 'flycheck-gcc-args "-std=c++17")
(add-to-list 'flycheck-gcc-args
(concat "-isystem"
(substitute-in-file-name "$localroot/system/include")))
(add-to-list 'flycheck-gcc-definitions "LIBRA_ER=LIBRA_ER_ALL")
(let
((cc-search-dirs
(list
(concat
(projectile-project-root)
"include/rcppsw/*/*")
(concat
(projectile-project-root)
"src/*/*")
(concat
(projectile-project-root)
"include"))))
(setq cc-search-directories cc-search-dirs))))))
)

;;; Code:
((c++-mode .
((eval . (progn
(let ((includes-list (list
(substitute-in-file-name "$rcsw/include")
(concat (projectile-project-root)
"include")
"/usr/include/lua5.2"
)))
(setq flycheck-clang-include-path includes-list)
(add-to-list 'flycheck-clang-args "-fPIC")
(add-to-list 'flycheck-clang-args "-std=c++17")
(add-to-list 'flycheck-clang-args "-std=c++17")
(add-to-list 'flycheck-clang-args "-Wno-pragma-once-outside-header")
(add-to-list 'flycheck-clang-args (concat "-isystem" (substitute-in-file-name
"$localroot/system/include")))
(add-to-list 'flycheck-clang-definitions "LIBRA_ER=LIBRA_ER_ALL")


(setq flycheck-gcc-include-path includes-list)
(add-to-list 'flycheck-gcc-args "-fPIC")
(add-to-list 'flycheck-gcc-args "-std=c++17")
(add-to-list 'flycheck-gcc-args (concat "-isystem" (substitute-in-file-name
"$localroot/system/include")))

(add-to-list 'flycheck-gcc-definitions "LIBRA_ER=LIBRA_ER_ALL")
(let ((cc-search-dirs (list (concat (projectile-project-root) "include/rcppsw/*/*")
(concat (projectile-project-root) "src/*/*")
(concat (projectile-project-root) "include"))
))
(setq cc-search-directories cc-search-dirs))
)
)
))
))
(nil . ((eval .
(progn
(add-to-list 'projectile-globally-ignored-directories
"docs/doxyoutput")
)
))
)
)

;;; end of .dir-locals.el
46 changes: 0 additions & 46 deletions .github/actions/rcppsw-setup/action.yml

This file was deleted.

32 changes: 32 additions & 0 deletions .github/actions/rcsw-setup/action.yml
@@ -0,0 +1,32 @@
name: 'Setup RCSW'
description: 'Setup RCSW for CI and testing'
# inputs:
# who-to-greet: # id of input
# description: 'Who to greet'
# required: true
# default: 'World'
# outputs:
# time: # id of output
# description: 'The time we greeted you'
runs:
using: 'composite'
steps:
- name: Install RCSW
shell: bash
run: |
mkdir -p build && cd build
git clone https://github.com/jharwell/rcsw.git
cd rcsw
git config --global --add safe.directory $PWD
git checkout devel
git submodule update --init --remote --recursive
mkdir build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr/local \
-DCMAKE_BUILD_TYPE=DEV \
..
JOBS=$(grep -c ^processor /proc/cpuinfo)
make -j${JOBS} install
53 changes: 0 additions & 53 deletions .github/workflows/build-and-test.yml

This file was deleted.

93 changes: 93 additions & 0 deletions .github/workflows/ci.yml
@@ -0,0 +1,93 @@
name: Build and test

on:
push:
branches:
- master
- devel

concurrency:
group: "build-and-test"
cancel-in-progress: true

jobs:
build-and-test:
runs-on: ubuntu-latest
container:
image: jharwell/ubuntu22.04:2023-03-23
strategy:
matrix:
CMAKE_BUILD_TYPE:
- OPT
- DEV

steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/rcsw-setup
- name: Build=${{ matrix.CMAKE_BUILD_TYPE }}
shell: bash
run: |
git config --global --add safe.directory $PWD
git submodule update --init --remote --recursive
mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=$HOME/.local \
-DCMAKE_BUILD_TYPE=${{ matrix.CMAKE_BUILD_TYPE }} \
-DLIBRA_TESTS=yes \
-DLIBRA_CODE_COV=YES \
-DLIBRA_ER=ALL \
..
make ticpp
make build-and-test -j$(nproc)
make coverage-report
- name: Coverralls
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
path-to-lcov: build/coverage.info

docs:
uses: ./.github/workflows/pages.yml
needs:
- build-and-test
secrets: inherit

tag-release:
runs-on: ubuntu-latest
needs:
- build-and-test
container:
image: jharwell/ubuntu22.04:2023-03-23
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v3

- name: Push tag
shell: bash
run: |
git config --global --add safe.directory $PWD
git config --global user.email "${{ github.event.pusher.email }}"
git config --global user.name "${{ github.event.pusher.name }}"
git submodule update --init --remote --recursive
VERSION_MAJOR=$(sed -nE 's/.*PROJECT_VERSION_MAJOR ([0-9]+).*/\1/p' cmake/project-local.cmake)
VERSION_MINOR=$(sed -nE 's/.*PROJECT_VERSION_MINOR ([0-9]+).*/\1/p' cmake/project-local.cmake)
VERSION_PATCH=$(sed -nE 's/.*PROJECT_VERSION_PATCH ([0-9]+).*/\1/p' cmake/project-local.cmake)
PACKAGE_VERSION=$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH
if [ "${{ github.ref }}" = "refs/heads/devel" ]; then
TAG_VERSION=${PACKAGE_VERSION}.beta
TAG_MESSAGE="Development release ${TAG_VERSION}"
else
TAG_VERSION=${PACKAGE_VERSION}
TAG_MESSAGE="Release ${TAG_VERSION}"
fi
git tag ${TAG_VERSION} -m "${TAG_MESSAGE}"
git push -o ci.skip origin ${TAG_VERSION}
68 changes: 68 additions & 0 deletions .github/workflows/pages.yml
@@ -0,0 +1,68 @@
# Simple workflow for deploying static content to GitHub Pages
name: docs

on:
workflow_call:
# Runs on pushes targeting the default branch
# push:
# branches:
# - master

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

# Allow one concurrent deployment
concurrency:
group: "pages"
cancel-in-progress: true

jobs:
build:
runs-on: ubuntu-latest
container:
image: jharwell/ubuntu22.04:2023-03-23
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/rcsw-setup
- name: Setup Pages
id: pages
uses: actions/configure-pages@v3

- shell: bash
run: |
git config --global --add safe.directory $PWD
git submodule update --init --remote --recursive
mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr/local \
-DCMAKE_BUILD_TYPE=DEV \
..
make apidoc
cd ..
cd docs && make html
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
with:
path: ./docs/_build/html

deploy:
runs-on: ubuntu-latest
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}

needs: build
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v1

0 comments on commit e259ec6

Please sign in to comment.