Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
BaseMax authored Nov 26, 2024
2 parents 5d0ba79 + bd1728f commit 26bd892
Show file tree
Hide file tree
Showing 15 changed files with 162 additions and 115 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.5-browsers
- image: cimg/ruby:3.3.6-browsers
working_directory: ~/repo
steps:
- checkout
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
build:
docker:
- image: cimg/ruby:3.3.5-browsers
- image: cimg/ruby:3.3.6-browsers
working_directory: ~/repo
steps:
- checkout
Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:
well-formed:
docker:
- image: cimg/ruby:3.3.5-node
- image: cimg/ruby:3.3.6-node
working_directory: ~/repo
steps:
- checkout
Expand All @@ -129,7 +129,7 @@ jobs:
built-in-datatypes:
docker:
- image: cimg/ruby:3.3.5-node
- image: cimg/ruby:3.3.6-node
working_directory: ~/repo
steps:
- checkout
Expand All @@ -146,7 +146,7 @@ jobs:
spelling:
docker:
- image: cimg/ruby:3.3.5-node
- image: cimg/ruby:3.3.6-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.23.2
- image: cimg/go:1.23.3
# 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.2 #
- image: cimg/go:1.23.3 #
# directory where steps are run. Path must conform to the Go Workspace requirements
working_directory: ~/repo
steps:
Expand Down Expand Up @@ -254,7 +254,7 @@ jobs:
php:
docker:
- image: cimg/php:8.3.13
- image: cimg/php:8.4.1
working_directory: ~/repo
steps:
- checkout
Expand Down
36 changes: 36 additions & 0 deletions .github/workflows/restyled.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Restyled

on:
pull_request:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
restyled:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.ref }}

- uses: restyled-io/actions/setup@v4
- id: restyler
uses: restyled-io/actions/run@v4
with:
fail-on-differences: true

- if: |
!cancelled() &&
steps.restyler.outputs.success == 'true' &&
github.event.pull_request.head.repo.full_name == github.repository
uses: peter-evans/create-pull-request@v7
with:
base: ${{ steps.restyler.outputs.restyled-base }}
branch: ${{ steps.restyler.outputs.restyled-head }}
title: ${{ steps.restyler.outputs.restyled-title }}
body: ${{ steps.restyler.outputs.restyled-body }}
labels: "restyled"
reviewers: ${{ github.event.pull_request.user.login }}
delete-branch: true
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@v7.1.0
uses: super-linter/super-linter@v7.2.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.11.0
uses: cloudflare/wrangler-action@v3.12.1
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.11.0
uses: cloudflare/wrangler-action@v3.12.1
with:
apiToken: ${{ secrets.CF_API_TOKEN }}
workingDirectory: 'workers.dev/preston'
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.5-bullseye
FROM ruby:3.3.6-bullseye

RUN apt-get update && apt-get install -y --no-install-recommends python3-pip shellcheck \
&& apt-get clean \
Expand Down
19 changes: 11 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (7.2.1.2)
activesupport (8.0.0)
base64
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
Expand All @@ -12,6 +13,7 @@ GEM
minitest (>= 5.1)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
uri (>= 0.13.1)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
ast (2.4.2)
Expand All @@ -20,6 +22,7 @@ GEM
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
base64 (0.2.0)
benchmark (0.4.0)
bigdecimal (3.1.8)
chef-utils (18.3.0)
concurrent-ruby
Expand Down Expand Up @@ -86,7 +89,7 @@ GEM
ffi (1.17.0)
ffi-win32-extensions (1.0.4)
ffi
fileutils (1.7.2)
fileutils (1.7.3)
flay (2.13.3)
erubi (~> 1.10)
path_expander (~> 1.0)
Expand Down Expand Up @@ -269,7 +272,7 @@ GEM
gemoji (>= 3, < 5)
html-pipeline (~> 2.2)
jekyll (>= 3.0, < 5.0)
json (2.7.2)
json (2.7.5)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
Expand Down Expand Up @@ -311,7 +314,7 @@ GEM
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
minitest (5.24.1)
minitest (5.25.1)
mixlib-cli (2.1.8)
mixlib-config (3.0.27)
tomlrb
Expand Down Expand Up @@ -361,7 +364,7 @@ GEM
regexp_parser (2.9.2)
rexml (3.3.9)
rouge (3.30.0)
rubocop (1.67.0)
rubocop (1.68.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
Expand All @@ -371,7 +374,7 @@ GEM
rubocop-ast (>= 1.32.2, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.32.3)
rubocop-ast (1.33.0)
parser (>= 3.3.1.0)
ruby-progressbar (1.13.0)
ruby_parser (3.20.3)
Expand Down Expand Up @@ -401,7 +404,7 @@ GEM
addressable (>= 2.3.5)
faraday (>= 0.17.3, < 3)
securerandom (0.3.1)
selenium-webdriver (4.25.0)
selenium-webdriver (4.27.0)
base64 (~> 0.2)
logger (~> 1.4)
rexml (~> 3.2, >= 3.2.5)
Expand All @@ -428,7 +431,7 @@ GEM
tzinfo-data (1.2024.2)
tzinfo (>= 1.0.0)
unicode-display_width (2.6.0)
uri (0.13.0)
uri (1.0.1)
virtus (2.0.0)
axiom-types (~> 0.1)
coercible (~> 1.0)
Expand Down
6 changes: 3 additions & 3 deletions charts/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ GEM
bigdecimal (3.1.6)
chroma (0.2.0)
csv (3.3.0)
fileutils (1.7.2)
kramdown (2.4.0)
rexml
fileutils (1.7.3)
kramdown (2.5.1)
rexml (>= 3.3.9)
matrix (0.4.2)
pdf-core (0.10.0)
prawn (2.5.0)
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.2.0" if Gem.win_platform?

ruby "3.3.5"
ruby "3.3.6"
Loading

0 comments on commit 26bd892

Please sign in to comment.