From 0823c01bcec535fb96231789583ea4b8293fc8f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C5=A1per=20Fele-=C5=BDor=C5=BE?= Date: Thu, 29 Aug 2024 10:11:22 +0200 Subject: [PATCH 1/9] Add missing subjects (P1), mono --- roles/P1-63277/meta/main.yml | 8 ++++++++ roles/P1-63702/meta/main.yml | 7 +++++++ roles/mono/tasks/main.yml | 4 ++++ roles/mono/tasks/main_lin.yml | 4 ++++ roles/mono/tasks/main_win.yml | 3 +++ 5 files changed, 26 insertions(+) create mode 100644 roles/P1-63277/meta/main.yml create mode 100644 roles/P1-63702/meta/main.yml create mode 100644 roles/mono/tasks/main.yml create mode 100644 roles/mono/tasks/main_lin.yml create mode 100644 roles/mono/tasks/main_win.yml diff --git a/roles/P1-63277/meta/main.yml b/roles/P1-63277/meta/main.yml new file mode 100644 index 0000000..6c58609 --- /dev/null +++ b/roles/P1-63277/meta/main.yml @@ -0,0 +1,8 @@ +# Programiranje 1 +# luka.furst@fri.uni-lj.si +# JDK, mono +dependencies: + - role: jdk + - role: gedit + - role: mono + - role: vscode diff --git a/roles/P1-63702/meta/main.yml b/roles/P1-63702/meta/main.yml new file mode 100644 index 0000000..204af38 --- /dev/null +++ b/roles/P1-63702/meta/main.yml @@ -0,0 +1,7 @@ +# Programiranje 1 +# tomaz.hocevar@fri.uni-lj.si +# vscode, gcc, g++ +dependencies: + - role: gedit + - role: vscode + - role: c_development diff --git a/roles/mono/tasks/main.yml b/roles/mono/tasks/main.yml new file mode 100644 index 0000000..55203f6 --- /dev/null +++ b/roles/mono/tasks/main.yml @@ -0,0 +1,4 @@ +- import_tasks: main_win.yml + when: ansible_connection == 'winrm' +- import_tasks: main_lin.yml + when: ansible_connection == 'ssh' diff --git a/roles/mono/tasks/main_lin.yml b/roles/mono/tasks/main_lin.yml new file mode 100644 index 0000000..62cd928 --- /dev/null +++ b/roles/mono/tasks/main_lin.yml @@ -0,0 +1,4 @@ +- name: Install Mono + apt: + name: mono-devel + state: latest diff --git a/roles/mono/tasks/main_win.yml b/roles/mono/tasks/main_win.yml new file mode 100644 index 0000000..a0b6f40 --- /dev/null +++ b/roles/mono/tasks/main_win.yml @@ -0,0 +1,3 @@ +- name: Do not install Mono + debug: + msg: "Do not install Mono" From a90db23d5c985da8ea6a08335d1b149193eaeb4f Mon Sep 17 00:00:00 2001 From: kllemen Date: Fri, 13 Sep 2024 14:33:01 +0200 Subject: [PATCH 2/9] duplicate GNS3.yml removed --- roles/linroom/tasks/DF-63530.yml | 2 +- roles/linroom/tasks/GNS3.yml | 15 --------------- roles/linroom/tasks/KPOV-63716.yml | 2 +- roles/winroom/tasks/DF-63530.yml | 2 +- roles/winroom/tasks/GNS3.yml | 4 ---- roles/winroom/tasks/KPOV-63716.yml | 2 +- 6 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 roles/linroom/tasks/GNS3.yml delete mode 100644 roles/winroom/tasks/GNS3.yml diff --git a/roles/linroom/tasks/DF-63530.yml b/roles/linroom/tasks/DF-63530.yml index 5e24a7a..ae8557c 100644 --- a/roles/linroom/tasks/DF-63530.yml +++ b/roles/linroom/tasks/DF-63530.yml @@ -1,5 +1,5 @@ # Digitalna forenzika # Aleks.Huc@fri.uni-lj.si, Gasper.FeleZorz@fri.uni-lj.si # Windows, GNU/Linux, GNS3, VirtualBox -- include_tasks: GNS3.yml +- include_tasks: gns3.yml - include_tasks: virtualbox.yml diff --git a/roles/linroom/tasks/GNS3.yml b/roles/linroom/tasks/GNS3.yml deleted file mode 100644 index df2807d..0000000 --- a/roles/linroom/tasks/GNS3.yml +++ /dev/null @@ -1,15 +0,0 @@ -- name: Add GNS3 repository - apt_repository: - repo: ppa:gns3/ppa - state: present - update_cache: True - validate_certs: False -- name: Install gns3 server - ansible.builtin.apt: - name: gns3-server - state: latest -- name: Install gns3 GUI - ansible.builtin.apt: - name: gns3-gui - state: latest - diff --git a/roles/linroom/tasks/KPOV-63716.yml b/roles/linroom/tasks/KPOV-63716.yml index 5411878..19bfd45 100644 --- a/roles/linroom/tasks/KPOV-63716.yml +++ b/roles/linroom/tasks/KPOV-63716.yml @@ -1,5 +1,5 @@ # Komunikacijski protokoli in omrežna varnost # Aleks.Huc@fri.uni-lj.si, Gasper.FeleZorz@fri.uni-lj.si # Windows, GNU/Linux, GNS3, VirtualBox -- include_tasks: GNS3.yml +- include_tasks: gns3.yml - include_tasks: virtualbox.yml diff --git a/roles/winroom/tasks/DF-63530.yml b/roles/winroom/tasks/DF-63530.yml index 5e24a7a..ae8557c 100644 --- a/roles/winroom/tasks/DF-63530.yml +++ b/roles/winroom/tasks/DF-63530.yml @@ -1,5 +1,5 @@ # Digitalna forenzika # Aleks.Huc@fri.uni-lj.si, Gasper.FeleZorz@fri.uni-lj.si # Windows, GNU/Linux, GNS3, VirtualBox -- include_tasks: GNS3.yml +- include_tasks: gns3.yml - include_tasks: virtualbox.yml diff --git a/roles/winroom/tasks/GNS3.yml b/roles/winroom/tasks/GNS3.yml deleted file mode 100644 index 2cc5ce3..0000000 --- a/roles/winroom/tasks/GNS3.yml +++ /dev/null @@ -1,4 +0,0 @@ -- name: GNS3 na Windows ne deluje - debug: - msg: "GNS3 na Windows zaenkrat ne vklapljamo" - diff --git a/roles/winroom/tasks/KPOV-63716.yml b/roles/winroom/tasks/KPOV-63716.yml index 5411878..248eefc 100644 --- a/roles/winroom/tasks/KPOV-63716.yml +++ b/roles/winroom/tasks/KPOV-63716.yml @@ -1,5 +1,5 @@ # Komunikacijski protokoli in omrežna varnost # Aleks.Huc@fri.uni-lj.si, Gasper.FeleZorz@fri.uni-lj.si # Windows, GNU/Linux, GNS3, VirtualBox -- include_tasks: GNS3.yml +- include_tasks: gns.yml - include_tasks: virtualbox.yml From 02198c1de91df6c8d7676a3cdc58215d144186ba Mon Sep 17 00:00:00 2001 From: kllemen Date: Fri, 13 Sep 2024 14:55:09 +0200 Subject: [PATCH 3/9] KIRV cleanup --- roles/KRV-63528/meta/main.yml | 11 ++++++----- roles/linroom/tasks/KRV-63528.yml | 5 +++-- roles/linroom/tasks/sagemath.yml | 17 +++++++++-------- roles/sagemath/tasks/main_lin.yml | 17 +++++++++-------- roles/sagemath/tasks/main_win.yml | 1 - roles/winroom/tasks/KRV-63528.yml | 7 ------- roles/winroom/tasks/all_classes.yml | 1 - roles/winroom/tasks/openssl.yml | 4 ---- roles/winroom/tasks/sagemath.yml | 1 - 9 files changed, 27 insertions(+), 37 deletions(-) delete mode 100644 roles/sagemath/tasks/main_win.yml delete mode 100644 roles/winroom/tasks/KRV-63528.yml delete mode 100644 roles/winroom/tasks/openssl.yml delete mode 100644 roles/winroom/tasks/sagemath.yml diff --git a/roles/KRV-63528/meta/main.yml b/roles/KRV-63528/meta/main.yml index 96bd0ff..36b64c6 100644 --- a/roles/KRV-63528/meta/main.yml +++ b/roles/KRV-63528/meta/main.yml @@ -1,7 +1,8 @@ # Kriptografija in računalniška varnost -# Klemen.Klanjscek@fri.uni-lj.si, Janos.Vidali@fri.uni-lj.si +# Klemen.Klanjscek@fri.uni-lj.si # GNU/Linux, SageMath, Python 3, Jupyter Notebook, OpenSSL, OpenSSH client -dependencies: - - role: sagemath - - role: jupyter - - role: openssl + +# SageMath se se prevede za Ubutnu 24.04: https://github.com/sagemath/sage/issues/38051#issuecomment-2123452861 +# - include_tasks: sagemath.yml +- include_tasks: jupyter.yml +- include_tasks: openssl.yml diff --git a/roles/linroom/tasks/KRV-63528.yml b/roles/linroom/tasks/KRV-63528.yml index 3d5690e..36b64c6 100644 --- a/roles/linroom/tasks/KRV-63528.yml +++ b/roles/linroom/tasks/KRV-63528.yml @@ -1,7 +1,8 @@ # Kriptografija in računalniška varnost -# Klemen.Klanjscek@fri.uni-lj.si, Janos.Vidali@fri.uni-lj.si +# Klemen.Klanjscek@fri.uni-lj.si # GNU/Linux, SageMath, Python 3, Jupyter Notebook, OpenSSL, OpenSSH client -- include_tasks: sagemath.yml +# SageMath se se prevede za Ubutnu 24.04: https://github.com/sagemath/sage/issues/38051#issuecomment-2123452861 +# - include_tasks: sagemath.yml - include_tasks: jupyter.yml - include_tasks: openssl.yml diff --git a/roles/linroom/tasks/sagemath.yml b/roles/linroom/tasks/sagemath.yml index 9b757ef..f7607d8 100644 --- a/roles/linroom/tasks/sagemath.yml +++ b/roles/linroom/tasks/sagemath.yml @@ -1,9 +1,10 @@ -- name: Install SageMath - apt: - name: sagemath - state: latest +# # SageMath se se prevede za Ubutnu 24.04: https://github.com/sagemath/sage/issues/38051#issuecomment-2123452861 +# - name: Install SageMath +# apt: +# name: sagemath +# state: latest -- name: Install SageMath - Jupyter - apt: - name: sagemath-jupyter - state: latest +# - name: Install SageMath - Jupyter +# apt: +# name: sagemath-jupyter +# state: latest diff --git a/roles/sagemath/tasks/main_lin.yml b/roles/sagemath/tasks/main_lin.yml index 9b757ef..f7607d8 100644 --- a/roles/sagemath/tasks/main_lin.yml +++ b/roles/sagemath/tasks/main_lin.yml @@ -1,9 +1,10 @@ -- name: Install SageMath - apt: - name: sagemath - state: latest +# # SageMath se se prevede za Ubutnu 24.04: https://github.com/sagemath/sage/issues/38051#issuecomment-2123452861 +# - name: Install SageMath +# apt: +# name: sagemath +# state: latest -- name: Install SageMath - Jupyter - apt: - name: sagemath-jupyter - state: latest +# - name: Install SageMath - Jupyter +# apt: +# name: sagemath-jupyter +# state: latest diff --git a/roles/sagemath/tasks/main_win.yml b/roles/sagemath/tasks/main_win.yml deleted file mode 100644 index 4640904..0000000 --- a/roles/sagemath/tasks/main_win.yml +++ /dev/null @@ -1 +0,0 @@ -# TODO diff --git a/roles/winroom/tasks/KRV-63528.yml b/roles/winroom/tasks/KRV-63528.yml deleted file mode 100644 index 3d5690e..0000000 --- a/roles/winroom/tasks/KRV-63528.yml +++ /dev/null @@ -1,7 +0,0 @@ -# Kriptografija in računalniška varnost -# Klemen.Klanjscek@fri.uni-lj.si, Janos.Vidali@fri.uni-lj.si -# GNU/Linux, SageMath, Python 3, Jupyter Notebook, OpenSSL, OpenSSH client - -- include_tasks: sagemath.yml -- include_tasks: jupyter.yml -- include_tasks: openssl.yml diff --git a/roles/winroom/tasks/all_classes.yml b/roles/winroom/tasks/all_classes.yml index 534b7af..b99be79 100644 --- a/roles/winroom/tasks/all_classes.yml +++ b/roles/winroom/tasks/all_classes.yml @@ -13,7 +13,6 @@ - import_tasks: IVZ-63521.yml - import_tasks: KCR-63550.yml - import_tasks: KPOV-63716.yml -- import_tasks: KRV-63528.yml - import_tasks: MRO-63257.yml - import_tasks: MV-63288.yml - import_tasks: NDN-63729.yml diff --git a/roles/winroom/tasks/openssl.yml b/roles/winroom/tasks/openssl.yml deleted file mode 100644 index 9687d1b..0000000 --- a/roles/winroom/tasks/openssl.yml +++ /dev/null @@ -1,4 +0,0 @@ -# We have it at least in git and msys2 but what the hell. -- name: Install OpenSSL - win_chocolatey: - name: openssl diff --git a/roles/winroom/tasks/sagemath.yml b/roles/winroom/tasks/sagemath.yml deleted file mode 100644 index 4640904..0000000 --- a/roles/winroom/tasks/sagemath.yml +++ /dev/null @@ -1 +0,0 @@ -# TODO From 4d2ba0d99925cd25e0a4391be89e4f4377e45088 Mon Sep 17 00:00:00 2001 From: kllemen Date: Fri, 13 Sep 2024 15:18:05 +0200 Subject: [PATCH 4/9] vscodevim.vim removed --- roles/vscode/tasks/vscode_extensions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/vscode/tasks/vscode_extensions.yml b/roles/vscode/tasks/vscode_extensions.yml index 7255502..3acb371 100644 --- a/roles/vscode/tasks/vscode_extensions.yml +++ b/roles/vscode/tasks/vscode_extensions.yml @@ -10,7 +10,7 @@ VSCode_Extensions: - franneck94.c-cpp-runner - ritwickdey.LiveServer - ms-toolsai.jupyter - - vscodevim.vim + # - vscodevim.vim - ocamllabs.ocaml-platform - stonebuddha.vscode-better-sml - vscode-icons-team.vscode-icons From dafd821af9ac111c6a6419a37812375ec0d5d411 Mon Sep 17 00:00:00 2001 From: kllemen Date: Fri, 13 Sep 2024 15:20:52 +0200 Subject: [PATCH 5/9] vscode-lldb never stops loading --- roles/vscode/tasks/vscode_extensions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/vscode/tasks/vscode_extensions.yml b/roles/vscode/tasks/vscode_extensions.yml index 3acb371..dfa6b79 100644 --- a/roles/vscode/tasks/vscode_extensions.yml +++ b/roles/vscode/tasks/vscode_extensions.yml @@ -22,4 +22,4 @@ VSCode_Extensions: - platformio.platformio-ide # ORS-63218 - stmicroelectronics.stm32-vscode-extension # RA-63703 - danielpinto8zz6.c-cpp-compile-run - - vadimcn.vscode-lldb + # - vadimcn.vscode-lldb From ba865a90340d86601759fd3101ca027f7ca32377 Mon Sep 17 00:00:00 2001 From: kllemen Date: Fri, 13 Sep 2024 15:52:03 +0200 Subject: [PATCH 6/9] PPJ cleanup --- roles/haskell/tasks/main_win.yml | 42 +++++++++++------------ roles/linroom/tasks/PPJ-63220.yml | 2 +- roles/linroom/tasks/htop.yml | 0 roles/linroom/tasks/utop.yml | 4 +++ roles/linroom/tasks/vscode_extensions.yml | 4 +-- roles/vscode/tasks/vscode_extensions.yml | 4 +-- roles/winroom/tasks/PPJ-63220.yml | 11 ------ roles/winroom/tasks/haskell.yml | 42 +++++++++++------------ roles/winroom/tasks/vscode_extensions.yml | 4 --- 9 files changed, 49 insertions(+), 64 deletions(-) create mode 100644 roles/linroom/tasks/htop.yml create mode 100644 roles/linroom/tasks/utop.yml delete mode 100644 roles/winroom/tasks/PPJ-63220.yml diff --git a/roles/haskell/tasks/main_win.yml b/roles/haskell/tasks/main_win.yml index da6988e..882021a 100644 --- a/roles/haskell/tasks/main_win.yml +++ b/roles/haskell/tasks/main_win.yml @@ -1,25 +1,25 @@ -- name: Check Haskell install status - win_stat: - path: C:\ghcup\bin\ghc.exe - register: file +# - name: Check Haskell install status +# win_stat: +# path: C:\ghcup\bin\ghc.exe +# register: file -- when: not file.stat.exists - block: - - name: Download Haskell - win_get_url: - url: "https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1" - dest: 'C:\' - register: download +# - when: not file.stat.exists +# block: +# - name: Download Haskell +# win_get_url: +# url: "https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1" +# dest: 'C:\' +# register: download - - name: Install Haskell - win_command: powershell.exe {{ download.dest }} -InBash -ExistingMsys2Dir C:\msys64 +# - name: Install Haskell +# win_command: powershell.exe {{ download.dest }} -InBash -ExistingMsys2Dir C:\msys64 - - name: Add Haskell to PATH - win_path: - elements: - C:\ghcup\bin +# - name: Add Haskell to PATH +# win_path: +# elements: +# C:\ghcup\bin - - name: Remove temporary files - win_file: - path: "{{ download.dest }}" - state: absent +# - name: Remove temporary files +# win_file: +# path: "{{ download.dest }}" +# state: absent diff --git a/roles/linroom/tasks/PPJ-63220.yml b/roles/linroom/tasks/PPJ-63220.yml index 075a5cb..19f2ee3 100644 --- a/roles/linroom/tasks/PPJ-63220.yml +++ b/roles/linroom/tasks/PPJ-63220.yml @@ -5,7 +5,7 @@ - include_tasks: vscode.yml - include_tasks: ocaml.yml - include_tasks: eclipse.yml -- include_tasks: haskell.yml - include_tasks: swi-prolog.yml - include_tasks: rlwrap.yml +- include_tasks: utop.yml diff --git a/roles/linroom/tasks/htop.yml b/roles/linroom/tasks/htop.yml new file mode 100644 index 0000000..e69de29 diff --git a/roles/linroom/tasks/utop.yml b/roles/linroom/tasks/utop.yml new file mode 100644 index 0000000..38e38d2 --- /dev/null +++ b/roles/linroom/tasks/utop.yml @@ -0,0 +1,4 @@ +- name: Install utop + apt: + name: utop + state: latest diff --git a/roles/linroom/tasks/vscode_extensions.yml b/roles/linroom/tasks/vscode_extensions.yml index f42ef76..be886a8 100644 --- a/roles/linroom/tasks/vscode_extensions.yml +++ b/roles/linroom/tasks/vscode_extensions.yml @@ -1,9 +1,7 @@ VSCode_Extensions: - VisualStudioExptTeam.vscodeintellicode - - arthurwang.vsc-prolog - - dramforever.vscode-ghc-simple + - AmauryRabouan.new-vsc-prolog - eamodio.gitlens - - justusadam.language-haskell - ms-dotnettools.csdevkit # IS-63714 - ms-python.python - ms-vscode.cpptools diff --git a/roles/vscode/tasks/vscode_extensions.yml b/roles/vscode/tasks/vscode_extensions.yml index dfa6b79..5c47d87 100644 --- a/roles/vscode/tasks/vscode_extensions.yml +++ b/roles/vscode/tasks/vscode_extensions.yml @@ -1,9 +1,7 @@ VSCode_Extensions: - VisualStudioExptTeam.vscodeintellicode - - arthurwang.vsc-prolog - - dramforever.vscode-ghc-simple + - AmauryRabouan.new-vsc-prolog - eamodio.gitlens - - justusadam.language-haskell - ms-dotnettools.csdevkit # IS-63714 - ms-python.python - ms-vscode.cpptools diff --git a/roles/winroom/tasks/PPJ-63220.yml b/roles/winroom/tasks/PPJ-63220.yml deleted file mode 100644 index 075a5cb..0000000 --- a/roles/winroom/tasks/PPJ-63220.yml +++ /dev/null @@ -1,11 +0,0 @@ -# Principi programskih jezikov -# Klemen.Klanjscek@fri.uni-lj.si -# Windows, GNU/Linux, VS Code, Ocaml, Eclipse, Haskell, SWI-Prolog, rlwrap - -- include_tasks: vscode.yml -- include_tasks: ocaml.yml -- include_tasks: eclipse.yml -- include_tasks: haskell.yml -- include_tasks: swi-prolog.yml -- include_tasks: rlwrap.yml - diff --git a/roles/winroom/tasks/haskell.yml b/roles/winroom/tasks/haskell.yml index da6988e..882021a 100644 --- a/roles/winroom/tasks/haskell.yml +++ b/roles/winroom/tasks/haskell.yml @@ -1,25 +1,25 @@ -- name: Check Haskell install status - win_stat: - path: C:\ghcup\bin\ghc.exe - register: file +# - name: Check Haskell install status +# win_stat: +# path: C:\ghcup\bin\ghc.exe +# register: file -- when: not file.stat.exists - block: - - name: Download Haskell - win_get_url: - url: "https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1" - dest: 'C:\' - register: download +# - when: not file.stat.exists +# block: +# - name: Download Haskell +# win_get_url: +# url: "https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1" +# dest: 'C:\' +# register: download - - name: Install Haskell - win_command: powershell.exe {{ download.dest }} -InBash -ExistingMsys2Dir C:\msys64 +# - name: Install Haskell +# win_command: powershell.exe {{ download.dest }} -InBash -ExistingMsys2Dir C:\msys64 - - name: Add Haskell to PATH - win_path: - elements: - C:\ghcup\bin +# - name: Add Haskell to PATH +# win_path: +# elements: +# C:\ghcup\bin - - name: Remove temporary files - win_file: - path: "{{ download.dest }}" - state: absent +# - name: Remove temporary files +# win_file: +# path: "{{ download.dest }}" +# state: absent diff --git a/roles/winroom/tasks/vscode_extensions.yml b/roles/winroom/tasks/vscode_extensions.yml index f42ef76..3796ad4 100644 --- a/roles/winroom/tasks/vscode_extensions.yml +++ b/roles/winroom/tasks/vscode_extensions.yml @@ -1,13 +1,9 @@ VSCode_Extensions: - VisualStudioExptTeam.vscodeintellicode - - arthurwang.vsc-prolog - - dramforever.vscode-ghc-simple - eamodio.gitlens - - justusadam.language-haskell - ms-dotnettools.csdevkit # IS-63714 - ms-python.python - ms-vscode.cpptools - - ocamllabs.ocaml-platform - stonebuddha.vscode-better-sml - vscode-icons-team.vscode-icons - vscjava.vscode-java-pack From a9154741a4a123fbfc53dd14500cdc268d23ef54 Mon Sep 17 00:00:00 2001 From: kllemen Date: Fri, 13 Sep 2024 16:02:10 +0200 Subject: [PATCH 7/9] Readline for SML (wip) --- roles/linroom/tasks/smlnj.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/roles/linroom/tasks/smlnj.yml b/roles/linroom/tasks/smlnj.yml index 7096389..04e9ce0 100644 --- a/roles/linroom/tasks/smlnj.yml +++ b/roles/linroom/tasks/smlnj.yml @@ -11,3 +11,8 @@ name: elpa-sml-mode state: latest +# - name: Readline for SML +# lineinfile: +# dest: "$HOME/.bashrc" +# line: "alias smlnj='rlwrap sml'" +# insertafter: EOF From e0861fd5eb96aba2cb35e5eacc29a8a197215d29 Mon Sep 17 00:00:00 2001 From: kllemen Date: Fri, 13 Sep 2024 16:05:52 +0200 Subject: [PATCH 8/9] PPJ ne rabi win --- roles/winroom/tasks/all_classes.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/winroom/tasks/all_classes.yml b/roles/winroom/tasks/all_classes.yml index b99be79..1e4427e 100644 --- a/roles/winroom/tasks/all_classes.yml +++ b/roles/winroom/tasks/all_classes.yml @@ -31,7 +31,6 @@ - import_tasks: PB-63707.yml - import_tasks: PB2-63713.yml - import_tasks: PJC-63769.yml -- import_tasks: PPJ-63220.yml - import_tasks: PS-63261.yml - import_tasks: PSP-63287.yml - import_tasks: PUI-63768.yml From abaf6b19ee36aa2025a09bb71348f671a4d8d5ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C5=A1per=20Fele-=C5=BDor=C5=BE?= Date: Mon, 16 Sep 2024 11:04:03 +0200 Subject: [PATCH 9/9] Add old sagemath config int he hopes that we can later uncomment it --- linsetup.yml | 8 +- roles/OR-63717/meta/main.yml | 1 + roles/RA-63703/meta/main.yml | 1 + .../tasks/androidsdk_packages.yml | 13 ++- roles/arduino/tasks/main_lin.yml | 2 +- roles/bayesfusion/tasks/main_lin.yml | 16 ++-- roles/cp2102_driver/tasks/main_win.yml | 1 + roles/docker/tasks/main_lin.yml | 4 +- roles/firefox/tasks/main_lin.yml | 1 + roles/fri_base/tasks/main_lin.yml | 14 +++- roles/fri_base/tasks/main_win.yml | 6 ++ roles/haskell/tasks/main_lin.yml | 4 +- roles/jdk/tasks/main_lin.yml | 14 ++-- roles/logisim/tasks/main_lin.yml | 3 +- roles/matlab/meta/main.yml | 4 +- roles/matlab/tasks/main_win.yml | 8 +- roles/mysql_workbench/tasks/main_lin.yml | 6 +- roles/netbeans/tasks/main_win.yml | 2 +- roles/notepad++/tasks/main_lin.yml | 16 ++-- roles/omnetpp/tasks/main_win.yml | 2 +- roles/orange/tasks/main_lin.yml | 6 +- roles/pelles-c/tasks/main_lin.yml | 16 ++-- roles/powerdesigner/tasks/main_lin.yml | 6 +- roles/sagemath/tasks/main_lin.yml | 9 +-- roles/stm32cube/tasks/main_win.yml | 79 +++++++++---------- roles/stm32duino/tasks/main_lin.yml | 21 ++--- roles/tensorflow/tasks/main_lin.yml | 2 +- roles/twincat3/tasks/main_lin.yml | 3 +- roles/twincat3/tasks/main_win.yml | 9 ++- roles/unity/tasks/main_lin.yml | 16 ++-- roles/visualstudio/tasks/main.yml | 4 - roles/visualstudio/tasks/main_lin.yml | 2 - roles/visualstudio/tasks/main_win.yml | 5 -- roles/visualstudio19/tasks/main_lin.yml | 3 +- roles/wireshark/tasks/main_lin.yml | 6 +- winsetup.yml | 11 ++- 36 files changed, 177 insertions(+), 147 deletions(-) delete mode 100644 roles/visualstudio/tasks/main.yml delete mode 100644 roles/visualstudio/tasks/main_lin.yml delete mode 100644 roles/visualstudio/tasks/main_win.yml diff --git a/linsetup.yml b/linsetup.yml index 071f086..ba5ac23 100644 --- a/linsetup.yml +++ b/linsetup.yml @@ -3,12 +3,16 @@ become: true vars: ansible_port: 1001 + ansible_ssh_extra_args: '-o ForwardX11=yes' # ansible_become_pass: '{{ lookup("env", "ANSIBLE_PASSWORD") }}' # ansible_password: '{{ lookup("env", "ANSIBLE_PASSWORD") }}' + installers: /mnt/ucilnice_d/install ansible_connection: 'ssh' vars_files: - vars/credentials.yml - vars/software_keys.yml roles: - # - all_classes - - fri_base + # - orange + - all_classes + # - fri_base + # - powerdesigner diff --git a/roles/OR-63717/meta/main.yml b/roles/OR-63717/meta/main.yml index 70b9078..3edb72d 100644 --- a/roles/OR-63717/meta/main.yml +++ b/roles/OR-63717/meta/main.yml @@ -5,6 +5,7 @@ dependencies: - role: logisim - role: stm32cube - role: stm32duino + - role: putty - role: ninja - role: cmake - role: gcc-arm diff --git a/roles/RA-63703/meta/main.yml b/roles/RA-63703/meta/main.yml index 4a34c54..cccfc52 100644 --- a/roles/RA-63703/meta/main.yml +++ b/roles/RA-63703/meta/main.yml @@ -5,6 +5,7 @@ dependencies: - role: stm32cube - role: stm32duino - role: vscode + - role: putty - role: winidea - role: gcc-arm - role: git diff --git a/roles/android_studio/tasks/androidsdk_packages.yml b/roles/android_studio/tasks/androidsdk_packages.yml index da206a7..2705a0f 100644 --- a/roles/android_studio/tasks/androidsdk_packages.yml +++ b/roles/android_studio/tasks/androidsdk_packages.yml @@ -1,7 +1,10 @@ AndroidSDK_packages: + - add-ons;addon-google_apis-google-24 - add-ons;addon-google_apis-google-24 - build-tools;34.0.0-rc3 + - build-tools;35.0.0 - cmake;3.22.1 + #- cmake;latest - cmdline-tools;latest - emulator - extras;android;m2repository @@ -13,17 +16,21 @@ AndroidSDK_packages: - extras;google;market_licensing - extras;google;simulators - extras;google;webdriver - - extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2 - - extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 + # - extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2 + # - extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2 - ndk-bundle - - patcher;v4 + # - patcher;v4 - platform-tools - platforms;android-34 + - platforms;android-35 - platforms;android-32 - platforms;android-UpsideDownCakePrivacySandbox - skiaparser;3 + - sources;android-35 - sources;android-34 + - system-images;android-35;google_apis;x86_64 - system-images;android-34;google_apis;x86_64 - system-images;android-32;google_apis;x86_64 + - system-images;android-35;google_apis_playstore;x86_64 - system-images;android-34;google_apis_playstore;x86_64 - system-images;android-UpsideDownCakePrivacySandbox;google_apis_playstore;x86_64 diff --git a/roles/arduino/tasks/main_lin.yml b/roles/arduino/tasks/main_lin.yml index de9d922..aee2266 100644 --- a/roles/arduino/tasks/main_lin.yml +++ b/roles/arduino/tasks/main_lin.yml @@ -5,7 +5,7 @@ - name: unpack Arduino unarchive: - src: https://downloads.arduino.cc/arduino-ide/arduino-ide_2.2.1_Linux_64bit.zip + src: https://downloads.arduino.cc/arduino-ide/arduino-ide_2.3.2_Linux_64bit.zip dest: /opt/Arduino remote_src: yes diff --git a/roles/bayesfusion/tasks/main_lin.yml b/roles/bayesfusion/tasks/main_lin.yml index d6903b4..7184d99 100644 --- a/roles/bayesfusion/tasks/main_lin.yml +++ b/roles/bayesfusion/tasks/main_lin.yml @@ -1,10 +1,10 @@ # TODO install BayesFusion.yml # https://download.bayesfusion.com/files.html?category=Academia#GeNIe -- name: Install Wine - apt: - name: wine-development - state: latest -- name: Install Wine binfmt support - apt: - name: wine-binfmt - state: latest +#- name: Install Wine +# apt: +# name: wine-development +# state: latest +#- name: Install Wine binfmt support +# apt: +# name: wine-binfmt +# state: latest diff --git a/roles/cp2102_driver/tasks/main_win.yml b/roles/cp2102_driver/tasks/main_win.yml index a578ecb..7f30792 100644 --- a/roles/cp2102_driver/tasks/main_win.yml +++ b/roles/cp2102_driver/tasks/main_win.yml @@ -1,3 +1,4 @@ - name: Install CP210x USB to UART Bridge VCP Drivers win_chocolatey: + ignore_checksums: true name: cp210x-vcp-drivers-win10 diff --git a/roles/docker/tasks/main_lin.yml b/roles/docker/tasks/main_lin.yml index 7daef92..4c400cd 100644 --- a/roles/docker/tasks/main_lin.yml +++ b/roles/docker/tasks/main_lin.yml @@ -11,12 +11,12 @@ - name: "Install docker" apt: - name: docker + name: docker.io state: latest - name: "Install docker-compose" apt: - name: docker-compose + name: docker-compose-v2 state: latest diff --git a/roles/firefox/tasks/main_lin.yml b/roles/firefox/tasks/main_lin.yml index c80124a..eb729c0 100644 --- a/roles/firefox/tasks/main_lin.yml +++ b/roles/firefox/tasks/main_lin.yml @@ -20,3 +20,4 @@ name: - firefox state: latest + allow_downgrade: True diff --git a/roles/fri_base/tasks/main_lin.yml b/roles/fri_base/tasks/main_lin.yml index 7a2987d..1cc6e95 100644 --- a/roles/fri_base/tasks/main_lin.yml +++ b/roles/fri_base/tasks/main_lin.yml @@ -1,3 +1,6 @@ +- name: Enable multiarch + command: dpkg --add-architecture i386 + - name: Install generally useful packages apt: name: @@ -16,11 +19,13 @@ - qutebrowser - chromium-browser - firefox - - qemu + - qemu-system-x86 - qemu-kvm - qemu-utils - virt-manager - - wine-development + - wine + - wine32:i386 + - wine-binfmt - dosbox - webext-ublock-origin-chromium - webext-ublock-origin-firefox @@ -38,6 +43,9 @@ - overlayroot - nfs-common - cifs-utils + - samba-vfs-modules-extra + - samba-vfs-modules + - smbclient - neovim-qt - binwalk - iotop @@ -110,7 +118,7 @@ mount: boot: true fstype: nfs - src: "10.32.254.16:/srv/nfs/clonezilla_images" + src: "ucilnicenfs.fri.uni-lj.si:/srv/nfs/clonezilla_images" path: /home/partimag state: mounted opts: defaults,nofail diff --git a/roles/fri_base/tasks/main_win.yml b/roles/fri_base/tasks/main_win.yml index 8eacd61..40d9e2f 100644 --- a/roles/fri_base/tasks/main_win.yml +++ b/roles/fri_base/tasks/main_win.yml @@ -7,6 +7,12 @@ name: HideFileExt data: 0 type: dword +- name: Allow SMB insecure guest access + win_regedit: + path: HKLM:\Software\Policies\Microsoft\Windows\LanmanWorkstation + name: AllowInsecureGuestAuth + data: 1 + type: dword - name: Install PSCX community.windows.win_psmodule: name: Pscx diff --git a/roles/haskell/tasks/main_lin.yml b/roles/haskell/tasks/main_lin.yml index a5f4818..6cfc854 100644 --- a/roles/haskell/tasks/main_lin.yml +++ b/roles/haskell/tasks/main_lin.yml @@ -1,6 +1,6 @@ -- name: install Haskell platform +- name: install Emacs haskell mode apt: - name: haskell-platform + name: elpa-haskell-mode state: latest - name: install Haskell Tool Stack diff --git a/roles/jdk/tasks/main_lin.yml b/roles/jdk/tasks/main_lin.yml index 8173858..eaaa1b3 100644 --- a/roles/jdk/tasks/main_lin.yml +++ b/roles/jdk/tasks/main_lin.yml @@ -1,11 +1,11 @@ -- name: Install OpenJDK 18 +- name: Install OpenJDK 21 apt: - name: openjdk-18-jdk + name: openjdk-21-jdk state: latest -- name: Install OpenJDK 19 +- name: Install OpenJDK 17 apt: - name: openjdk-19-jdk + name: openjdk-17-jdk state: latest - name: Install OpenJDK 11 @@ -31,11 +31,11 @@ - libc6-x32 state: latest -- name: Install Oracle JDK 20 +- name: Install Oracle JDK 22 apt: - deb: "https://download.oracle.com/java/20/latest/jdk-20_linux-x64_bin.deb" + deb: "https://download.oracle.com/java/22/latest/jdk-22_linux-x64_bin.deb" - name: Install Java docs apt: - deb: "https://download.oracle.com/java/20/latest/jdk-20_linux-x64_bin.deb" + deb: "https://download.oracle.com/java/22/latest/jdk-22_linux-x64_bin.deb" diff --git a/roles/logisim/tasks/main_lin.yml b/roles/logisim/tasks/main_lin.yml index bb46c19..d35c8f5 100644 --- a/roles/logisim/tasks/main_lin.yml +++ b/roles/logisim/tasks/main_lin.yml @@ -7,6 +7,7 @@ state: directory - name: Download and unpack Logisim unarchive: - src: https://altushost-swe.dl.sourceforge.net/project/circuit/2.7.x/2.7.1/logisim-generic-2.7.1.jar + src: https://deac-fra.dl.sourceforge.net/project/circuit/2.7.x/2.7.1/logisim-generic-2.7.1.jar dest: /opt/logisim remote_src: yes + creates: /opt/logisim/META-INF/MANIFEST.MF diff --git a/roles/matlab/meta/main.yml b/roles/matlab/meta/main.yml index 144a389..286878c 100644 --- a/roles/matlab/meta/main.yml +++ b/roles/matlab/meta/main.yml @@ -1,2 +1,2 @@ -dependencies: - - role: fri_base +# dependencies: +# - role: fri_base diff --git a/roles/matlab/tasks/main_win.yml b/roles/matlab/tasks/main_win.yml index 5aca958..d723043 100644 --- a/roles/matlab/tasks/main_win.yml +++ b/roles/matlab/tasks/main_win.yml @@ -4,9 +4,13 @@ license_path: \\ucilnicesmb.fri1.uni-lj.si\ucilnice_d\install\matlab\network.lic dest_dir: D:\matlab +- name: Set ISO path + set_fact: + iso_path: "{{ installers }}\\matlab\\{{ target_version }}_Windows.iso" + - name: Mount Matlab ISO win_disk_image: - image_path: "{{ installers }}\\matlab\\{{ target_version }}_Windows.iso" + image_path: "{{ iso_path }}" state: present register: disk_image @@ -22,7 +26,7 @@ - name: Unmount Matlab ISO win_disk_image: - image_path: "{{ installers }}\\matlab\\matlab-{{ target_version }}_windows.iso" + image_path: "{{ iso_path }}" state: absent # TODO MATLAB throws license error -83 when run diff --git a/roles/mysql_workbench/tasks/main_lin.yml b/roles/mysql_workbench/tasks/main_lin.yml index aefdaba..27c4fa3 100644 --- a/roles/mysql_workbench/tasks/main_lin.yml +++ b/roles/mysql_workbench/tasks/main_lin.yml @@ -1,8 +1,8 @@ - name: Download mysql workbench get_url: - url: https://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community_8.0.34-1ubuntu22.04_amd64.deb - dest: /tmp/mysql-workbench-community_8.0.34-1ubuntu22.04_amd64.deb + url: https://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community_8.0.38-1ubuntu24.04_amd64.deb + dest: /tmp/mysql-workbench-community_8.0.38-1ubuntu24.04_amd64.deb http_agent: "Wget/1.21.3" - name: Install mysql workbench apt: - deb: /tmp/mysql-workbench-community_8.0.34-1ubuntu22.04_amd64.deb + deb: /tmp/mysql-workbench-community_8.0.38-1ubuntu24.04_amd64.deb diff --git a/roles/netbeans/tasks/main_win.yml b/roles/netbeans/tasks/main_win.yml index f7e7734..b63b5a8 100644 --- a/roles/netbeans/tasks/main_win.yml +++ b/roles/netbeans/tasks/main_win.yml @@ -1,6 +1,6 @@ - name: Set Netbeans version set_fact: - target_version: "19" + target_version: "22" - name: Install Netbeans win_package: diff --git a/roles/notepad++/tasks/main_lin.yml b/roles/notepad++/tasks/main_lin.yml index 505b865..3e194ff 100644 --- a/roles/notepad++/tasks/main_lin.yml +++ b/roles/notepad++/tasks/main_lin.yml @@ -3,14 +3,14 @@ - name: Install notepad++ debug: msg: "Install Notepad++" -- name: Install Wine - apt: - name: wine-development - state: latest -- name: Install Wine binfmt support - apt: - name: wine-binfmt - state: latest +#- name: Install Wine +# apt: +# name: wine-development +# state: latest +#- name: Install Wine binfmt support +# apt: +# name: wine-binfmt +# state: latest - name: Create dir file: diff --git a/roles/omnetpp/tasks/main_win.yml b/roles/omnetpp/tasks/main_win.yml index 05d30b5..5908028 100644 --- a/roles/omnetpp/tasks/main_win.yml +++ b/roles/omnetpp/tasks/main_win.yml @@ -23,7 +23,7 @@ delete_archive: yes - name: Move OMNet++ to final location - win_command: cmd.exe /c move "C:\\omnetpp-{{ target_version }}" "{{ target_dir }}" + win_command: cmd.exe /c move "C:\omnetpp-{{ target_version }}" "{{ target_dir }}" - name: Create OMNet++ compile script win_copy: diff --git a/roles/orange/tasks/main_lin.yml b/roles/orange/tasks/main_lin.yml index 1ffba8a..43971f7 100644 --- a/roles/orange/tasks/main_lin.yml +++ b/roles/orange/tasks/main_lin.yml @@ -1,4 +1,8 @@ +- name: Install pipx + apt: + name: pipx + state: latest - name: Install orange pip: - executable: pip3 + executable: pipx name: orange3 diff --git a/roles/pelles-c/tasks/main_lin.yml b/roles/pelles-c/tasks/main_lin.yml index b7deab0..0c4ab95 100644 --- a/roles/pelles-c/tasks/main_lin.yml +++ b/roles/pelles-c/tasks/main_lin.yml @@ -2,14 +2,14 @@ - name: Install Pelles debug: msg: "Install Pelles-C" -- name: Install Wine - apt: - name: wine-development - state: latest -- name: Install Wine binfmt support - apt: - name: wine-binfmt - state: latest +#- name: Install Wine +# apt: +# name: wine-development +# state: latest +#- name: Install Wine binfmt support +# apt: +# name: wine-binfmt +# state: latest - name: Install icon block: diff --git a/roles/powerdesigner/tasks/main_lin.yml b/roles/powerdesigner/tasks/main_lin.yml index 60a6243..0535f47 100644 --- a/roles/powerdesigner/tasks/main_lin.yml +++ b/roles/powerdesigner/tasks/main_lin.yml @@ -1,4 +1,2 @@ -- name: Install PowerDesigner - win_package: - path: "{{ installers }}\\PowerDesigner 12.5\\cd1\\setup\\setup.exe" - arguments: "/s /f1\"{{ installers }}\\PowerDesigner 12.5\\setup.iss\"" +# - name: Install PowerDesigner +# command: "wine {{ installers }}/PowerDesigner\\ 12.5/cd1/Setup/setup.exe /s /f1\"Z:\\mnt\\ucilnice_d\\install\\PowerDesigner 12.5\\setup.iss\"" diff --git a/roles/sagemath/tasks/main_lin.yml b/roles/sagemath/tasks/main_lin.yml index f7607d8..041794b 100644 --- a/roles/sagemath/tasks/main_lin.yml +++ b/roles/sagemath/tasks/main_lin.yml @@ -1,10 +1,9 @@ # # SageMath se se prevede za Ubutnu 24.04: https://github.com/sagemath/sage/issues/38051#issuecomment-2123452861 -# - name: Install SageMath -# apt: -# name: sagemath -# state: latest - # - name: Install SageMath - Jupyter # apt: # name: sagemath-jupyter # state: latest + +- name: Do not install SageMath + debug: + msg: SageMath is not installable on Ubuntu 24.04 right now diff --git a/roles/stm32cube/tasks/main_win.yml b/roles/stm32cube/tasks/main_win.yml index a697a39..752db87 100644 --- a/roles/stm32cube/tasks/main_win.yml +++ b/roles/stm32cube/tasks/main_win.yml @@ -7,24 +7,23 @@ block: - name: Set download filenames set_fact: - # cubemx_download_file: C:\CubeMX.exe + cubemx_download_file: C:\CubeMX.exe cubeprogrammer_download_file: C:\CubeProgrammer.exe cubemonitor_download_file: C:\CubeMonitor.exe - # cufinder_download_file: C:\CUFinder.exe + cufinder_download_file: C:\CUFinder.exe cubeide_download_file: C:\st-stm32cubeide_1.16.0_21983_20240628_1741_x86_64.exe - # - name: Download CubeMX + - name: Download CubeMX # # win_get_url: - # win_command: wget "https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/EZhqHxJoAfdEjdlMu0uGWGcBOqrT0vTVv2_nhynWZ3fOwQ?e=ilAlzP&download=1" -O "{{ cubemx_download_file }}" + win_command: wget "https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/EZhqHxJoAfdEjdlMu0uGWGcBOqrT0vTVv2_nhynWZ3fOwQ?e=ilAlzP&download=1" -O "{{ cubemx_download_file }}" # #dest: C:\CubeMX.exe # #register: cubemx_download - # args: - # creates: "{{ cubemx_download_file }}" + args: + creates: "{{ cubemx_download_file }}" -# - name: Install CubeMX -# win_package: - # path: "{{cubemx_download.dest}}" -# path: "{{ cubemx_download_file }}" -# arguments: /S + #- name: Install CubeMX + # win_package: + # path: "{{ cubemx_download_file }}" + # arguments: /S - name: Download CubeProgrammer win_command: wget "https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/EXHsKDjM6hVAuEGwEWcMyBEB6bHd3HuOP38D7Wjt41vjTw?e=7jatnu&download=1" -O "{{ cubeprogrammer_download_file }}" @@ -34,10 +33,10 @@ args: creates: "{{ cubeprogrammer_download_file }}" - # - name: Install CubeProgrammer - # win_package: - # path: "{{ cubeprogrammer_download_file }}" - # arguments: /S + - name: Install CubeProgrammer + win_package: + path: "{{ cubeprogrammer_download_file }}" + arguments: /S - name: Download CubeMonitor # TODO 2024: only zip distributions exists in zip file @@ -50,23 +49,23 @@ args: creates: "{{ cubemonitor_download_file}}" - # - name: Install CubeMonitor - # win_package: - # path: "{{ cubemonitor_download_file }}" - # arguments: /S + - name: Install CubeMonitor + win_package: + path: "{{ cubemonitor_download_file }}" + arguments: /S - # - name: Download STM CUFinder - # win_command: wget "https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/EfesbSW7EftDoSjtt-nr_eYBH_EBzXnysW0Lk1wnNzx2Mw?e=HSSmDz&download=1" -O "{{ cufinder_download_file }}" + - name: Download STM CUFinder + win_command: wget "https://unilj-my.sharepoint.com/:u:/g/personal/rozman_fri1_uni-lj_si/EfesbSW7EftDoSjtt-nr_eYBH_EBzXnysW0Lk1wnNzx2Mw?e=HSSmDz&download=1" -O "{{ cufinder_download_file }}" # #win_get_url: # # dest: C:\CUFinder.exe # #register: cubecufinder_download - # args: - # creates: "{{ cufinder_download_file }}" + args: + creates: "{{ cufinder_download_file }}" -# - name: Install STM CUFinder -# win_package: -# path: "{{ cubecufinder_download_file }}" -# arguments: /S + - name: Install STM CUFinder + win_package: + path: "{{ cubecufinder_download_file }}" + arguments: /S - name: Download CubeIDE # win_get_url: @@ -76,20 +75,20 @@ args: creates: "{{ cubeide_download_file }}" -# - name: Install CubeIDE -# win_package: -# path: "{{ cubeide_download_file }}" -# arguments: /S + - name: Install CubeIDE + win_package: + path: "{{ cubeide_download_file }}" + arguments: /S # TODO test the installers -# - name: Set CubeIDE default workspace -# win_lineinfile: -# path: C:\ST\STM32CubeIDE_1.10.1\STM32CubeIDE\stm32cubeide.ini -# regexp: "osgi.instance.area.default" -# line: "-Dosgi.instance.area.default=D:/RAVINOR/CubeIDE_Workspace" + - name: Set CubeIDE default workspace + win_lineinfile: + path: C:\ST\STM32CubeIDE_1.10.1\STM32CubeIDE\stm32cubeide.ini + regexp: "osgi.instance.area.default" + line: "-Dosgi.instance.area.default=D:/RAVINOR/CubeIDE_Workspace" # Replace -installIU... with -list to get available packages. -# - name: Install QEMU -# win_command: stm32cubeidec.exe -application org.eclipse.equinox.p2.director -nosplash -repository https://download.eclipse.org/embed-cdt/updates/v6/ -installIU org.eclipse.embedcdt.debug.gdbjtag.qemu.feature.group -# args: -# chdir: C:\ST\STM32CubeIDE_1.10.1\STM32CubeIDE + - name: Install QEMU + win_command: stm32cubeidec.exe -application org.eclipse.equinox.p2.director -nosplash -repository https://download.eclipse.org/embed-cdt/updates/v6/ -installIU org.eclipse.embedcdt.debug.gdbjtag.qemu.feature.group + args: + chdir: C:\ST\STM32CubeIDE_1.10.1\STM32CubeIDE diff --git a/roles/stm32duino/tasks/main_lin.yml b/roles/stm32duino/tasks/main_lin.yml index 7b29b42..c8c341c 100644 --- a/roles/stm32duino/tasks/main_lin.yml +++ b/roles/stm32duino/tasks/main_lin.yml @@ -1,13 +1,14 @@ -- name: create destination - file: - path: /opt/Arduino - state: directory +#- name: create destination +# file: +# path: /opt/Arduino +# state: directory -- name: unpack Arduino - unarchive: - src: - dest: /opt/Arduino-cli - remote_src: yes +# - name: unpack Arduino +# unarchive: +# src: +# dest: /opt/Arduino-cli +# remote_src: yes #- name: Add .json for new boards -# +# https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json +# TODO: write this task file! diff --git a/roles/tensorflow/tasks/main_lin.yml b/roles/tensorflow/tasks/main_lin.yml index 35c805e..2b55013 100644 --- a/roles/tensorflow/tasks/main_lin.yml +++ b/roles/tensorflow/tasks/main_lin.yml @@ -1,4 +1,4 @@ - name: Install TensorFlow pip: - executable: pip3 + executable: pipx name: tensorflow diff --git a/roles/twincat3/tasks/main_lin.yml b/roles/twincat3/tasks/main_lin.yml index 996ec5c..81ba37f 100644 --- a/roles/twincat3/tasks/main_lin.yml +++ b/roles/twincat3/tasks/main_lin.yml @@ -1,2 +1,3 @@ - name: Do not install TwinCat 3 on Linux - debug: Do not install TwinCat 3 on Linux + debug: + msg: Do not install TwinCat 3 on Linux diff --git a/roles/twincat3/tasks/main_win.yml b/roles/twincat3/tasks/main_win.yml index c2ec314..9884e96 100644 --- a/roles/twincat3/tasks/main_win.yml +++ b/roles/twincat3/tasks/main_win.yml @@ -1,5 +1,6 @@ - name: Install TwinCat 3 - win_chocolatey: - name: visualstudio2019community - -# Maybe sometime use https://learn.microsoft.com/en-us/visualstudio/install/use-command-line-parameters-to-install-visual-studio?view=vs-2022 with the costlier version + debug: + msg: TODO - write twincat installer scripts + #win_package: + # path: "{{ installers }}\\TwinCat3\\setup\\setup.exe" + # arguments: "/s /f1\"{{ installers }}\\PowerDesigner 12.5\\setup.iss\" /f2\"C:\\powerdesigner_log.iss\"" diff --git a/roles/unity/tasks/main_lin.yml b/roles/unity/tasks/main_lin.yml index c13b36c..3c4a18e 100644 --- a/roles/unity/tasks/main_lin.yml +++ b/roles/unity/tasks/main_lin.yml @@ -2,11 +2,11 @@ - name: PowerDesigner debug: msg: "Unity" -- name: Install Wine - apt: - name: wine-development - state: latest -- name: Install Wine binfmt support - apt: - name: wine-binfmt - state: latest +#- name: Install Wine +# apt: +# name: wine-development +# state: latest +#- name: Install Wine binfmt support +# apt: +# name: wine-binfmt +# state: latest diff --git a/roles/visualstudio/tasks/main.yml b/roles/visualstudio/tasks/main.yml deleted file mode 100644 index 55203f6..0000000 --- a/roles/visualstudio/tasks/main.yml +++ /dev/null @@ -1,4 +0,0 @@ -- import_tasks: main_win.yml - when: ansible_connection == 'winrm' -- import_tasks: main_lin.yml - when: ansible_connection == 'ssh' diff --git a/roles/visualstudio/tasks/main_lin.yml b/roles/visualstudio/tasks/main_lin.yml deleted file mode 100644 index 54a5121..0000000 --- a/roles/visualstudio/tasks/main_lin.yml +++ /dev/null @@ -1,2 +0,0 @@ -- name: Do not install VisualStudio on Linux - debug: Do not install VisualStudio on Linux diff --git a/roles/visualstudio/tasks/main_win.yml b/roles/visualstudio/tasks/main_win.yml deleted file mode 100644 index 398a3a8..0000000 --- a/roles/visualstudio/tasks/main_win.yml +++ /dev/null @@ -1,5 +0,0 @@ -- name: Install Microsoft Visual Studio - win_chocolatey: - name: visualstudio2022community - -# Maybe sometime use https://learn.microsoft.com/en-us/visualstudio/install/use-command-line-parameters-to-install-visual-studio?view=vs-2022 with the costlier version diff --git a/roles/visualstudio19/tasks/main_lin.yml b/roles/visualstudio19/tasks/main_lin.yml index 54a5121..0ddf286 100644 --- a/roles/visualstudio19/tasks/main_lin.yml +++ b/roles/visualstudio19/tasks/main_lin.yml @@ -1,2 +1,3 @@ - name: Do not install VisualStudio on Linux - debug: Do not install VisualStudio on Linux + debug: + msg: Do not install VisualStudio on Linux diff --git a/roles/wireshark/tasks/main_lin.yml b/roles/wireshark/tasks/main_lin.yml index fe4e91c..2b80842 100644 --- a/roles/wireshark/tasks/main_lin.yml +++ b/roles/wireshark/tasks/main_lin.yml @@ -6,5 +6,9 @@ vtype: boolean - name: "Install Wireshark" apt: - name: wireshark-qt + name: wireshark + state: latest +- name: "Install text-mode wireshark" + apt: + name: tshark state: latest diff --git a/winsetup.yml b/winsetup.yml index e6091ec..c8a4fb3 100644 --- a/winsetup.yml +++ b/winsetup.yml @@ -13,11 +13,10 @@ - vars/credentials.yml - vars/software_keys.yml roles: - # - fri_base - - matlab # - all_classes - # - android_studio - # - octave - # - audacity - # - vmware_player + # - stm32cube + - android_studio + #- OR-63717 + #- RA-63703 + #- VN-63728