From e845b92ce06a0ef4dad90b7fdc99ec34d27c9cde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C5=A1per=20Fele-=C5=BDor=C5=BE?= Date: Fri, 15 Aug 2025 23:04:26 +0200 Subject: [PATCH] Bump versions, fix installers --- .../tasks/androidsdk_packages.yml | 17 ++- roles/android_studio/tasks/main_win.yml | 18 +-- roles/chrome/tasks/main_lin.yml | 12 +- roles/firefox/tasks/main_lin.yml | 22 +++- roles/gns3/tasks/main_lin.yml | 24 +++- roles/inkscape/tasks/main_lin.yml | 22 +++- roles/jdk/tasks/main_lin.yml | 8 +- roles/jdk/tasks/main_win.yml | 2 +- roles/matlab/tasks/main_lin.yml | 4 +- roles/matlab/tasks/main_win.yml | 24 ++-- roles/matlab/templates/installer_input.txt | 3 +- roles/mysql_workbench/tasks/main_lin.yml | 106 +++++++++++++++++- roles/netbeans/tasks/main_win.yml | 22 +++- roles/nodejs/tasks/main_lin.yml | 11 +- roles/nodejs/tasks/main_win.yml | 7 +- roles/omnetpp/tasks/main_win.yml | 4 +- roles/processing/tasks/main_win.yml | 29 ++--- roles/python3/tasks/main_lin.yml | 4 +- roles/qcadesigner-e/tasks/main_lin.yml | 2 +- roles/rstudio/tasks/main_lin.yml | 21 ++-- roles/thonny/tasks/main_win.yml | 2 +- roles/vscode/tasks/main_lin.yml | 8 +- roles/wireshark/tasks/main_win.yml | 10 +- roles/xgboost/tasks/main_lin.yml | 1 - 24 files changed, 267 insertions(+), 116 deletions(-) diff --git a/roles/android_studio/tasks/androidsdk_packages.yml b/roles/android_studio/tasks/androidsdk_packages.yml index 2705a0f..bfd9d77 100644 --- a/roles/android_studio/tasks/androidsdk_packages.yml +++ b/roles/android_studio/tasks/androidsdk_packages.yml @@ -2,9 +2,8 @@ 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 + - build-tools;36.0.0 + - cmake;4.0.3 - cmdline-tools;latest - emulator - extras;android;m2repository @@ -22,15 +21,15 @@ AndroidSDK_packages: # - patcher;v4 - platform-tools - platforms;android-34 - - platforms;android-35 + - platforms;android-36 - platforms;android-32 - - platforms;android-UpsideDownCakePrivacySandbox + # - platforms;android-UpsideDownCakePrivacySandbox - skiaparser;3 - - sources;android-35 + - sources;android-36 - sources;android-34 - - system-images;android-35;google_apis;x86_64 + - system-images;android-36;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-36;google_apis_playstore;x86_64 - system-images;android-34;google_apis_playstore;x86_64 - - system-images;android-UpsideDownCakePrivacySandbox;google_apis_playstore;x86_64 + # - system-images;android-UpsideDownCakePrivacySandbox;google_apis_playstore;x86_64 diff --git a/roles/android_studio/tasks/main_win.yml b/roles/android_studio/tasks/main_win.yml index 1199913..a209379 100644 --- a/roles/android_studio/tasks/main_win.yml +++ b/roles/android_studio/tasks/main_win.yml @@ -6,7 +6,7 @@ - name: Check Android Studio tools win_stat: - path: "{{ sdk_path }}\\cmdline-tools\\cmdline-tools\\bin\\sdkmanager.bat" + path: "{{ sdk_path }}\\platform-tools\\adb.exe" register: tools - when: not tools.stat.exists @@ -19,20 +19,20 @@ - name: Extract Android Studio tools win_unzip: - src: "C:\\commandlinetools-win-{{ tools_version }}.zip" - dest: "{{ sdk_path }}\\cmdline-tools" + src: "C:\\platform-tools-{{ tools_version }}-windows.zip" + dest: "{{ sdk_path }}\\" delete_archive: yes -- name: Accept Android SDK licenses - win_shell: sh -c "yes | /c/android-sdk/cmdline-tools/cmdline-tools/bin/sdkmanager.bat --licenses" +# - name: Accept Android SDK licenses +# win_shell: sh -c "yes | /c/android-sdk/cmdline-tools/cmdline-tools/bin/sdkmanager.bat --licenses" - name: Include Android SDK packages include_vars: androidsdk_packages.yml -- name: Install Android SDK - win_shell: | - {{ sdk_path }}\\cmdline-tools\\cmdline-tools\\bin\\sdkmanager --install "{{ item }}" - loop: "{{ AndroidSDK_packages }}" +#- name: Install Android SDK +# win_shell: | +# {{ sdk_path }}\\cmdline-tools\\cmdline-tools\\bin\\sdkmanager --install "{{ item }}" +# loop: "{{ AndroidSDK_packages }}" # {{ sdk_path }}\\cmdline-tools\\cmdline-tools\\bin\\sdkmanager --install "{{ AndroidSDK_packages | join(' ') }}" diff --git a/roles/chrome/tasks/main_lin.yml b/roles/chrome/tasks/main_lin.yml index 390d25c..5433e42 100644 --- a/roles/chrome/tasks/main_lin.yml +++ b/roles/chrome/tasks/main_lin.yml @@ -1,9 +1,13 @@ - name: Add Chromium not-a-snap repository - apt_repository: - repo: ppa:xtradeb/apps + apt: + deb: https://launchpad.net/~xtradeb/+archive/ubuntu/apps/+files/xtradeb-apt-source_0.4_all.deb state: present - update_cache: True - validate_certs: False + + #apt_repository: + # repo: ppa:xtradeb/apps + # state: present + # update_cache: True + # validate_certs: False - name: Install Chromium instead of Chrome apt: diff --git a/roles/firefox/tasks/main_lin.yml b/roles/firefox/tasks/main_lin.yml index eb729c0..8cd61d2 100644 --- a/roles/firefox/tasks/main_lin.yml +++ b/roles/firefox/tasks/main_lin.yml @@ -1,5 +1,21 @@ - name: Add Firefox not-a-snap repository block: + - name: add Mozilla apt key + ansible.builtin.get_url: + url: https://packages.mozilla.org/apt/repo-signing-key.gpg + dest: /etc/apt/keyrings/packages.mozilla.org.asc + + - name: add Mozilla apt source + ansible.builtin.apt_repository: + repo: "deb [signed-by=/etc/apt/keyrings/packages.mozilla.org.asc] https://packages.mozilla.org/apt mozilla main" + state: present + + #- name: Add Firefox PPA + # apt_repository: + # repo: ppa:mozillateam/ppa + # state: present + # update_cache: True + # validate_certs: False - name: Pin Firefox PPA package priority template: src: mozilla-firefox-apt-preferences @@ -8,12 +24,6 @@ template: src: mozilla-firefox-unattended-upgrades dest: /etc/apt/apt.conf.d/51unattended-upgrades-firefox - - name: Add Firefox PPA - apt_repository: - repo: ppa:mozillateam/ppa - state: present - update_cache: True - validate_certs: False - name: Install Firefox apt: diff --git a/roles/gns3/tasks/main_lin.yml b/roles/gns3/tasks/main_lin.yml index df2807d..7b8fb8a 100644 --- a/roles/gns3/tasks/main_lin.yml +++ b/roles/gns3/tasks/main_lin.yml @@ -1,9 +1,23 @@ - name: Add GNS3 repository - apt_repository: - repo: ppa:gns3/ppa - state: present - update_cache: True - validate_certs: False + block: + - name: add GNS3 apt key + ansible.builtin.get_url: + url: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xb83aaabffbd82d21b543c8ea86c22c2ec6a24d7f + dest: /etc/apt/keyrings/gns3-ppa.asc + - name: add GNS3 apt deb source + ansible.builtin.apt_repository: + repo: "deb [signed-by=/etc/apt/keyrings/gns3-ppa.asc] https://ppa.launchpadcontent.net/gns3/ppa/ubuntu {{ ansible_distribution_release }} main " + state: present + - name: add GNS3 apt deb-src source + ansible.builtin.apt_repository: + repo: "deb-src [signed-by=/etc/apt/keyrings/gns3-ppa.asc] https://ppa.launchpadcontent.net/gns3/ppa/ubuntu {{ ansible_distribution_release }} main " + state: present +# apt_repository: +# repo: ppa:gns3/ppa +# state: present +# update_cache: True +# validate_certs: False + - name: Install gns3 server ansible.builtin.apt: name: gns3-server diff --git a/roles/inkscape/tasks/main_lin.yml b/roles/inkscape/tasks/main_lin.yml index 4c8441a..69a9e9c 100644 --- a/roles/inkscape/tasks/main_lin.yml +++ b/roles/inkscape/tasks/main_lin.yml @@ -1,10 +1,20 @@ - name: Add Inkscape repository - apt_repository: - repo: ppa:inkscape.dev/stable - state: present - update_cache: True - validate_certs: False + block: + - name: add Inkscape trunk apt key + ansible.builtin.get_url: + url: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x1F46021FF9A0C56504CE42CD06E315A37AAEF27A + dest: /etc/apt/keyrings/inkscape-trunk-ppa.asc + - name: add Inkscape trunk apt deb source + ansible.builtin.apt_repository: + repo: "deb [signed-by=/etc/apt/keyrings/inkscape-trunk-ppa.asc] https://ppa.launchpadcontent.net/reviczky/inkscape-1.4/ubuntu {{ ansible_distribution_release }} main " + state: present + +# apt_repository: +# repo: ppa:inkscape.dev/stable +# state: present +# update_cache: True +# validate_certs: False - name: Install Inkscape apt: - name: inkscape + name: inkscape-trunk state: latest diff --git a/roles/jdk/tasks/main_lin.yml b/roles/jdk/tasks/main_lin.yml index eaaa1b3..04dd67e 100644 --- a/roles/jdk/tasks/main_lin.yml +++ b/roles/jdk/tasks/main_lin.yml @@ -31,11 +31,7 @@ - libc6-x32 state: latest -- name: Install Oracle JDK 22 +- name: Install Oracle JDK 24 apt: - 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/22/latest/jdk-22_linux-x64_bin.deb" + deb: "https://download.oracle.com/java/24/latest/jdk-24_linux-x64_bin.deb" diff --git a/roles/jdk/tasks/main_win.yml b/roles/jdk/tasks/main_win.yml index ceb1996..4aad6a4 100644 --- a/roles/jdk/tasks/main_win.yml +++ b/roles/jdk/tasks/main_win.yml @@ -1,6 +1,6 @@ - name: Install Oracle JDK win_package: - path: https://download.oracle.com/java/22/latest/jdk-22_windows-x64_bin.msi + path: https://download.oracle.com/java/24/latest/jdk-24_windows-x64_bin.msi arguments: INSTALLLEVEL=3 - name: Find Java version diff --git a/roles/matlab/tasks/main_lin.yml b/roles/matlab/tasks/main_lin.yml index 200fd19..2942237 100644 --- a/roles/matlab/tasks/main_lin.yml +++ b/roles/matlab/tasks/main_lin.yml @@ -1,6 +1,6 @@ - name: Set Matlab version and destination set_fact: - target_version: "R2024a_Update_5" + target_version: "R2025a_Update_1" install_dir: "/mnt/ucilnice_d/install/matlab/" license_path: "/mnt/ucilnice_d/install/matlab/network.lic" dest_dir: /opt/matlab @@ -23,7 +23,7 @@ - name: Install Matlab command: cmd: /tmp/matlab_iso/install -inputFile "/tmp/matlab_installer_input.txt" - # creates: "{{ dest_dir }}/VersionInfo.xml" + creates: "{{ dest_dir }}/licenses/license_info.xml" #- name: Unmount Matlab ISO # win_disk_image: # image_path: "{{ installers }}\\matlab\\matlab-{{ target_version }}_windows.iso" diff --git a/roles/matlab/tasks/main_win.yml b/roles/matlab/tasks/main_win.yml index ee89c98..e0cddc2 100644 --- a/roles/matlab/tasks/main_win.yml +++ b/roles/matlab/tasks/main_win.yml @@ -2,7 +2,7 @@ set_fact: target_version: "R2025a_Update_1" license_path: \\ucilnicesmb.fri1.uni-lj.si\ucilnice_d\install\matlab\network.lic - dest_dir: D:\matlab + dest_dir: C:\matlab - name: Set ISO path set_fact: @@ -17,21 +17,27 @@ - name: Prepare installer_input.txt template: src: installer_input.txt - dest: d:\matlab_installer_input.txt + dest: c:\matlab_installer_input.txt - name: Install Matlab win_package: path: "{{ disk_image.mount_paths[0] }}\\setup.exe" - arguments: -inputFile "d:\\matlab_installer_input.txt" + arguments: -inputFile "c:\\matlab_installer_input.txt" - name: Unmount Matlab ISO win_disk_image: image_path: "{{ iso_path }}" state: absent + ignore_errors: true -# TODO MATLAB throws license error -83 when run -- name: Install Matlab license - win_copy: - dest: "{{ dest_dir }}\\licenses\\network.lic" - src: "{{ installers }}\\matlab\\network.lic" - remote_src: yes +- name: Create licenses directory + win_file: + dest: "{{ dest_dir }}\\licenses" + state: directory + +# MATLAB will no longer be used with concurrent licenses - let them license their own! +#- name: Install Matlab license +# win_copy: +# dest: "{{ dest_dir }}\\licenses\\network.lic" +# src: "{{ installers }}\\matlab\\network.lic" +# remote_src: yes diff --git a/roles/matlab/templates/installer_input.txt b/roles/matlab/templates/installer_input.txt index 4207b6d..7ce76e9 100644 --- a/roles/matlab/templates/installer_input.txt +++ b/roles/matlab/templates/installer_input.txt @@ -13,7 +13,8 @@ agreeToLicense=yes ## Users must log in to their MathWorks Account when MATLAB starts. ## ## NOTE: This flag is valid in silent installations only. -enableLNU=no +# enableLNU=no +enableLNU=yes improveMATLAB=no diff --git a/roles/mysql_workbench/tasks/main_lin.yml b/roles/mysql_workbench/tasks/main_lin.yml index 27c4fa3..f5dea85 100644 --- a/roles/mysql_workbench/tasks/main_lin.yml +++ b/roles/mysql_workbench/tasks/main_lin.yml @@ -1,8 +1,104 @@ -- name: Download mysql workbench +- name: Create mysql workbench build directory + file: + path: /tmp/mysql-workbench + state: directory + +- name: Download mysql workbench source get_url: - 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 + url: https://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-8.0.43-src.tar.gz + dest: /tmp/mysql-workbench/mysql-workbench.tgz http_agent: "Wget/1.21.3" -- name: Install mysql workbench + register: mysql_download + +- name: Install mysql workbench build dependencies apt: - deb: /tmp/mysql-workbench-community_8.0.38-1ubuntu24.04_amd64.deb + package: + - build-essential + - cmake + - cmake-data + - autoconf + - automake + - pkg-config + - libtool + - libzip-dev + - libxml2-dev + - libsigc++-2.0-dev + - libglade2-dev + - libglu1-mesa-dev + - libgl1-mesa-dev + - mesa-common-dev + - libmysqlclient-dev + - libmysqlcppconn-dev + - uuid-dev + - libpixman-1-dev + - libpcre3-dev + - libpango1.0-dev + - libcairo2-dev + - python3-dev + - libboost-dev + - default-mysql-client + - libsqlite3-dev + - swig4.1 + - libvsqlitepp-dev + - libgdal-dev + - libgtk-3-dev + - libgtkmm-3.0-dev + - libssl-dev + - libsecret-1-dev + - libproj-dev + - libssh-dev + - rapidjson-dev + - unixodbc-dev + - unixodbc + +- name: Create /usr/local/share/java + file: + path: /usr/local/share/java + state: directory + +- name: Download antlr jar + get_url: + url: https://www.antlr.org/download/antlr-4.13.2-complete.jar + dest: /usr/local/share/java/antlr-4.13.2-complete.jar + + +- name: Create antlr4 build dir + file: + path: /tmp/antlr4/build + state: directory + +- name: Checkout antlr4 (cpp runtime) + git: + repo: https://github.com/antlr/antlr4/ + dest: /tmp/antlr4/antlr4 + +- name: Build antlr4 cpp runtime + shell: + cmd: "cd /tmp/antlr4/build; cmake ../antlr4/runtime/Cpp; make; make install" + +- name: Extract MySQL Workbench source + unarchive: + src: "{{ mysql_download.dest }}" + remote_src: true + dest: /tmp/mysql-workbench + +- name: Create build dir + file: + path: /tmp/mysql-workbench/build + state: directory + +- name: Build Mysql Workbench + shell: + cmd: "cd /tmp/mysql-workbench/build; cmake -DUSE_UNIXODBC=True -DODBC_LIBRARIES=-lodbc -DANTLR_JAR_PATH=/usr/local/share/java -DSWIG_EXECUTABLE=/usr/bin/swig4.1 -DSWIG_DIR=/usr/share/swig4.1 ../mysql-workbench-*-src; make; make install" + +#- name: Download mysql workbench +# get_url: +# 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.38-1ubuntu24.04_amd64.deb diff --git a/roles/netbeans/tasks/main_win.yml b/roles/netbeans/tasks/main_win.yml index 72b2659..afb9134 100644 --- a/roles/netbeans/tasks/main_win.yml +++ b/roles/netbeans/tasks/main_win.yml @@ -2,8 +2,22 @@ set_fact: target_version: "26" +#- name: Install Netbeans from Chocolatey +# win_chocolatey: +# name: NetBeans +# state: upgrade + + +# https://downloads.apache.org/netbeans/netbeans/26/netbeans-26-bin.zip +- name: Download Netbeans + win_get_url: + url: "https://github.com/Friends-of-Apache-NetBeans/netbeans-installers/releases/download/v{{ target_version }}-build1/Apache-NetBeans-{{ target_version }}.exe" + dest: "c:\\Apache-NetBeans-{{ target_version }}.exe" + - name: Install Netbeans - win_package: - path: "https://dlcdn.apache.org/netbeans/netbeans-installers/{{ target_version }}/Apache-NetBeans-{{ target_version }}-bin-windows-x64.exe" - arguments: --silent - creates_path: "%ProgramFiles%\\NetBeans-{{ target_version }}\\netbeans\\bin\\netbeans.exe" + win_package: + path: "c:\\Apache-NetBeans-{{ target_version }}.exe" + # path: "https://github.com/Friends-of-Apache-NetBeans/netbeans-installers/releases/download/v{{ target_version }}-build1/Apache-NetBeans-{{ target_version }}.exe" + # path: "https://dlcdn.apache.org/netbeans/netbeans-installers/{{ target_version }}/Apache-NetBeans-{{ target_version }}-bin-windows-x64.exe" + arguments: "\"/DIR={{ ansible_env['ProgramFiles'] }}\\NetBeans-{{ target_version }}\" /SUPPRESSMSGBOXES /VERYSILENT /SP-" + creates_path: "%ProgramFiles%\\NetBeans-{{ target_version }}\\bin\\netbeans.exe" diff --git a/roles/nodejs/tasks/main_lin.yml b/roles/nodejs/tasks/main_lin.yml index 601d761..76f3fb2 100644 --- a/roles/nodejs/tasks/main_lin.yml +++ b/roles/nodejs/tasks/main_lin.yml @@ -1,7 +1,7 @@ - name: Add NodeJS repo key - apt_key: + get_url: url: https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key - keyring: /etc/apt/keyrings/nodesource.gpg + dest: /etc/apt/keyrings/nodesource.asc #- name: Add NodeJS repo url # apt_repository: @@ -9,10 +9,5 @@ - name: Add NodeJS LTS repo url apt_repository: - repo: "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" - -- name: Install NodeJS - apt: - name: nodejs - state: latest + repo: "deb [signed-by=/etc/apt/keyrings/nodesource.asc] https://deb.nodesource.com/node_22.x nodistro main" diff --git a/roles/nodejs/tasks/main_win.yml b/roles/nodejs/tasks/main_win.yml index 80cb160..177e2ec 100644 --- a/roles/nodejs/tasks/main_win.yml +++ b/roles/nodejs/tasks/main_win.yml @@ -2,6 +2,7 @@ win_chocolatey: name: nodejs -- name: Install NodeJS-LTS - win_chocolatey: - name: nodejs-lts +# Install fails if multiple versions are installed +# - name: Install NodeJS-LTS +# win_chocolatey: +# name: nodejs-lts diff --git a/roles/omnetpp/tasks/main_win.yml b/roles/omnetpp/tasks/main_win.yml index 17ebf56..833b000 100644 --- a/roles/omnetpp/tasks/main_win.yml +++ b/roles/omnetpp/tasks/main_win.yml @@ -1,3 +1,5 @@ +# TODO: omnetpp na Windows sedaj zahteva WSL. Premisli, kaj storiti glede tega + - name: Set OMNet++ version set_fact: target_version: "6.2.0" @@ -12,7 +14,7 @@ block: - name: Download OMNet++ win_get_url: - url: "https://github.com/omnetpp/omnetpp/releases/download/omnetpp-{{ target_version }}/omnetpp-{{ target_version }}-windows-x86_64.zip" + url: "https://github.com/omnetpp/omnetpp/releases/download/omnetpp-{{ target_version }}/omnetpp-{{ target_version }}-windows-x86_64.7z" dest: C:\ register: download diff --git a/roles/processing/tasks/main_win.yml b/roles/processing/tasks/main_win.yml index 2caf84a..e8fda8a 100644 --- a/roles/processing/tasks/main_win.yml +++ b/roles/processing/tasks/main_win.yml @@ -1,7 +1,7 @@ - name: Set Processing version set_fact: - target_version: 4.4.4 - target_build: 1304 + target_version: 4.4.6 + target_build: 1306 - name: Check Processing install status win_stat: @@ -22,20 +22,21 @@ state: directory - name: Download Processing win_get_url: - dest: 'C:\Program Files\Processing\processing.zip' - url: https://github.com/processing/processing4/releases/download/processing-{{ target_build }}-{{ target_version }}/processing-{{ target_version }}-windows-x64.zip + dest: 'C:\Program Files\processing.zip' + url: https://github.com/processing/processing4/releases/download/processing-{{ target_build }}-{{ target_version }}/processing-{{ target_version }}-windows-x64-portable.zip - name: Unzip Processing win_unzip: - dest: 'C:\Program Files\Processing' - src: 'C:\Program Files\Processing\processing.zip' - - name: Install Processing - win_copy: - dest: C:\Program Files\Processing\ - src: 'C:\Program Files\Processing\processing-{{ target_version }}\' - remote_src: yes + src: 'C:\Program Files\processing.zip' + dest: 'C:\Program Files\' + creates: 'C:\Program Files\Processing\Processing.exe' + #- name: Install Processing + # win_copy: + # dest: C:\Program Files\Processing\ + # src: 'C:\Program Files\Processing\processing-{{ target_version }}\' + # remote_src: yes - name: Disable telemetry win_lineinfile: - path: C:\Program Files\Processing\lib\defaults.txt + path: C:\Program Files\Processing\app\resources\lib\defaults.txt regexp: 'update.check' line: 'update.check = false' - name: Create Processing shortcut @@ -44,8 +45,8 @@ dest: "C:\\Users\\Public\\Desktop\\Processing.lnk" - name: Remove temporary files win_file: - path: C:\Program Files\Processing\{{ item }} + # path: C:\Program Files\Processing\{{ item }} + path: C:\Program Files\processing.zip state: absent loop: - processing.zip - - processing-{{ target_version }} diff --git a/roles/python3/tasks/main_lin.yml b/roles/python3/tasks/main_lin.yml index 56ce94f..8c183df 100644 --- a/roles/python3/tasks/main_lin.yml +++ b/roles/python3/tasks/main_lin.yml @@ -5,6 +5,8 @@ - name: Install ipython apt: - name: python3-ipython + name: + - python3-ipython + - ipython3 state: latest diff --git a/roles/qcadesigner-e/tasks/main_lin.yml b/roles/qcadesigner-e/tasks/main_lin.yml index dd955bc..78f8f49 100644 --- a/roles/qcadesigner-e/tasks/main_lin.yml +++ b/roles/qcadesigner-e/tasks/main_lin.yml @@ -15,7 +15,7 @@ - name: Clone QCADesigner-E repo # ansible.builtin.git: - repo: https://github.com/FSillT/QCADesigner-E + repo: https://github.com/polz113/QCADesigner-E force: yes dest: /opt/QCADesigner-E - name: Build QCADesigner-E diff --git a/roles/rstudio/tasks/main_lin.yml b/roles/rstudio/tasks/main_lin.yml index a21785b..423cd11 100644 --- a/roles/rstudio/tasks/main_lin.yml +++ b/roles/rstudio/tasks/main_lin.yml @@ -1,13 +1,14 @@ -- name: Add R repository - block: - - name: R repo - apt key - ansible.builtin.get_url: - url: https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc - dest: /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc - - name: R repo - url - ansible.builtin.apt_repository: - repo: "deb https://cloud.r-project.org/bin/linux/ubuntu {{ansible_distribution_release}}-cran40/" - state: present +#- name: Add R repository +# block: +# - name: R repo - apt key +# ansible.builtin.get_url: +# url: https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc +# dest: /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc +# - name: R repo - url +# ansible.builtin.apt_repository: +# repo: "deb https://cloud.r-project.org/bin/linux/ubuntu {{ansible_distribution_release}}-cran40/" +# state: present +# ignore_errors: true - name: Install R ansible.builtin.apt: name: r-base diff --git a/roles/thonny/tasks/main_win.yml b/roles/thonny/tasks/main_win.yml index 6a14128..bb7cb8c 100644 --- a/roles/thonny/tasks/main_win.yml +++ b/roles/thonny/tasks/main_win.yml @@ -1,6 +1,6 @@ - name: Set Thonny version set_fact: - target_version: 4.0.1 + target_version: 4.1.7 - name: Check Thonny install status win_stat: diff --git a/roles/vscode/tasks/main_lin.yml b/roles/vscode/tasks/main_lin.yml index 08ae21d..1989fff 100644 --- a/roles/vscode/tasks/main_lin.yml +++ b/roles/vscode/tasks/main_lin.yml @@ -1,11 +1,11 @@ - name: Add VS repo key - apt_key: + get_url: url: https://packages.microsoft.com/keys/microsoft.asc - keyring: /etc/apt/trusted.gpg.d/microsoft.gpg + dest: /etc/apt/keyrings/microsoft.asc - name: Add VS repo url apt_repository: - repo: "deb https://packages.microsoft.com/repos/vscode stable main" + repo: "deb [arch=amd64 signed-by=/etc/apt/keyrings/microsoft.asc] https://packages.microsoft.com/repos/vscode stable main" - name: Install VSCode apt: @@ -16,6 +16,6 @@ include_vars: vscode_extensions.yml - name: Install VS Code extensions - command: code --no-sandbox --user-data-dir "/usr/share/code/resources/app" --extensions-dir "/usr/share/code/resources/app/extensions" --install-extension "{{ item }}" + command: code --no-sandbox --user-data-dir "/usr/share/code/resources/app" --extensions-dir "/usr/share/code/resources/app/extensions" --install-extension --force "{{ item }}" loop: "{{VSCode_Extensions}}" notify: fix VS code extensions diff --git a/roles/wireshark/tasks/main_win.yml b/roles/wireshark/tasks/main_win.yml index 5c38680..407a8d8 100644 --- a/roles/wireshark/tasks/main_win.yml +++ b/roles/wireshark/tasks/main_win.yml @@ -1,9 +1,9 @@ # npcap=0.96 is the last version to support silent installation -- name: Install npcap - win_package: - path: https://npcap.com/dist/npcap-0.96.exe - arguments: /S - creates_path: "%ProgramFiles%\\Npcap\\npcap.cat" +#- name: Install npcap +# win_package: +# path: https://npcap.com/dist/npcap-0.96.exe +# arguments: /S +# creates_path: "%ProgramFiles%\\Npcap\\npcap.cat" - name: Install Wireshark win_chocolatey: diff --git a/roles/xgboost/tasks/main_lin.yml b/roles/xgboost/tasks/main_lin.yml index 7046677..c8b94d7 100644 --- a/roles/xgboost/tasks/main_lin.yml +++ b/roles/xgboost/tasks/main_lin.yml @@ -1,7 +1,6 @@ - name: Install xgboost apt: name: - - xgboost - python3-xgboost state: latest