Skip to content

Commit 030c9f3

Browse files
authored
Merge branch 'main' into global-graphql-batch-prefetch
2 parents 44f56ef + a97571f commit 030c9f3

File tree

38 files changed

+290
-26
lines changed

38 files changed

+290
-26
lines changed

.github/workflows/collections-renames.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,3 @@ jobs:
3737
committer: "github-actions[bot] <actions@github.com>"
3838
branch: "update-collections-${PR_ID}"
3939
title: "✨ Autofixing renamed/removed collection items ✨"
40-
41-
- name: Auto-merge PR
42-
if: steps.cpr.outputs.pull-request-number
43-
run: |
44-
gh pr review --approve "${{ steps.cpr.outputs.pull-request-url }}"
45-
gh pr merge --auto "${{ steps.cpr.outputs.pull-request-url }}"
46-
env:
47-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,21 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
test_type:
20-
- collections
21-
- topics
22-
- all
19+
include:
20+
- test_type: topics
21+
- test_type: collections
22+
shard: 0
23+
total_shards: 4
24+
- test_type: collections
25+
shard: 1
26+
total_shards: 4
27+
- test_type: collections
28+
shard: 2
29+
total_shards: 4
30+
- test_type: collections
31+
shard: 3
32+
total_shards: 4
33+
- test_type: all
2334
runs-on: ubuntu-latest
2435
steps:
2536
- uses: actions/checkout@v6.0.1
@@ -47,6 +58,17 @@ jobs:
4758
with:
4859
bundler-cache: true
4960

61+
- name: Restore API cache
62+
if: |
63+
(matrix.test_type == 'collections' && steps.collections.outputs.changed) ||
64+
(matrix.test_type == 'all' && steps.all.outputs.changed)
65+
uses: actions/cache@v4
66+
with:
67+
path: .api-cache.json
68+
key: api-cache-${{ matrix.test_type }}-${{ github.run_id }}
69+
restore-keys: |
70+
api-cache-${{ matrix.test_type }}-
71+
5072
- name: Build and test with Rake
5173
if: |
5274
(matrix.test_type == 'topics' && steps.topics.outputs.changed) ||
@@ -58,3 +80,6 @@ jobs:
5880
TOPIC_FILES: ${{ steps.topics.outputs.changed }}
5981
COLLECTION_FILES: ${{ steps.collections.outputs.changed }}
6082
TEST_ALL_FILES: ${{ steps.all.outputs.changed }}
83+
SKIP_COLLECTION_API_CHECKS: ${{ matrix.test_type == 'all' && '1' || '' }}
84+
COLLECTION_SHARD: ${{ matrix.shard }}
85+
COLLECTION_TOTAL_SHARDS: ${{ matrix.total_shards }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ vendor
88
.bundle
99
.idea
1010
.tool-versions
11+
.api-cache.json

Gemfile

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

3-
gem "faraday", "2.14.0"
3+
gem "faraday", "2.14.1"
44
gem "faraday-retry", "2.4.0"
55
gem "github-pages", "~> 232", group: :jekyll_plugins
66
gem "json", "2.18.0"

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ GEM
4141
ffi (>= 1.15.0)
4242
eventmachine (1.2.7)
4343
execjs (2.10.0)
44-
faraday (2.14.0)
44+
faraday (2.14.1)
4545
faraday-net_http (>= 2.0, < 3.5)
4646
json
4747
logger
@@ -366,7 +366,7 @@ PLATFORMS
366366
x86_64-linux-musl
367367

368368
DEPENDENCIES
369-
faraday (= 2.14.0)
369+
faraday (= 2.14.1)
370370
faraday-retry (= 2.4.0)
371371
fastimage
372372
github-pages (~> 232)

collections/clean-code-linters/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ items:
3939
- nicklockwood/SwiftFormat
4040
- super-linter/super-linter
4141
- stylelint/stylelint
42+
- agent-sh/agnix
4243
display_name: Clean code linters
4344
created_by: holman
4445
---

collections/devops-tools/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ items:
4343
- cloudposse/atmos
4444
- axem-solutions/dem
4545
- semaphoreio/semaphore
46+
- stoicsoft/server-compass-releases
4647

4748
display_name: DevOps tools
4849
---

collections/github-browser-extensions/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ items:
4141
- octobox/extension
4242
- hypertrons/hypertrons-crx
4343
- NirmalScaria/le-git-graph
44+
- slmkhanahmed/Git-Galaxy-Finder
4445
display_name: GitHub Browser Extensions
4546
created_by: leereilly
4647
---

collections/green-software/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ items:
3939
- TechEmpower/FrameworkBenchmarks
4040
- greensoftwarelab/Energy-Languages
4141
- etsy/cloud-jewels
42-
- GreenAlgorithms/green-algorithms-tool
42+
- Cambridge-Sustainable-Computing-Lab/Green-Algorithms-calculator
4343
- digital4better/carbonara
4444
- sosy-lab/cpu-energy-meter
4545
- Green-Software-Foundation/if
@@ -48,7 +48,7 @@ items:
4848
- green-code-initiative/creedengo-rules-specifications
4949
- geopm/geopm
5050
- green-code-initiative/ecoCode-android
51-
- Accenture/EcoSonar
51+
- green-code-initiative/EcoSonar
5252
- green-code-initiative/creedengo-ios
5353
- GoogleCloudPlatform/region-carbon-info
5454
- Azure/carbon-aware-keda-operator

collections/machine-learning/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ items:
3939
- https://www.youtube.com/embed/bHvf7Tagt18
4040
- https://www.youtube.com/embed/ILsA4nyG7I0
4141
- AMAI-GmbH/AI-Expert-Roadmap
42+
- vitali87/code-graph-rag
4243
display_name: Getting started with machine learning
4344
created_by: omoju
4445
---

0 commit comments

Comments
 (0)