Skip to content
This repository has been archived by the owner on Feb 24, 2021. It is now read-only.

Use whole arrow-site for 0.11 #80

Merged
merged 2 commits into from
Feb 19, 2021
Merged

Use whole arrow-site for 0.11 #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4fab73
Use whole arrow-site for 0.11
rachelcarmena Feb 19, 2021
166aa7a
Consider different Jekyll versions
rachelcarmena Feb 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
run: |
mkdir $BASEDIR/logs
brew install tree
bundle install --gemfile Gemfile --path vendor/bundle
# bundle install --gemfile Gemfile --path vendor/bundle
#- name: "Landing page: build"
# run: |
# ./scripts/checkout-latest-landingpage.sh
Expand Down Expand Up @@ -62,10 +62,10 @@ jobs:
for version in $(cat update-other-versions.txt); do
export VERSION=$version
export SHORT_VERSION=$(echo $VERSION | cut -d. -f1-2)
git clone https://github.com/arrow-kt/arrow-site.git $BASEDIR/arrow-site-$VERSION
LAST_TAG=$(git tag -l --sort=version:refname ${VERSION}* | tail -1)
# git clone https://github.com/arrow-kt/arrow-site.git $BASEDIR/arrow-site-$VERSION
export LAST_TAG=$(git tag -l --sort=version:refname ${VERSION}* | tail -1)
echo ">> Last tag: $LAST_TAG"
cd $BASEDIR/arrow-site-$VERSION; git checkout $LAST_TAG; cd -
# cd $BASEDIR/arrow-site-$VERSION; git checkout $LAST_TAG; cd -
./scripts/generate-and-validate-doc.sh
cd $BASEDIR/arrow-site
rm -f docs/index.md
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
run: |
mkdir $BASEDIR/logs
brew install tree
bundle install --gemfile Gemfile --path vendor/bundle
# bundle install --gemfile Gemfile --path vendor/bundle
#- name: "Landing page: build"
# run: |
# ./scripts/checkout-latest-landingpage.sh
Expand Down Expand Up @@ -81,10 +81,10 @@ jobs:
for version in $(cat update-other-versions.txt); do
export VERSION=$version
export SHORT_VERSION=$(echo $VERSION | cut -d. -f1-2)
git clone https://github.com/arrow-kt/arrow-site.git $BASEDIR/arrow-site-$VERSION
LAST_TAG=$(git tag -l --sort=version:refname ${VERSION}* | tail -1)
# git clone https://github.com/arrow-kt/arrow-site.git $BASEDIR/arrow-site-$VERSION
export LAST_TAG=$(git tag -l --sort=version:refname ${VERSION}* | tail -1)
echo ">> Last tag: $LAST_TAG"
cd $BASEDIR/arrow-site-$VERSION; git checkout $LAST_TAG; cd -
# cd $BASEDIR/arrow-site-$VERSION; git checkout $LAST_TAG; cd -
./scripts/generate-and-validate-doc.sh
cd $BASEDIR/arrow-site
rm -f docs/index.md
Expand Down
6 changes: 4 additions & 2 deletions scripts/generate-and-validate-doc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ echo "For version: $VERSION ..."

cd $BASEDIR/arrow-site
git checkout .
git clean -dxf -e vendor -e .bundle
if [ -d $BASEDIR/arrow-site-$VERSION ]; then cp $BASEDIR/arrow-site-$VERSION/docs/_data/sidebar* docs/_data/; fi
git clean -dxf # -e vendor -e .bundle
git checkout $LAST_TAG # Reason: incompatible changes
bundle install --gemfile Gemfile --path vendor/bundle
# if [ -d $BASEDIR/arrow-site-$VERSION ]; then cp $BASEDIR/arrow-site-$VERSION/docs/_data/sidebar* docs/_data/; fi
perl -pe "s/latest/$VERSION/g" -i docs/_includes/_head-docs.html # TODO

cd $BASEDIR/arrow
Expand Down