Skip to content

Commit

Permalink
Merge branch 'release/0.1.0-alpha.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
vector-of-bool committed Mar 16, 2020
2 parents 286e39f + 8ee61b8 commit 54e8110
Show file tree
Hide file tree
Showing 125 changed files with 3,326 additions and 1,140 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/docs-change.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ about:
Report an omission, contradiction, or inaccuracy in the documentation, or
request an addition to the documentation,
title: "[DOCS]"
labels: enhancement,documentation,bug
labels: documentation
assignees: ''

---
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ __pycache__/
.vscode/
.mypy_cache/
_prebuilt/
.pytest_cache
.pytest_cache/
.vagrant/
29 changes: 27 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
.SILENT:

.PHONY: docs docs-server docs-watch docs-sync-server
.PHONY: \
docs docs-server docs-watch docs-sync-server nix-ci linux-ci macos-ci \
vagrant-freebsd-ci

_invalid:
echo "Specify a target name to execute"
exit 1

docs:
sphinx-build -b html \
Expand All @@ -21,8 +24,30 @@ docs-server: docs
docs-watch: docs
+sh tools/docs-watch.sh

docs-sync-server: docs
docs-sync-server:
mkdir -p _build/docs
cd _build/docs && \
browser-sync start --server \
--reload-delay 300 \
--watch **/*.html

macos-ci: nix-ci
linux-ci: nix-ci

nix-ci:
python3 -u tools/ci.py \
-B build \
-T tools/gcc-9.dds \
-T2 tools/gcc-9.jsonc

vagrant-freebsd-ci:
vagrant up freebsd11
vagrant ssh freebsd11 -c '\
cd /vagrant && \
python3.7 tools/ci.py \
-B build \
-T tools/freebsd-gcc-9.dds \
-T2 tools/freebsd-gcc-9.jsonc \
'
vagrant scp freebsd11:/vagrant/_build/dds _build/dds-freebsd-x64
vagrant halt
28 changes: 28 additions & 0 deletions Vagrantfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
Vagrant.configure("2") do |config|
# Refer: https://docs.vagrantup.com.

config.vm.synced_folder ".", "/vagrant",
type: 'rsync',
rsync__exclude: ['_build/', '.mypy_cache/', '.pytest_cache/', '_prebuilt/']

config.vm.define 'freebsd11' do |freebsd11|
freebsd11.vm.box = 'generic/freebsd11'
freebsd11.vm.provision 'shell', inline: <<-SHELL
set -eu
for package in python37 py37-pip ccache gcc9 gcc8 git; do
echo "Installing $package"
pkg install -qy $package
done
ln -fs g++9 /usr/local/bin/g++-9
ln -fs gcc9 /usr/local/bin/gcc-9
ln -fs g++8 /usr/local/bin/g++-8
ln -fs gcc8 /usr/local/bin/gcc-8
sudo -u vagrant pip install -q --user pytest pytest-xdist
SHELL
end

config.vm.provider 'virtualbox' do |vbox|
vbox.memory = 1024 * 4
vbox.cpus = 8
end
end
10 changes: 5 additions & 5 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:
echo Executing Build and Tests
reg add HKLM\SYSTEM\CurrentControlSet\Control\FileSystem /v LongPathsEnabled /t REG_DWORD /d 1 /f || exit 1
python -m pip install pytest pytest-xdist || exit 1
python -u tools/ci.py -B download -T tools\msvc.dds || exit 1
python -u tools/ci.py -B build -T tools\msvc.dds -T2 tools\msvc.jsonc || exit 1
displayName: Full CI
- publish: _build/dds.exe
artifact: DDS Executable - Windows VS2019

- job: Linux_GCC8
- job: Linux_GCC9
pool:
vmImage: ubuntu-18.04
steps:
Expand All @@ -27,12 +27,12 @@ jobs:
sudo apt install -y python3-minimal g++-9 ccache
python3 -m pip install pytest pytest-xdist
displayName: Prepare System
- script: python3 -u tools/ci.py -B download -T tools/gcc-9.dds
- script: make linux-ci
displayName: Full CI
- publish: _build/dds
artifact: DDS Executable - Linux

- job: macOS_GCC8
- job: macOS_GCC9
pool:
vmImage: macOS-10.14
steps:
Expand All @@ -41,7 +41,7 @@ jobs:
- script: |
set -eu
python3 -m pip install pytest pytest-xdist
python3 -u tools/ci.py -B download -T tools/gcc-9.dds
make macos-ci
displayName: Build and Run Unit Tests
- publish: _build/dds
artifact: DDS Executable - macOS
36 changes: 36 additions & 0 deletions catalog.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
{
"packages": {
"ctre": {
"2.7.0": {
"depends": {},
"description": "A compile-time PCRE (almost) compatible regular expression matcher",
"git": {
"auto-lib": "hanickadot/ctre",
"ref": "v2.7",
"url": "https://github.com/hanickadot/compile-time-regular-expressions.git"
}
}
},
"fmt": {
"0.10.0": {
"depends": {},
Expand Down Expand Up @@ -685,6 +696,31 @@
"url": "https://github.com/gabime/spdlog.git"
}
}
},
"vob-json5": {
"0.1.5": {
"depends": {},
"description": "A C++ implementation of a JSON5 parser",
"git": {
"auto-lib": null,
"ref": "0.1.5",
"url": "https://github.com/vector-of-bool/json5.git"
}
}
},
"vob-semester": {
"0.1.0": {
"depends": {
"neo-concepts": "^0.2.1",
"neo-fun": "^0.1.0"
},
"description": "A C++ library to process recursive dynamic data",
"git": {
"auto-lib": null,
"ref": "0.1.0",
"url": "https://github.com/vector-of-bool/semester.git"
}
}
}
},
"version": 1
Expand Down
Empty file removed docs/_static/tweaks.css
Empty file.
8 changes: 2 additions & 6 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# The short X.Y version
version = ''
# The full version, including alpha/beta/rc tags
release = '0.1.0'
release = '0.1.0-alpha.2'

# -- General configuration ---------------------------------------------------
extensions = []
Expand All @@ -23,9 +23,5 @@
# -- Options for HTML output -------------------------------------------------
html_theme = 'pyramid'
html_theme_options = {}
html_static_path = ['_static']
html_static_path = []
html_sidebars = {}


def setup(app):
app.add_stylesheet('tweaks.css')
Loading

0 comments on commit 54e8110

Please sign in to comment.