Skip to content

Commit b6995a0

Browse files
brunoborgesbrunoborges
authored
Merge branch 'main' into master
2 parents 28c8ed4 + e61a0b9 commit b6995a0

File tree

19 files changed

+121
-46
lines changed

19 files changed

+121
-46
lines changed

‎.github/workflows/collections-renames.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/[email protected]
2020

2121
- name: Setup Ruby
22-
uses: ruby/setup-ruby@472790540115ce5bd69d399a020189a8c87d641f # v1.247.0
22+
uses: ruby/setup-ruby@2a7b30092b0caf9c046252510f9273b4875f3db9 # v1.254.0
2323
with:
2424
bundler-cache: true
2525

‎.github/workflows/jekyll_build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: actions/[email protected]
2525

2626
- name: 💎 setup ruby
27-
uses: ruby/setup-ruby@472790540115ce5bd69d399a020189a8c87d641f # v1.247.0
27+
uses: ruby/setup-ruby@2a7b30092b0caf9c046252510f9273b4875f3db9 # v1.254.0
2828
with:
2929
bundler-cache: true
3030
cache-version: 0

‎.github/workflows/lint.yml‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,28 @@ jobs:
1616
- uses: actions/[email protected]
1717

1818
- name: Setup Ruby
19-
uses: ruby/setup-ruby@472790540115ce5bd69d399a020189a8c87d641f # v1.247.0
19+
uses: ruby/setup-ruby@v1.255.0
2020
with:
2121
bundler-cache: true
2222

23-
- name: Run linters
24-
uses: wearerequired/lint-action@548d8a7c4b04d3553d32ed5b6e91eb171e10e7bb # v2
25-
if: ${{ github.event_name == 'pull_request_target' }}
26-
with:
27-
auto_fix: true
28-
rubocop: true
29-
rubocop_command_prefix: bundle exec
23+
- name: Run RuboCop with auto-correct
24+
run: |
25+
bundle exec rubocop -A
26+
27+
- name: Check for changes
28+
id: changes
29+
run: |
30+
git config --global user.name "github-actions[bot]"
31+
git config --global user.email "github-actions[bot]@users.noreply.github.com"
32+
if git status --porcelain | grep .; then
33+
echo "changes=true" >> $GITHUB_ENV
34+
else
35+
echo "changes=false" >> $GITHUB_ENV
36+
fi
37+
38+
- name: Commit and push changes
39+
if: env.changes == 'true'
40+
run: |
41+
git add .
42+
git commit -m "chore: auto-corrected with RuboCop"
43+
git push

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343

4444
- name: Setup Ruby
4545
if: ${{ steps.topics.outputs.changed || steps.collections.outputs.changed || steps.all.outputs.changed }}
46-
uses: ruby/setup-ruby@472790540115ce5bd69d399a020189a8c87d641f # v1.247.0
46+
uses: ruby/setup-ruby@2a7b30092b0caf9c046252510f9273b4875f3db9 # v1.254.0
4747
with:
4848
bundler-cache: true
4949

‎Gemfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
source "https://rubygems.org"
22

3-
gem "faraday", "2.12.2"
4-
gem "faraday-retry", "2.3.1"
3+
gem "faraday", "2.13.4"
4+
gem "faraday-retry", "2.3.2"
55
gem "github-pages", "~> 232", group: :jekyll_plugins
6-
gem "json", "2.11.3"
7-
gem "language_server-protocol", "3.17.0.4"
6+
gem "json", "2.13.2"
7+
gem "language_server-protocol", "3.17.0.5"
88
gem "nokogiri", "~> 1.18.8"
9-
gem "rake", "13.2.1"
10-
gem "rubocop", "1.75.5"
9+
gem "rake", "13.3.0"
10+
gem "rubocop", "1.79.2"
1111

1212
group :test do
1313
gem "fastimage"

‎Gemfile.lock‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ GEM
4141
ffi (>= 1.15.0)
4242
eventmachine (1.2.7)
4343
execjs (2.10.0)
44-
faraday (2.12.2)
44+
faraday (2.13.4)
4545
faraday-net_http (>= 2.0, < 3.5)
4646
json
4747
logger
4848
faraday-net_http (3.4.1)
4949
net-http (>= 0.5.0)
50-
faraday-retry (2.3.1)
50+
faraday-retry (2.3.2)
5151
faraday (~> 2.0)
5252
fastimage (2.4.0)
5353
ffi (1.17.2)
@@ -235,12 +235,12 @@ GEM
235235
gemoji (>= 3, < 5)
236236
html-pipeline (~> 2.2)
237237
jekyll (>= 3.0, < 5.0)
238-
json (2.11.3)
238+
json (2.13.2)
239239
kramdown (2.4.0)
240240
rexml
241241
kramdown-parser-gfm (1.1.0)
242242
kramdown (~> 2.0)
243-
language_server-protocol (3.17.0.4)
243+
language_server-protocol (3.17.0.5)
244244
lint_roller (1.1.0)
245245
liquid (4.0.4)
246246
listen (3.9.0)
@@ -260,30 +260,30 @@ GEM
260260
bigdecimal (~> 3.1)
261261
net-http (0.6.0)
262262
uri
263-
nokogiri (1.18.8)
263+
nokogiri (1.18.9)
264264
mini_portile2 (~> 2.8.2)
265265
racc (~> 1.4)
266-
nokogiri (1.18.8-aarch64-linux-gnu)
266+
nokogiri (1.18.9-aarch64-linux-gnu)
267267
racc (~> 1.4)
268-
nokogiri (1.18.8-aarch64-linux-musl)
268+
nokogiri (1.18.9-aarch64-linux-musl)
269269
racc (~> 1.4)
270-
nokogiri (1.18.8-arm-linux-gnu)
270+
nokogiri (1.18.9-arm-linux-gnu)
271271
racc (~> 1.4)
272-
nokogiri (1.18.8-arm-linux-musl)
272+
nokogiri (1.18.9-arm-linux-musl)
273273
racc (~> 1.4)
274-
nokogiri (1.18.8-arm64-darwin)
274+
nokogiri (1.18.9-arm64-darwin)
275275
racc (~> 1.4)
276-
nokogiri (1.18.8-x86_64-darwin)
276+
nokogiri (1.18.9-x86_64-darwin)
277277
racc (~> 1.4)
278-
nokogiri (1.18.8-x86_64-linux-gnu)
278+
nokogiri (1.18.9-x86_64-linux-gnu)
279279
racc (~> 1.4)
280-
nokogiri (1.18.8-x86_64-linux-musl)
280+
nokogiri (1.18.9-x86_64-linux-musl)
281281
racc (~> 1.4)
282282
octokit (4.25.1)
283283
faraday (>= 1, < 3)
284284
sawyer (~> 0.9)
285285
parallel (1.27.0)
286-
parser (3.3.8.0)
286+
parser (3.3.9.0)
287287
ast (~> 2.4.1)
288288
racc
289289
pathutil (0.16.2)
@@ -295,25 +295,25 @@ GEM
295295
public_suffix (5.1.1)
296296
racc (1.8.1)
297297
rainbow (3.1.1)
298-
rake (13.2.1)
298+
rake (13.3.0)
299299
rb-fsevent (0.11.2)
300300
rb-inotify (0.11.1)
301301
ffi (~> 1.0)
302-
regexp_parser (2.10.0)
302+
regexp_parser (2.11.1)
303303
rexml (3.4.1)
304304
rouge (3.30.0)
305-
rubocop (1.75.5)
305+
rubocop (1.79.2)
306306
json (~> 2.3)
307307
language_server-protocol (~> 3.17.0.2)
308308
lint_roller (~> 1.1.0)
309309
parallel (~> 1.10)
310310
parser (>= 3.3.0.2)
311311
rainbow (>= 2.2.2, < 4.0)
312312
regexp_parser (>= 2.9.3, < 3.0)
313-
rubocop-ast (>= 1.44.0, < 2.0)
313+
rubocop-ast (>= 1.46.0, < 2.0)
314314
ruby-progressbar (~> 1.7)
315315
unicode-display_width (>= 2.4.0, < 4.0)
316-
rubocop-ast (1.45.1)
316+
rubocop-ast (1.46.0)
317317
parser (>= 3.3.7.2)
318318
prism (~> 1.4)
319319
rubocop-performance (1.25.0)
@@ -361,22 +361,22 @@ PLATFORMS
361361
x86_64-linux-musl
362362

363363
DEPENDENCIES
364-
faraday (= 2.12.2)
365-
faraday-retry (= 2.3.1)
364+
faraday (= 2.13.4)
365+
faraday-retry (= 2.3.2)
366366
fastimage
367367
github-pages (~> 232)
368368
httparty
369-
json (= 2.11.3)
370-
language_server-protocol (= 3.17.0.4)
369+
json (= 2.13.2)
370+
language_server-protocol (= 3.17.0.5)
371371
minitest
372372
nokogiri (~> 1.18.8)
373373
octokit
374374
pry
375-
rake (= 13.2.1)
376-
rubocop (= 1.75.5)
375+
rake (= 13.3.0)
376+
rubocop (= 1.79.2)
377377
rubocop-performance
378378
safe_yaml
379379
webrick
380380

381381
BUNDLED WITH
382-
2.5.19
382+
2.7.1

‎collections/productivity-tools/index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ items:
1818
- ajeetdsouza/zoxide
1919
- Slackadays/Clipboard
2020
- devtron-labs/devtron
21-
- Maximus5/ConEmu
21+
- ConEmu/ConEmu
2222
- wavetermdev/waveterm
2323
- termux/termux-app
2424
- zed-industries/zed

‎topics/adventurex2025/adventurex2025.png‎

12.9 KB
Loading

‎topics/adventurex2025/index.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
aliases: adventure-x
3+
created_by: Ryan Zhu & AdventureX Teams
4+
display_name: AdventureX 2025
5+
logo: adventurex2025.png
6+
released: July 23, 2025
7+
related: adventurex2024
8+
short_description: AdventureX 2025 is China's largest hackathon.
9+
topic: adventurex2025
10+
url: https://adventure-x.org/en
11+
---
12+
AdventureX 2025 is China's largest hackathon, taking place in Hangzhou from July 23 to 27. This 72-hour innovation challenge for young developers offers free entry, encourages tech for good, and promotes open source development. Let's once again lose sleep for creation, embrace the uncertain 72 hours. Not just another competition, but a stage for young changemakers, where projects address social issues and technology redefines what's possible - a miracle machine for the youth.

‎topics/c/c.png‎

-8.48 KB
Loading

0 commit comments

Comments
 (0)