Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/gh-pages' into test
Browse files Browse the repository at this point in the history
  • Loading branch information
jon committed Jul 11, 2024
2 parents 5cf767a + 9306670 commit 8239f01
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/publish-to-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ on:
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
# permissions:
# contents: read
# pages: write
# id-token: write
permissions:
contents: read
pages: write
id-token: write

# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
Expand All @@ -32,16 +32,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Ruby
uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0
with:
ruby-version: '2.5' # Not needed with a .ruby-version file
ruby-version: '3.1' # Not needed with a .ruby-version file
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
cache-version: 0 # Increment this number if you need to re-download cached gems
- name: Setup Pages
id: pages
uses: actions/configure-pages@v3
uses: actions/configure-pages@v5
- name: Build with Jekyll
# Outputs to the './_site' directory by default
# Clarify the right site url for each branch using config chain includes
Expand All @@ -53,16 +53,16 @@ jobs:
run: echo "ghpages.level-up.cc" > ./_site/CNAME
- name: Upload artifact
# Automatically uploads an artifact from the './_site' directory by default
uses: actions/upload-pages-artifact@v2
uses: actions/upload-pages-artifact@v3

# Deployment in same repo / gh-pages job
deploy:
environment:
name: github-pages
url: level-up.cc
url: ghpages.level-up.cc
runs-on: ubuntu-latest
needs: build
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
uses: actions/deploy-pages@v4
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ breadcrumb: Creating Safe Spaces
In addition to the content below, you may also find articles from the Security Education Companion on [The Harm Reduction Approach](https://www.securityeducationcompanion.org/articles/the-harm-reduction-approach), [Cultural Sensitivity](https://www.securityeducationcompanion.org/articles/cultural-sensitivity), [Touching Other People's Devices](https://www.securityeducationcompanion.org/articles/a-word-on-touching-other-people-s-devices-don-t), and [Fear Is The Mind Killer](https://www.securityeducationcompanion.org/articles/fear-is-the-mind-killer-rethinking-demos) to be helpful.
{: .notice}

*"Caring for myself is not self-indulgence, it is self-preservation and that is an act of political warfare" - Audre Lord*
*"Caring for myself is not self-indulgence, it is self-preservation and that is an act of political warfare" - Audre Lorde*

## Why Is a "Safe Space" Crucial for Digital Security Trainings?

Expand Down

0 comments on commit 8239f01

Please sign in to comment.