From 9862189d58756677fce6e248121ba323ac9f79c7 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 9 Oct 2022 15:18:12 +0200
Subject: upgrade ele-dolmetsch raspis

---
 roles/streaming/dolmetsch-raspi/tasks/main.yml | 32 ++------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

(limited to 'roles/streaming/dolmetsch-raspi/tasks')

diff --git a/roles/streaming/dolmetsch-raspi/tasks/main.yml b/roles/streaming/dolmetsch-raspi/tasks/main.yml
index c525c3cd..21d841fe 100644
--- a/roles/streaming/dolmetsch-raspi/tasks/main.yml
+++ b/roles/streaming/dolmetsch-raspi/tasks/main.yml
@@ -10,35 +10,7 @@
     - git
     - libasound2-dev
     - telnet
-
-- name: download golang tarball
-  get_url:
-    url: "https://dl.google.com/go/go{{ dolmetsch_raspi_golang_version }}.linux-armv6l.tar.gz"
-    dest: "/usr/local/src/go{{ dolmetsch_raspi_golang_version }}.linux-armv6l.tar.gz"
-    checksum: "{{ dolmetsch_raspi_golang_checksum }}"
-
-- name: check current goloang version (if any)
-  command: /usr/local/go/bin/go version
-  ignore_errors: yes
-  check_mode: no
-  changed_when: false
-  register: golang_version
-
-- name: update golang installation
-  when: golang_version is failed or golang_version.stdout != ("go version go" + dolmetsch_raspi_golang_version + " linux/arm")
-  block:
-  - name: remove old golang installation
-    file:
-      path: /usr/local/go
-      state: absent
-
-  - name: extract the golang tarball
-    environment: ### TODO: remove once this lands in ansible: https://github.com/ansible/ansible/pull/76542
-      LANGUAGE: en_US.utf8
-    unarchive:
-      src: "/usr/local/src/go{{ dolmetsch_raspi_golang_version }}.linux-armv6l.tar.gz"
-      dest: /usr/local
-      copy: no
+    - golang-go
 
 - name: clone dolmetschctl repo
   git:
@@ -49,7 +21,7 @@
   loop:
   - dolmetschctl
   - dolmetschctld
-  command: "/usr/local/go/bin/go build -o {{ item }} ./cmd/{{ item }}"
+  command: "go build -o {{ item }} ./cmd/{{ item }}"
   args:
     chdir: /opt/dolmetschctl
     creates: "/opt/dolmetschctl/{{ item }}"
-- 
cgit v1.2.3