Skip to content

Commit

Permalink
Merge branch 'release/0.1.0-alpha.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
vector-of-bool committed Jul 13, 2020
2 parents 54e8110 + c25e239 commit 0fc8b01
Show file tree
Hide file tree
Showing 114 changed files with 16,603 additions and 1,456 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
_build/
_site/
__pycache__/
.vscode/
.mypy_cache/
Expand Down
38 changes: 29 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@

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

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

clean:
rm -f -r -- $(shell find -name __pycache__ -type d)
rm -f -r -- _build/ _prebuilt/

docs:
sphinx-build -b html \
docs \
Expand All @@ -31,23 +35,39 @@ docs-sync-server:
--reload-delay 300 \
--watch **/*.html

macos-ci: nix-ci
linux-ci: nix-ci
macos-ci:
python3 -u tools/ci.py \
-B download \
-T tools/gcc-9.jsonc \
-T2 tools/gcc-9.next.jsonc \

linux-ci:
python3 -u tools/ci.py \
-B download \
-T tools/gcc-9.jsonc \
-T2 tools/gcc-9-static.jsonc

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

vagrant-freebsd-ci:
vagrant up freebsd11
vagrant rsync
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 \
-B download \
-T tools/freebsd-gcc-9.jsonc \
-T2 tools/freebsd-gcc-9.next.jsonc \
'
vagrant scp freebsd11:/vagrant/_build/dds _build/dds-freebsd-x64
vagrant halt

site: docs
rm -r -f -- _site/
mkdir -p _site/
cp site/index.html _site/
cp -r _build/docs _site/
echo "Site generated at _site/"
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ 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 build -T tools\msvc.dds -T2 tools\msvc.jsonc || exit 1
python -u tools/ci.py -B download -T tools\msvc.jsonc -T2 tools\msvc.next.jsonc || exit 1
displayName: Full CI
- publish: _build/dds.exe
artifact: DDS Executable - Windows VS2019
Expand Down
Loading

0 comments on commit 0fc8b01

Please sign in to comment.