Skip to content

Commit 7fb7d55

Browse files
drkameleondrkameleon
authored
Merge branch 'main' into main
2 parents 8ee81cc + 011f9d9 commit 7fb7d55

File tree

909 files changed

+7043
-826
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

909 files changed

+7043
-826
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<!-- Thank you for contributing! -->
22
### Please confirm this pull request meets the following requirements:
33

4-
- [ ] I followed the contributing guidelines: <https://github.com/github/explore/blob/master/CONTRIBUTING.md>.
5-
- [ ] I have no affiliation with the project I am suggesting (as a maintainer, creator, contractor, or employee).
4+
- [ ] I followed the contributing guidelines: <https://github.com/github/explore/blob/main/CONTRIBUTING.md>.
5+
- [ ] I am not the sole author or employee of a company who created either the topic I am modifying/adding or the collection entry I am modifying/adding.
66

77
### Which change are you proposing?
88

@@ -21,12 +21,12 @@ I'm suggesting these edits to an existing topic or collection:
2121

2222
> Please replace this line with an explanation of why you think these changes should be made.
2323
24-
<!-- ⚠️ ... or this section ⚠️ -->
24+
<!-- ⚠️ this section... ⚠️ -->
2525
### Curating a new topic or collection
2626

2727
- [ ] I've formatted my changes as a new folder directory, named for the topic or collection as it appears in the URL on GitHub (e.g. `https://github.com/topics/[NAME]` or `https://github.com/collections/[NAME]`)
2828
- [ ] My folder contains a `*.png` image (if applicable) and `index.md`
29-
- [ ] All required fields in my `index.md` conform to the Style Guide and API docs: <https://github.com/github/explore/tree/master/docs>
29+
- [ ] All required fields in my `index.md` conform to the Style Guide and API docs: <https://github.com/github/explore/tree/main/docs>
3030

3131
> Please replace this line with an explanation of why you think this topic or collection should be curated.
3232
@@ -35,7 +35,7 @@ I'm suggesting these edits to an existing topic or collection:
3535

3636
- [ ] My suggested edits are not about an existing topic or collection, or at least not a single one
3737
- [ ] My suggested edits are not about curating a new topic or collection, or at least not a single one
38-
- [ ] My suggested edits conform to the Style Guide and API docs: https://github.com/github/explore/tree/master/docs
38+
- [ ] My suggested edits conform to the Style Guide and API docs: https://github.com/github/explore/tree/main/docs
3939

4040
> Please replace this line with an explanation of your proposed changes.
4141

‎.github/dependabot.yml‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
version: 2
22
updates:
3-
- package-ecosystem: bundler
4-
directory: "/"
5-
schedule:
6-
interval: daily
7-
time: "10:00"
8-
timezone: Europe/Vienna
9-
pull-request-branch-name:
10-
separator: "-"
11-
open-pull-requests-limit: 99
12-
allow:
13-
- dependency-type: direct
14-
- dependency-type: indirect
15-
rebase-strategy: disabled
3+
- package-ecosystem: github-actions
4+
directory: "/"
5+
schedule:
6+
interval: daily
7+
time: "10:00"
8+
timezone: Europe/Vienna
9+
pull-request-branch-name:
10+
separator: "-"
11+
open-pull-requests-limit: 99
12+
rebase-strategy: disabled

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Check and update renamed/removed collection items
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
- cron: "0 * * * *" # every hour
7+
8+
jobs:
9+
update:
10+
runs-on: ubuntu-latest
11+
if: github.repository_owner == 'github'
12+
steps:
13+
- uses: actions/checkout@v4
14+
15+
- name: Setup Ruby
16+
uses: ruby/setup-ruby@v1
17+
with:
18+
bundler-cache: true
19+
20+
- name: Test collection with autofix and commit changes
21+
uses: technote-space/create-pr-action@v2
22+
env:
23+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
24+
AUTOCORRECT_RENAMED_REPOS: 1
25+
with:
26+
EXECUTE_COMMANDS: |
27+
bundle exec rake collections
28+
COMMIT_MESSAGE: '✨ Autofixing renamed/removed collection items ✨'
29+
COMMIT_NAME: 'GitHub Actions'
30+
COMMIT_EMAIL: '[email protected]'
31+
PR_BRANCH_NAME: 'update-collections-${PR_ID}'
32+
PR_TITLE: '✨ Autofixing renamed/removed collection items ✨'

‎.github/workflows/conflict.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Check for conflicts of interest
2+
3+
on:
4+
pull_request:
5+
merge_group:
6+
7+
jobs:
8+
check:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- run: |
12+
echo "In order to review this pull request for acceptance, we need to make sure that all of the prerequisites are satisfied."
13+
echo "This was not checked:"
14+
echo "> I am not the sole author or employee of a company who created either the topic I am modifying/adding or the collection entry I am modifying/adding."
15+
echo "This is a requirement to maintain a high level of independence in this project. Please update if you are able to verify that you meet that requirement."
16+
echo "Thank you!"
17+
exit 1
18+
if: contains(github.event.pull_request.body, '- [ ] I am not the sole author or employee of a company who created either the topic I am modifying/adding or the collection entry I am modifying/adding.')
19+
name: Fail
20+
- run: exit 0
21+
if: contains(github.event.pull_request.body, '- [x] I am not the sole author or employee of a company who created either the topic I am modifying/adding or the collection entry I am modifying/adding.')
22+
name: Succeed

‎.github/workflows/jekyll_build.yml‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: Build and Publish Jekyll for GitHub Pages
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches:
7+
- main
8+
9+
permissions:
10+
contents: read
11+
pages: write
12+
id-token: write
13+
14+
concurrency:
15+
group: "pages"
16+
cancel-in-progress: true
17+
18+
jobs:
19+
build:
20+
runs-on: ubuntu-latest
21+
steps:
22+
- name: 📂 checkout
23+
uses: actions/checkout@v4
24+
25+
- name: 💎 setup ruby
26+
uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939 # v1.152.0
27+
with:
28+
bundler-cache: true
29+
cache-version: 0
30+
31+
- name: 📄 setup pages
32+
id: pages
33+
uses: actions/configure-pages@v5
34+
35+
- name: 🔨 install dependencies & build site
36+
uses: actions/[email protected]
37+
38+
- name: ⚡️ upload artifact
39+
uses: actions/upload-pages-artifact@v3
40+
41+
deploy:
42+
needs: build
43+
44+
environment:
45+
name: github-pages
46+
url: ${{ steps.deployment.outputs.page_url }}
47+
48+
runs-on: ubuntu-latest
49+
steps:
50+
- name: 🚀 deploy
51+
id: deployment
52+
uses: actions/[email protected]

‎.github/workflows/lint.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Lint
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
workflow_dispatch:
9+
merge_group:
10+
11+
jobs:
12+
lint:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v4
16+
17+
- name: Setup Ruby
18+
uses: ruby/setup-ruby@v1
19+
with:
20+
bundler-cache: true
21+
22+
- name: Run linters
23+
if: ${{ github.event_name != 'merge_group' }}
24+
uses: wearerequired/lint-action@v2
25+
with:
26+
auto_fix: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.owner.login == github.repository_owner }}
27+
rubocop: true
28+
rubocop_command_prefix: bundle exec
29+
30+
- name: Skip with successful status
31+
if: ${{ github.event_name == 'merge_group' }}
32+
run: exit 0

‎.github/workflows/pull_request.yml‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎.github/workflows/stale.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,17 @@ on:
44
schedule:
55
- cron: "0 12 * * *"
66

7+
permissions:
8+
contents: read
9+
710
jobs:
811
stale:
12+
permissions:
13+
issues: write # for actions/stale to close stale issues
14+
pull-requests: write # for actions/stale to close stale PRs
915
runs-on: ubuntu-latest
1016
steps:
11-
- uses: actions/stale@v3
17+
- uses: actions/stale@v9
1218
with:
1319
stale-pr-message: >
1420
This pull request has been automatically marked as stale because it has not

‎.github/workflows/test.yml‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: Test
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
workflow_dispatch:
9+
merge_group:
10+
11+
jobs:
12+
test:
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
test_type:
17+
- collections
18+
- topics
19+
- all
20+
runs-on: ubuntu-latest
21+
steps:
22+
- uses: actions/checkout@v4
23+
with:
24+
fetch-depth: 0
25+
26+
- name: Get non-topic and non-collection changed files
27+
id: all
28+
if: matrix.test_type == 'all'
29+
run: echo "changed=$(git diff --name-only --diff-filter=ACMRT ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | grep -ve '^topics\/' -ve '^collections\/' | xargs)" >> $GITHUB_OUTPUT
30+
31+
- name: Get changed topic files
32+
id: topics
33+
if: matrix.test_type == 'topics'
34+
run: echo "changed=$(git diff --name-only --diff-filter=ACMRT ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | grep ^topics\/ | xargs)" >> $GITHUB_OUTPUT
35+
36+
- name: Get changed collection files
37+
id: collections
38+
if: matrix.test_type == 'collections'
39+
run: echo "changed=$(git diff --name-only --diff-filter=ACMRT ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | grep ^collections\/ | xargs)" >> $GITHUB_OUTPUT
40+
41+
- name: Setup Ruby
42+
if: ${{ steps.topics.outputs.changed || steps.collections.outputs.changed || steps.all.outputs.changed }}
43+
uses: ruby/setup-ruby@v1
44+
with:
45+
bundler-cache: true
46+
47+
- name: Build and test with Rake
48+
if: |
49+
(matrix.test_type == 'topics' && steps.topics.outputs.changed) ||
50+
(matrix.test_type == 'collections' && steps.collections.outputs.changed) ||
51+
(matrix.test_type == 'all' && steps.all.outputs.changed)
52+
run: bundle exec rake ${{ matrix.test_type }}
53+
env:
54+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
55+
TOPIC_FILES: ${{ steps.topics.outputs.changed }}
56+
COLLECTION_FILES: ${{ steps.collections.outputs.changed }}
57+
TEST_ALL_FILES: ${{ steps.all.outputs.changed }}

‎.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,10 @@
11
.DS_Store
2+
Gemfile.lock
23
scripts/
4+
_site
5+
.sass-cache
6+
.jekyll-cache
7+
.jekyll-metadata
8+
vendor
9+
.bundle
10+
.idea

0 commit comments

Comments
 (0)