Skip to content

Commit

Permalink
Merge branch 'release/0.1.0-alpha.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
vector-of-bool committed Sep 5, 2020
2 parents 2cd1b8e + 77325d3 commit c377474
Show file tree
Hide file tree
Showing 82 changed files with 1,640 additions and 4,931 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ List the platform(s) and toolsets which are applicable to the issue, and all of

- Operating System: [e.g. macOS, Linux, Windows]
- Compiler: [e.g. MSVC, GCC, Clang]
- `dds` Version: [e.g. `0.1.0-alpha.2`]
- `dds` Version: [e.g. `0.1.0-alpha.5`]

**Additional context**

Expand Down
18 changes: 10 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ docs:
-Wqanj8
echo "Docs generated to _build/docs"

hugo-docs:
env GEN_FOR_HUGO=1 $(MAKE) docs

docs-server: docs
echo "Docs are visible on http://localhost:9794/"
cd _build/docs && \
Expand All @@ -38,19 +41,19 @@ docs-sync-server:
macos-ci:
python3 -u tools/ci.py \
-B download \
-T tools/gcc-9.jsonc \
-T2 tools/gcc-9.next.jsonc \
-T tools/gcc-9-rel.jsonc
mv _build/dds _build/dds-macos-x64

linux-ci:
python3 -u tools/ci.py \
-B download \
-T tools/gcc-9.jsonc \
-T2 tools/gcc-9-static.jsonc
-T tools/gcc-9-static-rel.jsonc
mv _build/dds _build/dds-linux-x64

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

vagrant-freebsd-ci:
vagrant up freebsd11
Expand All @@ -59,8 +62,7 @@ vagrant-freebsd-ci:
cd /vagrant && \
python3.7 tools/ci.py \
-B download \
-T tools/freebsd-gcc-9.jsonc \
-T2 tools/freebsd-gcc-9.next.jsonc \
-T tools/freebsd-gcc-10.jsonc \
'
vagrant scp freebsd11:/vagrant/_build/dds _build/dds-freebsd-x64
vagrant halt
Expand All @@ -70,4 +72,4 @@ site: docs
mkdir -p _site/
cp site/index.html _site/
cp -r _build/docs _site/
echo "Site generated at _site/"
echo "Site generated at _site/"
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Vagrant.configure("2") do |config|
freebsd11.vm.box = 'generic/freebsd11'
freebsd11.vm.provision 'shell', inline: <<-SHELL
set -eu
for package in python37 py37-pip ccache gcc9 gcc8 git; do
for package in python37 py37-pip ccache gcc10 gcc9 gcc8 git; do
echo "Installing $package"
pkg install -qy $package
done
Expand Down
127 changes: 85 additions & 42 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,47 +1,90 @@
# Refer: https://aka.ms/yaml

jobs:
variables:
shouldDeploy: >-
${{ or(
eq(variables['Build.SourceBranch'], 'refs/heads/develop'),
eq(variables['Build.SourceBranch'], 'refs/heads/master')
) }}
deployDest: ${{ format('~/web/{0}/', variables['Build.SourceBranchName']) }}

- job: Windows_MSVC_VS2019
pool:
vmImage: windows-2019
steps:
- script: |
echo Loading VS environment
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\vsdevcmd" -arch=x64 || exit 1
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.jsonc -T2 tools\msvc.next.jsonc || exit 1
displayName: Full CI
- publish: _build/dds.exe
artifact: DDS Executable - Windows VS2019
stages:
- stage: build_test
displayName: Build and Test
jobs:
- job: win_vs2019
displayName: Windows - VS 2019
pool:
vmImage: windows-2019
steps:
- script: |
echo Loading VS environment
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\vsdevcmd" -arch=x64 || exit 1
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.jsonc || exit 1
move _build\dds.exe _build\dds-win-x64.exe || exit 1
displayName: Build and Test
- publish: _build\dds-win-x64.exe
displayName: Publish
artifact: dds-win-x64

- job: Linux_GCC9
pool:
vmImage: ubuntu-18.04
steps:
- script: |
set -eu
sudo apt update -y
sudo apt install -y python3-minimal g++-9 ccache
python3 -m pip install pytest pytest-xdist
displayName: Prepare System
- script: make linux-ci
displayName: Full CI
- publish: _build/dds
artifact: DDS Executable - Linux
- job: linux_gcc9
displayName: Linux - GCC 9
pool:
vmImage: ubuntu-18.04
steps:
- script: |
set -eu
sudo apt update -y
sudo apt install -y python3-minimal python3-setuptools g++-9 ccache
python3 -m pip install pytest pytest-xdist
displayName: Prepare System
- script: make linux-ci
displayName: Build and Test
- publish: _build/dds-linux-x64
displayName: Publish
artifact: dds-linux-x64

- job: macOS_GCC9
pool:
vmImage: macOS-10.14
steps:
- script: brew install gcc@9 ccache
displayName: Prepare System
- script: |
set -eu
python3 -m pip install pytest pytest-xdist
make macos-ci
displayName: Build and Run Unit Tests
- publish: _build/dds
artifact: DDS Executable - macOS
- job: macos_gcc9
displayName: macOS - GCC 9
pool:
vmImage: macOS-10.14
steps:
- script: brew install gcc@9 ccache
displayName: Prepare System
- script: |
set -eu
python3 -m pip install pytest pytest-xdist
make macos-ci
displayName: Build and Test
- publish: _build/dds-macos-x64
displayName: Publish
artifact: dds-macos-x64

- stage: deploy_build
displayName: Deploy
condition: and(succeeded(), eq(variables.shouldDeploy, 'true'))
jobs:
- job: deploy
displayName: Deploy (${{variables['Build.SourceBranch']}})
steps:
- checkout: none
- task: DownloadPipelineArtifact@2
displayName: Download builds
inputs:
targetPath: art-dirs/
- bash: |
set -eu
mkdir -p art/
mv -- $(find art-dirs/ -type f) art/
displayName: Rearrange
- task: CopyFilesOverSSH@0
displayName: Post builds
inputs:
sshEndpoint: dds.pizza
sourceFolder: art/
targetFolder: ${{ variables.deployDest }}
failOnEmptySource: true
overwrite: true
Loading

0 comments on commit c377474

Please sign in to comment.