Skip to content

Commit

Permalink
Replace script with tasks
Browse files Browse the repository at this point in the history
  • Loading branch information
JimMadge committed Sep 25, 2024
1 parent 3f7dce5 commit 4af6918
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 39 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,10 @@ deb_packages:
- source: https://download1.rstudio.org/electron/jammy/amd64
filename: rstudio-2024.04.2-764-amd64.deb
sha256: 1d0bd2f54215f514a8a78a4d035c7804218bb8fafa417aa5083d341e174e6452
creates: /usr/bin/rstudio
noble:
- source: https://download1.rstudio.org/electron/jammy/amd64
filename: rstudio-2024.04.2-764-amd64.deb
sha256: 1d0bd2f54215f514a8a78a4d035c7804218bb8fafa417aa5083d341e174e6452
creates: /usr/bin/rstudio

snap_packages:
- name: codium
Expand Down
33 changes: 0 additions & 33 deletions data_safe_haven/resources/workspace/ansible/install_deb.sh

This file was deleted.

13 changes: 13 additions & 0 deletions data_safe_haven/resources/workspace/ansible/tasks/install_deb.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---

- name: Fetch deb

Check failure on line 3 in data_safe_haven/resources/workspace/ansible/tasks/install_deb.yaml

View workflow job for this annotation

GitHub Actions / lint_python

risky-file-permissions

File permissions unset or incorrect.
ansible.builtin.get_url:
url: "{{ item.source }}/{{ item.filename }}"
dest: /tmp/build/
checksum: "sha256:{{ item.sha256 }}"
register: debfile

- name: Install deb
ansible.builtin.apt:
deb: "{{ debfile.dest }}"
state: present
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@

- name: Install deb packages
tags: deb
ansible.builtin.script:
executable: /bin/bash
cmd: "/var/local/ansible/install_deb.sh {{ item.source }} {{ item.filename }} {{ item.sha256 }}"
creates: "{{ item.creates }}"
ansible.builtin.include_tasks:
file: tasks/install_deb.yaml
loop: "{{ deb_packages[ansible_facts.distribution_release] }}"

- name: Install snap packages
Expand Down

0 comments on commit 4af6918

Please sign in to comment.