tests: fix test breakage in Github CI.

Fix tests not working in Github. They were failing because the latest
version of Webpack needs a version of Node newer than the version in
shipped Ubuntu 20.04.

Also fix the Docker build failing because of the system timezone
database not being installed in Ubuntu 20.10.
This commit is contained in:
evazion
2021-02-05 02:49:00 -06:00
parent 3639d7eae5
commit 9a0a988572
4 changed files with 7 additions and 3 deletions

View File

@@ -12,7 +12,7 @@ on:
jobs: jobs:
test: test:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: ubuntu:20.04 container: ubuntu:20.10
defaults: defaults:
run: run:

View File

@@ -45,6 +45,7 @@ gem 'pundit'
gem 'mail' gem 'mail'
gem 'nokogiri' gem 'nokogiri'
gem 'view_component', require: 'view_component/engine' gem 'view_component', require: 'view_component/engine'
gem 'tzinfo-data'
group :production, :staging do group :production, :staging do
gem 'unicorn', :platforms => :ruby gem 'unicorn', :platforms => :ruby

View File

@@ -387,6 +387,8 @@ GEM
thor (1.1.0) thor (1.1.0)
tzinfo (2.0.4) tzinfo (2.0.4)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
tzinfo-data (1.2021.1)
tzinfo (>= 1.0.0)
unf (0.1.4) unf (0.1.4)
unf_ext unf_ext
unf_ext (0.0.7.7) unf_ext (0.0.7.7)
@@ -485,6 +487,7 @@ DEPENDENCIES
streamio-ffmpeg streamio-ffmpeg
stripe stripe
stripe-ruby-mock stripe-ruby-mock
tzinfo-data
unicorn unicorn
unicorn-worker-killer unicorn-worker-killer
view_component view_component

View File

@@ -1,4 +1,4 @@
FROM ubuntu:20.04 AS build FROM ubuntu:20.10 AS build
RUN \ RUN \
apt-get update && \ apt-get update && \
@@ -40,7 +40,7 @@ ARG RAILS_ENV=production
RUN bin/rails assets:precompile && ln -sf packs public/packs-test RUN bin/rails assets:precompile && ln -sf packs public/packs-test
RUN rm -rf node_modules log tmp && mkdir log tmp RUN rm -rf node_modules log tmp && mkdir log tmp
FROM ubuntu:20.04 FROM ubuntu:20.10
RUN \ RUN \
useradd --create-home --user-group danbooru && \ useradd --create-home --user-group danbooru && \