Skip to content
This repository was archived by the owner on Jan 25, 2023. It is now read-only.

Commit 308f422

Browse files
authored
fix: cache ruby version gems dir (#808)
* fix: cache ruby version gems dir * fix: handle when ruby_version already cached
1 parent 08743d1 commit 308f422

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

run-build-functions.sh

+10-2
Original file line numberDiff line numberDiff line change
@@ -331,11 +331,14 @@ install_dependencies() {
331331
local rvs=($(rvm list strings))
332332

333333
local fulldruby="ruby-${druby}"
334-
if [ -d $NETLIFY_CACHE_DIR/ruby_version/${fulldruby} ]
334+
if [ -d $NETLIFY_CACHE_DIR/ruby_version/${fulldruby} ] && [ -d $NETLIFY_CACHE_DIR/ruby_version_gems/${fulldruby} ]
335335
then
336336
echo "Started restoring cached ruby version"
337337
rm -rf $RVM_DIR/rubies/${fulldruby}
338338
cp -p -r $NETLIFY_CACHE_DIR/ruby_version/${fulldruby} $RVM_DIR/rubies/
339+
340+
rm -rf $RVM_DIR/gems/${fulldruby}
341+
cp -p -r $NETLIFY_CACHE_DIR/ruby_version_gems/${fulldruby} $RVM_DIR/gems/
339342
echo "Finished restoring cached ruby version"
340343
fi
341344

@@ -734,15 +737,20 @@ cache_artifacts() {
734737
# cache the version of ruby installed
735738
if [[ "$CUSTOM_RUBY" -ne "0" ]]
736739
then
737-
if ! [ -d $NETLIFY_CACHE_DIR/ruby_version/ruby-$RUBY_VERSION ]
740+
if ! [ -d $NETLIFY_CACHE_DIR/ruby_version/ruby-$RUBY_VERSION ] || ! [ -d $NETLIFY_CACHE_DIR/ruby_version_gems/ruby-$RUBY_VERSION ]
738741
then
739742
rm -rf $NETLIFY_CACHE_DIR/ruby_version
740743
mkdir $NETLIFY_CACHE_DIR/ruby_version
741744
mv $RVM_DIR/rubies/ruby-$RUBY_VERSION $NETLIFY_CACHE_DIR/ruby_version/
742745
echo "Cached ruby version $RUBY_VERSION"
746+
747+
rm -rf $NETLIFY_CACHE_DIR/ruby_version_gems
748+
mkdir $NETLIFY_CACHE_DIR/ruby_version_gems
749+
mv $RVM_DIR/gems/ruby-$RUBY_VERSION $NETLIFY_CACHE_DIR/ruby_version_gems/
743750
fi
744751
else
745752
rm -rf $NETLIFY_CACHE_DIR/ruby_version
753+
rm -rf $NETLIFY_CACHE_DIR/ruby_version_gems
746754
fi
747755

748756
# cache the version of Swift installed

0 commit comments

Comments
 (0)