Skip to content

Commit

Permalink
Merge branch 'main' into fix-4811
Browse files Browse the repository at this point in the history
  • Loading branch information
atsansone authored Jan 16, 2024
2 parents d5de28b + f26bbe5 commit f9c17d2
Show file tree
Hide file tree
Showing 52 changed files with 69 additions and 5,118 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/scorecards-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:

# Upload the results as artifacts (optional).
- name: "Upload artifact"
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595
with:
name: SARIF file
path: results.sarif
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.2-slim-bookworm@sha256:75f884a28c1337d744a42b006d864d3ba161c6b1980d2414910e660d2034b14e as base
FROM ruby:3.3-slim-bookworm@sha256:540e94266a7509bba7b50d5194eb63f51197ffbe5c203c5c81aa956c377ec4e8 as base

ENV DEBIAN_FRONTEND=noninteractive
ENV TZ=US/Pacific
Expand All @@ -11,7 +11,6 @@ RUN apt update && apt install -yq --no-install-recommends \
lsof \
make \
unzip \
vim-nox \
&& rm -rf /var/lib/apt/lists/*

RUN echo "alias lla='ls -lAhG --color=auto'" >> ~/.bashrc
Expand Down Expand Up @@ -95,6 +94,7 @@ FROM node as dev
WORKDIR /app

ENV JEKYLL_ENV=development
ENV RUBY_YJIT_ENABLE=1
COPY Gemfile Gemfile.lock ./
RUN gem update --system && gem install bundler
RUN BUNDLE_WITHOUT="test production" bundle install --jobs=4 --retry=2
Expand Down Expand Up @@ -137,6 +137,7 @@ FROM node AS build
WORKDIR /app

ENV JEKYLL_ENV=production
ENV RUBY_YJIT_ENABLE=1
COPY Gemfile Gemfile.lock ./
RUN gem update --system && gem install bundler
RUN BUNDLE_WITHOUT="test development" bundle install --jobs=4 --retry=2 --quiet
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source "https://rubygems.org"

gem 'activesupport', '~> 7.1.2'
gem 'jekyll', '4.3.2'
gem 'jekyll', '4.3.3'
gem 'jekyll-sass-converter', '~> 3.0.0'
gem 'kramdown-parser-gfm'
gem 'liquid-tag-parser', '~> 2.0.2'
Expand Down
46 changes: 22 additions & 24 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ GEM
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.5)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
base64 (0.2.0)
bigdecimal (3.1.4)
bigdecimal (3.1.5)
colorator (1.1.0)
concurrent-ruby (1.2.2)
connection_pool (2.4.1)
Expand All @@ -26,15 +26,13 @@ GEM
eventmachine (1.2.7)
extras (0.3.0)
forwardable-extended (~> 2.5)
ffi (1.15.5)
ffi (1.16.3)
forwardable-extended (2.6.0)
google-protobuf (3.24.3)
google-protobuf (3.24.3-aarch64-linux)
google-protobuf (3.24.3-x86_64-linux)
google-protobuf (3.25.2)
http_parser.rb (0.8.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
jekyll (4.3.2)
jekyll (4.3.3)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
Expand Down Expand Up @@ -69,40 +67,40 @@ GEM
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
mini_portile2 (2.8.4)
mini_portile2 (2.8.5)
minitest (5.20.0)
mutex_m (0.2.0)
nokogiri (1.15.4)
nokogiri (1.16.0)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.15.4-aarch64-linux)
nokogiri (1.16.0-aarch64-linux)
racc (~> 1.4)
nokogiri (1.15.4-x86_64-linux)
nokogiri (1.16.0-x86_64-linux)
racc (~> 1.4)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (5.0.3)
racc (1.7.1)
rake (13.0.6)
public_suffix (5.0.4)
racc (1.7.3)
rake (13.1.0)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.6)
rouge (4.1.3)
rouge (4.2.0)
ruby2_keywords (0.0.5)
safe_yaml (1.0.5)
sass-embedded (1.67.0)
google-protobuf (~> 3.23)
sass-embedded (1.69.7)
google-protobuf (~> 3.25)
rake (>= 13.0.0)
sass-embedded (1.67.0-aarch64-linux-gnu)
google-protobuf (~> 3.23)
sass-embedded (1.67.0-x86_64-linux-gnu)
google-protobuf (~> 3.23)
sass-embedded (1.69.7-aarch64-linux-gnu)
google-protobuf (~> 3.25)
sass-embedded (1.69.7-x86_64-linux-gnu)
google-protobuf (~> 3.25)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.4.2)
unicode-display_width (2.5.0)
webrick (1.8.1)

PLATFORMS
Expand All @@ -112,12 +110,12 @@ PLATFORMS

DEPENDENCIES
activesupport (~> 7.1.2)
jekyll (= 4.3.2)
jekyll (= 4.3.3)
jekyll-sass-converter (~> 3.0.0)
jekyll-toc (~> 0.18.0)
kramdown-parser-gfm
liquid-tag-parser (~> 2.0.2)
webrick

BUNDLED WITH
2.4.19
2.5.4
Loading

0 comments on commit f9c17d2

Please sign in to comment.