Include rdoc as a dependency

We've had some reports (#1342, #1809) of `rdoc` not being installed in some environments, causing Gollum to error in unpleasant ways. This isn't an issue that's unique to Gollum, and I don't think `rdoc` should actually be a hard dependency of this project. But since we can side-step the issue by requiring `rdoc`, something that most users who install Gollum via RubyGems would already have installed, I don't think this is a horrible solution.
Remove arm/v6 and v7 from the Docker builds (#1822 )
2022-05-04 18:07:35 -07:00 · 2022-05-03 08:15:09 -07:00 · 2022-04-30 23:04:45 -07:00 · 2022-04-30 23:03:56 -07:00
3 changed files with 4 additions and 1 deletions
@@ -45,5 +45,6 @@ jobs:
          tags: ${{ env.DEPLOY_NAME }}
          cache-from: type=local,src=/tmp/.buildx-cache
          cache-to: type=local,dest=/tmp/.buildx-cache
+          platforms: linux/amd64, linux/arm64
      - name: Image digest
        run: echo ${{ steps.docker_build.outputs.digest }}
@@ -32,7 +32,8 @@ COPY --from=builder /usr/local/bundle/ /usr/local/bundle/

 RUN apk add \
    bash \
-    git
+    git \
+    libc6-compat

 VOLUME /wiki
 WORKDIR /wiki
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
  s.rdoc_options = ['--charset=UTF-8']
  s.extra_rdoc_files = %w[README.md LICENSE]

+  s.add_dependency 'rdoc', '~> 6'
  s.add_dependency 'gollum-lib', '~> 5.1'
  s.add_dependency 'kramdown', '~> 2.3'
  s.add_dependency 'kramdown-parser-gfm', '~> 1.1.0'
Author	SHA1	Message	Date
benjamin wil	a9039177b7	Include `rdoc` as a dependency We've had some reports (#1342, #1809) of `rdoc` not being installed in some environments, causing Gollum to error in unpleasant ways. This isn't an issue that's unique to Gollum, and I don't think `rdoc` should actually be a hard dependency of this project. But since we can side-step the issue by requiring `rdoc`, something that most users who install Gollum via RubyGems would already have installed, I don't think this is a horrible solution.	2022-05-04 18:07:35 -07:00
Andreas Wachter	ddc7dba0a2	Remove `arm/v6` and `v7` from the Docker builds (#1822 ) * added platforms to actions, install libc6-compat for pi * fix build problem for now. https://github.com/gollum/gollum/runs/6248371141	2022-05-03 08:15:09 -07:00
Andreas Wachter	bc3503f374	added platforms to actions, install libc6-compat for pi (#1806 )	2022-04-30 23:04:45 -07:00
benjamin wil	2dfe103687	Ensure example git repos are valid (#1821 ) * Ensure example git repos are valid It was reported in #1817 that the `lotr_migration.git` repository we use in `test/test_migrate.rb` is not a valid git repository on when clone, causing the test suite to fail when run locally. The reason is because there is no `.git/refs` directory, meaning it's not really a valid git repository at all. I noticed that the `empty.git` example repository has the same problem. This commit simply ensures that the directory structure of these example repositories are persisted in git. * Run `test_migrate` tests on CI Now that we've resolved the issue with the invalid git repository in the parent commit, we can run all of the tests in our CI environment.	2022-04-30 23:03:56 -07:00