From f90609578907977a4e6abdc3dd11612d83e4f011 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Mon, 10 Feb 2020 19:55:15 +1100 Subject: [PATCH 1/2] docs ci: Ensure deploy directory exists --- tools/ci/config/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/ci/config/deploy.yml b/tools/ci/config/deploy.yml index acdd0e125d..e5c90db0d8 100644 --- a/tools/ci/config/deploy.yml +++ b/tools/ci/config/deploy.yml @@ -74,6 +74,7 @@ push_to_github: cd docs/_build/$DOCLANG/$DOCTGT mv html $GIT_VER tar czf $GIT_VER.tar.gz $GIT_VER + ssh $DOCS_SERVER -x "mkdir -p $DOCS_PATH/$DOCLANG/$DOCTGT" scp $GIT_VER.tar.gz $DOCS_SERVER:$DOCS_PATH/$DOCLANG/$DOCTGT ssh $DOCS_SERVER -x "cd $DOCS_PATH/$DOCLANG/$DOCTGT && tar xzf $GIT_VER.tar.gz && rm -f latest && ln -s $GIT_VER latest" cd - From 0441c5d744f5fbfbf868425e030a028c5d832650 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Mon, 10 Feb 2020 19:55:46 +1100 Subject: [PATCH 2/2] docs ci: Use the final version of the esp-idf-doc-env image (Content is the same) --- tools/ci/config/build.yml | 2 +- tools/ci/config/post_deploy.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ci/config/build.yml b/tools/ci/config/build.yml index 5aaee5cd12..a3593441ae 100644 --- a/tools/ci/config/build.yml +++ b/tools/ci/config/build.yml @@ -231,7 +231,7 @@ build_test_apps_esp32s2: .build_docs_template: &build_docs_template stage: build - image: $CI_DOCKER_REGISTRY/esp-idf-doc-env:v2-d4034371 + image: $CI_DOCKER_REGISTRY/esp-idf-doc-env:v2 tags: - build_docs artifacts: diff --git a/tools/ci/config/post_deploy.yml b/tools/ci/config/post_deploy.yml index 8cc46821a8..841f10eccf 100644 --- a/tools/ci/config/post_deploy.yml +++ b/tools/ci/config/post_deploy.yml @@ -1,6 +1,6 @@ .check_doc_links_template: &check_doc_links_template stage: post_deploy - image: $CI_DOCKER_REGISTRY/esp-idf-doc-env:v2-d4034371 + image: $CI_DOCKER_REGISTRY/esp-idf-doc-env:v2 tags: [ "build", "amd64", "internet" ] only: - master