Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
jbampton authored Dec 9, 2024
2 parents 26bd892 + 1b2065b commit 22a2fa1
Show file tree
Hide file tree
Showing 11 changed files with 716 additions and 75 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
version: 2.1
orbs:
python: circleci/python@2.2.0
python: circleci/python@3.0.0
shellcheck: circleci/[email protected]
jobs:
build-python:
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.23.3
- image: cimg/go:1.23.4
# directory where steps are run. Path must conform to the Go Workspace requirements
working_directory: ~/repo
steps:
Expand All @@ -201,7 +201,7 @@ jobs:
csv-lint:
docker: # run the steps with Docker
# CircleCI Go images available at: https://hub.docker.com/r/circleci/golang/
- image: cimg/go:1.23.3 #
- image: cimg/go:1.23.4 #
# directory where steps are run. Path must conform to the Go Workspace requirements
working_directory: ~/repo
steps:
Expand All @@ -222,7 +222,7 @@ jobs:

shell:
docker:
- image: cimg/python:3.12.7-node
- image: cimg/python:3.13.1-node
working_directory: ~/repo
steps:
- checkout
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.12.1
uses: cloudflare/wrangler-action@v3.13.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.12.1
uses: cloudflare/wrangler-action@v3.13.0
with:
apiToken: ${{ secrets.CF_API_TOKEN }}
workingDirectory: 'workers.dev/preston'
Expand Down
20 changes: 10 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ GEM
gemoji (>= 3, < 5)
html-pipeline (~> 2.2)
jekyll (>= 3.0, < 5.0)
json (2.7.5)
json (2.8.2)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
Expand Down Expand Up @@ -309,7 +309,7 @@ GEM
mime-types (3.5.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2024.1001)
mini_portile2 (2.8.7)
mini_portile2 (2.8.8)
minima (2.5.1)
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
Expand All @@ -331,15 +331,15 @@ GEM
net-http-persistent (4.0.4)
connection_pool (~> 2.2)
nkf (0.2.0)
nokogiri (1.16.7)
nokogiri (1.17.0)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
octokit (4.25.1)
faraday (>= 1, < 3)
sawyer (~> 0.9)
paint (2.3.0)
parallel (1.26.3)
parser (3.3.5.0)
parser (3.3.6.0)
ast (~> 2.4.1)
racc
path_expander (1.1.2)
Expand All @@ -361,20 +361,20 @@ GEM
parser (~> 3.3.0)
rainbow (>= 2.0, < 4.0)
rexml (~> 3.1)
regexp_parser (2.9.2)
regexp_parser (2.9.3)
rexml (3.3.9)
rouge (3.30.0)
rubocop (1.68.0)
rubocop (1.69.1)
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 (>= 2.4, < 3.0)
rubocop-ast (>= 1.32.2, < 2.0)
regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.36.2, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.33.0)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.36.2)
parser (>= 3.3.1.0)
ruby-progressbar (1.13.0)
ruby_parser (3.20.3)
Expand Down
10 changes: 5 additions & 5 deletions logorama/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -67,21 +67,21 @@ GEM
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
mini_portile2 (2.8.7)
mini_portile2 (2.8.8)
minima (2.5.2)
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
minitest (5.19.0)
nokogiri (1.16.7)
nokogiri (1.17.0)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.16.7-x86_64-darwin)
nokogiri (1.17.0-x86_64-darwin)
racc (~> 1.4)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (5.0.5)
racc (1.7.3)
racc (1.8.1)
rake (13.2.1)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
Expand Down Expand Up @@ -118,7 +118,7 @@ DEPENDENCIES
tzinfo-data

RUBY VERSION
ruby 3.3.5p100
ruby 3.3.6p108

BUNDLED WITH
2.4.6
Loading

0 comments on commit 22a2fa1

Please sign in to comment.