Skip to content

Fix upgrade scripts #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 6, 2020
Merged

Fix upgrade scripts #25

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
706865d
Fix upgrade scripts
filipesperandio Jan 3, 2020
b88aa9c
Update gems
filipesperandio Jan 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.3.0-alpine
FROM ruby:2.6.3-alpine

ENV LANG C.UTF-8

Expand All @@ -19,8 +19,8 @@ RUN { \
ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk/jre
ENV PATH $PATH:/usr/lib/jvm/java-1.8-openjdk/jre/bin:/usr/lib/jvm/java-1.8-openjdk/bin

ENV JAVA_VERSION 8u92
ENV JAVA_ALPINE_VERSION 8.92.14-r0
ENV JAVA_VERSION 8u222
ENV JAVA_ALPINE_VERSION 8.222.10-r0

RUN set -x \
&& apk update && apk add --no-cache --update \
Expand All @@ -35,7 +35,7 @@ COPY bin/install-checkstyle.sh /usr/src/app/bin/
RUN chown -R app:app /usr/src/app

RUN ./bin/install-checkstyle.sh
RUN apk add --update make g++ git && bundle install
RUN apk add --update make g++ git curl && bundle install

VOLUME /code
WORKDIR /code
Expand Down
44 changes: 20 additions & 24 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,28 @@ GEM
specs:
coderay (1.1.2)
diff-lcs (1.3)
method_source (0.8.2)
mini_portile2 (2.1.0)
nokogiri (1.6.8)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
pkg-config (1.1.7)
posix-spawn (0.3.11)
pry (0.10.4)
method_source (0.9.2)
mini_portile2 (2.4.0)
nokogiri (1.10.7)
mini_portile2 (~> 2.4.0)
posix-spawn (0.3.13)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
rake (11.2.2)
rspec (3.6.0)
rspec-core (~> 3.6.0)
rspec-expectations (~> 3.6.0)
rspec-mocks (~> 3.6.0)
rspec-core (3.6.0)
rspec-support (~> 3.6.0)
rspec-expectations (3.6.0)
method_source (~> 0.9.0)
rake (13.0.1)
rspec (3.9.0)
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
rspec-core (3.9.1)
rspec-support (~> 3.9.1)
rspec-expectations (3.9.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.6.0)
rspec-mocks (3.6.0)
rspec-support (~> 3.9.0)
rspec-mocks (3.9.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.6.0)
rspec-support (3.6.0)
slop (3.6.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.2)

PLATFORMS
ruby
Expand All @@ -41,4 +37,4 @@ DEPENDENCIES
rspec

BUNDLED WITH
1.11.2
1.17.2
3 changes: 1 addition & 2 deletions bin/scrape-docs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ if !Dir.exists? "data/"
system "git clone --shallow-since=2019-01-01 https://github.com/checkstyle/checkstyle.git data/" or raise "clone failed"
end

system "cd data && git checkout master 1>/dev/null 2>/dev/null && git pull origin master 1>/dev/null 2>/dev/null" or raise "pull failed"
system "cd data && git checkout checkstyle-#{CHECKSTYLE_VERSION} 2>/dev/null" or raise "checkout failed"
system "cd data && git fetch origin && git reset --hard && git checkout checkstyle-#{CHECKSTYLE_VERSION} 2>/dev/null" or raise "checkout failed"

xml_files = Dir.glob("data/src/xdocs/config_*").sort
xml_data = xml_files.map{|f| Nokogiri::XML(File.read(f)) }
Expand Down