diff --git a/ansible/bootstrap/aegis.bu b/ansible/bootstrap/aegis.bu index b11c126..f03beac 100644 --- a/ansible/bootstrap/aegis.bu +++ b/ansible/bootstrap/aegis.bu @@ -39,6 +39,22 @@ systemd: [Install] WantedBy=multi-user.target storage: + disks: + - device: /dev/mmcblk0 + wipe_table: false + partitions: + - label: aegis-data + number: 5 + size_mib: 0 + filesystems: + - device: /dev/disk/by-partlabel/aegis-data + format: btrfs + label: aegis-data + wipe_filesystem: false + mount: + path: / + options: + - compress=zstd files: - path: /etc/hostname mode: 0644 diff --git a/ansible/inventory/group_vars/workstation_dev_wsl.yml b/ansible/inventory/group_vars/workstation_dev_wsl.yml index 3cc5843..d8dbbcd 100644 --- a/ansible/inventory/group_vars/workstation_dev_wsl.yml +++ b/ansible/inventory/group_vars/workstation_dev_wsl.yml @@ -8,9 +8,10 @@ workstation_dev_wsl_packages: - python3-pip - tmux -# Java 11 is no longer supplied by the Fedora repositories used by this WSL -# profile. Keep the JDK patch pinned; update this value deliberately. +# Java 11 and Maven are managed by Mise on this Fedora WSL profile. Keep their +# versions pinned; update them deliberately. workstation_mise_java_version: temurin-11.0.31+11 +workstation_mise_maven_version: 3.9.16 workstation_is_wsl: true workstation_wsl_systemd_enabled: true diff --git a/ansible/roles/profile_workstation_dev_wsl/tasks/main.yml b/ansible/roles/profile_workstation_dev_wsl/tasks/main.yml index e08d324..b835425 100644 --- a/ansible/roles/profile_workstation_dev_wsl/tasks/main.yml +++ b/ansible/roles/profile_workstation_dev_wsl/tasks/main.yml @@ -66,14 +66,27 @@ changed_when: false failed_when: false -- name: Install the pinned Java version with Mise - tags: [packages, mise, java, wsl] +- name: Check whether the pinned Maven version is installed with Mise + tags: [packages, mise, maven, wsl] + ansible.builtin.command: + cmd: "mise where maven@{{ workstation_mise_maven_version }}" + become_user: "{{ username }}" + environment: + HOME: "{{ user_home }}" + register: workstation_mise_maven_where + changed_when: false + failed_when: false + +- name: Install the pinned Mise tools + tags: [packages, mise, java, maven, wsl] ansible.builtin.command: cmd: mise install become_user: "{{ username }}" environment: HOME: "{{ user_home }}" - when: workstation_mise_java_where.rc != 0 + when: >- + workstation_mise_java_where.rc != 0 or + workstation_mise_maven_where.rc != 0 - name: Ensure WSL boot configuration file exists tags: [packages, services] diff --git a/dotfiles/workstation_dev_wsl/.config/mise/config.toml b/dotfiles/workstation_dev_wsl/.config/mise/config.toml index e452a0f..93944df 100644 --- a/dotfiles/workstation_dev_wsl/.config/mise/config.toml +++ b/dotfiles/workstation_dev_wsl/.config/mise/config.toml @@ -1,2 +1,3 @@ [tools] java = "temurin-11.0.31+11" +maven = "3.9.16"