Skip to content

Commit

Permalink
Checkout upcoming branch of naev-website when building naev-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
ProjectSynchro committed Mar 21, 2024
1 parent b21019d commit f1d592a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
- `naev-steamruntime` (Used for testing linux steam builds in the steamruntime (sniper) environment with extra dependencies installed.)
- `naev-windows` (Used to cross compile for Windows.)

### v1.10.1
- Checkout `upcoming` branch of naev-website when building naev-docs

### v1.10.0
- Bump minimum macOS version for arm64 to 12.0, due to issues with gettext packaging.

Expand Down
5 changes: 3 additions & 2 deletions naev-docs/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Build luarocks and ruby in build container to save space.
# Build ruby in build container to save space.
FROM registry.fedoraproject.org/fedora-minimal:latest AS build

# Install luarocks and ruby deps
# Install ruby deps
RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install findutils gcc git gzip \
libyaml libyaml-devel make openssl openssl-devel tar unzip automake findutils g++ zlib-devel && \
microdnf clean all
Expand Down Expand Up @@ -29,6 +29,7 @@ RUN mkdir websiteTemp && \
git clone --recurse https://github.com/naev/naev-website.git websiteTemp && \
# Install Website Build gems.
cd websiteTemp && \
git checkout upcoming && \
bundle install -j"$(nproc --all)" && \
rm -rf /tmp/websiteTemp

Expand Down

0 comments on commit f1d592a

Please sign in to comment.