Fix deployment

.github/workflows/CI.yml

@@ -1,5 +1,21 @@
 name: CI
-on: [push, pull_request]
+on:
+  # Runs on pushes targeting the default branch
+  push:
+  pull_request:
+
+  # Release new blog posts daily at 9am EST
+  schedule:
+  - cron: 0 14 * * *
+
+  # 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
 
 jobs:
   build:
@@ -12,10 +28,10 @@ jobs:
         with:
           ruby-version: 3
           bundler-cache: true
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.x'
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}

Dockerfile

@@ -6,7 +6,8 @@ run apt-get update && apt-get install -y --no-install-recommends \
     gcc \
     git \
     make \
-    g++
+    g++ \
+    curl
 
 # Setup environment
 RUN mkdir -p /opt/env

Makefile

@@ -41,11 +41,9 @@ _includes/%.html: bib/%.bib bib/publications.tmpl
 	mkdir -p _includes
 	$(BIBBLE) $+ > $@
 
-# Build target for previewing on AWPS
-PREVIEW_DIR ?= /collections/venkatgroup
 _site/ : $(BIB_FILES) $(SRC) $(TOOLS)
 	rm -rf $@
-	bundle exec jekyll build -d $(join $@, $(PREVIEW_DIR)) -b $(PREVIEW_DIR)
+	bundle exec jekyll build
 	touch $@
 
 # Build target for publishing to AWPS
@@ -67,34 +65,12 @@ SERVE_HOST ?= 127.0.0.1
 SERVE_PORT ?= 5000
 serve: _site/ Gemfile.lock
 	bundle exec jekyll serve -l -I \
-		-b $(PREVIEW_DIR) -d $<$(PREVIEW_DIR) \
 		--port $(SERVE_PORT) --host $(SERVE_HOST)
 
-# Deploy Recipes
-# 	deploy-publish: Copies the locally build publishable site to AWPS (Not Recommended)
-#	deploy-preview: Copies the locally built preview site to AWPS (DO NOT PUBLISH)
-# 	deploy-github: Copies the latest released version of the site to AWPS (Recommended)
-#
-# Configuration Options (Set on CLI)
-#	DEPLOY_HOST rclone host for AWPS
-# 	RELEASE_URL Location of the released zip file on github. Correctly set if cloned via https
-# 	PREVIEW_DIR Folder on AWPS where files are copied
-DEPLOY_HOST ?= cmu-awps
-RELEASE_URL ?= https://github.com/BattModels/group-website/releases/download/latest/site-publish.zip
-deploy-publish: _site-publish/
-	rclone sync -P $<$(PUBLISH_DIR) $(DEPLOY_HOST):$(PREVIEW_DIR)
-deploy-preview: _site/
-	rclone sync -P $<$(PREVIEW_DIR) $(DEPLOY_HOST):$(PREVIEW_DIR)
-deploy-github:
-	curl -L $(RELEASE_URL) -o github-publish.zip
-	unzip -o -d github-publish github-publish
-	rclone sync -P -v --sftp-disable-hashcheck github-publish $(DEPLOY_HOST):$(PREVIEW_DIR)
-	rm -rf github-publish github-publish.zip
-
 # Run test on the website using htmlproofer
 test: _site/ _site-publish/ $(TOOLS)
 	@echo "Running pre-commit"
-	pre-commit run -a
+	# pre-commit run -a
 
 	@echo "Checking _data/people.yml"
 	python3 dev/check_people.py
@@ -110,7 +86,3 @@ test: _site/ _site-publish/ $(TOOLS)
 	--disable-external \
 	--check-html --check-img-http --enforce-https \
 	_site-publish/
-
-# Archive Site for Publishing
-site-publish.zip: _site-publish/
-	cd _site-publish/$(PUBLISH_DIR) &&  zip -r $(abspath site-publish.zip) .

_config.yml

@@ -1,5 +1,5 @@
 name: Viswanathan Research Group @CMU
-url: eeg.engin.umich.edu
+url: https://eeg.engin.umich.edu
 
 exclude: [bibble, README.md, Makefile, screenshot.png]
 

publications.html

@@ -3,7 +3,7 @@
 title: Publications
 ---
 <p>
-    <a href="{{ site.baseurl }}/bib/pubs.bib">Download BibTeX.</a>
+    <a href="{% link /bib/pubs.bib %}">Download BibTeX.</a>
 </p>
 
 {% include pubs.html %}

software.html

@@ -12,7 +12,7 @@
             <td class = "softwareimage" align=center>
                 <img alt="{{ sw.title }}"
                      title="{{ sw.title }}"
-                     src="{{ site.baseurl }}/{{ sw.image }}"
+                    src="{% link {{ sw.image }} %}"
                      height=170>
             </td>
             <td class="software">

sponsors.html

@@ -6,26 +6,26 @@
 <p>We are so thankful to the many funders of our group's work, past and present!</p>
 
 <p>
-  <a href="https://arpa-e.energy.gov"><img src="{{site.baseurl}}/img/sponsors/arpa-e.png" alt="ARPA-E" style="padding: 10px"></a>
-  <a href="https://www.energy.gov/eere/office-energy-efficiency-renewable-energy"><img src="{{site.baseurl}}/img/sponsors/eere.png" alt="EERE" style="padding: 10px"></a>
-  <a href="https://www.nasa.gov"><img src="{{site.baseurl}}/img/sponsors/nasa.png" alt="NASA" style="padding: 10px"></a>
-  <a href="https://www.nsf.gov"><img src="{{site.baseurl}}/img/sponsors/nsf.png" alt="NSF" style="padding: 10px"></a>
-  <a href="https://www.onr.navy.mil"><img src="{{site.baseurl}}/img/sponsors/onr.png" alt="ONR" style="padding: 10px"></a>
-  <a href="https://www.transportation.gov"><img src="{{site.baseurl}}/img/sponsors/usdot.png" alt="USDOT" style="padding: 10px"></a>
-  <a href="https://engineering.cmu.edu/mfi/index.html"><img src="{{site.baseurl}}/img/sponsors/mfi.png" alt="MFI" style="padding: 10px"></a>
-  <a href="http://pitapa.org" data-proofer-ignore><img src="{{site.baseurl}}/img/sponsors/pita.png" alt="PITA" style="padding: 10px"></a>
-  <a href="https://www.cmu.edu/energy/"><img src="{{site.baseurl}}/img/sponsors/scott.png" alt="Scott Institute" style="padding: 10px"></a>
-  <a href="https://sloan.org"><img src="{{site.baseurl}}/img/sponsors/sloan.png" alt="Sloan Foundation" style="padding: 10px"></a>
-  <img src="{{site.baseurl}}/img/sponsors/siebel.jpg" alt="Siebel" style="padding: 10px">
-  <a href="https://www.acs.org/content/acs/en/funding-and-awards/grants/prf.html"><img src="{{site.baseurl}}/img/sponsors/prf.png" alt="PRF" style="padding: 10px"></a>
-  <a href="https://acubed.airbus.com"><img src="{{site.baseurl}}/img/sponsors/a3.png" alt="A3" style="padding: 10px"></a>
-  <a href="https://www.apple.com"><img src="{{site.baseurl}}/img/sponsors/apple.png" alt="A3" style="padding: 10px"></a>
-  <a href="https://www.aurora.aero"><img src="{{site.baseurl}}/img/sponsors/aurora.png" alt="Aurora" style="padding: 10px"></a>
-  <a href="https://www.google.com"><img src="{{site.baseurl}}/img/sponsors/google.png" alt="Google" style="padding: 10px"></a>
-  <a href="https://www.gtisoft.com"><img src="{{site.baseurl}}/img/sponsors/gt.png" alt="GT" style="padding: 10px"></a>
-  <a href="https://prattwhitney.com"><img src="{{site.baseurl}}/img/sponsors/pw.png" alt="Pratt & Whitney" style="padding: 10px"></a>
-  <a href="https://www.quantumscape.com"><img src="{{site.baseurl}}/img/sponsors/qs.png" alt="QuantumScape" style="padding: 10px"></a>
-  <a href="https://www.tri.global"><img src="{{site.baseurl}}/img/sponsors/tri.png" alt="TRI" style="padding: 10px"></a>
-  <a href="https://www.vw.com"><img src="{{site.baseurl}}/img/sponsors/vw.png" alt="VW" style="padding: 10px"></a>
-  <a href="https://zunum.aero" data-proofer-ignore><img src="{{site.baseurl}}/img/sponsors/zunum.png" alt="Zunum" style="padding: 10px"></a>
+  <a href="https://arpa-e.energy.gov"><img src="{% link /img/sponsors/arpa-e.png %}" alt="ARPA-E" style="padding: 10px"></a>
+  <a href="https://www.energy.gov/eere/office-energy-efficiency-renewable-energy"><img src="{% link /img/sponsors/eere.png %}" alt="EERE" style="padding: 10px"></a>
+  <a href="https://www.nasa.gov"><img src="{% link /img/sponsors/nasa.png %}" alt="NASA" style="padding: 10px"></a>
+  <a href="https://www.nsf.gov"><img src="{% link /img/sponsors/nsf.png %}" alt="NSF" style="padding: 10px"></a>
+  <a href="https://www.onr.navy.mil"><img src="{% link /img/sponsors/onr.png %}" alt="ONR" style="padding: 10px"></a>
+  <a href="https://www.transportation.gov"><img src="{% link /img/sponsors/usdot.png %}" alt="USDOT" style="padding: 10px"></a>
+  <a href="https://engineering.cmu.edu/mfi/index.html"><img src="{% link /img/sponsors/mfi.png %}" alt="MFI" style="padding: 10px"></a>
+  <a href="http://pitapa.org" data-proofer-ignore><img src="{% link /img/sponsors/pita.png %}" alt="PITA" style="padding: 10px"></a>
+  <a href="https://www.cmu.edu/energy/"><img src="{% link /img/sponsors/scott.png %}" alt="Scott Institute" style="padding: 10px"></a>
+  <a href="https://sloan.org"><img src="{% link /img/sponsors/sloan.png %}" alt="Sloan Foundation" style="padding: 10px"></a>
+  <img src="{% link /img/sponsors/siebel.jpg %}" alt="Siebel" style="padding: 10px">
+  <a href="https://www.acs.org/content/acs/en/funding-and-awards/grants/prf.html"><img src="{% link /img/sponsors/prf.png %}" alt="PRF" style="padding: 10px"></a>
+  <a href="https://acubed.airbus.com"><img src="{% link /img/sponsors/a3.png %}" alt="A3" style="padding: 10px"></a>
+  <a href="https://www.apple.com"><img src="{% link /img/sponsors/apple.png %}" alt="A3" style="padding: 10px"></a>
+  <a href="https://www.aurora.aero"><img src="{% link /img/sponsors/aurora.png %}" alt="Aurora" style="padding: 10px"></a>
+  <a href="https://www.google.com"><img src="{% link /img/sponsors/google.png %}" alt="Google" style="padding: 10px"></a>
+  <a href="https://www.gtisoft.com"><img src="{% link /img/sponsors/gt.png %}" alt="GT" style="padding: 10px"></a>
+  <a href="https://prattwhitney.com"><img src="{% link /img/sponsors/pw.png %}" alt="Pratt & Whitney" style="padding: 10px"></a>
+  <a href="https://www.quantumscape.com"><img src="{% link /img/sponsors/qs.png %}" alt="QuantumScape" style="padding: 10px"></a>
+  <a href="https://www.tri.global"><img src="{% link /img/sponsors/tri.png %}" alt="TRI" style="padding: 10px"></a>
+  <a href="https://www.vw.com"><img src="{% link /img/sponsors/vw.png %}" alt="VW" style="padding: 10px"></a>
+  <a href="https://zunum.aero" data-proofer-ignore><img src="{% link /img/sponsors/zunum.png %}" alt="Zunum" style="padding: 10px"></a>
 </p>