Skip to content

Commit

Permalink
Merge branch 'master' into clue
Browse files Browse the repository at this point in the history
  • Loading branch information
Markos-Th09 authored May 19, 2024
2 parents ab9daa5 + e2012cd commit 3224725
Show file tree
Hide file tree
Showing 422 changed files with 16,029 additions and 1,598 deletions.
3 changes: 3 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Available versions: https://github.com/devcontainers/images/tree/main/src/ruby
FROM mcr.microsoft.com/devcontainers/ruby
RUN apt update && apt install -y cmake
27 changes: 27 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"name": "Ruby",
"build": {
"dockerfile": "Dockerfile"
},
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
"ghcr.io/devcontainers/features/go:1": {}
},
"customizations": {
"codespaces": {
"openFiles": [
"CONTRIBUTING.md",
"lib/linguist/languages.yml"
]
},
"vscode": {
"extensions": [
"EditorConfig.EditorConfig",
"redhat.vscode-yaml",
"Shopify.ruby-lsp"
]
}
},
"onCreateCommand": ".devcontainer/onCreateCommand.sh",
"remoteUser": "vscode"
}
4 changes: 4 additions & 0 deletions .devcontainer/onCreateCommand.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
./script/bootstrap
git remote add linguist https://github.com/github-linguist/linguist
git fetch linguist v2.0.0:v2.0.0 test/attributes:test/attributes test/master:test/master
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Fix syntax highlighting for devcontainer files
.devcontainer/*.json linguist-language=JSON-with-Comments
3 changes: 1 addition & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# All pull requests need to be reviewed by someone from GitHub.
# @github/linguist is a GitHub maintained team.
#
* @github/linguist
* @github-linguist/github
12 changes: 6 additions & 6 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ title: ''
labels: Bug
assignees: ''
---
<!--
NOTE: Please use Discussions for all incorrect or unexpected language analysis or
<!--
NOTE: Please use Discussions for all incorrect or unexpected language analysis or
statistics behaviour BEFORE opening a bug.
If you know how to fix this bug, please feel free to submit a Pull Request
with your fix; we don't need an issue first.
-->

## Describe the bug
<!--
Please provide a clear and detailed explanation of the bug you've found, and why
you consider it to be a bug.
<!--
Please provide a clear and detailed explanation of the bug you've found, and why
you consider it to be a bug.
Ideally, please provide steps to reproduce the bug and include the output from
Ideally, please provide steps to reproduce the bug and include the output from
using `github-linguist` on the command line.
-->

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/new_language.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ assignees: ''

<!--
👋 If you have the time and know-how, send us a pull-request: everybody is welcome to contribute!
👋 If you have the time and know-how, send us a pull-request: everybody is welcome to contribute!
Otherwise, fill out the following fields as best you can.
-->
Expand Down
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
- [ ] The new extension is used in hundreds of repositories on github.com
- Search results for each extension:
<!-- Replace FOOBAR with the new extension, and KEYWORDS with keywords unique to the language. Repeat for each extension added. -->
- https://github.com/search?utf8=%E2%9C%93&type=Code&ref=searchresults&q=extension%3AFOOBAR+KEYWORDS+NOT+nothack
- https://github.com/search?type=code&q=NOT+is%3Afork+path%3A*.FOOBAR+KEYWORDS
- [ ] I have included a real-world usage sample for all extensions added in this PR:
- Sample source(s):
- [URL to each sample source, if applicable]
Expand All @@ -22,7 +22,7 @@
- [ ] The extension of the new language is used in hundreds of repositories on github.com.
- Search results for each extension:
<!-- Replace FOOBAR with the new extension, and KEYWORDS with keywords unique to the language. Repeat for each extension added. -->
- https://github.com/search?utf8=%E2%9C%93&type=Code&ref=searchresults&q=extension%3AFOOBAR+KEYWORDS+NOT+nothack
- https://github.com/search?type=code&q=NOT+is%3Afork+path%3A*.FOOBAR+KEYWORDS
- [ ] I have included a real-world usage sample for all extensions added in this PR:
- Sample source(s):
- [URL to each sample source, if applicable]
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
pull_request:
branches:
- master
merge_group:

permissions:
contents: read
Expand All @@ -18,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ruby: [ '3.1', '3.0', '2.7', '2.6' ]
ruby: [ '3.2', '3.1', '3.0' ]
steps:
- uses: actions/checkout@v1
- name: Set up Ruby
Expand Down Expand Up @@ -56,7 +57,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.0'
ruby-version: '3.2'
bundler-cache: true
- name: Build
run: bundle exec rake samples
Expand Down
Loading

0 comments on commit 3224725

Please sign in to comment.