Skip to content

Commit

Permalink
Merge branch 'main' into fix-markdown-link-action-fail
Browse files Browse the repository at this point in the history
  • Loading branch information
jbampton authored Jul 10, 2024
2 parents 7474ca7 + 0ef8075 commit efd67f6
Show file tree
Hide file tree
Showing 27 changed files with 250 additions and 170 deletions.
16 changes: 8 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ orbs:
jobs:
build-python:
docker:
- image: cimg/ruby:3.3.0-browsers
- image: cimg/ruby:3.3.4-browsers
working_directory: ~/repo
steps:
- checkout
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
build:
docker:
- image: cimg/ruby:3.3.0-browsers
- image: cimg/ruby:3.3.4-browsers
working_directory: ~/repo
steps:
- checkout
Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:
well-formed:
docker:
- image: cimg/ruby:3.3.0-node
- image: cimg/ruby:3.3.4-node
working_directory: ~/repo
steps:
- checkout
Expand All @@ -129,7 +129,7 @@ jobs:
built-in-datatypes:
docker:
- image: cimg/ruby:3.3.0-node
- image: cimg/ruby:3.3.4-node
working_directory: ~/repo
steps:
- checkout
Expand All @@ -146,7 +146,7 @@ jobs:
spelling:
docker:
- image: cimg/ruby:3.3.0-node
- image: cimg/ruby:3.3.4-node
working_directory: ~/repo
steps:
- checkout
Expand Down Expand Up @@ -175,7 +175,7 @@ jobs:
go-test:
docker: # run the steps with Docker
# CircleCI Go images available at: https://hub.docker.com/r/circleci/golang/
- image: cimg/go:1.22.2
- image: cimg/go:1.22.5
# directory where steps are run. Path must conform to the Go Workspace requirements
working_directory: ~/repo
steps:
Expand Down Expand Up @@ -222,7 +222,7 @@ jobs:

shell:
docker:
- image: cimg/python:3.12.3-node
- image: cimg/python:3.12.4-node
working_directory: ~/repo
steps:
- checkout
Expand Down Expand Up @@ -254,7 +254,7 @@ jobs:
php:
docker:
- image: cimg/php:8.3.6
- image: cimg/php:8.3.9
working_directory: ~/repo
steps:
- checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/super-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Download Dependencies
run: go mod download
- name: Lint Code Base
uses: super-linter/super-linter@v6.5.0
uses: super-linter/super-linter@v6.7.0
env:
DEFAULT_BRANCH: main
VALIDATE_ALL_CODEBASE: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/wrangler-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Deploy
uses: cloudflare/wrangler-action@v3.6.1
uses: cloudflare/wrangler-action@v3.7.0
with:
apiToken: ${{ secrets.CF_API_TOKEN }}
workingDirectory: 'workers.dev/magic'
Expand All @@ -25,7 +25,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Deploy
uses: cloudflare/wrangler-action@v3.6.1
uses: cloudflare/wrangler-action@v3.7.0
with:
apiToken: ${{ secrets.CF_API_TOKEN }}
workingDirectory: 'workers.dev/preston'
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ repos:
hooks:
- id: codespell
entry: codespell -I codespell.txt ./doc/source
exclude: ^assets/.*$|^charts/.*$|^docs/assets/.*$|^eclipse-cheatsheets-to-dita-to-pdf/.*$|^Gemfile\.lock$|^go\.work\.sum$|^logorama/.*$|^rubycritic/.*$|^ruby-eclipse-cheatsheets-to-dita/.*$|^tests/spelling/.*$
exclude: ^assets/.*$|^charts/.*$|^docs/assets/.*$|^eclipse-cheatsheets-to-dita-to-pdf/.*$|^Gemfile\.lock$|^go\.sum$|^go\.work\.sum$|^logorama/.*$|^rubycritic/.*$|^ruby-eclipse-cheatsheets-to-dita/.*$|^tests/spelling/.*$
# - repo: https://github.com/syntaqx/git-hooks
# rev: v0.0.16
# hooks:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.3.1-bullseye
FROM ruby:3.3.4-bullseye

RUN apt-get update && apt-get install -y --no-install-recommends python3-pip shellcheck \
&& apt-get clean \
Expand Down
66 changes: 33 additions & 33 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (7.1.3.2)
activesupport (7.1.3.4)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
Expand All @@ -11,15 +11,15 @@ GEM
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
ast (2.4.2)
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
base64 (0.2.0)
bigdecimal (3.1.6)
bigdecimal (3.1.8)
chef-utils (18.3.0)
concurrent-ruby
chroma (0.2.0)
Expand All @@ -40,8 +40,7 @@ GEM
simpleidn (~> 0.2.1)
docile (1.4.0)
domain_name (0.6.20240107)
drb (2.2.0)
ruby2_keywords
drb (2.2.1)
dry-configurable (1.1.0)
dry-core (~> 1.0, < 2)
zeitwerk (~> 2.6)
Expand All @@ -54,15 +53,16 @@ GEM
concurrent-ruby (~> 1.0)
dry-core (~> 1.0, < 2)
zeitwerk (~> 2.6)
dry-schema (1.13.3)
dry-schema (1.13.4)
concurrent-ruby (~> 1.0)
dry-configurable (~> 1.0, >= 1.0.1)
dry-core (~> 1.0, < 2)
dry-initializer (~> 3.0)
dry-logic (>= 1.4, < 2)
dry-types (>= 1.7, < 2)
zeitwerk (~> 2.6)
dry-types (1.7.1)
dry-types (1.7.2)
bigdecimal (~> 3.0)
concurrent-ruby (~> 1.0)
dry-core (~> 1.0)
dry-inflector (~> 1.0)
Expand All @@ -85,7 +85,7 @@ GEM
ffi-win32-extensions (1.0.4)
ffi
fileutils (1.7.2)
flay (2.13.1)
flay (2.13.3)
erubi (~> 1.10)
path_expander (~> 1.0)
ruby_parser (~> 3.0)
Expand Down Expand Up @@ -150,10 +150,10 @@ GEM
html-pipeline (2.14.3)
activesupport (>= 2)
nokogiri (>= 1.4)
http-cookie (1.0.5)
http-cookie (1.0.6)
domain_name (~> 0.5)
http_parser.rb (0.8.0)
i18n (1.14.1)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
jekyll (3.9.5)
Expand Down Expand Up @@ -276,14 +276,15 @@ GEM
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
logger (1.6.0)
matrix (0.4.2)
mdl (0.13.0)
kramdown (~> 2.3)
kramdown-parser-gfm (~> 1.1)
mixlib-cli (~> 2.1, >= 2.1.1)
mixlib-config (>= 2.2.1, < 4)
mixlib-shellout
mechanize (2.10.0)
mechanize (2.10.1)
addressable (~> 2.8)
base64
domain_name (~> 0.5, >= 0.5.20190701)
Expand All @@ -300,12 +301,12 @@ GEM
mime-types (3.5.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2023.1205)
mini_portile2 (2.8.5)
mini_portile2 (2.8.7)
minima (2.5.1)
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
minitest (5.22.2)
minitest (5.22.3)
mixlib-cli (2.1.8)
mixlib-config (3.0.27)
tomlrb
Expand All @@ -323,17 +324,15 @@ GEM
net-http-persistent (4.0.2)
connection_pool (~> 2.2)
nkf (0.2.0)
nokogiri (1.16.4)
nokogiri (1.16.6)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.16.4-x86_64-darwin)
racc (~> 1.4)
octokit (4.25.1)
faraday (>= 1, < 3)
sawyer (~> 0.9)
paint (2.3.0)
parallel (1.24.0)
parser (3.3.0.5)
parallel (1.25.1)
parser (3.3.4.0)
ast (~> 2.4.1)
racc
path_expander (1.1.1)
Expand All @@ -344,8 +343,8 @@ GEM
matrix (~> 0.4)
pdf-core (~> 0.10.0)
ttfunk (~> 1.8)
public_suffix (5.0.4)
racc (1.7.3)
public_suffix (5.0.5)
racc (1.8.0)
rainbow (3.1.1)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
Expand All @@ -355,25 +354,24 @@ GEM
parser (~> 3.3.0)
rainbow (>= 2.0, < 4.0)
rexml (~> 3.1)
regexp_parser (2.9.0)
rexml (3.2.8)
strscan (>= 3.0.9)
regexp_parser (2.9.2)
rexml (3.3.1)
strscan
rouge (3.30.0)
rubocop (1.63.1)
rubocop (1.65.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
regexp_parser (>= 2.4, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.31.2)
parser (>= 3.3.0.4)
rubocop-ast (1.31.3)
parser (>= 3.3.1.0)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
ruby_parser (3.20.3)
sexp_processor (~> 4.16)
rubycritic (4.9.0)
Expand All @@ -388,7 +386,8 @@ GEM
simplecov (>= 0.22.0)
tty-which (~> 0.5.0)
virtus (~> 2.0)
rubyntlm (0.6.3)
rubyntlm (0.6.5)
base64
rubyzip (2.3.2)
safe_yaml (1.0.5)
sass (3.7.4)
Expand All @@ -399,12 +398,13 @@ GEM
sawyer (0.9.2)
addressable (>= 2.3.5)
faraday (>= 0.17.3, < 3)
selenium-webdriver (4.19.0)
selenium-webdriver (4.22.0)
base64 (~> 0.2)
logger (~> 1.4)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
sexp_processor (4.17.0)
sexp_processor (4.17.2)
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
Expand Down Expand Up @@ -441,7 +441,7 @@ GEM
win32-process (0.10.0)
ffi (>= 1.0.0)
wmi-lite (1.0.7)
zeitwerk (2.6.12)
zeitwerk (2.6.16)

PLATFORMS
ruby
Expand Down
4 changes: 4 additions & 0 deletions codespell.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
accademia
aling
ans
buda
bund
calle
carrer
classe
crate
empress
Expand All @@ -12,6 +14,8 @@ fro
leibnitz
lew
lod
manuel
momentos
pase
pinter
pont
Expand Down
6 changes: 3 additions & 3 deletions flicker-diff/flicker-diff.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ pdftocairo -png new/"$filename".pdf new/images/"$filename"/"$filename"

# Fix to get number or pages ???
for i in {01..03}; do
# create the difference between each png page and generate a flicker based GIF image difference
convert -delay 50 old/images/"$filename"/"$filename"-"$i".png new/images/"$filename"/"$filename"-"$i".png flicker/"$filename"/"$filename"-"$i"-difference-flicker.gif
# create the difference between each png page and generate a flicker based GIF image difference
convert -delay 50 old/images/"$filename"/"$filename"-"$i".png new/images/"$filename"/"$filename"-"$i".png flicker/"$filename"/"$filename"-"$i"-difference-flicker.gif
done

# zero file
Expand All @@ -47,7 +47,7 @@ echo "<!doctype html><html><head><meta charset=\"UTF-8\"></head><body>" >&3

# loop over flicker GIFs
for f in flicker/"$filename"/*; do
echo "<img src='$f' alt='$f'>" >&3
echo "<img src='$f' alt='$f'>" >&3
done
# finish HTML page
echo "</body></html>" >&3
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.21
require (
github.com/gocolly/colly/v2 v2.1.0
github.com/spf13/pflag v1.0.5
github.com/urfave/cli/v2 v2.27.1
github.com/urfave/cli/v2 v2.27.2
)

require (
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ github.com/temoto/robotstxt v1.1.2 h1:W2pOjSJ6SWvldyEuiFXNxz3xZ8aiWX5LbfDiOFd7Fx
github.com/temoto/robotstxt v1.1.2/go.mod h1:+1AmkuG3IYkh1kv0d2qEB9Le88ehNO0zwOr3ujewlOo=
github.com/urfave/cli/v2 v2.27.1 h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho=
github.com/urfave/cli/v2 v2.27.1/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
github.com/urfave/cli/v2 v2.27.2 h1:6e0H+AkS+zDckwPCUrZkKX38mRaau4nL2uipkJpbkcI=
github.com/urfave/cli/v2 v2.27.2/go.mod h1:g0+79LmHHATl7DAcHO99smiR/T7uGLw84w8Y42x+4eM=
github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 h1:+qGGcbkzsfDQNPPe9UDgpxAWQrhbbBXOYJFQDq/dtJw=
github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913/go.mod h1:4aEEwZQutDLsQv2Deui4iYQ6DWTxR14g6m8Wv88+Xqk=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
Expand Down
2 changes: 1 addition & 1 deletion logorama/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw jruby]
# Performance-booster for watching directories on Windows
gem "wdm", "~> 0.1.0" if Gem.win_platform?

ruby "3.3.1"
ruby "3.3.4"
Loading

0 comments on commit efd67f6

Please sign in to comment.