Skip to content

Commit

Permalink
feat(software): Update Go version, fix GVM source in terminal
Browse files Browse the repository at this point in the history
  • Loading branch information
Ziwi01 committed Jan 25, 2024
1 parent c9417a9 commit 1832ac8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 14 deletions.
15 changes: 4 additions & 11 deletions ansible/roles/config/templates/zshrc.j2
Original file line number Diff line number Diff line change
Expand Up @@ -122,16 +122,6 @@ lazyload nvm -- "source '${NVM_DIR}/nvm.sh'"
# You may need to manually set your language environment
# export LANG=en_US.UTF-8

# Preferred editor for local and remote sessions
# if [[ -n $SSH_CONNECTION ]]; then
# export EDITOR='vim'
# else
# export EDITOR='mvim'
# fi

# Compilation flags
# export ARCHFLAGS="-arch x86_64"

# Set personal aliases, overriding those provided by oh-my-zsh libs,
# plugins, and themes. Aliases can be placed here, though oh-my-zsh
# users are encouraged to define aliases within the ZSH_CUSTOM folder.
Expand Down Expand Up @@ -277,9 +267,12 @@ export ANSIBLE_TRANSFORM_INVALID_GROUP_CHARS=ignore
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh

# CArgo
# Cargo
. "$HOME/.cargo/env"

# Go version manager
. "${HOME}/.gvm/scripts/gvm"

# RVM
# Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
export PATH="$PATH:$HOME/.rvm/bin"
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/software/tasks/gvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
- name: "[Go] Install Go versions"
ansible.builtin.shell: ". {{ ansible_env.HOME }}/.gvm/scripts/gvm && gvm install {{ goversion }} -B"
args:
creates: "{{ ansible_env.HOME}}/.gvm/environments/{{ goversion }}"
creates: "{{ ansible_env.HOME }}/.gvm/environments/{{ goversion }}"
executable: /bin/bash
loop: "{{ go_versions }}"
loop_control:
Expand Down
4 changes: 2 additions & 2 deletions ansible/roles/software/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -183,5 +183,5 @@ sdkman_flush_caches_after: []
sdkman_update_alternatives: []
# Go versions installed with GVM
go_versions:
- go1.20.4
go_default: go1.20.4
- go1.21.6
go_default: go1.21.6

0 comments on commit 1832ac8

Please sign in to comment.