Skip to content

Commit 79918db

Browse files
Merge branch 'main' into patch-1
2 parents ec9bfc8 + ce90dbb commit 79918db

20 files changed

Lines changed: 127 additions & 82 deletions

File tree

.github/workflows/collections-renames.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
if: github.repository_owner == 'github'
1818
steps:
19-
- uses: actions/checkout@v6.0.2
19+
- uses: actions/checkout@v6.0.3
2020

2121
- name: Setup Ruby
2222
uses: ruby/setup-ruby@afeafc3d1ab54a631816aba4c914a0081c12ff2f # v1.310.0

.github/workflows/jekyll_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: 📂 checkout
24-
uses: actions/checkout@v6.0.2
24+
uses: actions/checkout@v6.0.3
2525

2626
- name: 💎 setup ruby
2727
uses: ruby/setup-ruby@afeafc3d1ab54a631816aba4c914a0081c12ff2f # v1.310.0

.github/workflows/lint.yml

Lines changed: 64 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,64 @@
1-
# name: Lint
2-
#
3-
# on:
4-
# pull_request_target:
5-
# workflow_dispatch:
6-
# merge_group:
7-
#
8-
# jobs:
9-
# lint:
10-
# runs-on: ubuntu-latest
11-
# permissions:
12-
# contents: read
13-
# steps:
14-
# - uses: actions/checkout@v6.0.2
15-
# with:
16-
# ref: ${{ github.event.pull_request.head.sha || github.ref }}
17-
# repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
18-
#
19-
# - name: Setup Ruby
20-
# uses: ruby/setup-ruby@v1.306.0
21-
# with:
22-
# bundler-cache: false
23-
#
24-
# - name: Install dependencies
25-
# run: bundle install
26-
#
27-
# - name: Run RuboCop
28-
# run: |
29-
# bundle exec rubocop
30-
#
31-
# autocorrect:
32-
# if: github.event.pull_request.head.repo.full_name == github.repository
33-
# runs-on: ubuntu-latest
34-
# permissions:
35-
# contents: write
36-
# steps:
37-
# - uses: actions/checkout@v6.0.2
38-
# with:
39-
# ref: ${{ github.event.pull_request.head.ref || github.ref }}
40-
#
41-
# - name: Setup Ruby
42-
# uses: ruby/setup-ruby@v1.306.0
43-
# with:
44-
# bundler-cache: true
45-
#
46-
# - name: Run RuboCop with auto-correct
47-
# run: |
48-
# bundle exec rubocop -A
49-
#
50-
# - name: Check for changes
51-
# run: |
52-
# git config --global user.name "github-actions[bot]"
53-
# git config --global user.email "github-actions[bot]@users.noreply.github.com"
54-
# if git status --porcelain | grep .; then
55-
# echo "changes=true" >> $GITHUB_ENV
56-
# else
57-
# echo "changes=false" >> $GITHUB_ENV
58-
# fi
59-
#
60-
# - name: Commit and push changes
61-
# if: env.changes == 'true'
62-
# run: |
63-
# git add .
64-
# git commit -m "chore: auto-corrected with RuboCop"
65-
# git push
1+
name: Lint
2+
3+
on:
4+
# Use `pull_request` (not `pull_request_target`): this workflow checks out and
5+
# runs untrusted PR code, so it must not run with access to repository secrets.
6+
pull_request:
7+
workflow_dispatch:
8+
merge_group:
9+
10+
jobs:
11+
lint:
12+
runs-on: ubuntu-latest
13+
permissions:
14+
contents: read
15+
steps:
16+
- uses: actions/checkout@v6.0.2
17+
18+
- name: Setup Ruby
19+
uses: ruby/setup-ruby@afeafc3d1ab54a631816aba4c914a0081c12ff2f # v1.310.0
20+
with:
21+
bundler-cache: false
22+
23+
- name: Install dependencies
24+
run: bundle install
25+
26+
- name: Run RuboCop
27+
run: |
28+
bundle exec rubocop
29+
30+
autocorrect:
31+
if: github.event.pull_request.head.repo.full_name == github.repository
32+
runs-on: ubuntu-latest
33+
permissions:
34+
contents: write
35+
steps:
36+
- uses: actions/checkout@v6.0.2
37+
with:
38+
ref: ${{ github.event.pull_request.head.ref || github.ref }}
39+
40+
- name: Setup Ruby
41+
uses: ruby/setup-ruby@afeafc3d1ab54a631816aba4c914a0081c12ff2f # v1.310.0
42+
with:
43+
bundler-cache: true
44+
45+
- name: Run RuboCop with auto-correct
46+
run: |
47+
bundle exec rubocop -A
48+
49+
- name: Check for changes
50+
run: |
51+
git config --global user.name "github-actions[bot]"
52+
git config --global user.email "github-actions[bot]@users.noreply.github.com"
53+
if git status --porcelain | grep .; then
54+
echo "changes=true" >> $GITHUB_ENV
55+
else
56+
echo "changes=false" >> $GITHUB_ENV
57+
fi
58+
59+
- name: Commit and push changes
60+
if: env.changes == 'true'
61+
run: |
62+
git add .
63+
git commit -m "chore: auto-corrected with RuboCop"
64+
git push

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- test_type: all
3434
runs-on: ubuntu-latest
3535
steps:
36-
- uses: actions/checkout@v6.0.2
36+
- uses: actions/checkout@v6.0.3
3737
with:
3838
fetch-depth: 0
3939

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ source "https://rubygems.org"
33
gem "faraday", "2.14.2"
44
gem "faraday-retry", "2.4.0"
55
gem "github-pages", "~> 232", group: :jekyll_plugins
6-
gem "json", "2.19.5"
6+
gem "json", "2.19.7"
77
gem "language_server-protocol", "3.17.0.5"
88
gem "nokogiri", "~> 1.19.3"
99
gem "rake", "13.4.2"
10-
gem "rubocop", "1.86.2"
10+
gem "rubocop", "1.87.0"
1111

1212
group :test do
1313
gem "fastimage"

Gemfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ GEM
236236
gemoji (>= 3, < 5)
237237
html-pipeline (~> 2.2)
238238
jekyll (>= 3.0, < 5.0)
239-
json (2.19.5)
239+
json (2.19.7)
240240
kramdown (2.4.0)
241241
rexml
242242
kramdown-parser-gfm (1.1.0)
@@ -308,7 +308,7 @@ GEM
308308
io-console (~> 0.5)
309309
rexml (3.4.2)
310310
rouge (3.30.0)
311-
rubocop (1.86.2)
311+
rubocop (1.87.0)
312312
json (~> 2.3)
313313
language_server-protocol (~> 3.17.0.2)
314314
lint_roller (~> 1.1.0)
@@ -372,14 +372,14 @@ DEPENDENCIES
372372
fastimage
373373
github-pages (~> 232)
374374
httparty
375-
json (= 2.19.5)
375+
json (= 2.19.7)
376376
language_server-protocol (= 3.17.0.5)
377377
minitest
378378
nokogiri (~> 1.19.3)
379379
octokit
380380
pry
381381
rake (= 13.4.2)
382-
rubocop (= 1.86.2)
382+
rubocop (= 1.87.0)
383383
rubocop-performance
384384
safe_yaml
385385
webrick
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
items:
3+
- SSAgov/ANDI
4+
- ffoodd/a11y.css
5+
- mrcoles/bookmarklet
6+
- Mottie/GitHub-userscripts
7+
- quoid/userscripts
8+
- violentmonkey/violentmonkey
9+
- GreasyFork-org/greasyfork
10+
- kellnerd/userscript-bundler
11+
- ThomasOrlita/awesome-bookmarklets
12+
display_name: Bookmarklets and Userscripts
13+
created_by: ohsusannamarie
14+
---
15+
Bookmarklets and userscripts are lightweight browser scripts that automate repetitive tasks, customize websites, inspect pages, improve accessibility, and extend browser workflows without requiring a full browser extension.

collections/front-end-javascript-frameworks/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ items:
1010
- spine/spine
1111
- vuejs/vue
1212
- Polymer/polymer
13-
- facebook/react
13+
- react/react
1414
- finom/seemple
1515
- aurelia/framework
1616
- optimizely/nuclear-js

collections/github-pages-examples/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ items:
88
- twitter/opensource-website
99
- Netflix/netflix.github.com
1010
- Yelp/yelp.github.io
11-
- facebook/react
11+
- react/react
1212
- artsy/artsy.github.io
1313
- Metroxe/one-html-page-challenge
1414
- fairfield-programming/fairfield-programming.github.io

collections/made-in-algeria/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ items:
66
- GitHubAlgeria/pyIslam
77
- mohsenuss91/AlgerianAdministrativeDivision
88
- Alfanous-team/alfanous
9-
- idurar/idurar-erp-crm
9+
- salahlalami/idurar-erp-crm
1010
- linuxscout/mishkal
1111
- linuxscout/pyarabic
1212
- linuxscout/tashaphyne

0 commit comments

Comments
 (0)