Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,12 @@ USER vscode
RUN git clone https://github.com/magicmonty/bash-git-prompt.git /home/vscode/.bash-git-prompt --depth 1 \
&& cat >> /home/vscode/.bashrc <<EOF

if [ -f ~/.bash-git-prompt/gitprompt.sh ]; then
GIT_PROMPT_ONLY_IN_REPO=1
. ~/.bash-git-prompt/gitprompt.sh
fi
bash_git_prompt() {
if [ -f ~/.bash-git-prompt/gitprompt.sh ]; then
GIT_PROMPT_ONLY_IN_REPO=1
. ~/.bash-git-prompt/gitprompt.sh
fi
}
EOF

# Set the working directory
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/pr_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ jobs:
strategy:
matrix:
ruby:
- '2.7' # Puppet 7
- '3.2' # Puppet 8
- '3.3'
- '3.4'
Expand All @@ -41,4 +40,9 @@ jobs:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
- name: Spec tests
run: bundle exec rake spec
run: |
if [ "${{ matrix.ruby }}" = "4.0" ]; then
bundle exec rspec spec/classes
else
bundle exec rake parallel_spec
fi
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,10 @@
# rspec failure tracking
.rspec_status

# Test-generated hiera data files (process-specific, cleaned up automatically)
/spec/data/profile-merging-*.yaml
/spec/data/10_enforce_spec-*.yaml

/Gemfile.lock
/vendor/
/spec/fixtures/modules/
Loading