Skip to content
This repository has been archived by the owner on Dec 13, 2023. It is now read-only.

Update deps 2022-10-11 #1143

Merged
merged 16 commits into from
Nov 9, 2022
Merged

Update deps 2022-10-11 #1143

merged 16 commits into from
Nov 9, 2022

Conversation

Simran-B
Copy link
Collaborator

@Simran-B Simran-B commented Oct 11, 2022

  • Jekyll 4.2.2
  • Bundler 2.3.23
  • htmltest 0.16.0
  • Jekyll gems

Also changes the default build folder from _site to _site/docs, which allows us to run htmltest easily (PowerShell example):
docker run --rm -it -v ${PWD}:/docs arangodb/arangodb-docs htmltest
This also makes it unnecessary to copy _site to htmltest/docs in the Netlify CI, which should slightly improve build times.

build.sh (used in Jenkins) is also adjusted for the new output location but places the resulting archive into the old location so that the Jenkins jobs do not need to be changed (which would make them incompatible with older states of the docs repo or require additional scripting).

Also disables the generation of unversioned redirects to stable that we didn't use, unveiling some incorrect internal links.

Updates the build image from Xenial to Focal (via the Netlify UI).
https://answers.netlify.com/t/please-read-end-of-support-for-xenial-build-image-everything-you-need-to-know/68239
#1108 did not address this issue because we don't use the Docker image in Netlify.

@Simran-B Simran-B self-assigned this Oct 17, 2022
@Simran-B
Copy link
Collaborator Author

Netlify build image updated, new Docker image verified with https://jenkins.arangodb.biz/view/Documentation/job/arangodb-ANY-examples/2516/

…k.file

Jekyll >= 4.3.0 uses Rouge 4.0+ which requires Ruby >= 2.7.0, making it incompatible with our Ruby 2.6.x setup
@Simran-B Simran-B removed the request for review from KVS85 November 4, 2022 13:47
@Simran-B
Copy link
Collaborator Author

Simran-B commented Nov 4, 2022

Fixed problem with Docker builds failing because Jekyll 4.3.x was released and uses a Rouge version incompatible with our Ruby 2.6:

v4.3.0
...
Relax version constraint to allow Rouge 4.x #9134

https://jenkins01.arangodb.biz/view/Documentation/job/arangodb-ANY-examples/2562/

Copy link
Contributor

@dandimeo dandimeo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything works after last docker file fix, approved.

@nerpaula nerpaula self-requested a review November 9, 2022 10:07
@nerpaula nerpaula merged commit e3eb2d5 into main Nov 9, 2022
@nerpaula nerpaula deleted the update-deps-2022-10-11 branch November 9, 2022 13:58
Simran-B added a commit that referenced this pull request Nov 9, 2022
* Update to Jekyll 4.2.2, bundler 2.3.23, and other deps

* Use _site/docs as output folder to make running htmltest easier

* Adjustments for new output folder

* Change Netlify publish directory

* Adjust README for output dir, add jekyll clean and htmltest

* Disable generation of unversioned redirects to stable (default feature of the versions plugin)

* kube-arangodb: Conditional content about 3.9+ license management

* Let Jenkins target _site/docs but place build artifact in the well-known location

* Leave Jekyll installation to bundler to install version as per Gemlock.file

Jekyll >= 4.3.0 uses Rouge 4.0+ which requires Ruby >= 2.7.0, making it incompatible with our Ruby 2.6.x setup

* Update Bundler to v2.3.25, Jekyll deps, htmltest 0.16.0

* Remove 3.9+ content from older versions, fix links

* Fix more links

Co-authored-by: Paula Mihu <97217318+nerpaula@users.noreply.github.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants