Skip to content

Commit

Permalink
Merge branch 'UQComputingSociety:main' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
fattyhope authored Mar 18, 2024
2 parents 6ddebe5 + bd9e5f4 commit 5e0f4e2
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 13 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/build-pr.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
name: Check Build On PR

on:
pull_request:
branches: [ '*' ]

jobs:
check-build:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v1
- name: Checkout
uses: actions/checkout@v4

- name: Setup Hugo
uses: peaceiris/actions-hugo@v2
with:
hugo-version: '0.64.0'
hugo-version: '0.120.4'
extended: true

- name: Build
run: hugo --minify
44 changes: 33 additions & 11 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,51 @@
name: github pages
name: Deploy to GitHub Pages

on:
push:
branches:
- master
- main

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.
concurrency:
group: "pages"
cancel-in-progress: false

jobs:
deploy:
build:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v1
- name: Checkout
uses: actions/checkout@v4

- name: Setup Hugo
uses: peaceiris/actions-hugo@v2
with:
hugo-version: '0.64.0'
hugo-version: '0.121.0'
extended: true

- name: Build
run: hugo --minify

- name: Deploy
uses: peaceiris/actions-gh-pages@v3
- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
publish_dir: ./public
user_name: uqcs
user_email: [email protected]
path: ./public

deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-22.04
needs: build
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4

0 comments on commit 5e0f4e2

Please sign in to comment.