diff --git a/.ci/deploy-docs.sh b/.ci/deploy-docs.sh deleted file mode 100755 index 687d2e9..0000000 --- a/.ci/deploy-docs.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -set -ex - -mkdir -p "${BUILD_DIR:-./build}" - -CMAKE_ARGS="" - -if [ -n "$CI" ]; then - CMAKE_ARGS="-DCI=ON" -fi - -sudo enable-lua ${LUA_VERSION:-5.1} - -make -j $(nproc) -C ${SOURCE_DIR:-.} BUILD_DIR=${BUILD_DIR:-./build} LUA_VERSION=${LUA_VERSION:-5.1} LUA=lua doc - -tar -czf doc.tar.gz -C ${BUILD_DIR:-./build}/doc . - -curl -T doc.tar.gz -XPOST --user ${DOCS_CREDENTIALS} https://${DOCS_HOST}/publish/lua-libpulse-glib - -sudo disable-lua ${LUA_VERSION:-5.1} - diff --git a/.ci/deploy-docs.yml b/.ci/deploy-docs.yml deleted file mode 100644 index 3cb49d6..0000000 --- a/.ci/deploy-docs.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -platform: linux - -image_resource: - type: registry-image - source: - repository: registry.local:5000/lua-clib-pulse - tag: latest - -inputs: -- name: repo - -params: - CI: true - SOURCE_DIR: repo - BUILD_DIR: /tmp/build-output - DOCS_HOST: ((doc-host)) - DOCS_CREDENTIALS: "((deploy-user)):((deploy-password))" - -run: - path: repo/.ci/deploy-docs.sh - diff --git a/.ci/pipeline.yml b/.ci/pipeline.yml index ced9a29..10f7488 100644 --- a/.ci/pipeline.yml +++ b/.ci/pipeline.yml @@ -55,14 +55,3 @@ jobs: file: repo/.ci/rock.yml vars: lua-version: 5.4 - -- name: doc - plan: - - get: repo - trigger: true - - task: deploy-docs - file: repo/.ci/deploy-docs.yml - params: - doc-host: ((doc-host)) - deploy-user: ((deploy-user)) - deploy-password: ((deploy-password)) diff --git a/.ci/test.sh b/.ci/test.sh index fd886fb..f07b1ff 100755 --- a/.ci/test.sh +++ b/.ci/test.sh @@ -15,7 +15,9 @@ eval "$(luarocks --lua-version ${LUA_VERSION:-5.1} path)" luarocks --lua-version ${LUA_VERSION:-5.1} install busted luarocks --lua-version ${LUA_VERSION:-5.1} install lgi +luarocks --lua-version ${LUA_VERSION:-5.1} install ldoc +luarocks --lua-version ${LUA_VERSION:-5.1} install lua-discount -make -j $(nproc) -C ${SOURCE_DIR:-.} BUILD_DIR=${BUILD_DIR:-./build} LUA_VERSION=${LUA_VERSION:-5.1} LUA=lua build +make -j $(nproc) -C ${SOURCE_DIR:-.} LUA_VERSION=${LUA_VERSION:-5.1} LUA=lua sudo disable-lua ${LUA_VERSION:-5.1} diff --git a/Makefile b/Makefile index d2a1cd1..a8899ee 100644 --- a/Makefile +++ b/Makefile @@ -82,6 +82,9 @@ doc-styles: $(BUILD_DIR)/doc/ldoc.css doc-content: $(BUILD_DIR)/doc/index.html doc: doc-styles doc-content +ifdef CI + touch "$(BUILD_DIR)/doc/.nojekyll" +endif clean: rm -r out/ diff --git a/bors.toml b/bors.toml new file mode 100644 index 0000000..85d5802 --- /dev/null +++ b/bors.toml @@ -0,0 +1,10 @@ +status = [ + "check", + "test (5.1)", + "test (5.2)", + "test (5.3)", + "test (luajit)", + "rock (5.1)", + "rock (5.2)", + "rock (5.3)", +]