diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index 4de6011..5639209 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -12,23 +12,36 @@ jobs: - ubuntu:25.10 container: image: ${{ matrix.os }} + options: --ulimit nofile=1024:1024 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v5 - name: Install dependencies dnf - run: dnf install -y git jq curl >/dev/null 2>&1 || echo "no dnf" + run: dnf install -y git curl >/dev/null 2>&1 || echo "no dnf" + - name: Update apt cache + run: apt update >/dev/null 2>&1 || echo "no apt" - name: Install dependencies apt - run: > - apt update && apt install -y git jq curl >/dev/null 2>&1; - exit 0; - - name: is curl installed - run: command -v curl >/dev/null 2>&1 || echo "no curl" - - name: PATH - run: echo "$PATH" + run: apt install -y git curl >/dev/null 2>&1 || echo "no apt" - name: Install chezmoi run: sh -c "$(curl -fsLS get.chezmoi.io)" -- -b /usr/bin - name: Init the repo based off the current branch - run: chezmoi init $(pwd) + run: chezmoi init -S . - name: Show the chezmoi data - run: chezmoi data + run: chezmoi data -S . - name: Run the chezmoi apply - run: chezmoi apply \ No newline at end of file + run: chezmoi apply -S . + install-and-test-macos: + runs-on: macos-latest + steps: + - uses: actions/checkout@v5 + - name: Install chezmoi + run: sh -c "$(curl -fsLS get.chezmoi.io)" -- -b /Users/runner/.local/bin + - name: echo $PATH + run: echo $PATH + - name: which chezmoi + run: which chezmoi + - name: Init the repo based off the current branch + run: chezmoi init -S . + - name: Show the chezmoi data + run: chezmoi data -S . + - name: Run the chezmoi apply + run: chezmoi apply -S . \ No newline at end of file diff --git a/home/.chezmoiscripts/after/run_after_010_install-brew-packages.sh.tmpl b/home/.chezmoiscripts/after/run_after_010_install-brew-packages.sh.tmpl index 60325b8..5ca86d2 100644 --- a/home/.chezmoiscripts/after/run_after_010_install-brew-packages.sh.tmpl +++ b/home/.chezmoiscripts/after/run_after_010_install-brew-packages.sh.tmpl @@ -1,5 +1,9 @@ #!/usr/bin/env bash echo "⭐️ Running after 010 install-brew-packages" +# Install GCC First +$BREWBIN install gcc --skip-post-install + +# Install deps from generated brew file $BREWBIN bundle --file=~/.config/brew/Brewfile diff --git a/home/.chezmoitemplates/brew/cask.brew.tmpl b/home/.chezmoitemplates/brew/cask.brew.tmpl index b6fda4c..f6ef317 100644 --- a/home/.chezmoitemplates/brew/cask.brew.tmpl +++ b/home/.chezmoitemplates/brew/cask.brew.tmpl @@ -1,6 +1,6 @@ {{ if eq .chezmoi.config.env.OS "darwin" }} ## Common casks -{{- $commonConfig := .data.common }} +{{- $commonConfig := .common }} {{- if hasKey $commonConfig.packages "brewCaskTaps" }} {{- range $commonConfig.packages.brewCaskTaps }} tap "{{ . }}" @@ -12,7 +12,7 @@ cask "{{ . }}" {{- end }} {{- end }} -## Machine Specific casks: {{- .data.hostname }} +## Machine Specific casks: {{- .hostname }} {{- $hostConfig := get .hosts .hostname }} {{- if (and (hasKey $hostConfig "packages") (hasKey $hostConfig.packages "brewCaskTaps")) }} {{- range $hostConfig.packages.brewCaskTaps }}