diff --git a/.cirrus.yml b/.cirrus.yml index 9bb3e949f0..ec2755408d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -38,9 +38,7 @@ tooling_tests_task: env: PYTHONPATH: . install_dependencies_script: - - cd rspec-tools - - pipenv install --dev - - pipenv run pip install pytest pytest-cov + - ci/install_rspec_tools_dependencies.sh tests_script: - bash ci/fetch_branches.sh - cd rspec-tools diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 0000000000..0711a73432 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,16 @@ +{ + "build": { + "dockerfile": "../ci/Dockerfile" + }, + // https://code.visualstudio.com/docs/devcontainers/create-dev-container#_rebuild + "postCreateCommand": ".devcontainer/finalize-container.sh", + "waitFor": "postCreateCommand", + "customizations": { + "vscode": { + "extensions": [ + "ms-python.python", + "asciidoctor.asciidoctor-vscode" + ] + } + } +} diff --git a/.devcontainer/finalize-container.sh b/.devcontainer/finalize-container.sh new file mode 100755 index 0000000000..726a060bf9 --- /dev/null +++ b/.devcontainer/finalize-container.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -euo pipefail + +TOP_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)/.. + +$TOP_DIR/ci/install_rspec_tools_dependencies.sh diff --git a/.gitignore b/.gitignore index 7d6282cbc6..d330529ce0 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ # generated files /rules/**/*.html /frontend/public/rules +rspec-tools/link_probes.history # compiled files *.out diff --git a/ci/install_rspec_tools_dependencies.sh b/ci/install_rspec_tools_dependencies.sh new file mode 100755 index 0000000000..8d56709f11 --- /dev/null +++ b/ci/install_rspec_tools_dependencies.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -euo pipefail + +cd rspec-tools +pipenv install --dev +pipenv run pip install pytest pytest-cov