Skip to content

Commit 7585fdb

Browse files
authored
Update container dependencies (#1340)
1 parent f4def2f commit 7585fdb

File tree

8 files changed

+28
-13
lines changed

8 files changed

+28
-13
lines changed

getting_started/setup_vm/app-dev.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
- import_role:
1212
name: az_dcap
1313
tasks_from: install.yml
14+
- import_role:
15+
name: llvm_repo
16+
tasks_from: install.yml
1417
- import_role:
1518
name: ccf_run
1619
tasks_from: install.yml

getting_started/setup_vm/app-run.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
- import_role:
99
name: az_dcap
1010
tasks_from: install.yml
11+
- import_role:
12+
name: llvm_repo
13+
tasks_from: install.yml
1114
- import_role:
1215
name: ccf_run
1316
tasks_from: install.yml

getting_started/setup_vm/ccf-dev.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
- import_role:
1313
name: openenclave
1414
tasks_from: install.yml
15+
- import_role:
16+
name: llvm_repo
17+
tasks_from: install.yml
1518
- import_role:
1619
name: ccf_run
1720
tasks_from: install.yml

getting_started/setup_vm/roles/ccf_build/tasks/install.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,6 @@
66
repo: ppa:deadsnakes/ppa
77
become: true
88

9-
- name: Add LLVM repository key
10-
apt_key:
11-
url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
12-
state: present
13-
become: yes
14-
15-
- name: Add LLVM repository
16-
apt_repository:
17-
repo: "deb http://apt.llvm.org/{{ ansible_distribution_release }} llvm-toolchain-{{ ansible_distribution_release }}-8 main"
18-
state: present
19-
update_cache: yes
20-
become: yes
21-
229
- name: Add CMake repository key
2310
apt_key:
2411
url: "https://apt.kitware.com/keys/kitware-archive-latest.asc"

getting_started/setup_vm/roles/ccf_build/vars/common.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ debs:
99
- python3.7-venv
1010
- llvm-8
1111
- clang-8
12+
- clang-format-8
1213
- expect
1314
- xsltproc
1415
- git
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
workspace: "/tmp/"
22
debs:
3+
- libc++abi1
4+
- libc++1
35
- libuv1
46
- libcurl4
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
- name: Include vars
2+
include_vars: common.yml
3+
4+
- name: Add LLVM repository key
5+
apt_key:
6+
url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
7+
state: present
8+
become: yes
9+
10+
- name: Add LLVM repository
11+
apt_repository:
12+
repo: "deb http://apt.llvm.org/{{ ansible_distribution_release }} llvm-toolchain-{{ ansible_distribution_release }}-{{ llvm_version }} main"
13+
state: present
14+
update_cache: yes
15+
become: yes
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
llvm_version: 8

0 commit comments

Comments
 (0)