fix: address failing configure-from-scratch steps
Some checks failed
/ sast (push) Failing after 40s

This commit is contained in:
Marc 2024-10-13 19:36:06 -04:00
parent e8a98665b6
commit f0e509fbe2
Signed by: marc
GPG key ID: 048E042F22B5DC79
5 changed files with 60 additions and 21 deletions

View file

@ -2,8 +2,13 @@ FROM debian:bookworm
COPY . . COPY . .
RUN apt update && apt install pipx -y RUN apt update && apt upgrade -y --autoremove
RUN apt install -y\
pipx \
make \
sudo
ENV PATH="$PATH:/root/.local/bin" ENV PATH="$PATH:/root/.local/bin"
CMD ./run.sh ./home.yml CMD make configure-env PLAY=./home.yml

View file

@ -2,12 +2,14 @@
- name: Check if rustup is installed - name: Check if rustup is installed
shell: which rustup shell: which rustup
register: which_rustup register: which_rustup
ignore_errors: true
- name: Install rustup - name: Install rustup
shell: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y shell: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
when: which_rustup.rc == 1 when: which_rustup.rc == 1
- name: Check if go is installed - name: Check if go is installed
shell: go version shell: go version
register: check_go_version register: check_go_version
ignore_errors: true
- name: Install go - name: Install go
become: true become: true
shell: | shell: |

View file

@ -1,4 +1,12 @@
--- ---
- name: Ensure general config dir exists
file:
path: "{{ lookup('ansible.builtin.env', 'HOME') }}/.config/nvim"
state: directory
- name: Ensure .zshrc exists
file:
path: "{{ lookup('ansible.builtin.env', 'HOME') }}/.config/nvim/init.vim"
state: touch
- name: Add nvim managed block - name: Add nvim managed block
blockinfile: blockinfile:
path: "{{ lookup('ansible.builtin.env', 'HOME') }}/.config/nvim/init.vim" path: "{{ lookup('ansible.builtin.env', 'HOME') }}/.config/nvim/init.vim"

View file

@ -1,35 +1,50 @@
--- ---
- name: Ensure general config dir exists
file:
path: "{{ lookup('ansible.builtin.env', 'HOME') }}/.config"
state: directory
- name: Install OMZsh - name: Install OMZsh
shell: | shell: |
sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
args: args:
creates: "{{ lookup('ansible.builtin.env', 'HOME') }}/.oh-my-zsh" creates: "{{ lookup('ansible.builtin.env', 'HOME') }}/.oh-my-zsh"
- name: Ensure .zshrc exists
file:
path: "{{ lookup('ansible.builtin.env', 'HOME') }}/.zshrc"
state: touch
- name: Add zsh managed block - name: Add zsh managed block
blockinfile: blockinfile:
path: "{{ lookup('ansible.builtin.env', 'HOME') }}/.zshrc" path: "{{ lookup('ansible.builtin.env', 'HOME') }}/.zshrc"
marker: "# Marc's env managed block - {mark}" marker: "# Marc's env managed block - {mark}"
block: "{{ lookup('ansible.builtin.file', 'files/shell_extras') }}" block: "{{ lookup('ansible.builtin.file', 'files/shell_extras') }}"
- name: Install Starship
shell: $HOME/.cargo/bin/cargo install starship
- name: Ensure Starship config exists
file:
path: "{{ lookup('ansible.builtin.env', 'HOME') }}/.config/starship.toml"
state: touch
- name: Add starship managed block - name: Add starship managed block
blockinfile: blockinfile:
path: "{{ lookup('ansible.builtin.env', 'HOME') }}/.config/starship.toml" path: "{{ lookup('ansible.builtin.env', 'HOME') }}/.config/starship.toml"
marker: "# Marc's env managed block - {mark}" marker: "# Marc's env managed block - {mark}"
block: "{{ lookup('ansible.builtin.file', 'files/starship.toml') }}" block: "{{ lookup('ansible.builtin.file', 'files/starship.toml') }}"
- name: Check if gh-dash is installed # TODO: Add gh cli login.
shell: gh extension list #- name: Check if gh-dash is installed
register: gh_ext_list # shell: gh extension list
- name: Install gh CLI extensions (gh-dash) # register: gh_ext_list
command: gh extension install dlvhdr/gh-dash #- name: Install gh CLI extensions (gh-dash)
when: gh_ext_list.stdout.find('gh dash') == -1 # command: gh extension install dlvhdr/gh-dash
- name: Ensure gh-dash config directory exists # when: gh_ext_list.stdout.find('gh dash') == -1
file: #- name: Ensure gh-dash config directory exists
path: "{{ lookup('ansible.builtin.env', 'HOME') }}/.config/gh-dash" # file:
state: directory # path: "{{ lookup('ansible.builtin.env', 'HOME') }}/.config/gh-dash"
- name: Ensure gh-dash config exists # state: directory
file: #- name: Ensure gh-dash config exists
path: "{{ lookup('ansible.builtin.env', 'HOME') }}/.config/gh-dash/config.yml" # file:
state: touch # path: "{{ lookup('ansible.builtin.env', 'HOME') }}/.config/gh-dash/config.yml"
- name: Add gh-dash configuration managed block # state: touch
blockinfile: #- name: Add gh-dash configuration managed block
path: "{{ lookup('ansible.builtin.env', 'HOME') }}/.config/gh-dash/config.yml" # blockinfile:
marker: "# Marc's env managed block - {mark}" # path: "{{ lookup('ansible.builtin.env', 'HOME') }}/.config/gh-dash/config.yml"
block: "{{ lookup('ansible.builtin.file', 'files/gh-dash.yml') }}" # marker: "# Marc's env managed block - {mark}"
# block: "{{ lookup('ansible.builtin.file', 'files/gh-dash.yml') }}"

View file

@ -4,6 +4,13 @@
apt: apt:
update_cache: true update_cache: true
upgrade: "yes" upgrade: "yes"
- name: Install Build Essentials
become: true
apt:
pkg:
- make
- build-essential
- cmake
- name: Install terminal & shell - name: Install terminal & shell
become: true become: true
apt: apt:
@ -16,6 +23,8 @@
pkg: pkg:
- shellcheck - shellcheck
- gh - gh
- curl
- git
- name: Install DB-related tooling - name: Install DB-related tooling
become: true become: true
apt: apt: