Skip to content
Snippets Groups Projects
Commit 3d9ca099 authored by Alexander Olofsson's avatar Alexander Olofsson
Browse files

Merge branch 'pdk-workaround-improvements' into 'master'

Handle Ruby 2.7 for PDK workarounds

See merge request puppet-infra/shared-ci-piplines!60
parents 2b617831 dd2b3dd1
No related branches found
No related tags found
No related merge requests found
......@@ -26,14 +26,23 @@ pdk-validate:
# For PDK 3.0.0
if [ "$(pdk --version)" == "3.0.0" ]; then
pdk env 2>/dev/null > /tmp/pdk-env
source /tmp/pdk-env
touch Gemfile Gemfile.local
echo "Locking ffi to 1.15.5"
sed -e '/"ffi"/d' -e "/'ffi'/d" -i Gemfile Gemfile.local
echo 'gem "ffi", "= 1.15.5"' >> Gemfile.local
echo "Locking racc to 1.6.2"
sed -e '/"racc"/d' -e "/'racc'/d" -i Gemfile Gemfile.local
echo 'gem "racc", "= 1.6.2"' >> Gemfile.local
if [ "$PDK_RESOLVED_RUBY_VERSION" == "2.7.8" ]; then
echo "Locking racc to 1.4.16"
sed -e '/"racc"/d' -e "/'racc'/d" -i Gemfile Gemfile.local
echo 'gem "racc", "= 1.4.16"' >> Gemfile.local
else
echo "Locking racc to 1.6.2"
sed -e '/"racc"/d' -e "/'racc'/d" -i Gemfile Gemfile.local
echo 'gem "racc", "= 1.6.2"' >> Gemfile.local
fi
fi
script:
- pdk validate --parallel --format=junit:validate.xml --format=text
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment