Merge pull request #36 from joeroe/master

Add make.R to hugo workflow
zackbatist · Dec 13, 2023 · 09a6975 · 09a6975
2 parents bd164d4 + a3e2a58
commit 09a6975
Show file tree

Hide file tree

Showing 582 changed files with 1,713 additions and 8,790 deletions.
diff --git a/.Rprofile b/.Rprofile
@@ -0,0 +1 @@
+source("renv/activate.R")
diff --git a/.github/workflows/hugo.yml b/.github/workflows/hugo.yml
@@ -1,11 +1,11 @@
 # Sample workflow for building and deploying a Hugo site to GitHub Pages
-name: Deploy Hugo site to Pages
+name: Generate and deploy Hugo site to Pages
 
 on:
   # Runs on pushes targeting the default branch
   push:
     branches:
-      - main
+      - master
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -34,17 +34,23 @@ jobs:
     env:
       HUGO_VERSION: 0.121.0
     steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0
+      - name: Set up R
+        uses: r-lib/actions/setup-r@v2
+      - name: Set up renv
+        uses: r-lib/actions/setup-renv@v2
+      - name: Make Hugo source files
+        run: Rscript -e 'source("make.R")'
       - name: Install Hugo CLI
         run: |
           wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb \
           && sudo dpkg -i ${{ runner.temp }}/hugo.deb          
       - name: Install Dart Sass
         run: sudo snap install dart-sass
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          fetch-depth: 0
       - name: Setup Pages
         id: pages
         uses: actions/configure-pages@v4

diff --git a/.gitignore b/.gitignore
@@ -43,6 +43,10 @@ Thumbs.db
 .RData
 .hugo_build.lock
 
+# Hugo content files (generated from CSV in make.R)
+/content/post/*
+!/content/post/.keep
+
 # Generated files by hugo
 /public/
 /resources/_gen/
@@ -55,4 +59,4 @@ hugo.darwin
 hugo.linux
 
 # Temporary lock file while building
-/.hugo_build.lock
+/.hugo_build.lock
diff --git a/R/internet-archive_links.R b/R/internet-archive_links.R
@@ -25,8 +25,8 @@ rm(list=ls())
 # 
 # # Delete package tarball
 # unlink(pkgFile)
+# library(internetarchive)
 
-library(internetarchive)
 library(reshape)
 library("dplyr", warn.conflicts = FALSE)
 

diff --git a/content/post/.keep b/content/post/.keep
diff --git a/content/post/14c-power-sensitivity.md b/content/post/14c-power-sensitivity.md
diff --git a/content/post/3d-ceramics.md b/content/post/3d-ceramics.md
diff --git a/content/post/3d-edgeangle.md b/content/post/3d-edgeangle.md
diff --git a/content/post/3d-libraries-of-ships.md b/content/post/3d-libraries-of-ships.md
diff --git a/content/post/3d-organ.md b/content/post/3d-organ.md
diff --git a/content/post/3d-spatial-ripley-analyses.md b/content/post/3d-spatial-ripley-analyses.md
diff --git a/...blic-archaeology-and-archaeological-heritage-management-in-the-mediterranean.md b/...blic-archaeology-and-archaeological-heritage-management-in-the-mediterranean.md
diff --git a/content/post/a-mobile-data-collection-workflow-for-archaeologists.md b/content/post/a-mobile-data-collection-workflow-for-archaeologists.md
diff --git a/content/post/a-scientific-computing-environment-for-archaeology-txt.md b/content/post/a-scientific-computing-environment-for-archaeology-txt.md
diff --git a/content/post/abc-of-archaeobotanical-open-science.md b/content/post/abc-of-archaeobotanical-open-science.md
diff --git a/content/post/abm-tutorials.md b/content/post/abm-tutorials.md
diff --git a/content/post/abma.md b/content/post/abma.md
diff --git a/content/post/aca-data-collection.md b/content/post/aca-data-collection.md
diff --git a/content/post/admur.md b/content/post/admur.md
diff --git a/content/post/adrac.md b/content/post/adrac.md
diff --git a/content/post/adrsm.md b/content/post/adrsm.md
diff --git a/content/post/aida.md b/content/post/aida.md
diff --git a/content/post/aion.md b/content/post/aion.md