From 209751040d523a70b5ff3f1eff7500e4c6d2c040 Mon Sep 17 00:00:00 2001 From: Nick Volynkin Date: Tue, 12 Jul 2022 14:43:53 +0700 Subject: [PATCH] Use consistent naming for S3_ENDPOINT_URL in upload_output Same problem as in e9745c7, now resolved in upload_output.sh Fixes #3 --- .github/workflows/deploy-branch.yml | 2 +- upload_output.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy-branch.yml b/.github/workflows/deploy-branch.yml index 5bd2c71..fa79d81 100644 --- a/.github/workflows/deploy-branch.yml +++ b/.github/workflows/deploy-branch.yml @@ -9,7 +9,7 @@ jobs: AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}} AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}} AWS_DEFAULT_REGION: ${{secrets.AWS_DEFAULT_REGION}} - ENDPOINT_URL: ${{secrets.S3_ENDPOINT_URL}} + S3_ENDPOINT_URL: ${{secrets.S3_ENDPOINT_URL}} S3_UPLOAD_PATH: ${{secrets.S3_UPLOAD_PATH}} S3_BUCKET: ${{secrets.S3_BUCKET}} INTERNALS_UPDATE_URL: ${{secrets.INTERNALS_DEVELOP_UPDATE_URL}} diff --git a/upload_output.sh b/upload_output.sh index 34e3834..6ec7cb4 100755 --- a/upload_output.sh +++ b/upload_output.sh @@ -13,10 +13,10 @@ if [ $not_exist ]; then echo "toctree.json does not exist" else echo "found toctree.json, remove the branch from s3 location" - aws s3 rm "${DOC_DEST}"/json --endpoint-url="${ENDPOINT_URL}" --recursive + aws s3 rm "${DOC_DEST}"/json --endpoint-url="${S3_ENDPOINT_URL}" --recursive fi -aws s3 cp build/json "${DOC_DEST}"/json/_build_en/json --endpoint-url="${ENDPOINT_URL}" --recursive --include "*" --exclude "*.jpg" --exclude "*.png" --exclude "*.svg" +aws s3 cp build/json "${DOC_DEST}"/json/_build_en/json --endpoint-url="${S3_ENDPOINT_URL}" --recursive --include "*" --exclude "*.jpg" --exclude "*.png" --exclude "*.svg" curl --fail --show-error \ --data '{"update_key":"'"${UPDATE_KEY}"'"}' \