Skip to content

Commit

Permalink
Removed unneeded RPM dependencies (#248)
Browse files Browse the repository at this point in the history
Visual Studio Code packages now correctly reference all required dependencies.
  • Loading branch information
freemanjp authored Sep 4, 2023
1 parent ab2c650 commit a5d99be
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 105 deletions.
21 changes: 0 additions & 21 deletions molecule/code-only/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,6 @@
changed_when: false
when: ansible_pkg_mgr == 'apt'

- name: Install gnupg2 (apt)
become: true
ansible.builtin.apt:
name: gnupg2
state: present
when: ansible_pkg_mgr == 'apt'

- name: Install extension cli dependencies (zypper)
become: true
ansible.builtin.package:
name: libX11-xcb1
state: present
when: ansible_pkg_mgr == 'zypper'

- name: Install extension cli dependencies (apt)
become: true
ansible.builtin.apt:
name: libx11-xcb1
state: present
when: ansible_pkg_mgr == 'apt'

roles:
- role: ansible-role-visual-studio-code
users:
Expand Down
21 changes: 0 additions & 21 deletions molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,27 +23,6 @@
changed_when: false
when: ansible_pkg_mgr == 'apt'

- name: Install gnupg2 (apt)
become: true
ansible.builtin.apt:
name: gnupg2
state: present
when: ansible_pkg_mgr == 'apt'

- name: Install extension cli dependencies (zypper)
become: true
ansible.builtin.package:
name: libX11-xcb1
state: present
when: ansible_pkg_mgr == 'zypper'

- name: Install extension cli dependencies (apt)
become: true
ansible.builtin.apt:
name: libx11-xcb1
state: present
when: ansible_pkg_mgr == 'apt'

- name: Create settings directory
become: true
become_user: test_usr4
Expand Down
14 changes: 0 additions & 14 deletions molecule/ubuntu-min-trusted-yes/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,6 @@
changed_when: false
when: ansible_pkg_mgr == 'apt'

- name: Install gnupg2 (apt)
become: true
ansible.builtin.apt:
name: gnupg2
state: present
when: ansible_pkg_mgr == 'apt'

- name: Install extension cli dependencies (apt)
become: true
ansible.builtin.apt:
name: libx11-xcb1
state: present
when: ansible_pkg_mgr == 'apt'

roles:
- role: ansible-role-visual-studio-code
visual_studio_code_gpgcheck: false
Expand Down
34 changes: 13 additions & 21 deletions molecule/ubuntu-min/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,38 +23,30 @@
changed_when: false
when: ansible_pkg_mgr == 'apt'

- name: Install gnupg2 (apt)
- name: Create APT keyrings dir
become: true
ansible.builtin.apt:
name: gnupg2
state: present
when: ansible_pkg_mgr == 'apt'

- name: Install extension cli dependencies (zypper)
become: true
ansible.builtin.package:
name: libX11-xcb1
state: present
when: ansible_pkg_mgr == 'zypper'

- name: Install extension cli dependencies (apt)
become: true
ansible.builtin.apt:
name: libx11-xcb1
state: present
ansible.builtin.file:
path: '/etc/apt/keyrings'
state: directory
mode: 'u=rwx,go=rx'
when: ansible_pkg_mgr == 'apt'

- name: Install key (apt)
become: true
ansible.builtin.apt_key:
ansible.builtin.get_url:
url: '{{ visual_studio_code_mirror }}/keys/microsoft.asc'
state: present
dest: '/etc/apt/keyrings/'
mode: 'u=rw,go=r'
force: true
when: ansible_pkg_mgr == 'apt'

- name: Install VS Code repo (apt)
become: true
ansible.builtin.apt_repository:
repo: 'deb [arch=amd64] {{ visual_studio_code_mirror }}/repos/code stable main'
repo: >-
deb [arch={{ visual_studio_code_deb_architecture }}
signed-by=/etc/apt/keyrings/microsoft.asc]
{{ visual_studio_code_mirror }}/repos/code stable main
filename: vscode
state: present
when: ansible_pkg_mgr == 'apt'
Expand Down
11 changes: 0 additions & 11 deletions tasks/install-dnf.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
# code: language=ansible
---
- name: Install dependencies (dnf)
become: true
ansible.builtin.dnf:
name:
- libdrm
- libX11-xcb
- libxshmfence
- mesa-libgbm
- which
state: present

- name: Install VS Code repo (dnf)
become: true
ansible.builtin.yum_repository:
Expand Down
6 changes: 0 additions & 6 deletions tasks/install-yum.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
# code: language=ansible
---
- name: Install dependencies (yum)
become: true
ansible.builtin.yum:
name: which
state: present

- name: Install VS Code repo (yum)
become: true
ansible.builtin.yum_repository:
Expand Down
11 changes: 0 additions & 11 deletions tasks/install-zypper.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
# code: language=ansible
---
- name: Install dependencies (zypper)
become: true
ansible.builtin.package:
name:
- libdrm2
- libgbm1
- libxcb-dri3-0
- libxshmfence1
- which
state: present

- name: Install key (zypper)
become: true
ansible.builtin.rpm_key:
Expand Down

0 comments on commit a5d99be

Please sign in to comment.