From c1552c619bdbb530a50f4eb7be09885434c6467e Mon Sep 17 00:00:00 2001
From: Matthew Avaylon <mavaylon1@berkeley.edu>
Date: Fri, 29 Sep 2023 16:27:49 -0700
Subject: [PATCH] Update doc_builds.yml and merge PR #82

Update doc_builds.yml

Update doc_builds.yml

Update azure-pipelines.yml

Update azure-pipelines.yml

Update azure-pipelines.yml

Update doc_builds.yml
---
 .github/workflows/doc_builds.yml | 14 +++++++----
 azure-pipelines.yml              | 43 +++++++++++++++++++-------------
 2 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/doc_builds.yml b/.github/workflows/doc_builds.yml
index d5e5137..dac94c9 100644
--- a/.github/workflows/doc_builds.yml
+++ b/.github/workflows/doc_builds.yml
@@ -8,6 +8,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
       
       - name: Set up Python 3.11
         uses: actions/setup-python@v4
@@ -15,26 +17,28 @@ jobs:
           python-version: "3.11"
           
       - name: Clone HDMF-Common-Schema and Install Requirements
-        run:
+        run: |
           git clone https://github.com/hdmf-dev/hdmf-common-schema.git
           cd hdmf-common-schema
           python -m pip install -r requirements-doc.txt
 
       - name: Build HDMF-Common-Schema Docs
-        run:
+        run: |
+          cd hdmf-common-schema
           cd docs
           make clean
           make html
 
       - name: Clone NWB-Schema and Install Requirements
-        run:
+        run: |
           git clone https://github.com/NeurodataWithoutBorders/nwb-schema.git
           cd nwb-schema
           python -m pip install -r requirements-doc.txt
 
       - name: Build NWB-Schema Docs
-        run: 
-          cd docs
+        run: |
+          cd nwb-schema
+          cd docs/format
           make clean
           make html
           
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 9fa521f..7f64c7a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -8,13 +8,13 @@ jobs:
 - job: 'StyleCheck'
 
   pool:
-    vmImage: 'ubuntu-20.04'
+    vmImage: 'ubuntu-latest'
 
   steps:
 
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.9'
+      versionSpec: '3.11'
       architecture: 'x64'
 
   - script: |
@@ -32,35 +32,44 @@ jobs:
 
   strategy:
     matrix:
+      Linux-py3.11:
+        imageName: 'ubuntu-latest'
+        pythonVersion: '3.11'
+      Linux-py3.10:
+        imageName: 'ubuntu-latest'
+        pythonVersion: '3.10'
       Linux-py3.9:
-        imageName: 'ubuntu-20.04'
+        imageName: 'ubuntu-latest'
         pythonVersion: '3.9'
       Linux-py3.8:
-        imageName: 'ubuntu-20.04'
+        imageName: 'ubuntu-latest'
         pythonVersion: '3.8'
-      Linux-py3.7:
-        imageName: 'ubuntu-20.04'
-        pythonVersion: '3.7'
 
+      macOS-py3.11:
+        imageName: 'macos-latest'
+        pythonVersion: '3.11'
+      macOS-py3.10:
+        imageName: 'macos-latest'
+        pythonVersion: '3.10'
       macOS-py3.9:
-        imageName: 'macos-10.15'
+        imageName: 'macos-latest'
         pythonVersion: '3.9'
       macOS-py3.8:
-        imageName: 'macos-10.15'
+        imageName: 'macos-latest'
         pythonVersion: '3.8'
-      macOS-py3.7:
-        imageName: 'macos-10.15'
-        pythonVersion: '3.7'
 
+      Windows-py3.11:
+        imageName: 'windows-latest'
+        pythonVersion: '3.11'
+      Windows-py3.10:
+        imageName: 'windows-latest'
+        pythonVersion: '3.10'
       Windows-py3.9:
-        imageName: 'windows-2019'
+        imageName: 'windows-latest'
         pythonVersion: '3.9'
       Windows-py3.8:
-        imageName: 'windows-2019'
+        imageName: 'windows-latest'
         pythonVersion: '3.8'
-      Windows-py3.7:
-        imageName: 'windows-2019'
-        pythonVersion: '3.7'
 
   pool:
     vmImage: $(imageName)