Commit 7d5d821d authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch 'fix/ca-certs-for-url-var' into 'main' 

fix: install CA certs before @url@ eval

See merge request to-be-continuous/tools/template-skeleton!24
parents a3b40c8b 6c959f01

{{cookiecutter.project_slug}}/templates/gitlab-ci-{{cookiecutter.project_slug}}.yml

+6 −3
Original line number Diff line number Diff line
@@ -719,9 +719,6 @@ stages: 
  }

{%- endif %}



  unscope_variables

  eval_all_secrets



  # ENDSCRIPT

{% if cookiecutter.template_type == 'build' %}

# job prototype
@@ -733,7 +730,9 @@ stages: 
      command: ["--service", "{{ cookiecutter.project_slug }}", "1.0.0"]

  before_script:

    - !reference [.{{ cookiecutter.template_prefix }}-scripts]

    - unscope_variables

    - install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}"

    - eval_all_secrets

  variables:

    # TODO (if necessary): set cache dir variables

    XDG_CACHE_HOME: "$CI_PROJECT_DIR/.cache"
@@ -849,7 +848,9 @@ stages: 
      command: ["--service", "{{ cookiecutter.project_slug }}", "1.0.0"]

  before_script:

    - !reference [.{{ cookiecutter.template_prefix }}-scripts]

    - unscope_variables

    - install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}"

    - eval_all_secrets



# Env management job prototype

# Can be extended to define a concrete environment
@@ -1038,7 +1039,9 @@ stages: 
      - .cache/

  before_script:

    - !reference [.{{ cookiecutter.template_prefix }}-scripts]

    - unscope_variables

    - install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}"

    - eval_all_secrets

    - eval_env_url

    - cd "${{ cookiecutter.template_PREFIX }}_PROJECT_DIR"

    # TODO (if necessary): do setup stuff here