Skip to content

Commit

Permalink
Merge branch 'github:main' into openutau
Browse files Browse the repository at this point in the history
  • Loading branch information
oxygen-dioxide authored Jan 29, 2025
2 parents 6cbdfea + 471e5f6 commit 4c21d22
Show file tree
Hide file tree
Showing 504 changed files with 3,764 additions and 450 deletions.
19 changes: 19 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"name": "Jekyll website",
"image": "mcr.microsoft.com/devcontainers/jekyll:latest",
"features": {
"ghcr.io/devcontainers/features/node:1": {
"version": "22"
},
"ghcr.io/devcontainers/features/ruby:1": {
"version": "3.3.5"
}
},
"forwardPorts": [
// Jekyll server
4000,
// Live reload server
35729
],
"postCreateCommand": "bundle exec jekyll serve --incremental"
}
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
### Please confirm this pull request meets the following requirements:

- [ ] I followed the contributing guidelines: <https://github.com/github/explore/blob/main/CONTRIBUTING.md>.
- [ ] I am not the sole author or employee of a company who created the topic or collection I'm changing.
- [ ] 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.

### Which change are you proposing?

Expand All @@ -21,7 +21,7 @@ I'm suggesting these edits to an existing topic or collection:

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

- [ ] 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]`)
Expand Down
41 changes: 34 additions & 7 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,39 @@
---
version: 2
updates:
- package-ecosystem: github-actions
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: daily
time: "10:00"
timezone: Europe/Vienna
pull-request-branch-name:
separator: "-"
interval: "weekly"
timezone: "America/Los_Angeles"
labels:
- "dependabot"
- "dependencies"
- "github-actions"
commit-message:
prefix: "chore(deps)"
open-pull-requests-limit: 99
rebase-strategy: disabled
groups:
dependencies:
applies-to: version-updates
update-types:
- "minor"
- "patch"
- package-ecosystem: "bundler"
directory: /
schedule:
interval: "weekly"
timezone: "America/Los_Angeles"
labels:
- "dependabot"
- "dependencies"
- "bundler"
commit-message:
prefix: "chore(deps)"
open-pull-requests-limit: 99
groups:
dependencies:
applies-to: version-updates
update-types:
- "minor"
- "patch"
24 changes: 15 additions & 9 deletions .github/workflows/collections-renames.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,36 @@ name: Check and update renamed/removed collection items
on:
workflow_dispatch:
schedule:
- cron: "0 * * * *" # every hour
- cron: "0 * * * *" # every hour

permissions:
contents: read

jobs:
update:
permissions:
pull-requests: write
contents: write
runs-on: ubuntu-latest
if: github.repository_owner == 'github'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4.2.2

- name: Setup Ruby
uses: ruby/setup-ruby@v1
uses: ruby/setup-ruby@1287d2b408066abada82d5ad1c63652e758428d9 # v1.214.0
with:
bundler-cache: true

- name: Test collection with autofix and commit changes
uses: technote-space/create-pr-action@v2
uses: technote-space/create-pr-action@91114507cf92349bec0a9a501c2edf1635427bc5 # v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
AUTOCORRECT_RENAMED_REPOS: 1
with:
EXECUTE_COMMANDS: |
bundle exec rake collections
COMMIT_MESSAGE: '✨ Autofixing renamed/removed collection items ✨'
COMMIT_NAME: 'GitHub Actions'
COMMIT_EMAIL: '[email protected]'
PR_BRANCH_NAME: 'update-collections-${PR_ID}'
PR_TITLE: '✨ Autofixing renamed/removed collection items ✨'
COMMIT_MESSAGE: "✨ Autofixing renamed/removed collection items ✨"
COMMIT_NAME: "GitHub Actions"
COMMIT_EMAIL: "[email protected]"
PR_BRANCH_NAME: "update-collections-${PR_ID}"
PR_TITLE: "✨ Autofixing renamed/removed collection items ✨"
9 changes: 6 additions & 3 deletions .github/workflows/conflict.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,22 @@ on:
pull_request:
merge_group:

permissions:
contents: read

jobs:
check:
runs-on: ubuntu-latest
steps:
- run: |
echo "In order to review this pull request for acceptance, we need to make sure that all of the prerequisites are satisfied."
echo "This was not checked:"
echo "> I have no affiliation with the project I am suggesting (as a maintainer, creator, contractor, or employee)"
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."
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."
echo "Thank you!"
exit 1
if: contains(github.event.pull_request.body, '- [ ] I have no affiliation with the project I am suggesting (as a maintainer, creator, contractor, or employee).')
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.')
name: Fail
- run: exit 0
if: contains(github.event.pull_request.body, '- [x] I have no affiliation with the project I am suggesting (as a maintainer, creator, contractor, or employee).')
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.')
name: Succeed
42 changes: 23 additions & 19 deletions .github/workflows/jekyll_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,38 +8,42 @@ on:

permissions:
contents: read
pages: write
id-token: write


concurrency:
group: "pages"
cancel-in-progress: true

jobs:
build:
permissions:
pages: write
id-token: write
runs-on: ubuntu-latest
steps:
- name: 📂 checkout
uses: actions/checkout@v3
- name: 📂 checkout
uses: actions/[email protected]

- name: 💎 setup ruby
uses: ruby/setup-ruby@1287d2b408066abada82d5ad1c63652e758428d9 # v1.214.0
with:
bundler-cache: true
cache-version: 0

- name: 💎 setup ruby
uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939 # v1.152.0
with:
bundler-cache: true
cache-version: 0
- name: 📄 setup pages
id: pages
uses: actions/[email protected]

- name: 📄 setup pages
id: pages
uses: actions/configure-pages@v3
- name: 🔨 install dependencies & build site
uses: actions/jekyll-build-pages@44a6e6beabd48582f863aeeb6cb2151cc1716697 # v1.0.13

- name: 🔨 install dependencies & build site
uses: actions/[email protected]

- name: ⚡️ upload artifact
uses: actions/upload-pages-artifact@v2
- name: ⚡️ upload artifact
uses: actions/[email protected]

deploy:
needs: build
permissions:
pages: write
id-token: write

environment:
name: github-pages
Expand All @@ -49,4 +53,4 @@ jobs:
steps:
- name: 🚀 deploy
id: deployment
uses: actions/deploy-pages@v2.0.3
uses: actions/deploy-pages@v4.0.5
9 changes: 6 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,23 @@ on:
workflow_dispatch:
merge_group:

permissions:
contents: read

jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4.2.2

- name: Setup Ruby
uses: ruby/setup-ruby@v1
uses: ruby/setup-ruby@1287d2b408066abada82d5ad1c63652e758428d9 # v1.214.0
with:
bundler-cache: true

- name: Run linters
if: ${{ github.event_name != 'merge_group' }}
uses: wearerequired/lint-action@v2
uses: wearerequired/lint-action@548d8a7c4b04d3553d32ed5b6e91eb171e10e7bb # v2
with:
auto_fix: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.owner.login == github.repository_owner }}
rubocop: true
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@ name: Mark stale PRs
on:
workflow_dispatch:
schedule:
- cron: "0 12 * * *"
- cron: "0 12 * * *"

permissions:
contents: read

jobs:
stale:
permissions:
issues: write # for actions/stale to close stale issues
pull-requests: write # for actions/stale to close stale PRs
issues: write # for actions/stale to close stale issues
pull-requests: write # for actions/stale to close stale PRs
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v8
with:
stale-pr-message: >
This pull request has been automatically marked as stale because it has not
had recent activity. It will be closed if no further activity occurs.
Thank you for your contributions.
stale-pr-label: "stale"
exempt-pr-labels: "pinned,security,dependencies"
days-before-pr-stale: 30
days-before-pr-close: 7
ascending: true
operations-per-run: 100
- uses: actions/stale@v9.1.0
with:
stale-pr-message: >
This pull request has been automatically marked as stale because it has not
had recent activity. It will be closed if no further activity occurs.
Thank you for your contributions.
stale-pr-label: "stale"
exempt-pr-labels: "pinned,security,dependencies"
days-before-pr-stale: 30
days-before-pr-close: 7
ascending: true
operations-per-run: 100
7 changes: 5 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ on:
workflow_dispatch:
merge_group:

permissions:
contents: read

jobs:
test:
strategy:
Expand All @@ -19,7 +22,7 @@ jobs:
- all
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4.2.2
with:
fetch-depth: 0

Expand All @@ -40,7 +43,7 @@ jobs:

- name: Setup Ruby
if: ${{ steps.topics.outputs.changed || steps.collections.outputs.changed || steps.all.outputs.changed }}
uses: ruby/setup-ruby@v1
uses: ruby/setup-ruby@1287d2b408066abada82d5ad1c63652e758428d9 # v1.214.0
with:
bundler-cache: true

Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.DS_Store
Gemfile.lock
scripts/
_site
.sass-cache
Expand All @@ -8,3 +7,4 @@ _site
vendor
.bundle
.idea
.tool-versions
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.2
3.4.1
Loading

0 comments on commit 4c21d22

Please sign in to comment.