diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9210749186fdb6cd4258af78992f9354e24f9934..4dbc82a92d3b0051461aad8751c8087d8ddd5343 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,11 +68,13 @@ review: pages: extends: .deploy rules: - - if: $CI_COMMIT_BRANCH == 'custom-domain' + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Purge all of this site's URLs from the Cloudflare cache create-purge-json: stage: deploy + rules: + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH needs: ['pages'] tags: - docker @@ -89,6 +91,8 @@ create-purge-json: trigger-cache-purge: stage: .post + rules: + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH trigger: include: purge-cache.gitlab-ci.yml variables: diff --git a/purge-cache.gitlab-ci.yml b/purge-cache.gitlab-ci.yml index cfe4a2417724684e9b0c96d97925c1ca6b72ab98..0b4c616f97bb299e162ee611b5c6675a942eaa35 100644 --- a/purge-cache.gitlab-ci.yml +++ b/purge-cache.gitlab-ci.yml @@ -15,11 +15,11 @@ purge-cache: job: create-purge-json script: - cat purge.json -# - >- -# wget -qO- "https://api.cloudflare.com/client/v4/zones/$CF_PURGE_CACHE_ZONE/purge_cache" -# --header "Content-Type: application/json" -# --header "Authorization: Bearer $CF_PURGE_CACHE_TOKEN" -# --post-file purge.json + - >- + wget -qO- "https://api.cloudflare.com/client/v4/zones/$CF_PURGE_CACHE_ZONE/purge_cache" + --header "Content-Type: application/json" + --header "Authorization: Bearer $CF_PURGE_CACHE_TOKEN" + --post-file purge.json # vi: set ts=2 sw=2 et ft=yaml: