Skip to content

Commit

Permalink
Merge pull request #4487 from github/jm_ruby_jekyll_update_versions
Browse files Browse the repository at this point in the history
fix: use latest ruby and newer jekyll versions
  • Loading branch information
jmeridth authored Oct 17, 2024
2 parents 78be7df + 4bf9c55 commit fc52dac
Show file tree
Hide file tree
Showing 8 changed files with 411 additions and 14 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"
}
25 changes: 24 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,30 @@ updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
interval: "weekly"
timezone: "America/Los_Angeles"
labels:
- "dependabot"
- "dependencies"
- "github-actions"
commit-message:
prefix: "chore(deps)"
open-pull-requests-limit: 99
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
Expand Down
1 change: 0 additions & 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 Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.2
3.3.5
20 changes: 11 additions & 9 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ There are a few ways you can contribute:
As you write content, check out the [Style Guide](./docs/styleguide.md) to learn what each field means, and how it should be formatted. Following the style guide will increase the chances of your contribution being accepted.

Notes:
- Updates won't immediately appear once we've merged your PR. We pull in these changes regularly to GitHub.
- Please limit your pull request to the creation/updating of one topic or collection at a time.

- Updates won't immediately appear once we've merged your PR. We pull in these changes regularly to GitHub.
- Please limit your pull request to the creation/updating of one topic or collection at a time.

## Improving an existing topic or collection

Expand All @@ -37,7 +38,8 @@ To update text and links, edit the `index.md` inside the topic or collection's d
For **topics**, you'll notice that, in examples like the topic "[algorithm](https://raw.githubusercontent.com/github/explore/main/topics/algorithm/index.md)," data like its canonical URL, Wikipedia URL, or display name are called out in key-value pairs, while its detailed description is accounted for in the body of the document.

_/topics/algorithm/index.md_:
```

```markdown
---
aliases: algorithms
display_name: Algorithm
Expand All @@ -54,7 +56,7 @@ Similarly, **collections** like "[music](https://raw.githubusercontent.com/githu

_/collections/music/index.md_:

```
```markdown
---
items:
- beetbox/beets
Expand Down Expand Up @@ -98,11 +100,11 @@ This repository includes [a list of the most-used GitHub topics that don't yet h

## Guidelines

* Avoid conflicts of interest. These should be of general community interest, not a marketing vehicle for a product or a personal project. If you are a direct employee of a company creating the project, or the creator and sole maintainer, it's unlikely to be accepted.
* We love experimenting with new technologies, and we are especially fond of GitHub Copilot. But as with all new technology, many of us are still getting accustomed to using generative AI tools effectively. Here are important guidelines to follow when using generative AI to contribute to this repository (adapted from the [GitHub Community Discussions CoC](https://github.com/community/community/blob/main/CODE_OF_CONDUCT.md#reasonable-use-of-ai-generated-content)):
* Read and revise the content before you post it. Use your own authentic voice and edit.
* Do not post AI-generated content verbatim to pad out the size and number of your contributions. Your changes should materially improve the site, not just say the same thing in different words.
* AI tools will often provide completely inaccurate or invented answers to prompts. Verify with an independent source that the information is correct before including it.
- Avoid conflicts of interest. These should be of general community interest, not a marketing vehicle for a product or a personal project. If you are a direct employee of a company creating the project, or the creator and sole maintainer, it's unlikely to be accepted.
- We love experimenting with new technologies, and we are especially fond of GitHub Copilot. But as with all new technology, many of us are still getting accustomed to using generative AI tools effectively. Here are important guidelines to follow when using generative AI to contribute to this repository (adapted from the [GitHub Community Discussions CoC](https://github.com/community/community/blob/main/CODE_OF_CONDUCT.md#reasonable-use-of-ai-generated-content)):
- Read and revise the content before you post it. Use your own authentic voice and edit.
- Do not post AI-generated content verbatim to pad out the size and number of your contributions. Your changes should materially improve the site, not just say the same thing in different words.
- AI tools will often provide completely inaccurate or invented answers to prompts. Verify with an independent source that the information is correct before including it.

## Running tests

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source "https://rubygems.org"

gem "github-pages", group: :jekyll_plugins
gem "github-pages", "~> 232", group: :jekyll_plugins

group :test do
gem "fastimage"
Expand Down
Loading

0 comments on commit fc52dac

Please sign in to comment.