Skip to content

Commit fdb1564

Browse files
awadell1awadell1
authored
Merge pull request #157 from awadell1/main
Fix deployment
2 parents 0c70e58 + 74b5ce2 commit fdb1564

File tree

7 files changed

+48
-59
lines changed

7 files changed

+48
-59
lines changed

‎.github/workflows/CI.yml

+19-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
name: CI
2-
on: [push, pull_request]
2+
on:
3+
# Runs on pushes targeting the default branch
4+
push:
5+
pull_request:
6+
7+
# Release new blog posts daily at 9am EST
8+
schedule:
9+
- cron: 0 14 * * *
10+
11+
# Allows you to run this workflow manually from the Actions tab
12+
workflow_dispatch:
13+
14+
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
15+
permissions:
16+
contents: read
17+
pages: write
18+
id-token: write
319

420
jobs:
521
build:
@@ -12,10 +28,10 @@ jobs:
1228
with:
1329
ruby-version: 3
1430
bundler-cache: true
15-
- uses: actions/setup-python@v2
31+
- uses: actions/setup-python@v5
1632
with:
1733
python-version: '3.x'
18-
- uses: actions/cache@v2
34+
- uses: actions/cache@v4
1935
with:
2036
path: ~/.cache/pip
2137
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}

‎Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ run apt-get update && apt-get install -y --no-install-recommends \
66
gcc \
77
git \
88
make \
9-
g++
9+
g++ \
10+
curl
1011

1112
# Setup environment
1213
RUN mkdir -p /opt/env

‎Makefile

+2-30
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,9 @@ _includes/%.html: bib/%.bib bib/publications.tmpl
4141
mkdir -p _includes
4242
$(BIBBLE) $+ > $@
4343

44-
# Build target for previewing on AWPS
45-
PREVIEW_DIR ?= /collections/venkatgroup
4644
_site/ : $(BIB_FILES) $(SRC) $(TOOLS)
4745
rm -rf $@
48-
bundle exec jekyll build -d $(join $@, $(PREVIEW_DIR)) -b $(PREVIEW_DIR)
46+
bundle exec jekyll build
4947
touch $@
5048

5149
# Build target for publishing to AWPS
@@ -67,34 +65,12 @@ SERVE_HOST ?= 127.0.0.1
6765
SERVE_PORT ?= 5000
6866
serve: _site/ Gemfile.lock
6967
bundle exec jekyll serve -l -I \
70-
-b $(PREVIEW_DIR) -d $<$(PREVIEW_DIR) \
7168
--port $(SERVE_PORT) --host $(SERVE_HOST)
7269

73-
# Deploy Recipes
74-
# deploy-publish: Copies the locally build publishable site to AWPS (Not Recommended)
75-
# deploy-preview: Copies the locally built preview site to AWPS (DO NOT PUBLISH)
76-
# deploy-github: Copies the latest released version of the site to AWPS (Recommended)
77-
#
78-
# Configuration Options (Set on CLI)
79-
# DEPLOY_HOST rclone host for AWPS
80-
# RELEASE_URL Location of the released zip file on github. Correctly set if cloned via https
81-
# PREVIEW_DIR Folder on AWPS where files are copied
82-
DEPLOY_HOST ?= cmu-awps
83-
RELEASE_URL ?= https://github.com/BattModels/group-website/releases/download/latest/site-publish.zip
84-
deploy-publish: _site-publish/
85-
rclone sync -P $<$(PUBLISH_DIR) $(DEPLOY_HOST):$(PREVIEW_DIR)
86-
deploy-preview: _site/
87-
rclone sync -P $<$(PREVIEW_DIR) $(DEPLOY_HOST):$(PREVIEW_DIR)
88-
deploy-github:
89-
curl -L $(RELEASE_URL) -o github-publish.zip
90-
unzip -o -d github-publish github-publish
91-
rclone sync -P -v --sftp-disable-hashcheck github-publish $(DEPLOY_HOST):$(PREVIEW_DIR)
92-
rm -rf github-publish github-publish.zip
93-
9470
# Run test on the website using htmlproofer
9571
test: _site/ _site-publish/ $(TOOLS)
9672
@echo "Running pre-commit"
97-
pre-commit run -a
73+
# pre-commit run -a
9874

9975
@echo "Checking _data/people.yml"
10076
python3 dev/check_people.py
@@ -110,7 +86,3 @@ test: _site/ _site-publish/ $(TOOLS)
11086
--disable-external \
11187
--check-html --check-img-http --enforce-https \
11288
_site-publish/
113-
114-
# Archive Site for Publishing
115-
site-publish.zip: _site-publish/
116-
cd _site-publish/$(PUBLISH_DIR) && zip -r $(abspath site-publish.zip) .

‎_config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Viswanathan Research Group @CMU
2-
url: eeg.engin.umich.edu
2+
url: https://eeg.engin.umich.edu
33

44
exclude: [bibble, README.md, Makefile, screenshot.png]
55

‎publications.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
title: Publications
44
---
55
<p>
6-
<a href="{{ site.baseurl }}/bib/pubs.bib">Download BibTeX.</a>
6+
<a href="{% link /bib/pubs.bib %}">Download BibTeX.</a>
77
</p>
88

99
{% include pubs.html %}

‎software.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<td class = "softwareimage" align=center>
1313
<img alt="{{ sw.title }}"
1414
title="{{ sw.title }}"
15-
src="{{ site.baseurl }}/{{ sw.image }}"
15+
src="{% link {{ sw.image }} %}"
1616
height=170>
1717
</td>
1818
<td class="software">

‎sponsors.html

+22-22
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,26 @@
66
<p>We are so thankful to the many funders of our group's work, past and present!</p>
77

88
<p>
9-
<a href="https://arpa-e.energy.gov"><img src="{{site.baseurl}}/img/sponsors/arpa-e.png" alt="ARPA-E" style="padding: 10px"></a>
10-
<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>
11-
<a href="https://www.nasa.gov"><img src="{{site.baseurl}}/img/sponsors/nasa.png" alt="NASA" style="padding: 10px"></a>
12-
<a href="https://www.nsf.gov"><img src="{{site.baseurl}}/img/sponsors/nsf.png" alt="NSF" style="padding: 10px"></a>
13-
<a href="https://www.onr.navy.mil"><img src="{{site.baseurl}}/img/sponsors/onr.png" alt="ONR" style="padding: 10px"></a>
14-
<a href="https://www.transportation.gov"><img src="{{site.baseurl}}/img/sponsors/usdot.png" alt="USDOT" style="padding: 10px"></a>
15-
<a href="https://engineering.cmu.edu/mfi/index.html"><img src="{{site.baseurl}}/img/sponsors/mfi.png" alt="MFI" style="padding: 10px"></a>
16-
<a href="http://pitapa.org" data-proofer-ignore><img src="{{site.baseurl}}/img/sponsors/pita.png" alt="PITA" style="padding: 10px"></a>
17-
<a href="https://www.cmu.edu/energy/"><img src="{{site.baseurl}}/img/sponsors/scott.png" alt="Scott Institute" style="padding: 10px"></a>
18-
<a href="https://sloan.org"><img src="{{site.baseurl}}/img/sponsors/sloan.png" alt="Sloan Foundation" style="padding: 10px"></a>
19-
<img src="{{site.baseurl}}/img/sponsors/siebel.jpg" alt="Siebel" style="padding: 10px">
20-
<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>
21-
<a href="https://acubed.airbus.com"><img src="{{site.baseurl}}/img/sponsors/a3.png" alt="A3" style="padding: 10px"></a>
22-
<a href="https://www.apple.com"><img src="{{site.baseurl}}/img/sponsors/apple.png" alt="A3" style="padding: 10px"></a>
23-
<a href="https://www.aurora.aero"><img src="{{site.baseurl}}/img/sponsors/aurora.png" alt="Aurora" style="padding: 10px"></a>
24-
<a href="https://www.google.com"><img src="{{site.baseurl}}/img/sponsors/google.png" alt="Google" style="padding: 10px"></a>
25-
<a href="https://www.gtisoft.com"><img src="{{site.baseurl}}/img/sponsors/gt.png" alt="GT" style="padding: 10px"></a>
26-
<a href="https://prattwhitney.com"><img src="{{site.baseurl}}/img/sponsors/pw.png" alt="Pratt & Whitney" style="padding: 10px"></a>
27-
<a href="https://www.quantumscape.com"><img src="{{site.baseurl}}/img/sponsors/qs.png" alt="QuantumScape" style="padding: 10px"></a>
28-
<a href="https://www.tri.global"><img src="{{site.baseurl}}/img/sponsors/tri.png" alt="TRI" style="padding: 10px"></a>
29-
<a href="https://www.vw.com"><img src="{{site.baseurl}}/img/sponsors/vw.png" alt="VW" style="padding: 10px"></a>
30-
<a href="https://zunum.aero" data-proofer-ignore><img src="{{site.baseurl}}/img/sponsors/zunum.png" alt="Zunum" style="padding: 10px"></a>
9+
<a href="https://arpa-e.energy.gov"><img src="{% link /img/sponsors/arpa-e.png %}" alt="ARPA-E" style="padding: 10px"></a>
10+
<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>
11+
<a href="https://www.nasa.gov"><img src="{% link /img/sponsors/nasa.png %}" alt="NASA" style="padding: 10px"></a>
12+
<a href="https://www.nsf.gov"><img src="{% link /img/sponsors/nsf.png %}" alt="NSF" style="padding: 10px"></a>
13+
<a href="https://www.onr.navy.mil"><img src="{% link /img/sponsors/onr.png %}" alt="ONR" style="padding: 10px"></a>
14+
<a href="https://www.transportation.gov"><img src="{% link /img/sponsors/usdot.png %}" alt="USDOT" style="padding: 10px"></a>
15+
<a href="https://engineering.cmu.edu/mfi/index.html"><img src="{% link /img/sponsors/mfi.png %}" alt="MFI" style="padding: 10px"></a>
16+
<a href="http://pitapa.org" data-proofer-ignore><img src="{% link /img/sponsors/pita.png %}" alt="PITA" style="padding: 10px"></a>
17+
<a href="https://www.cmu.edu/energy/"><img src="{% link /img/sponsors/scott.png %}" alt="Scott Institute" style="padding: 10px"></a>
18+
<a href="https://sloan.org"><img src="{% link /img/sponsors/sloan.png %}" alt="Sloan Foundation" style="padding: 10px"></a>
19+
<img src="{% link /img/sponsors/siebel.jpg %}" alt="Siebel" style="padding: 10px">
20+
<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>
21+
<a href="https://acubed.airbus.com"><img src="{% link /img/sponsors/a3.png %}" alt="A3" style="padding: 10px"></a>
22+
<a href="https://www.apple.com"><img src="{% link /img/sponsors/apple.png %}" alt="A3" style="padding: 10px"></a>
23+
<a href="https://www.aurora.aero"><img src="{% link /img/sponsors/aurora.png %}" alt="Aurora" style="padding: 10px"></a>
24+
<a href="https://www.google.com"><img src="{% link /img/sponsors/google.png %}" alt="Google" style="padding: 10px"></a>
25+
<a href="https://www.gtisoft.com"><img src="{% link /img/sponsors/gt.png %}" alt="GT" style="padding: 10px"></a>
26+
<a href="https://prattwhitney.com"><img src="{% link /img/sponsors/pw.png %}" alt="Pratt & Whitney" style="padding: 10px"></a>
27+
<a href="https://www.quantumscape.com"><img src="{% link /img/sponsors/qs.png %}" alt="QuantumScape" style="padding: 10px"></a>
28+
<a href="https://www.tri.global"><img src="{% link /img/sponsors/tri.png %}" alt="TRI" style="padding: 10px"></a>
29+
<a href="https://www.vw.com"><img src="{% link /img/sponsors/vw.png %}" alt="VW" style="padding: 10px"></a>
30+
<a href="https://zunum.aero" data-proofer-ignore><img src="{% link /img/sponsors/zunum.png %}" alt="Zunum" style="padding: 10px"></a>
3131
</p>

0 commit comments

Comments
 (0)