From 15ae3430aa39c7c3a62439302ef74c267b4684e8 Mon Sep 17 00:00:00 2001
From: Barrows <clayton.barrows@nrel.gov>
Date: Sun, 8 Dec 2024 07:36:58 -0700
Subject: [PATCH] combining workflows

---
 .github/workflows/docs.yml   | 25 -------------------------
 .github/workflows/jekyll.yml | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 25 deletions(-)
 delete mode 100644 .github/workflows/docs.yml

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
deleted file mode 100644
index 663f839..0000000
--- a/.github/workflows/docs.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Documentation
-
-on:
-  push:
-    branches:
-      - main
-      - 'release-'
-    tags: '*'
-  pull_request:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: julia-actions/setup-julia@v1
-        with:
-          version: '1.6'
-      - name: Install dependencies
-        run: julia --project=SiennaDocs/docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=joinpath(pwd(),"SiennaDocs"))); Pkg.instantiate()'
-      - name: Build and deploy
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
-        run: julia --project=SiennaDocs/docs --color=yes SiennaDocs/docs/make.jl
diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml
index 5ec6bc0..912422f 100644
--- a/.github/workflows/jekyll.yml
+++ b/.github/workflows/jekyll.yml
@@ -27,6 +27,20 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
+  build_jl:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: julia-actions/setup-julia@v1
+        with:
+          version: '1.6'
+      - name: Install dependencies
+        run: julia --project=SiennaDocs/docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=joinpath(pwd(),"SiennaDocs"))); Pkg.instantiate()'
+      - name: Build and deploy
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
+        run: julia --project=SiennaDocs/docs --color=yes SiennaDocs/docs/make.jl
   # Build job
   build:
     runs-on: ubuntu-latest