From 48e73d1b094f6d1bc9350796e1471fee9f70c7c4 Mon Sep 17 00:00:00 2001 From: Eryk Kozakiewicz Date: Mon, 12 Feb 2024 12:15:15 +0100 Subject: [PATCH 1/5] fix(neovim): Update version query for better tag discovery --- ansible/roles/software/tasks/neovim.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/software/tasks/neovim.yml b/ansible/roles/software/tasks/neovim.yml index 4d284d4..a4a5cf0 100644 --- a/ansible/roles/software/tasks/neovim.yml +++ b/ansible/roles/software/tasks/neovim.yml @@ -14,7 +14,7 @@ vars: app: neovim repo: neovim/neovim - version_query: curl -s https://api.github.com/repos/neovim/neovim/releases/latest | grep -oP 'NVIM v([0-9]*\.[0-9]*\.[0-9])\\n' | grep -Eo '[0-9]*\.[0-9]*\.[0-9]' + version_query: curl -s https://api.github.com/repos/neovim/neovim/releases/latest | jq .tag_name | tr -d '"' | tr -d 'v' github_uri: "v{{ neovim_version }}/nvim.appimage" ansible.builtin.include_role: name: common From e0a33631e9ed78b39f9f05a415343edd529806dd Mon Sep 17 00:00:00 2001 From: Eryk Kozakiewicz Date: Mon, 12 Feb 2024 12:16:22 +0100 Subject: [PATCH 2/5] fix(git): Wrong .gitconfig target filename --- ansible/roles/config/tasks/git.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/config/tasks/git.yml b/ansible/roles/config/tasks/git.yml index 6819262..a61d07c 100644 --- a/ansible/roles/config/tasks/git.yml +++ b/ansible/roles/config/tasks/git.yml @@ -5,7 +5,7 @@ vars: app: git source_template: gitconfig.j2 - target_file: "{{ ansible_env.HOME }}/.gitconfig.j2" + target_file: "{{ ansible_env.HOME }}/.gitconfig" ansible.builtin.include_role: name: common tasks_from: config_file.yml From c1d9508dcc11260fc5427491b3a6518045ecf7b6 Mon Sep 17 00:00:00 2001 From: "Eryk K." Date: Sat, 24 Feb 2024 02:25:27 +0100 Subject: [PATCH 3/5] build: Release updated versions --- ansible/roles/software/vars/main.yml | 64 ++++++++++++++-------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/ansible/roles/software/vars/main.yml b/ansible/roles/software/vars/main.yml index ac0bb4a..af930c3 100644 --- a/ansible/roles/software/vars/main.yml +++ b/ansible/roles/software/vars/main.yml @@ -40,41 +40,41 @@ default_apt_packages: # Specific versions for software (github) # Fixed versions should be set without `v` prefix (e.g: 1.4.3) github_packages: - neovim: latest # Gets latest tag. Set to `nightly` for latest nightly - lunarvim: "latest" # Gets latest tag. Set to `master` to be more latest :) - diff_so_fancy: latest - bat: latest - zoxide: latest - helm: latest - lazygit: latest - fzf: latest - tmux: latest - ripgrep: latest - fd: latest - kind: latest - k9s: latest - yq: latest - win32yank: latest - terraform: latest - terragrunt: latest + neovim: nightly # Gets latest tag. Set to `nightly` for latest nightly + lunarvim: "9ee3b7b8" # Gets latest tag. Set to `master` to be more latest :) + diff_so_fancy: 1.4.4 + bat: 0.24.0 + zoxide: 0.9.4 + helm: 3.14.2 + lazygit: 0.40.2 + fzf: 0.46.1 + tmux: "3.4" + ripgrep: 14.1.0 + fd: 9.0.0 + kind: 0.22.0 + k9s: 0.31.9 + yq: 4.41.1 + win32yank: 0.1.1 + terraform: 1.7.4 + terragrunt: 0.55.8 git_fuzzy: latest # Does not have releases, latest (for latest commit) or specific commit - nvm: latest # Node Version Manater - tpm: latest # Tmux plugin manager. Does not have releases, gets latest tag instead - pes: latest # Puppet Editor Services. They don't release anymore, so latest means latest commit - p10k: latest + nvm: 0.39.7 # Node Version Manater + tpm: 99469c4a9b1ccf77fade25842dc7bafbc8ce9946 # Tmux plugin manager. Does not have releases, gets latest tag instead + pes: ad6f043b35db9dfc9eff6f46d5029ec13cb8ee76 # Puppet Editor Services. They don't release anymore, so latest means latest commit + p10k: 1.20.0 rvm1_ansible: 2.2.0 # Version of https://github.com/rvm/rvm1-ansible # Kubectl version -kubectl_version: latest +kubectl_version: 1.29.2 # Packages and their versions to install with PIP pip_packages: - thefuck: "latest" - gita: latest + thefuck: "3.32" + gita: 0.16.6.6 tmuxp: 1.34.0 # FZF fzf_git_url: "https://github.com/junegunn/fzf.git" fzf_home: "{{ ansible_env.HOME }}/.fzf" # Git from custom PPA repo -git_apt_version: latest +git_apt_version: 1:2.43.2-0ppa1~ubuntu22.04.1 # GIT Fuzzy git_fuzzy_url: "https://github.com/bigH/git-fuzzy.git" git_fuzzy_home: "{{ ansible_env.HOME }}/.local/opt/git-fuzzy" @@ -101,9 +101,9 @@ docker_apt_dependencies: - lsb-release # Docker main packages from APT repo docker_apt_packages: - docker-ce: latest - docker-compose-plugin: latest - containerd.io: latest + docker-ce: 5:25.0.3-1~ubuntu.22.04~jammy + docker-compose-plugin: 2.24.5-1~ubuntu.22.04~jammy + containerd.io: 1.6.28-1 # RVM / Ruby rvm1_rubies: - ruby-3.3.0 @@ -129,17 +129,17 @@ puppet_rubies: # PDK (Puppet Development KIT) # Please note the module does not support package downgrades - if PDK is already installed in higher version, remove it first. -puppet_pdk_version: latest +puppet_pdk_version: 3.0.1.3-1focal # Node node_version: 'lts/iron' # Ansible -ansible_pip_version: latest -ansible_lint_pip_version: latest +ansible_pip_version: 9.2.0 +ansible_lint_pip_version: 24.2.0 # LunarVIM lunarvim_url: https://github.com/lunarvim/lunarvim.git lunarvim_home: "{{ ansible_env.HOME }}/.local/opt/lunarvim" # Azure CLI -azurecli_apt_version: latest +azurecli_apt_version: 2.57.0-1~jammy # AWS CLI awscli_url: https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip # Puppet From 18640bd4df35822ee03cb098fd9003d78b99d8fd Mon Sep 17 00:00:00 2001 From: "Eryk K." Date: Sat, 24 Feb 2024 02:25:49 +0100 Subject: [PATCH 4/5] build: Set latest versions for development --- ansible/roles/software/vars/main.yml | 64 ++++++++++++++-------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/ansible/roles/software/vars/main.yml b/ansible/roles/software/vars/main.yml index af930c3..7c8f9ae 100644 --- a/ansible/roles/software/vars/main.yml +++ b/ansible/roles/software/vars/main.yml @@ -40,41 +40,41 @@ default_apt_packages: # Specific versions for software (github) # Fixed versions should be set without `v` prefix (e.g: 1.4.3) github_packages: - neovim: nightly # Gets latest tag. Set to `nightly` for latest nightly - lunarvim: "9ee3b7b8" # Gets latest tag. Set to `master` to be more latest :) - diff_so_fancy: 1.4.4 - bat: 0.24.0 - zoxide: 0.9.4 - helm: 3.14.2 - lazygit: 0.40.2 - fzf: 0.46.1 - tmux: "3.4" - ripgrep: 14.1.0 - fd: 9.0.0 - kind: 0.22.0 - k9s: 0.31.9 - yq: 4.41.1 - win32yank: 0.1.1 - terraform: 1.7.4 - terragrunt: 0.55.8 + neovim: latest # Gets latest tag. Set to `nightly` for latest nightly + lunarvim: "latest" # Gets latest tag. Set to `master` to be more latest :) + diff_so_fancy: latest + bat: latest + zoxide: latest + helm: latest + lazygit: latest + fzf: latest + tmux: "latest" + ripgrep: latest + fd: latest + kind: latest + k9s: latest + yq: latest + win32yank: latest + terraform: latest + terragrunt: latest git_fuzzy: latest # Does not have releases, latest (for latest commit) or specific commit - nvm: 0.39.7 # Node Version Manater - tpm: 99469c4a9b1ccf77fade25842dc7bafbc8ce9946 # Tmux plugin manager. Does not have releases, gets latest tag instead - pes: ad6f043b35db9dfc9eff6f46d5029ec13cb8ee76 # Puppet Editor Services. They don't release anymore, so latest means latest commit - p10k: 1.20.0 + nvm: latest # Node Version Manater + tpm: latest # Tmux plugin manager. Does not have releases, gets latest tag instead + pes: latest # Puppet Editor Services. They don't release anymore, so latest means latest commit + p10k: latest rvm1_ansible: 2.2.0 # Version of https://github.com/rvm/rvm1-ansible # Kubectl version -kubectl_version: 1.29.2 +kubectl_version: latest # Packages and their versions to install with PIP pip_packages: - thefuck: "3.32" - gita: 0.16.6.6 + thefuck: "latest" + gita: latest tmuxp: 1.34.0 # FZF fzf_git_url: "https://github.com/junegunn/fzf.git" fzf_home: "{{ ansible_env.HOME }}/.fzf" # Git from custom PPA repo -git_apt_version: 1:2.43.2-0ppa1~ubuntu22.04.1 +git_apt_version: latest # GIT Fuzzy git_fuzzy_url: "https://github.com/bigH/git-fuzzy.git" git_fuzzy_home: "{{ ansible_env.HOME }}/.local/opt/git-fuzzy" @@ -101,9 +101,9 @@ docker_apt_dependencies: - lsb-release # Docker main packages from APT repo docker_apt_packages: - docker-ce: 5:25.0.3-1~ubuntu.22.04~jammy - docker-compose-plugin: 2.24.5-1~ubuntu.22.04~jammy - containerd.io: 1.6.28-1 + docker-ce: latest + docker-compose-plugin: latest + containerd.io: latest # RVM / Ruby rvm1_rubies: - ruby-3.3.0 @@ -129,17 +129,17 @@ puppet_rubies: # PDK (Puppet Development KIT) # Please note the module does not support package downgrades - if PDK is already installed in higher version, remove it first. -puppet_pdk_version: 3.0.1.3-1focal +puppet_pdk_version: latest # Node node_version: 'lts/iron' # Ansible -ansible_pip_version: 9.2.0 -ansible_lint_pip_version: 24.2.0 +ansible_pip_version: latest +ansible_lint_pip_version: latest # LunarVIM lunarvim_url: https://github.com/lunarvim/lunarvim.git lunarvim_home: "{{ ansible_env.HOME }}/.local/opt/lunarvim" # Azure CLI -azurecli_apt_version: 2.57.0-1~jammy +azurecli_apt_version: latest # AWS CLI awscli_url: https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip # Puppet From ff1096fb6c101d9e0655952aa7c31fb27ee27cb9 Mon Sep 17 00:00:00 2001 From: "Eryk K." Date: Sat, 24 Feb 2024 02:26:26 +0100 Subject: [PATCH 5/5] build: Release updated versions --- ansible/roles/software/vars/main.yml | 64 ++++++++++++++-------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/ansible/roles/software/vars/main.yml b/ansible/roles/software/vars/main.yml index 7c8f9ae..af930c3 100644 --- a/ansible/roles/software/vars/main.yml +++ b/ansible/roles/software/vars/main.yml @@ -40,41 +40,41 @@ default_apt_packages: # Specific versions for software (github) # Fixed versions should be set without `v` prefix (e.g: 1.4.3) github_packages: - neovim: latest # Gets latest tag. Set to `nightly` for latest nightly - lunarvim: "latest" # Gets latest tag. Set to `master` to be more latest :) - diff_so_fancy: latest - bat: latest - zoxide: latest - helm: latest - lazygit: latest - fzf: latest - tmux: "latest" - ripgrep: latest - fd: latest - kind: latest - k9s: latest - yq: latest - win32yank: latest - terraform: latest - terragrunt: latest + neovim: nightly # Gets latest tag. Set to `nightly` for latest nightly + lunarvim: "9ee3b7b8" # Gets latest tag. Set to `master` to be more latest :) + diff_so_fancy: 1.4.4 + bat: 0.24.0 + zoxide: 0.9.4 + helm: 3.14.2 + lazygit: 0.40.2 + fzf: 0.46.1 + tmux: "3.4" + ripgrep: 14.1.0 + fd: 9.0.0 + kind: 0.22.0 + k9s: 0.31.9 + yq: 4.41.1 + win32yank: 0.1.1 + terraform: 1.7.4 + terragrunt: 0.55.8 git_fuzzy: latest # Does not have releases, latest (for latest commit) or specific commit - nvm: latest # Node Version Manater - tpm: latest # Tmux plugin manager. Does not have releases, gets latest tag instead - pes: latest # Puppet Editor Services. They don't release anymore, so latest means latest commit - p10k: latest + nvm: 0.39.7 # Node Version Manater + tpm: 99469c4a9b1ccf77fade25842dc7bafbc8ce9946 # Tmux plugin manager. Does not have releases, gets latest tag instead + pes: ad6f043b35db9dfc9eff6f46d5029ec13cb8ee76 # Puppet Editor Services. They don't release anymore, so latest means latest commit + p10k: 1.20.0 rvm1_ansible: 2.2.0 # Version of https://github.com/rvm/rvm1-ansible # Kubectl version -kubectl_version: latest +kubectl_version: 1.29.2 # Packages and their versions to install with PIP pip_packages: - thefuck: "latest" - gita: latest + thefuck: "3.32" + gita: 0.16.6.6 tmuxp: 1.34.0 # FZF fzf_git_url: "https://github.com/junegunn/fzf.git" fzf_home: "{{ ansible_env.HOME }}/.fzf" # Git from custom PPA repo -git_apt_version: latest +git_apt_version: 1:2.43.2-0ppa1~ubuntu22.04.1 # GIT Fuzzy git_fuzzy_url: "https://github.com/bigH/git-fuzzy.git" git_fuzzy_home: "{{ ansible_env.HOME }}/.local/opt/git-fuzzy" @@ -101,9 +101,9 @@ docker_apt_dependencies: - lsb-release # Docker main packages from APT repo docker_apt_packages: - docker-ce: latest - docker-compose-plugin: latest - containerd.io: latest + docker-ce: 5:25.0.3-1~ubuntu.22.04~jammy + docker-compose-plugin: 2.24.5-1~ubuntu.22.04~jammy + containerd.io: 1.6.28-1 # RVM / Ruby rvm1_rubies: - ruby-3.3.0 @@ -129,17 +129,17 @@ puppet_rubies: # PDK (Puppet Development KIT) # Please note the module does not support package downgrades - if PDK is already installed in higher version, remove it first. -puppet_pdk_version: latest +puppet_pdk_version: 3.0.1.3-1focal # Node node_version: 'lts/iron' # Ansible -ansible_pip_version: latest -ansible_lint_pip_version: latest +ansible_pip_version: 9.2.0 +ansible_lint_pip_version: 24.2.0 # LunarVIM lunarvim_url: https://github.com/lunarvim/lunarvim.git lunarvim_home: "{{ ansible_env.HOME }}/.local/opt/lunarvim" # Azure CLI -azurecli_apt_version: latest +azurecli_apt_version: 2.57.0-1~jammy # AWS CLI awscli_url: https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip # Puppet