Release 4.3.13 (#264)

Signed-off-by: David P. Chassin <david.chassin@me.com> Signed-off-by: David P. Chassin <dchassin@slac.stanford.edu> Signed-off-by: Alyona Teyber <Ivanova.alyona5@gmail.com> Signed-off-by: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com> Signed-off-by: David P. Chassin <dpchassin@gmail.com> Co-authored-by: David P. Chassin <dchassin@slac.stanford.edu> Co-authored-by: Alyona Teyber <Ivanova.alyona5@gmail.com> Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: Duncan Ragsdale <88173870+Thistleman@users.noreply.github.com>
arras-energy · Jan 26, 2025 · 7685f31 · 7685f31
1 parent e4f7d20
commit 7685f31
Show file tree

Hide file tree

Showing 63 changed files with 80,143 additions and 320 deletions.
diff --git a/.github/workflows/develop-image.yml b/.github/workflows/develop-image.yml
@@ -40,9 +40,83 @@ jobs:
         sh ./setup.sh --local
         sh ./build.sh --system --parallel --upload --release
 
+  buildMacos14FastS3:
+
+    runs-on: macos-14
+    environment: Integration
+
+    steps:
+    - uses: actions/checkout@v4
+
+      # this is to fix GIT not liking owner of the checkout dir
+    - name: Set ownership
+      run: |
+        chown -R $(id -u):$(id -g) $PWD
+
+    - name: Configure AWS Credentials
+      uses: aws-actions/configure-aws-credentials@v2
+      with:
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws-region: ${{ secrets.AWS_REGION }}
+
+    - name: Symlink for libtool
+      run: |
+        ln -s /usr/local/bin/glibtoolize /usr/local/bin/libtoolize
+        ln -s /usr/local/bin/glibtool /usr/local/bin/libtool
+
+    - name: Add libraries to PATH
+      run: |
+        echo "LIBRARY_PATH=$(brew --prefix)/lib:$(brew --prefix)/opt:$(brew --prefix)/include" >> $GITHUB_ENV
+
+    - name: Deploy to S3
+      run: |
+        sudo mkdir -p /usr/local/opt/gridlabd
+        sudo chmod 2777 /usr/local/opt/gridlabd
+        brew install gdal
+        sh ./setup.sh --local
+        sh ./build.sh --system --parallel --upload --release
+
+  buildMacos15FastS3:
+
+    runs-on: macos-15
+    environment: Integration
+
+    steps:
+    - uses: actions/checkout@v4
+
+      # this is to fix GIT not liking owner of the checkout dir
+    - name: Set ownership
+      run: |
+        chown -R $(id -u):$(id -g) $PWD
+
+    - name: Configure AWS Credentials
+      uses: aws-actions/configure-aws-credentials@v2
+      with:
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws-region: ${{ secrets.AWS_REGION }}
+
+    - name: Symlink for libtool
+      run: |
+        ln -s /usr/local/bin/glibtoolize /usr/local/bin/libtoolize
+        ln -s /usr/local/bin/glibtool /usr/local/bin/libtool
+
+    - name: Add libraries to PATH
+      run: |
+        echo "LIBRARY_PATH=$(brew --prefix)/lib:$(brew --prefix)/opt:$(brew --prefix)/include" >> $GITHUB_ENV
+
+    - name: Deploy to S3
+      run: |
+        sudo mkdir -p /usr/local/opt/gridlabd
+        sudo chmod 2777 /usr/local/opt/gridlabd
+        brew install gdal
+        sh ./setup.sh --local
+        sh ./build.sh --system --parallel --upload --release
+
   buildUbuntu22FastS3:
 
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     environment: Integration
     container:
       image: ubuntu:jammy
@@ -77,10 +151,47 @@ jobs:
         gridlabd python -m pip install awscli
         sudo sh ./build.sh --upload --release
 
+  buildUbuntu24FastS3:
+
+    runs-on: ubuntu-24.04
+    environment: Integration
+    container:
+      image: ubuntu:noble
+
+    steps:
+      # this is to fix GIT not liking owner of the checkout dir
+    - name: Set ownership and prep container
+      run: |
+        mkdir -p /usr/local/var
+        apt-get update && apt-get install -y apt-transport-https
+        apt-get install -y git curl nano sudo zip
+        curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+        unzip awscliv2.zip
+        sudo ./aws/install
+
+    - uses: actions/checkout@v4
+
+    - name: Configure AWS Credentials
+      uses: aws-actions/configure-aws-credentials@v2
+      with:
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws-region: ${{ secrets.AWS_REGION }}
+
+    - name: Deploy to S3
+      run: |
+        sudo aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY }} && sudo aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET_ACCESS_KEY }} && sudo aws configure set default.region ${{ secrets.AWS_REGION }}
+        export GIT_DISCOVERY_ACROSS_FILESYSTEM=1
+        chown -R root $PWD
+        sudo sh ./setup.sh --local
+        sudo sh ./build.sh --system --parallel
+        gridlabd python -m pip install awscli
+        sudo sh ./build.sh --upload --release
+
   buildAWSUbuntuAMI:
     runs-on: ubuntu-24.04
     environment: Integration
-    needs: [buildUbuntu22FastS3,buildMacos13FastS3]
+    needs: [buildUbuntu24FastS3,buildMacos13FastS3]
 
     steps:
     - uses: actions/checkout@v4
@@ -128,9 +239,9 @@ jobs:
 
   buildUbuntuDockerhub:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     environment: Integration
-    needs: buildUbuntu22FastS3
+    needs: buildUbuntu24FastS3
 
     steps:
     - name: Checkout code
@@ -161,7 +272,7 @@ jobs:
         tags: lfenergy/arras:develop
 
   updateS3websites:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     environment: Integration
 
     steps:
@@ -194,7 +305,7 @@ jobs:
 
   versionUpdate:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     environment: Integration
     needs: buildAWSUbuntuAMI
 

diff --git a/.github/workflows/master-image.yml b/.github/workflows/master-image.yml
@@ -40,9 +40,83 @@ jobs:
         sh ./setup.sh --local
         sh ./build.sh --system --parallel --upload --release
 
+  buildMacos14FastS3:
+
+    runs-on: macos-14
+    environment: Integration
+
+    steps:
+    - uses: actions/checkout@v4
+
+      # this is to fix GIT not liking owner of the checkout dir
+    - name: Set ownership
+      run: |
+        chown -R $(id -u):$(id -g) $PWD
+
+    - name: Configure AWS Credentials
+      uses: aws-actions/configure-aws-credentials@v2
+      with:
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws-region: ${{ secrets.AWS_REGION }}
+
+    - name: Symlink for libtool
+      run: |
+        ln -s /usr/local/bin/glibtoolize /usr/local/bin/libtoolize
+        ln -s /usr/local/bin/glibtool /usr/local/bin/libtool
+
+    - name: Add libraries to PATH
+      run: |
+        echo "LIBRARY_PATH=$(brew --prefix)/lib:$(brew --prefix)/opt:$(brew --prefix)/include" >> $GITHUB_ENV
+
+    - name: Deploy to S3
+      run: |
+        sudo mkdir -p /usr/local/opt/gridlabd
+        sudo chmod 2777 /usr/local/opt/gridlabd
+        sh ./setup.sh --local
+        brew install gdal
+        sh ./build.sh --system --parallel --upload --release
+
+  buildMacos15FastS3:
+
+    runs-on: macos-15
+    environment: Integration
+
+    steps:
+    - uses: actions/checkout@v4
+
+      # this is to fix GIT not liking owner of the checkout dir
+    - name: Set ownership
+      run: |
+        chown -R $(id -u):$(id -g) $PWD
+
+    - name: Configure AWS Credentials
+      uses: aws-actions/configure-aws-credentials@v2
+      with:
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws-region: ${{ secrets.AWS_REGION }}
+
+    - name: Symlink for libtool
+      run: |
+        ln -s /usr/local/bin/glibtoolize /usr/local/bin/libtoolize
+        ln -s /usr/local/bin/glibtool /usr/local/bin/libtool
+
+    - name: Add libraries to PATH
+      run: |
+        echo "LIBRARY_PATH=$(brew --prefix)/lib:$(brew --prefix)/opt:$(brew --prefix)/include" >> $GITHUB_ENV
+
+    - name: Deploy to S3
+      run: |
+        sudo mkdir -p /usr/local/opt/gridlabd
+        sudo chmod 2777 /usr/local/opt/gridlabd
+        sh ./setup.sh --local
+        brew install gdal
+        sh ./build.sh --system --parallel --upload --release
+
   buildUbuntu22FastS3:
 
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     environment: Integration
     container:
       image: ubuntu:jammy
@@ -77,10 +151,47 @@ jobs:
         gridlabd python -m pip install awscli
         sudo sh ./build.sh --upload --release
 
+  buildUbuntu24FastS3:
+
+    runs-on: ubuntu-24.04
+    environment: Integration
+    container:
+      image: ubuntu:noble
+
+    steps:
+      # this is to fix GIT not liking owner of the checkout dir
+    - name: Set ownership and prep container
+      run: |
+        mkdir -p /usr/local/var
+        apt-get update && apt-get install -y apt-transport-https
+        apt-get install -y git curl nano sudo zip
+        curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+        unzip awscliv2.zip
+        sudo ./aws/install
+
+    - uses: actions/checkout@v4
+
+    - name: Configure AWS Credentials
+      uses: aws-actions/configure-aws-credentials@v2
+      with:
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws-region: ${{ secrets.AWS_REGION }}
+
+    - name: Deploy to S3
+      run: |
+        sudo aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY }} && sudo aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET_ACCESS_KEY }} && sudo aws configure set default.region ${{ secrets.AWS_REGION }}
+        export GIT_DISCOVERY_ACROSS_FILESYSTEM=1
+        chown -R root $PWD
+        sudo sh ./setup.sh --local
+        sudo sh ./build.sh --system --parallel
+        gridlabd python -m pip install awscli
+        sudo sh ./build.sh --upload --release
+
   buildAWSUbuntuAMI:
     runs-on: ubuntu-24.04
     environment: Integration
-    needs: [buildUbuntu22FastS3,buildMacos13FastS3]
+    needs: [buildUbuntu24FastS3,buildMacos13FastS3]
 
     steps:
     - uses: actions/checkout@v4
@@ -91,7 +202,7 @@ jobs:
         chown -R $(id -u):$(id -g) $PWD
 
     - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v1
+      uses: aws-actions/configure-aws-credentials@v2
       with:
         aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
         aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -128,16 +239,16 @@ jobs:
 
   buildUbuntuDockerhub:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     environment: Integration
-    needs: buildUbuntu22FastS3
+    needs: buildUbuntu24FastS3
 
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
 
     - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v1
+      uses: aws-actions/configure-aws-credentials@v2
       with:
         aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
         aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -165,7 +276,7 @@ jobs:
         tags: lfenergy/arras:latest, lfenergy/arras:${{ env.VERSION }}
 
   updateS3websites:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     environment: Integration
 
     steps:
@@ -198,7 +309,7 @@ jobs:
 
   versionUpdate:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     environment: Integration
     needs: buildAWSUbuntuAMI
 

diff --git a/Makefile.am b/Makefile.am
@@ -67,8 +67,6 @@ bin_PROGRAMS =
 bin_SCRIPTS =
 dist_doc_DATA =
 
-docs_targets = docs/Utilities
-
 check-target:
 	@test $(prefix) = $(shell $(top_srcdir)/build-aux/version.sh --install) || ( echo "ERROR [Makefile]: prefix '$(prefix)' and target '($(shell $(top_srcdir)/build-aux/version.sh --install))' mismatch; ./configure is outdated. Build using '--clean' option to fix this." > /dev/stderr ; false )
 
@@ -309,6 +307,8 @@ $(prefix)/src:
 	@chmod -R 775 $(prefix)/src
 
 index: weather library template
+	@echo Updating file index...
+	@git ls-files | grep -v '^\.' | grep -v '/\.' > index
 
 html-local: module-html developer-html troubleshooting-html
 	@mkdir -p $(prefix)/share/doc/developer
@@ -331,7 +331,5 @@ documents/gridlabd.pdf: documents/gridlabd.glm
 	(cd documents ; $(DESTDIR)$(bindir)/gridlabd gridlabd.glm | echo "WARNING: unable to update documents/gridlabd.pdf")
 	test -f documents/gridlabd.md && pandoc -V geometry:landscape documents/gridlabd.md -o documents/gridlabd.pdf
 
-docs: $(docs_targets) # documents/gridlabd.pdf
-
 docs_toc:
 	utilities/regen_toc >'docs/User manual/0 - Cover/1 - Contents.md'
diff --git a/docs/Makefile.mk b/docs/Makefile.mk
@@ -1,15 +1,14 @@
 
-DOCS = 
-DOCS += docs/Utilities/Framework.md
-DOCS += docs/Utilities/Network.md
-DOCS += docs/Utilities/Edit.md
-DOCS += docs/Utilities/Mapping.md
-DOCS += docs/Utilities/Unitcalc.md
+docs: docs/Tools
+
+DOCS_UTILITIES = 
+
+include $(top_srcdir)/docs/Tools/Makefile.mk
+
+docs/Tools: $(DOCS_UTILITIES)
+	echo "Updating $@..."
 
 %.md: FORCE
-	echo "Updating $@"
 	$(DESTDIR)$(bindir)/gridlabd python docs/makemd.py $(basename $(notdir $(shell echo "$@" | tr 'A-Z' 'a-z'))) $(dir $@)
 
-docs/Utilities: $(DOCS)
-
 FORCE: