-
Notifications
You must be signed in to change notification settings - Fork 2
Upgrade/chirpy 7.6 to main site #3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
dcdce27
chore: upgrade Chirpy theme to 7.6.0
padraignix cd07ff2
fix: restore posts and legacy presentation
padraignix f21f782
fix: center post image and pin entropy URL
padraignix c769348
fix: center post images by default
padraignix 9fee08a
fix: satisfy JavaScript quote lint
padraignix b220f4f
Merge remote-tracking branch 'origin/main' into upgrade/chirpy-7.6
padraignix 0a6352f
fix: align CI with site deployment
padraignix File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| { | ||
| "name": "Jekyll", | ||
| "image": "mcr.microsoft.com/devcontainers/jekyll:2-bullseye", | ||
| "onCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}", | ||
| "postCreateCommand": "bash .devcontainer/post-create.sh", | ||
| "customizations": { | ||
| "vscode": { | ||
| "settings": { | ||
| "terminal.integrated.defaultProfile.linux": "zsh" | ||
| }, | ||
| "extensions": [ | ||
| // Liquid tags auto-complete | ||
| "killalau.vscode-liquid-snippets", | ||
| // Liquid syntax highlighting and formatting | ||
| "Shopify.theme-check-vscode", | ||
| // Shell | ||
| "timonwong.shellcheck", | ||
| "mkhl.shfmt", | ||
| // Common formatter | ||
| "EditorConfig.EditorConfig", | ||
| "esbenp.prettier-vscode", | ||
| "stylelint.vscode-stylelint", | ||
| "yzhang.markdown-all-in-one", | ||
| // Git | ||
| "mhutchie.git-graph" | ||
| ] | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| if [ -f package.json ]; then | ||
| bash -i -c "nvm install --lts && nvm install-latest-npm" | ||
| npm i | ||
| npm run build | ||
| fi | ||
|
|
||
| # Install dependencies for shfmt extension | ||
| curl -sS https://webi.sh/shfmt | sh &>/dev/null | ||
|
|
||
| # Add OMZ plugins | ||
| git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting | ||
| git clone https://github.com/zsh-users/zsh-autosuggestions ~/.oh-my-zsh/custom/plugins/zsh-autosuggestions | ||
| sed -i -E "s/^(plugins=\()(git)(\))/\1\2 zsh-syntax-highlighting zsh-autosuggestions\3/" ~/.zshrc | ||
|
|
||
| # Avoid git log use less | ||
| echo -e "\nunset LESS" >>~/.zshrc |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| body: | ||
| - type: checkboxes | ||
| attributes: | ||
| label: Checklist | ||
| description: Following the guidelines can make you more likely to get responses. | ||
| options: | ||
| - label: >- | ||
| I have read and accepted the | ||
| [contributing guidelines](https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/docs/CONTRIBUTING.md). | ||
| required: true | ||
|
|
||
| - type: textarea | ||
| attributes: | ||
| label: Description | ||
| description: Please describe in detail what you want to share. | ||
| validations: | ||
| required: true |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| body: | ||
| - type: textarea | ||
| attributes: | ||
| label: Description | ||
| description: Please describe in detail what you want to share. | ||
| validations: | ||
| required: true |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| body: | ||
| - type: checkboxes | ||
| attributes: | ||
| label: Checklist | ||
| description: Following the guidelines can make you more likely to get responses. | ||
| options: | ||
| - label: >- | ||
| I have read and accepted the | ||
| [contributing guidelines](https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/docs/CONTRIBUTING.md). | ||
| required: true | ||
|
|
||
| - type: dropdown | ||
| id: download | ||
| attributes: | ||
| label: How did you create the site? | ||
| options: | ||
| - Generated from `chirpy-starter` | ||
| - Built from `jekyll-theme-chirpy` | ||
| validations: | ||
| required: true | ||
|
|
||
| - type: textarea | ||
| attributes: | ||
| label: Description | ||
| description: Please describe your need in detail. | ||
| validations: | ||
| required: true | ||
|
|
||
| - type: textarea | ||
| attributes: | ||
| label: Operations you have already tried | ||
| description: Describe the effort you went through. | ||
| validations: | ||
| required: true | ||
|
|
||
| - type: textarea | ||
| attributes: | ||
| label: Anything else? | ||
| description: | | ||
| Links? References? Or logs? Anything that will give us more context about the issue you are encountering! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| name: Bug Report | ||
| description: Create a report to help us improve | ||
| body: | ||
| - type: checkboxes | ||
| attributes: | ||
| label: Checklist | ||
| description: Following the guidelines can make you more likely to get responses. | ||
| options: | ||
| - label: >- | ||
| I have read and accepted the | ||
| [contributing guidelines](https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/docs/CONTRIBUTING.md). | ||
| required: true | ||
|
|
||
| - type: dropdown | ||
| id: download | ||
| attributes: | ||
| label: How did you create the site? | ||
| options: | ||
| - Generated from `chirpy-starter` | ||
| - Built from `jekyll-theme-chirpy` | ||
| validations: | ||
| required: true | ||
|
|
||
| - type: textarea | ||
| attributes: | ||
| label: Describe the bug | ||
| description: A clear and concise description of what the bug is. | ||
| validations: | ||
| required: true | ||
|
|
||
| - type: textarea | ||
| attributes: | ||
| label: Steps To Reproduce | ||
| description: Steps to reproduce the behavior. | ||
| placeholder: | | ||
| 1. In this environment... | ||
| 2. With this config... | ||
| 3. Run '...' | ||
| 4. See error... | ||
| validations: | ||
| required: true | ||
|
|
||
| - type: textarea | ||
| attributes: | ||
| label: Expected Behavior | ||
| description: A concise description of what you expected to happen. | ||
| validations: | ||
| required: true | ||
|
|
||
| - type: textarea | ||
| attributes: | ||
| label: Environment | ||
| value: | | ||
| - Ruby: <!-- run `ruby -v` --> | ||
| - Jekyll: <!-- run `bundle exec jekyll -v` --> | ||
| - Chirpy: <!-- run `bundle info --version jekyll-theme-chirpy` --> | ||
| validations: | ||
| required: true | ||
|
|
||
| - type: textarea | ||
| attributes: | ||
| label: Anything else? | ||
| description: | | ||
| Links? References? Or logs? Anything that will give us more context about the issue you are encountering! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| blank_issues_enabled: false | ||
| contact_links: | ||
| - name: Ask the community for help | ||
| url: https://github.com/cotes2020/jekyll-theme-chirpy/discussions | ||
| about: Please ask and answer questions here. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| name: Feature Request | ||
| description: Suggest an idea for this project | ||
| labels: | ||
| - enhancement | ||
| body: | ||
| - type: checkboxes | ||
| attributes: | ||
| label: Checklist | ||
| description: Following the guidelines can make you more likely to get responses. | ||
| options: | ||
| - label: >- | ||
| I have read and accepted the | ||
| [contributing guidelines](https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/docs/CONTRIBUTING.md). | ||
| required: true | ||
|
|
||
| - type: textarea | ||
| attributes: | ||
| label: Is your feature request related to a problem? Please describe | ||
| description: A clear and concise description of what the problem is. | ||
| validations: | ||
| required: true | ||
|
|
||
| - type: textarea | ||
| attributes: | ||
| label: Describe the solution you'd like | ||
| description: A clear and concise description of what you want to happen. | ||
| validations: | ||
| required: true | ||
|
|
||
| - type: textarea | ||
| attributes: | ||
| label: Describe alternatives you've considered | ||
| description: A clear and concise description of any alternative solutions or features you've considered. | ||
|
|
||
| - type: textarea | ||
| attributes: | ||
| label: Additional context | ||
| description: Add any other context or screenshots about the feature request here. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| ## Type of change | ||
| <!-- Please select the desired item checkbox and change it from `[ ]` to `[x]` and then delete the irrelevant options. --> | ||
| - [ ] Bug fix (non-breaking change which fixes an issue) | ||
| - [ ] New feature (non-breaking change which adds functionality) | ||
| - [ ] Improvement (refactoring and improving code) | ||
| - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) | ||
| - [ ] Documentation update | ||
|
|
||
| ## Description | ||
| <!-- | ||
| Please include a summary of the change and which issue is fixed. | ||
| Please also include relevant motivation and context. | ||
| List any dependencies that are required for this change. | ||
| --> | ||
|
|
||
| ## Additional context | ||
| <!-- e.g. Fixes #(issue) --> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| version: 2 | ||
| updates: | ||
| - package-ecosystem: "bundler" | ||
| directory: "/" | ||
| schedule: | ||
| interval: "weekly" | ||
| - package-ecosystem: "npm" | ||
| directory: "/" | ||
| versioning-strategy: increase | ||
| groups: | ||
| prod-deps: | ||
| dependency-type: production | ||
| dev-deps: | ||
| dependency-type: development | ||
| schedule: | ||
| interval: "weekly" | ||
| - package-ecosystem: "github-actions" | ||
| directories: | ||
| - "/.github/workflows/**" | ||
| groups: | ||
| gh-actions: | ||
| update-types: | ||
| - "major" | ||
| schedule: | ||
| interval: "weekly" | ||
| - package-ecosystem: "devcontainers" | ||
| directory: "/" | ||
| schedule: | ||
| interval: weekly |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| name: CI | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - main | ||
| - "hotfix/*" | ||
| paths-ignore: | ||
| - ".github/**" | ||
| - "!.github/workflows/ci.yml" | ||
| - .gitignore | ||
| - "docs/**" | ||
| - README.md | ||
| - LICENSE | ||
|
|
||
| permissions: | ||
| contents: read | ||
| pull_request: | ||
| paths-ignore: | ||
| - ".github/**" | ||
| - "!.github/workflows/ci.yml" | ||
| - .gitignore | ||
| - "docs/**" | ||
| - README.md | ||
| - LICENSE | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| strategy: | ||
| matrix: | ||
| ruby: ["3.3", "3.4"] | ||
|
|
||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v7 | ||
| with: | ||
| fetch-depth: 0 # for posts's lastmod | ||
|
|
||
| - name: Setup Ruby | ||
| uses: ruby/setup-ruby@v1 | ||
| with: | ||
| ruby-version: ${{ matrix.ruby }} | ||
| bundler-cache: true | ||
|
|
||
| - name: Setup Node | ||
| uses: actions/setup-node@v6 | ||
| with: | ||
| node-version: lts/* | ||
|
|
||
| - name: Build Assets | ||
| run: npm ci && npm run build | ||
|
|
||
| - name: Test Site | ||
| run: bash tools/test.sh | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| name: Lint JS | ||
|
|
||
| on: | ||
| push: | ||
| paths: | ||
| - "_javascript/**/*.js" | ||
| - ".github/workflows/scripts/**/*.js" | ||
| - "*.js" | ||
|
|
||
| permissions: | ||
| contents: read | ||
| pull_request: | ||
| paths: | ||
| - "_javascript/**/*.js" | ||
| - ".github/workflows/scripts/*.js" | ||
| - "*.js" | ||
|
|
||
| jobs: | ||
| lint-js: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v7 | ||
|
|
||
| - name: Setup Node.js | ||
| uses: actions/setup-node@v6 | ||
| with: | ||
| node-version: lts/* | ||
|
|
||
| - name: Install Dependencies | ||
| run: npm ci | ||
|
|
||
| - name: Lint JS | ||
| run: npm run lint:js | ||
|
github-advanced-security[bot] marked this conversation as resolved.
Fixed
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.