Merge branch 'master' into develop

.gitignore

@@ -1,5 +1,4 @@
 _build/
-_site/
 __pycache__/
 .vscode/
 _prebuilt/

Makefile

@@ -5,27 +5,15 @@
 	vagrant-freebsd-ci site alpine-static-ci _alpine-static-ci poetry-setup \
 	full-ci dev-build release-build
 
-docs:
-	poetry run dagon docs
-	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 && \
-		python -m http.server 9794
-
-docs-watch: docs
-	+poetry run sh tools/docs-watch.sh
-
-docs-sync-server:
-	mkdir -p _build/docs
-	cd _build/docs && \
-	browser-sync start --server \
-		--reload-delay 300 \
-		--watch **/*.html
+docs-server:
+	poetry run sphinx-autobuild \
+		-b html \
+		-j 8 \
+		-Wna \
+		--re-ignore "docs/_build" \
+		--re-ignore "_build" \
+		docs/ \
+		_build/docs
 
 .poetry.stamp: poetry.lock
 	poetry install --no-dev
@@ -58,7 +46,7 @@ _alpine-static-ci:
 		-o test-toolchain=tools/gcc-10-static-rel.jsonc \
 		--interface simple \
 		--fail-cancels \
-		test format.check
+		test
 	poetry run dagon \
 		-o main-toolchain=tools/gcc-10-static-rel.jsonc \
 		--interface simple \
@@ -91,10 +79,3 @@ vagrant-freebsd-ci:
 	mkdir -p _build/
 	vagrant scp freebsd11:/vagrant/_build/bpt _build/bpt-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/"

azure-pipelines.yml

@@ -1,10 +1,5 @@
 # Refer: https://aka.ms/yaml
 
-variables:
-  shouldDeploy: >-
-    ${{ eq(variables['Build.SourceBranch'], 'refs/heads/master') }}
-  deployDest: ${{ format('~/web/{0}/', variables['Build.SourceBranchName']) }}
-
 stages:
   - stage: build_test
     displayName: Build and Test
@@ -81,29 +76,3 @@ stages:
           - publish: _build/bpt-macos-x64
             displayName: Publish
             artifact: bpt-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

conf/bpt.tweaks.hpp

@@ -0,0 +1,21 @@
+#pragma once
+
+// See bpt/config.hpp for information about this file.
+
+/*
+##    ##  #######  ######## ########  ##
+###   ## ##     ##    ##    ##       ####
+####  ## ##     ##    ##    ##        ##
+## ## ## ##     ##    ##    ######
+##  #### ##     ##    ##    ##        ##
+##   ### ##     ##    ##    ##       ####
+##    ##  #######     ##    ########  ##
+*/
+
+/**
+ * DO NOT COMMIT CHANGES TO THIS FILE.
+ *
+ * This file is for local development tweaking only.
+ */
+
+namespace bpt::config {}  // namespace bpt::config

dag.py

@@ -1 +1,3 @@
-import bpt_ci.tasks
+import importlib
+
+importlib.import_module('bpt_ci.tasks')

data/projects/simple/bpt.yaml

@@ -0,0 +1,9 @@
+# prettier-ignore
+{
+    "name": "simple",
+    "version": "1.2.3",
+    "libraries": [{
+        "name": "simple",
+        "path": "."
+    }],
+}

data/simple.crs/pkg.json

@@ -1,5 +1,5 @@
 {
-    "schema-version": 1,
+    "schema-version": 0,
     "name": "test-pkg",
     "version": "1.2.43",
     "pkg-version": 1,

data/simple2.crs/pkg.json

@@ -1,5 +1,5 @@
 {
-    "schema-version": 1,
+    "schema-version": 0,
     "name": "test-pkg",
     "version": "1.3.0",
     "pkg-version": 1,

data/simple3.crs/pkg.json

@@ -1,5 +1,5 @@
 {
-    "schema-version": 1,
+    "schema-version": 0,
     "name": "test-pkg",
     "version": "1.3.0",
     "pkg-version": 2,

data/simple4.crs/pkg.json

@@ -1,5 +1,5 @@
 {
-    "schema-version": 1,
+    "schema-version": 0,
     "name": "test-pkg",
     "version": "1.3.0",
     "pkg-version": 3,