From fdeae9aa09627ea9ea6f83bc312776275b1b296a Mon Sep 17 00:00:00 2001 From: Conrad Hodge Date: Sun, 7 Jan 2024 14:02:57 +0000 Subject: [PATCH] Switch from installations via snap Ubuntu snaps do not work in WSL 2. https://github.com/microsoft/WSL/issues/9026 https://github.com/microsoft/WSL/issues/8709 --- README.md | 2 +- ansible/roles/wsl/tasks/go.yml | 19 +++++++++++++++---- ansible/roles/wsl/tasks/main.yml | 7 ++++--- ansible/roles/wsl/tasks/ngrok.yml | 9 +++++++++ ansible/roles/wsl/tasks/snap.yml | 4 ---- ansible/roles/wsl/tasks/yq.yml | 8 ++++++++ ansible/roles/wsl/vars/main.yml | 6 ------ 7 files changed, 37 insertions(+), 18 deletions(-) create mode 100644 ansible/roles/wsl/tasks/ngrok.yml delete mode 100644 ansible/roles/wsl/tasks/snap.yml create mode 100644 ansible/roles/wsl/tasks/yq.yml diff --git a/README.md b/README.md index 6c5355c..901aa05 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ This will: - zip - [jq](https://stedolan.github.io/jq/) - [yq](https://mikefarah.gitbook.io/yq/) - - [Node.js](https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions) + - [Node.js LTS](https://nodejs.org/en) - [Go](https://golang.org/) - [Rush](https://rushjs.io/pages/intro/welcome/) - [pip and venv](https://docs.microsoft.com/en-us/windows/python/web-frameworks#install-python-pip-and-venv) diff --git a/ansible/roles/wsl/tasks/go.yml b/ansible/roles/wsl/tasks/go.yml index c0a3877..7158e01 100644 --- a/ansible/roles/wsl/tasks/go.yml +++ b/ansible/roles/wsl/tasks/go.yml @@ -1,6 +1,17 @@ --- -- name: Install Go +# https://go.dev/wiki/Ubuntu +- name: Add PPA repository for golang become: yes - community.general.snap: - name: go - classic: true + apt_repository: + repo: ppa:longsleep/golang-backports + +- name: Update apt packages + become: yes + ansible.builtin.apt: + update_cache: yes + +- name: Install golang + become: yes + ansible.builtin.apt: + name: golang-go + state: latest diff --git a/ansible/roles/wsl/tasks/main.yml b/ansible/roles/wsl/tasks/main.yml index 9203cd5..51c99a3 100644 --- a/ansible/roles/wsl/tasks/main.yml +++ b/ansible/roles/wsl/tasks/main.yml @@ -1,12 +1,13 @@ - import_tasks: apt.yml -- import_tasks: snap.yml - import_tasks: bash.yml - import_tasks: zsh.yml - import_tasks: git.yml - import_tasks: node.yml -#- import_tasks: gh.yml -- import_tasks: go.yml - import_tasks: npm.yml +- import_tasks: go.yml +#- import_tasks: gh.yml +- import_tasks: yq.yml +- import_tasks: ngrok.yml - import_tasks: aws.yml - import_tasks: azure.yml - import_tasks: liquibase.yml diff --git a/ansible/roles/wsl/tasks/ngrok.yml b/ansible/roles/wsl/tasks/ngrok.yml new file mode 100644 index 0000000..fe08636 --- /dev/null +++ b/ansible/roles/wsl/tasks/ngrok.yml @@ -0,0 +1,9 @@ +--- +# https://ngrok.com/download +- name: Download ngrok + become: yes + ansible.builtin.unarchive: + src: https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-amd64.tgz + dest: /usr/local/bin + remote_src: yes + creates: /usr/local/bin/ngrok diff --git a/ansible/roles/wsl/tasks/snap.yml b/ansible/roles/wsl/tasks/snap.yml deleted file mode 100644 index d28cee1..0000000 --- a/ansible/roles/wsl/tasks/snap.yml +++ /dev/null @@ -1,4 +0,0 @@ -- name: Install snap packages - become: yes - community.general.snap: - name: "{{ snap_packages }}" \ No newline at end of file diff --git a/ansible/roles/wsl/tasks/yq.yml b/ansible/roles/wsl/tasks/yq.yml new file mode 100644 index 0000000..55b5a22 --- /dev/null +++ b/ansible/roles/wsl/tasks/yq.yml @@ -0,0 +1,8 @@ +--- +# https://github.com/mikefarah/yq/#install +- name: Download yq + become: yes + ansible.builtin.get_url: + url: https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 + dest: /usr/bin/yq + mode: '0755' \ No newline at end of file diff --git a/ansible/roles/wsl/vars/main.yml b/ansible/roles/wsl/vars/main.yml index 282d944..071f53c 100644 --- a/ansible/roles/wsl/vars/main.yml +++ b/ansible/roles/wsl/vars/main.yml @@ -11,14 +11,8 @@ apt_packages: - tmpreaper - qdirstat -snap_packages: - - ngrok - - yq - node_packages: - "@microsoft/rush" - aws-cdk -node_version: 20 - liquibase_version: 4.25.0 \ No newline at end of file