From 61ae19f1a87e197f8c5945424c3e5ba07a17daa2 Mon Sep 17 00:00:00 2001 From: lecorguille Date: Fri, 20 May 2022 10:46:18 +0200 Subject: [PATCH 1/3] go 1.16.15 --- meta/main.yml | 2 +- tasks/main.yml | 2 ++ vars/main.yml | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 vars/main.yml diff --git a/meta/main.yml b/meta/main.yml index ec3925b..77d8c83 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,7 +1,7 @@ --- dependencies: - role: gantsign.golang - version: 2.4.0 + version: 2.10.2 galaxy_info: role_name: singularity diff --git a/tasks/main.yml b/tasks/main.yml index 3dfca68..ecf6ea6 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -71,6 +71,7 @@ PATH: '{{ golang_install_dir }}/bin:{{ ansible_env.PATH }}' GOROOT: '{{ golang_install_dir }}' GOPATH: '{{ golang_gopath }}' + GO111MODULE: off when: - not ansible_check_mode - go_installed.rc == 1 @@ -118,6 +119,7 @@ PATH: '{{ golang_install_dir }}/bin:{{ ansible_env.PATH }}' GOROOT: '{{ golang_install_dir }}' GOPATH: '{{ golang_gopath }}' + GO111MODULE: off register: singularity_make when: - not ansible_check_mode diff --git a/vars/main.yml b/vars/main.yml new file mode 100644 index 0000000..4f0db28 --- /dev/null +++ b/vars/main.yml @@ -0,0 +1,6 @@ +--- + +# Go language SDK version number +# Last version to support go get +golang_version: '1.16.15' + From a44a6723cf65901a9596c7491a9e73147e703bbf Mon Sep 17 00:00:00 2001 From: lecorguille Date: Fri, 20 May 2022 11:13:20 +0200 Subject: [PATCH 2/3] Fix lint --- requirements.yml | 2 +- tasks/main.yml | 4 ++-- vars/main.yml | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/requirements.yml b/requirements.yml index 2a22de9..73ecbfb 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,4 +1,4 @@ --- - src: gantsign.golang - version: 2.6.5 + version: 2.10.2 diff --git a/tasks/main.yml b/tasks/main.yml index ecf6ea6..83d75b8 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -71,7 +71,7 @@ PATH: '{{ golang_install_dir }}/bin:{{ ansible_env.PATH }}' GOROOT: '{{ golang_install_dir }}' GOPATH: '{{ golang_gopath }}' - GO111MODULE: off + GO111MODULE: 'off' when: - not ansible_check_mode - go_installed.rc == 1 @@ -119,7 +119,7 @@ PATH: '{{ golang_install_dir }}/bin:{{ ansible_env.PATH }}' GOROOT: '{{ golang_install_dir }}' GOPATH: '{{ golang_gopath }}' - GO111MODULE: off + GO111MODULE: 'off' register: singularity_make when: - not ansible_check_mode diff --git a/vars/main.yml b/vars/main.yml index 4f0db28..570a248 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -3,4 +3,3 @@ # Go language SDK version number # Last version to support go get golang_version: '1.16.15' - From 0d5d6b957da61ec6fdf70f837fed6a315525bfce Mon Sep 17 00:00:00 2001 From: lecorguille Date: Fri, 20 May 2022 12:30:47 +0200 Subject: [PATCH 3/3] Fix itempotent --- tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/main.yml b/tasks/main.yml index 83d75b8..e829d47 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -74,7 +74,7 @@ GO111MODULE: 'off' when: - not ansible_check_mode - - go_installed.rc == 1 + - go_versions.rc == 1 - name: singularity | create directory for singularity file: