Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
hi-andy committed Oct 31, 2023
2 parents caea4b8 + a9a6807 commit 1e0c08e
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 22 deletions.
51 changes: 51 additions & 0 deletions .github/workflows/jekyll-gh-pages.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# Sample workflow for building and deploying a Jekyll site to GitHub Pages
name: Deploy Jekyll with GitHub Pages dependencies preinstalled

on:
# Runs on pushes targeting the default branch
push:
branches: ["master"]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
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.
concurrency:
group: "pages"
cancel-in-progress: false

jobs:
# Build job
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Setup Pages
uses: actions/configure-pages@v3
- name: Build with Jekyll
uses: actions/jekyll-build-pages@v1
with:
source: ./
destination: ./_site
- name: Upload artifact
uses: actions/upload-pages-artifact@v2

# Deployment job
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
needs: build
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
20 changes: 0 additions & 20 deletions .github/workflows/jekyll.yml

This file was deleted.

3 changes: 1 addition & 2 deletions assets/css/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ $contact-delimiter: "{{ site.contact_delimiter | default: "·" }}";
"sanitize",
"base",
"responsive",
"print"
;
"print";

{% if site.text_direction == "rtl" %}
body { direction: rtl; }
Expand Down

0 comments on commit 1e0c08e

Please sign in to comment.