Skip to content

Commit

Permalink
Merge pull request #225 from sujaykundu777/sk/july2024
Browse files Browse the repository at this point in the history
upgrade dependencies
  • Loading branch information
sujaykundu777 authored Jul 11, 2024
2 parents 90ca90c + 380dca3 commit 472ab6f
Show file tree
Hide file tree
Showing 9 changed files with 190 additions and 129 deletions.
14 changes: 6 additions & 8 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,18 @@

name: "Jekyll CI"


# Controls when the workflow will run
on:
# Triggers the workflow on push or pull request events but only for the main branch
push:
branches: [ master ]
branches: [master]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
branches: [master]
# Triggers the workflow on push or pull request events but only for the main branch
schedule:
# Runs at 6am UTC every Monday
- cron: '0 6 * * 1'

- cron: "0 6 * * 1"

jobs:
# Check the Jekyll itself for errors and syntax
Expand All @@ -28,7 +26,7 @@ jobs:
# Check that the Jekyll can actually build
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Build the site in the jekyll/builder container
run: |
docker run \
Expand All @@ -43,13 +41,13 @@ jobs:
# Check markdown files are markdown-lint compliant
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Lint markdown files with markdown-lint
uses: articulate/[email protected]
with:
# Includes some specific rules to ignore
config: .github/workflows/markdownlint-config.json
files: '_posts/**/*.md'
files: "_posts/**/*.md"
# Ignore the built website, might have some funky files
ignore: _site/
# Try to fix basic errors
Expand Down
50 changes: 25 additions & 25 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Deploy Site

on:
push:
branches: [ master ]
branches: [master]
workflow_dispatch:

jobs:
Expand All @@ -11,7 +11,7 @@ jobs:
outputs:
target: ${{ steps.set-output.outputs.target }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: get deployment target
run: |
Expand Down Expand Up @@ -44,37 +44,37 @@ jobs:
if: needs.set-deploy-type.outputs.target == 'gh-pages'

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Deploy Jekyll Site
uses: sujaykundu777/[email protected].3
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_REPOSITORY: ${{ secrets.GITHUB_REPOSITORY }}
GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}
- name: Deploy Jekyll Site
uses: sujaykundu777/[email protected].4
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_REPOSITORY: ${{ secrets.GITHUB_REPOSITORY }}
GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}

deploy-firebase:
runs-on: ubuntu-latest
needs: set-deploy-type
if: needs.set-deploy-type.outputs.target == 'firebase'

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: setup ruby
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
- name: setup ruby
uses: ruby/setup-ruby@v1
with:
bundler-cache: true

- name: build jekyll
run: |
bundle install
bundle exec jekyll build
- name: build jekyll
run: |
bundle install
bundle exec jekyll build
- name: deploy to firebase
uses: w9jds/firebase-action@master
with:
args: deploy --only hosting
env:
FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
PROJECT_ID: ${{ secrets.FIREBASE_PROJECT_ID }}
- name: deploy to firebase
uses: w9jds/firebase-action@master
with:
args: deploy --only hosting
env:
FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
PROJECT_ID: ${{ secrets.FIREBASE_PROJECT_ID }}
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-3.1.2
ruby-3.3.4
2 changes: 1 addition & 1 deletion DEPLOY_STRATEGY
Original file line number Diff line number Diff line change
@@ -1 +1 @@
none
gh-pages
20 changes: 13 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,27 +1,32 @@
source "https://rubygems.org"

gem 'jekyll', '~> 4.3.2'
gem 'bundler', '~> 2.3.7'
gem 'jekyll', '~> 4.3.3'
gem 'bundler', '~> 2.5.15'
gem 'faraday-retry'
gem 'backports', '~> 3.23'
gem 'backports', '~> 3.25.0'
gem 'kramdown'
gem 'puma'

gem 'csv'
gem 'base64'

# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
# uncomment the line below. To upgrade, run `bundle update github-pages`.
# gem "github-pages", group: :jekyll_plugins
# you can read more about it here
# https://docs.github.com/en/pages/setting-up-a-github-pages-site-with-jekyll/about-github-pages-and-jekyll
# https://pages.github.com/versions/

# Plugins
group :jekyll_plugins do
# gem 'devlopr', '~> 0.4.5'
gem 'jgd', '~> 1.12'
gem 'jgd', '~> 1.14.0'
gem 'jekyll-feed', '~> 0.17.0'
gem 'jekyll-paginate', '~> 1.1.0'
gem 'jekyll-gist', '~> 1.5.0'
gem 'jekyll-seo-tag', '~> 2.8.0'
gem 'jekyll-sitemap', '~> 1.4.0'
gem 'jekyll-admin', '~> 0.11.1'

# gem 'jekyll-admin', '~> 0.11.1'
end


Expand All @@ -34,4 +39,5 @@ end

# Performance-booster for watching directories on Windows
gem "wdm", "~> 0.1.1", :install_if => Gem.win_platform?
gem "webrick", "~> 1.7"
gem "webrick", "~> 1.7"
gem "ffi", "~> 1.16.3"
120 changes: 60 additions & 60 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,29 +1,37 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.8.1)
public_suffix (>= 2.0.2, < 6.0)
backports (3.23.0)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
backports (3.25.0)
base64 (0.2.0)
bigdecimal (3.1.8)
colorator (1.1.0)
concurrent-ruby (1.2.0)
concurrent-ruby (1.3.3)
csv (3.3.0)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
eventmachine (1.2.7)
faraday (2.7.4)
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-net_http (3.0.2)
faraday-retry (2.0.0)
faraday (2.10.0)
faraday-net_http (>= 2.0, < 3.2)
logger
faraday-net_http (3.1.0)
net-http
faraday-retry (2.2.1)
faraday (~> 2.0)
ffi (1.15.5)
ffi (1.16.3)
forwardable-extended (2.6.0)
google-protobuf (3.21.12-x86_64-darwin)
google-protobuf (3.21.12-x86_64-linux)
google-protobuf (4.27.2-arm64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.27.2-x86_64-linux)
bigdecimal
rake (>= 13)
http_parser.rb (0.8.0)
i18n (1.12.0)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
jekyll (4.3.2)
jekyll (4.3.3)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
Expand All @@ -39,10 +47,6 @@ GEM
safe_yaml (~> 1.0)
terminal-table (>= 1.8, < 4.0)
webrick (~> 1.7)
jekyll-admin (0.11.1)
jekyll (>= 3.7, < 5.0)
sinatra (>= 1.4)
sinatra-contrib (>= 1.4)
jekyll-feed (0.17.0)
jekyll (>= 3.7, < 5.0)
jekyll-gist (1.5.0)
Expand All @@ -56,86 +60,82 @@ GEM
jekyll (>= 3.7, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
jgd (1.12)
jekyll (>= 1.5.1)
trollop (= 2.9.9)
jgd (1.14.0)
jekyll (>= 1)
trollop (>= 2)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.4)
listen (3.8.0)
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
logger (1.6.0)
mercenary (0.4.0)
multi_json (1.15.0)
mustermann (3.0.0)
ruby2_keywords (~> 0.0.1)
nio4r (2.5.8)
net-http (0.4.1)
uri
nio4r (2.7.3)
octokit (4.25.1)
faraday (>= 1, < 3)
sawyer (~> 0.9)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (5.0.1)
puma (6.0.2)
public_suffix (6.0.0)
puma (6.4.2)
nio4r (~> 2.0)
rack (2.2.6.2)
rack-protection (3.0.5)
rack
rake (13.0.6)
rake (13.2.1)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
rb-inotify (0.11.1)
ffi (~> 1.0)
rexml (3.2.5)
rouge (4.0.1)
ruby2_keywords (0.0.5)
rexml (3.3.1)
strscan
rouge (4.3.0)
safe_yaml (1.0.5)
sass-embedded (1.58.0)
google-protobuf (~> 3.21)
rake (>= 10.0.0)
sass-embedded (1.77.5-arm64-darwin)
google-protobuf (>= 3.25, < 5.0)
sass-embedded (1.77.5-x86_64-darwin)
google-protobuf (>= 3.25, < 5.0)
sass-embedded (1.77.5-x86_64-linux-gnu)
google-protobuf (>= 3.25, < 5.0)
sass-embedded (1.77.5-x86_64-linux-musl)
google-protobuf (>= 3.25, < 5.0)
sawyer (0.9.2)
addressable (>= 2.3.5)
faraday (>= 0.17.3, < 3)
sinatra (3.0.5)
mustermann (~> 3.0)
rack (~> 2.2, >= 2.2.4)
rack-protection (= 3.0.5)
tilt (~> 2.0)
sinatra-contrib (3.0.5)
multi_json
mustermann (~> 3.0)
rack-protection (= 3.0.5)
sinatra (= 3.0.5)
tilt (~> 2.0)
strscan (3.1.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
tilt (2.0.11)
trollop (2.9.9)
trollop (2.9.10)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
tzinfo-data (1.2022.7)
tzinfo-data (1.2024.1)
tzinfo (>= 1.0.0)
unicode-display_width (2.4.2)
unicode-display_width (2.5.0)
uri (0.13.0)
wdm (0.1.1)
webrick (1.8.1)

PLATFORMS
arm64-darwin-23
universal-darwin-21
x86_64-linux
x86_64-linux-musl

DEPENDENCIES
backports (~> 3.23)
bundler (~> 2.3.7)
backports (~> 3.25.0)
base64
bundler (~> 2.5.15)
csv
faraday-retry
jekyll (~> 4.3.2)
jekyll-admin (~> 0.11.1)
ffi (~> 1.16.3)
jekyll (~> 4.3.3)
jekyll-feed (~> 0.17.0)
jekyll-gist (~> 1.5.0)
jekyll-paginate (~> 1.1.0)
jekyll-seo-tag (~> 2.8.0)
jekyll-sitemap (~> 1.4.0)
jgd (~> 1.12)
jgd (~> 1.14.0)
kramdown
puma
tzinfo (~> 2.0)
Expand All @@ -144,4 +144,4 @@ DEPENDENCIES
webrick (~> 1.7)

BUNDLED WITH
2.3.7
2.5.15
Loading

0 comments on commit 472ab6f

Please sign in to comment.