Skip to content

Commit

Permalink
Merge branch 'main' into main-jd-v533-post
Browse files Browse the repository at this point in the history
  • Loading branch information
XhmikosR authored Feb 20, 2024
2 parents e4caaa2 + 773eb51 commit 833ee02
Show file tree
Hide file tree
Showing 67 changed files with 612 additions and 1,117 deletions.
37 changes: 14 additions & 23 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ env:
FORCE_COLOR: 2
NODE: 20

permissions:
contents: read

jobs:
test:
runs-on: ubuntu-latest
Expand All @@ -37,34 +40,22 @@ jobs:
run: npm test

- name: Upload docs
uses: actions/upload-artifact@v3
uses: actions/upload-pages-artifact@v3
if: github.repository == 'twbs/blog' && github.ref == 'refs/heads/main'
with:
name: docs
path: ./_site/
if-no-files-found: error

deploy:
runs-on: ubuntu-latest
needs: test
if: github.repository == 'twbs/blog' && github.ref == 'refs/heads/main'
permissions:
pages: write
id-token: write

steps:
- name: Clone repository
uses: actions/checkout@v4
with:
persist-credentials: false

- name: Download docs
uses: actions/download-artifact@v3
with:
name: docs
path: ./_site/
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}

- name: Deploy
uses: peaceiris/actions-gh-pages@v3
with:
allow_empty_commit: false
personal_token: ${{ secrets.PERSONAL_TOKEN }}
publish_branch: gh-pages
publish_dir: ./_site/
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ jobs:
persist-credentials: false

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: "javascript"
queries: +security-and-quality

- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
with:
category: "/language:javascript"
1 change: 0 additions & 1 deletion .npmrc

This file was deleted.

File renamed without changes.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2011-2023 The Bootstrap Authors
Copyright (c) 2011-2024 The Bootstrap Authors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
1 change: 0 additions & 1 deletion hugo.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
languageCode: "en"
title: "Bootstrap Blog"
baseURL: "https://blog.getbootstrap.com"
enableInlineShortcodes: true

security:
enableInlineShortcodes: true
Expand Down
Loading

0 comments on commit 833ee02

Please sign in to comment.