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
BaseMax authored Dec 16, 2024
2 parents f7b26b3 + bc9af8d commit a241f1a
Show file tree
Hide file tree
Showing 51 changed files with 897 additions and 303 deletions.
22 changes: 11 additions & 11 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
#
version: 2.1
orbs:
python: circleci/python@2.2.0
python: circleci/python@3.0.0
shellcheck: circleci/[email protected]
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.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.2 #
- 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 @@ -210,7 +210,7 @@ jobs:
# Read about caching dependencies: https://circleci.com/docs/2.0/caching/
keys:
- v1-pkg-cache
- run: go get -u github.com/Clever/csvlint/cmd/csvlint
- run: go install github.com/Clever/csvlint/cmd/csvlint@latest
- run:
name: 🧹 Run CSV lint
command: |
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 Expand Up @@ -254,7 +254,7 @@ jobs:
php:
docker:
- image: cimg/php:8.3.12
- 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.1
env:
DEFAULT_BRANCH: main
VALIDATE_ALL_CODEBASE: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/weekly_run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/[email protected].1
uses: actions/[email protected].2

- name: Set up Ruby
uses: ruby/setup-ruby@v1
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.9.0
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.9.0
uses: cloudflare/wrangler-action@v3.13.0
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
45 changes: 25 additions & 20 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)
activesupport (8.0.1)
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 All @@ -34,7 +37,7 @@ GEM
commonmarker (0.23.10)
concurrent-ruby (1.3.4)
connection_pool (2.4.1)
csv (3.3.0)
csv (3.3.1)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
dnsruby (1.72.2)
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.9.0)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
Expand All @@ -281,7 +284,7 @@ GEM
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
logger (1.6.1)
logger (1.6.3)
matrix (0.4.2)
mdl (0.13.0)
kramdown (~> 2.3)
Expand All @@ -306,12 +309,12 @@ 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)
jekyll-seo-tag (~> 2.1)
minitest (5.24.1)
minitest (5.25.4)
mixlib-cli (2.1.8)
mixlib-config (3.0.27)
tomlrb
Expand All @@ -328,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.2)
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 @@ -358,20 +361,20 @@ GEM
parser (~> 3.3.0)
rainbow (>= 2.0, < 4.0)
rexml (~> 3.1)
regexp_parser (2.9.2)
rexml (3.3.8)
regexp_parser (2.9.3)
rexml (3.4.0)
rouge (3.30.0)
rubocop (1.66.1)
rubocop (1.69.2)
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.32.2)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.37.0)
parser (>= 3.3.1.0)
ruby-progressbar (1.13.0)
ruby_parser (3.20.3)
Expand Down Expand Up @@ -400,8 +403,8 @@ GEM
sawyer (0.9.2)
addressable (>= 2.3.5)
faraday (>= 0.17.3, < 3)
securerandom (0.3.1)
selenium-webdriver (4.25.0)
securerandom (0.4.1)
selenium-webdriver (4.27.0)
base64 (~> 0.2)
logger (~> 1.4)
rexml (~> 3.2, >= 3.2.5)
Expand All @@ -427,8 +430,10 @@ GEM
concurrent-ruby (~> 1.0)
tzinfo-data (1.2024.2)
tzinfo (>= 1.0.0)
unicode-display_width (2.5.0)
uri (0.13.0)
unicode-display_width (3.1.2)
unicode-emoji (~> 4.0, >= 4.0.4)
unicode-emoji (4.0.4)
uri (1.0.2)
virtus (2.0.0)
axiom-types (~> 0.1)
coercible (~> 1.0)
Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# slurp

[![Fuchsia Programming](https://img.shields.io/website?label=github%20pages&url=https%3A%2F%2Fslurpcode.github.io%2Fslurp)](https://slurpcode.github.io/slurp)
[![Logorama](https://img.shields.io/website?label=heroku&url=https%3A%2F%2Flogorama.herokuapp.com%2F)](https://logorama.herokuapp.com/)
<!-- [![Logorama](https://img.shields.io/website?label=heroku&url=https%3A%2F%2Flogorama.herokuapp.com%2F)](https://logorama.herokuapp.com/) -->
[![Slurp - Read the Docs](https://img.shields.io/website?label=read%20the%20docs&url=https%3A%2F%2Fslurp.readthedocs.io%2F)](https://slurp.readthedocs.io/)
[![Magic Worker](https://img.shields.io/website?label=workers.dev&url=https%3A%2F%2Fmagic.slurp.workers.dev%2F)](https://magic.slurp.workers.dev/)
[![Discord](https://img.shields.io/discord/696441178421329970?label=Discord&logo=discord&logoColor=white)](https://discord.gg/h3WGCf2CN2)
Expand All @@ -10,8 +10,8 @@
[![Slurp - Read the Docs](https://img.shields.io/readthedocs/slurp)](https://readthedocs.org/projects/slurp/builds/)

[![Slurp is GPL-3.0](https://img.shields.io/github/license/slurpcode/slurp.svg)](https://github.com/slurpcode/slurp/blob/main/LICENSE)
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/4199d4805b2a473284988680cffe85db)](https://app.codacy.com/gh/slurpcode/slurp/dashboard)
[![This project is using Percy.io for visual regression testing](https://percy.io/static/images/percy-badge.svg)](https://percy.io)
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/4199d4805b2a473284988680cffe85db)](https://www.codacy.com/gh/slurpcode/slurp/dashboard)
[![CodeFactor](https://www.codefactor.io/repository/github/slurpcode/slurp/badge)](https://www.codefactor.io/repository/github/slurpcode/slurp)
[![GitHub repo size](https://img.shields.io/github/repo-size/slurpcode/slurp.svg)](#)
[![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/slurpcode/slurp.svg)](#)
Expand Down Expand Up @@ -55,7 +55,6 @@
- drivers - Selenium WebDriver scripts to test the Fuchsia Programming website
- [eclipse-cheatsheets-to-dita-to-pdf](https://slurp.readthedocs.io/en/latest/eclipse-cheatsheets-to-dita-to-pdf.html) - Eclipse cheat sheets to DITA to PDF
- [hashcheck](https://slurp.readthedocs.io/en/latest/hashcheck.html) - Ruby script to check file checksums with the Windows CertUtil Command
- [logorama](https://logorama.herokuapp.com/) - Logos done Rama. Hosted on Heroku Cloud Platform
- [ruby-cheatsheets-to-dita](https://slurp.readthedocs.io/en/latest/ruby-cheat-sheets.html) - Eclipse cheat sheets (XML) to DITA with Ruby, XSL, Nokogiri
- scrapers - Web scrapers in progress. FQL, Golang, PHP, Perl, Python, Ruby and Shell. Colly, ferret, Nokogiri, Regex, Scrapy, XPath. awk, cd, curl, echo, exit, grep, mkdir, pcregrep, sed, sort, sleep, tail, uniq
- [seek](https://slurp.readthedocs.io/en/latest/seek.html) - seek is a Ruby based command line script that builds 🔧 🔩 🔨 CSV results of job searches
Expand Down Expand Up @@ -196,7 +195,7 @@

The original **`Fuchsia`** Programming on Heroku

[https://fuchsia.herokuapp.com/](https://fuchsia.herokuapp.com/)
~~[https://fuchsia.herokuapp.com/](https://fuchsia.herokuapp.com/)~~ _(deprecated)_

## Contributors

Expand Down
12 changes: 5 additions & 7 deletions charts/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,17 @@ GEM
specs:
bigdecimal (3.1.6)
chroma (0.2.0)
csv (3.3.0)
fileutils (1.7.2)
kramdown (2.4.0)
rexml
csv (3.3.1)
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)
matrix (~> 0.4)
pdf-core (~> 0.10.0)
ttfunk (~> 1.8)
rexml (3.3.6)
strscan
strscan (3.1.0)
rexml (3.3.9)
ttfunk (1.8.0)
bigdecimal (~> 3.1)

Expand Down
Loading

0 comments on commit a241f1a

Please sign in to comment.