fix: latest versions file got overwritten

.latest-versions.yml

@@ -1,162 +1,35 @@
 ---
-# Specific versions for software (github)
-# Fixed versions should be set without `v` prefix (e.g: 1.4.3)
 github_packages:
-  neovim: 0.8.3
-  lunarvim: d559dfc1 # Gets latest tag. You can set it to `master` to be more latest :)
-  diff_so_fancy: 1.4.3
-  bat: 0.22.1
-  zoxide: 0.9.0
-  helm: 3.11.2
-  lazygit: 0.37.0
-  fzf: 0.38.0
-  tmux: 3.3a
-  ripgrep: 13.0.0
-  fd: 8.7.0
-  kind: 0.17.0
-  k9s: 0.27.3
-  yq: 4.31.2
-  win32yank: 0.0.4
-  git_fuzzy: latest # Does not have releases, latest (for latest commit) or specific commit
-  nvm: 0.39.3 # Node Version Manater
-  tpm: 99469c4a9b1ccf77fade25842dc7bafbc8ce9946 # Tmux plugin manager. Does not have releases, gets latest tag instead
-  pes: 54609ab9dc072d0913e90835d3ad50cbefaebef0 # Puppet Editor Services. They don't release anymore, so latest means latest commit
-  p10k: 1.17.0
-  rvm1_ansible: 2.2.0 # Version of https://github.com/rvm/rvm1-ansible
-# Git from custom PPA repo
-git_apt_version: 1:2.40.0-0ppa1~ubuntu20.04.1
-# Packages and their versions to install with PIP
+  neovim: latest
+  lunarvim: master
+  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
+  git_fuzzy: latest
+  nvm: latest
+  tpm: latest
+  pes: latest
+  p10k: latest
+git_apt_version: latest
 pip_packages:
-  gita: 0.16.2.4
-  thefuck: "3.32"
-# Docker main packages from APT repo
+  gita: latest
+  thefuck: latest
 docker_apt_packages:
-  docker-ce: 5:23.0.1-1~ubuntu.20.04~focal
-  docker-ce-cli: 5:23.0.1-1~ubuntu.20.04~focal
-  containerd.io: 1.6.18-1
-  docker-compose-plugin: 2.16.0-1~ubuntu.20.04~focal
-# Kubectl version
-kubectl_version: 1.26.2
-# Ansible
-ansible_pip_version: 7.3.0
-ansible_lint_pip_version: 6.14.2
-# 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: 2.7.0.0-1focal
-# Add this variable to your ansible/vars/overrides.yml if needed
-# This is array of tasks to exclude from software role.
-# For list of tasks see: software/tasks/main.yml or see README.md
-software_tasks_exclude: []
-# System manager to use. Ansible has issues detecting SysV vs. SystemD on WSL distributions
-# If you are using SysVInit WSL (not recommended, see `README.md`), overwrite this in `ansible/vars/overrides.yml` to `sysvinit`
-service_manager: systemd
-# Default packages to be installed first, using APT
-# There is no version here as those are Ubuntu distro defaults always
-default_apt_packages:
-  - curl
-  - unzip
-  - mlocate
-  - tree
-  - htop
-  - jq
-  - gcc
-  - zip
-  - dos2unix
-  - php
-  - composer
-  - keychain
-  - groff # Required for AWS CLI
-  - libevent-dev # v Required for latest Tmux install
-  - universal-ctags # v Required for latest Tmux install
-  - ncurses-dev # v Required for latest Tmux install
-# FZF
-fzf_git_url: "https://github.com/junegunn/fzf.git"
-fzf_home: "{{ ansible_env.HOME }}/.fzf"
-# GIT Fuzzy
-git_fuzzy_url: "https://github.com/bigH/git-fuzzy.git"
-git_fuzzy_home: "{{ ansible_env.HOME }}/.local/opt/git-fuzzy"
-# Oh-My-Zsh
-omz_home: "{{ ansible_env.HOME }}/.oh-my-zsh"
-omz_plugins:
-  fzf-tab: https://github.com/Aloxaf/fzf-tab
-  k: https://github.com/supercrabtree/k
-  you-should-use: https://github.com/MichaelAquilina/zsh-you-should-use.git
-  zsh-autosuggestions: https://github.com/zsh-users/zsh-autosuggestions
-  zsh-syntax-highlighting: https://github.com/zsh-users/zsh-syntax-highlighting.git
-  zsh-sdkman: https://github.com/matthieusb/zsh-sdkman.git
-  zsh-lazyload: https://github.com/qoomon/zsh-lazyload
-  pyenv-lazy: https://github.com/davidparsson/zsh-pyenv-lazy.git
-  zsh-snv: https://github.com/rpeshkov/zsh-snv
-# TMUX Plugin Manager
-tmux_plugins_dir: "{{ ansible_env.HOME }}/.tmux/plugins"
-tpm_git_url: https://github.com/tmux-plugins/tpm.git
-# Docker system dependency packages
-docker_apt_dependencies:
-  - ca-certificates
-  - gnupg
-  - lsb-release
-# RVM / Ruby
-rvm1_rubies:
-  - ruby-3.1.3
-rvm1_user: "{{ ansible_user_id }}"
-# Ruby
-# Install any gem for any ruby. `all` installs for all of them
-# Note that if Puppet is installed, it will install puppet/puppet-lint gems, so no need to add here.
-# Specific ruby must match one from `rvm_rubies` list (see OS-specific vars file)
-# You need to set specific gem version, `latest` is not supported here
-ruby_gems:
-  - ruby: all
-    gems:
-      - neovim: 0.9.0
-# Puppet
-puppet_version: 7.21.0
-puppet_lint_version: 3.0.1
-puppet_rubies:
-  - all # to install only for specific rubies, list their names (must match `rvm1_rubies`)
-# Example:
-# puppet_rubies:
-#   - ruby-2.7.6
-#   - ruby-3.1.2
-
-# Node
-node_version: 'lts/gallium'
-# LunarVIM
-lunarvim_url: https://github.com/lunarvim/lunarvim.git
-lunarvim_home: "{{ ansible_env.HOME }}/.local/opt/lunarvim"
-# Puppet
-puppet_pes_url: https://github.com/puppetlabs/puppet-editor-services.git
-# SDK Man
-sdkman_update: true
-sdkman_user: "{{ ansible_user_id }}"
-sdkman_group: "{{ ansible_user_gid }}"
-sdkman_user_home_dir: "{{ ansible_env.HOME }}"
-sdkman_dir: "{{ sdkman_user_home_dir + '/.sdkman' }}"
-sdkman_tmp_dir: /tmp
-sdkman_validate_ssl: true
-sdkman_install_packages:
-  - candidate: java
-    version: 18.0.2-open
-  - candidate: java
-    version: 11.0.12-open
-  - candidate: gradle
-    version: 7.5.1
-  - candidate: groovy
-    version: 4.0.4
-  - candidate: maven
-    version: 3.9.0
-sdkman_uninstall_packages: []
-# sdkman_uninstall_packages:
-#   - { candidate: java, version: 6u45 }
-# Configure default candidate versions
-sdkman_defaults:
-  java: '11.0.12-open'
-  gradle: '7.5.1'
-  groovy: '4.0.4'
-  maven: '3.9.0'
-# Flush caches before/after installing SDK packages
-# Reference: http://sdkman.io/usage (Flush section)
-sdkman_flush_caches_before: []
-sdkman_flush_caches_after: []
-# Link SDKMAN installed packages
-# Reference: https://linux.die.net/man/8/update-alternatives
-sdkman_update_alternatives: []
+  docker-ce: latest
+  docker-ce-cli: latest
+  containerd.io: latest
+  docker-compose-plugin: latest
+kubectl_version: latest
+ansible_pip_version: latest
+ansible_lint_pip_version: latest
+puppet_pdk_version: latest

publish.sh

@@ -10,19 +10,32 @@
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
+echo "Replace software/vars/main.yml versions with .current-versions.yml"
 yq -i eval-all '. as $item ireduce ({}; . * $item)' ${SCRIPT_DIR}/ansible/roles/software/vars/main.yml ${SCRIPT_DIR}/current-versions.yml
 
+echo 'git add'
 git add .
-git commit -a -m 'release: Publish changes to master'
+echo 'git commit'
+git commit -a -m 'release: Update versions'
+echo 'git push'
 git push
+echo 'git checkout master'
 git checkout master
+echo 'git pull'
 git pull
+echo 'git merge develop'
 git merge develop
+echo 'git push'
 git push
+echo 'git checkout develop'
 git checkout develop
 
-yq -i eval-all '. as $item ireduce ({}; . * $item)' ${SCRIPT_DIR}/.latest-versions.yml ${SCRIPT_DIR}/ansible/roles/software/vars/main.yml
+echo 'Replace software/vars/main.yml with .latest-versions.yml'
+yq -i eval-all '. as $item ireduce ({}; . * $item)' ${SCRIPT_DIR}/ansible/roles/software/vars/main.yml ${SCRIPT_DIR}/.latest-versions.yml
 
+echo 'git add'
 git add .
-git commit -a -m 'release: Set latest version for development'
+echo 'git commit'
+git commit -a -m 'release: Set latest versions for development'
+echo 'git push'
 git push