build: Additional fixes and add manual docker build override.

This commit is contained in:
Dorian 2020-01-23 15:28:42 -05:00
parent b57150fda0
commit 509df69ddd
2 changed files with 17 additions and 2 deletions

View File

@ -3,6 +3,11 @@ version: 2.1
orbs:
docker: circleci/docker@0.5.20
parameters:
trigger_docker_build:
type: boolean
default: false
jobs:
build-rookeries:
docker:
@ -54,7 +59,7 @@ jobs:
workflows:
version: 2
# TODO: Add a workflow that will create OS X and FreeBSD versions when a tag is present. And will upload to Object Storage.
build-env:
scheduled-build-env:
jobs:
- docker/publish:
image: dorianpula/rookeries-build:latest
@ -67,6 +72,13 @@ workflows:
branches:
only:
- master
manual-build-env:
when: << pipeline.parameters.trigger_docker_build >>
jobs:
- docker/publish:
image: dorianpula/rookeries-build:latest
docker-username: DOCKER_USER
docker-password: DOCKER_PASS
build-test-push:
jobs:
- build-rookeries

View File

@ -279,11 +279,14 @@ fn build_site(project_directory: PathBuf, activate_dev_mode: bool) -> Result {
&& path.extension() != None
&& path.extension().unwrap_or(&path.as_os_str()) == "md"
{
success_message(&format!("Found {}", path.display()));
site_source_pages.push(path.into_os_string());
}
}
site_source_pages.sort();
for source in &site_source_pages {
let path = Path::new(source);
success_message(&format!("Found {}", path.display()));
}
// TODO: Add in support for figuring out the index page or allowing one to be set.
header_message("Compiling page information...");