From fc6364fb7fa5e74173528c3d2ca20e386e6e2652 Mon Sep 17 00:00:00 2001 From: Emmanuel Cazenave Date: Mon, 18 Mar 2024 12:22:22 +0100 Subject: [PATCH] use setuptools to build publik-base-theme (#88271) --- roles/base/defaults/main.yml | 2 -- roles/base/tasks/main.yml | 20 ++++++++++++++++++-- tasks/install_source.yml | 1 + tasks/install_theme.yml | 35 ----------------------------------- 4 files changed, 19 insertions(+), 39 deletions(-) delete mode 100644 roles/base/defaults/main.yml delete mode 100644 tasks/install_theme.yml diff --git a/roles/base/defaults/main.yml b/roles/base/defaults/main.yml deleted file mode 100644 index 6e3e81c..0000000 --- a/roles/base/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -theme_repo: "publik-base-theme" -theme_link: "publik-base" diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index 0f94bbe..ad6cfeb 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -262,14 +262,30 @@ - source - name: install theme - import_tasks: tasks/install_theme.yml + import_tasks: tasks/install_source.yml vars: - src_theme_dir: "{{src_dir}}/{{theme_repo}}" + repo: "publik-base-theme" + repo_dir: "{{src_dir}}/publik-base-theme" + virtualenv: "{{venv_py3}}" version: "{{publik_base_theme_version|default('main')}}" + do_build: "{{compile_theme}}" tags: - theme - source +- name: create themes directory + file: + path: "{{themes_dir}}" + state: directory + become: yes + +- name: link to theme_repo + file: + src: "{{src_dir}}/publik-base-theme" + path: "{{themes_dir}}/publik-base" + state: link + become: yes + - name: create cert directory file: path: "{{certs_dir}}" diff --git a/tasks/install_source.yml b/tasks/install_source.yml index 43ee27e..5e4b3ef 100644 --- a/tasks/install_source.yml +++ b/tasks/install_source.yml @@ -26,3 +26,4 @@ command: "{{ virtualenv }}/bin/python setup.py build" args: chdir: "{{ repo_dir }}" + when: do_build | default(true) diff --git a/tasks/install_theme.yml b/tasks/install_theme.yml deleted file mode 100644 index 093c437..0000000 --- a/tasks/install_theme.yml +++ /dev/null @@ -1,35 +0,0 @@ - -- name: ssh git clone {{theme_repo}} - git: - repo: gitea@git.entrouvert.org:entrouvert/{{theme_repo}}.git - dest: "{{src_theme_dir}}" - version: "{{version}}" - when: - - git_ssh - -- name: standard git clone {{theme_repo}} - git: - repo: https://git.entrouvert.org/entrouvert/{{theme_repo}}.git - dest: "{{src_theme_dir}}" - version: "{{version}}" - when: - - not git_ssh - -- name: compile theme {{theme_repo}} - make: - chdir: "{{src_theme_dir}}" - target: all - when: compile_theme - -- name: create themes directory - file: - path: "{{themes_dir}}" - state: directory - become: yes - -- name: link to {{theme_repo}} - file: - src: "{{src_theme_dir}}" - path: "{{themes_dir}}/{{theme_link}}" - state: link - become: yes