Skip to content

Commit

Permalink
Updates to do dev work on our cockpit plugin
Browse files Browse the repository at this point in the history
This no longer installs yarn (as it is no longer necessary for f32).
This installs npm via rpm and install dev deps and project deps
for the mounted dev environment.
  • Loading branch information
cnsnyder committed Feb 19, 2021
1 parent 23d590d commit 4862576
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
11 changes: 11 additions & 0 deletions tasks/cockpit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,14 @@
enabled: yes
state: started
become: yes

- name: install webpack globally
npm:
name: webpack
global: yes
path: /vagrant/subscription-manager/cockpit

- name: install cockpit packages
npm:
state: latest
path: /vagrant/subscription-manager/cockpit
4 changes: 2 additions & 2 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
args:
creates: "{{ ansible_user_dir }}/.nvm"
warn: no
when: install_cockpit
when: install_cockpit and install_yarn_via_npm

- name: use nvm to install nodejs
shell: >
Expand All @@ -103,7 +103,7 @@
nvm alias default {{ subman_nodejs_version }}"
args:
creates: "{{ ansible_user_dir }}/.nvm/versions/node/{{ subman_nodejs_version }}"
when: install_cockpit
when: install_cockpit and install_yarn_via_npm

- name: install yarn (for cockpit package build)
npm:
Expand Down
2 changes: 1 addition & 1 deletion vars/Fedora32.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ distro_specific_deps:
- librsvg2
- libxslt-devel
- make
- npm
- python3-dmidecode
- python3-ethtool
- python3-dbus
- subscription-manager
- tito
- yarnpkg
- xorg-x11-server-Xvfb
builddep_command: dnf builddep
distro_package_command: dnf
Expand Down

0 comments on commit 4862576

Please sign in to comment.