Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
PatentLobster committed Sep 23, 2023
1 parent 37b50d1 commit cbf8475
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
1 change: 0 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ jobs:
- uses: actions/checkout@v4
- run: |
scripts/test.sh --variant "${{ matrix.variant }}" --os "${{ matrix.os }}"
scripts/vhs/tmux-vhs.sh
- uses: actions/upload-artifact@v3
with:
name: recording.yaml
Expand Down
15 changes: 11 additions & 4 deletions scripts/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ cmd() {
run_test() {
local -r os="$1"
local -r setup_script="$2"

local -r post_script="$3"
cmd time docker run --rm --init --interactive --user vscode \
--env TERM --env COLORTERM --env REMOTE_CONTAINERS=true \
--volume "${dotfiles_root}:/original-dotfiles:ro" \
Expand Down Expand Up @@ -146,6 +146,9 @@ source ~/.profile
set -xeu
chezmoi data
${post_script}
EOF
}

Expand Down Expand Up @@ -176,7 +179,11 @@ for variant in "${variants[@]}"; do
;;

devcontainer)
run_test "${os}" ""
run_test "${os}" "" "~/.repo/scripts/vhs.sh"
;;

zsh)
run_test "${os}" "" ""
;;

wsl)
Expand All @@ -202,7 +209,7 @@ EOM
sudo chmod +x /usr/local/bin/wslvar
EOF
)"
)" ""
;;

gnome)
Expand All @@ -212,7 +219,7 @@ EOF
sudo apt update --yes
sudo apt install -y --no-install-recommends gnome-shell zsh
EOF
)"
)" ""
;;

*)
Expand Down

0 comments on commit cbf8475

Please sign in to comment.