Merge Develop into incremental-sim

.github/workflows/cloc.yml

@@ -4,18 +4,20 @@ on:
   pull_request:
     branches:
       - develop
+      - dev-[0-9]+.[0-9]+.[0-9]+
   push:
     branches:
       - develop
     tags:
       - v*
+  workflow_dispatch:
 
 jobs:
   cloc:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install cloc
         run: |
           sudo apt-get update

.github/workflows/create_jnispice.yml

@@ -20,7 +20,7 @@ jobs:
           7z x JNISpice.zip
           echo "JNISpice unpacked"
       - name: Upload DLL
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Windows Spice
           path: JNISpice/lib/JNISpice.dll
@@ -39,7 +39,7 @@ jobs:
         run: mv libJNISpice.so libJNISpice_Intel.so
         working-directory: JNISpice/lib
       - name: Upload .so
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: x86 Linux Spice
           path: JNISpice/lib/libJNISpice_Intel.so
@@ -64,7 +64,7 @@ jobs:
         working-directory: JNISpice/src/JNISpice
         shell: csh {0}
       - name: Upload Intel Mac .jnilib
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: x86 Mac Spice
           path: JNISpice/lib/libJNISpice_Intel.jnilib
@@ -74,10 +74,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "temurin"
-          java-version: "19"
+          java-version: "21"
       - name: Download and Unpack JNISpice TAR
         run: |
           curl https://naif.jpl.nasa.gov/pub/naif/misc/JNISpice/PC_Linux_GCC_Java1.8_64bit/packages/JNISpice.tar.Z -o JNISpice.tar.Z
@@ -104,7 +104,7 @@ jobs:
         working-directory: JNISpice/src/JNISpice
       - name: Upload JAR
         if: success()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: JNISpice Jar
           path: JNISpice/src/JNISpice/JNISpice-*.jar

.github/workflows/deploy-to-gh-pages.yml

@@ -15,12 +15,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 19
-      - uses: gradle/gradle-build-action@v2
+          java-version: "21"
+      - uses: gradle/actions/setup-gradle@v3
       - name: Create Pages Build Directories
         run: mkdir -p build/javadoc/examples
       - name: Build EDSL API Docs
@@ -51,7 +51,7 @@ jobs:
           cp -a ./scheduler-server/build/docs/javadoc ./build/javadoc/scheduler-server
           cp -a ./scheduler-worker/build/docs/javadoc ./build/javadoc/scheduler-worker
       - name: Upload Artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         with:
           path: build/
 
@@ -64,4 +64,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v1
+        uses: actions/deploy-pages@v4

.github/workflows/load-test.yml

@@ -17,16 +17,16 @@ jobs:
     environment: load-test
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "temurin"
-          java-version: "19"
+          java-version: "21"
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/wrapper-validation-action@v2
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
       - name: Assemble
         run: ./gradlew assemble --parallel
       - name: Start Services
@@ -43,7 +43,7 @@ jobs:
           ./load-test.sh
       - name: Upload Load Test Results
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Load Test Results
           path: "**/load-tests/load-report.*"

.github/workflows/pgcmp.yml

@@ -17,6 +17,7 @@ on:
       - "deployment/postgres-init-db/sql/**"
     branches:
       - develop
+      - dev-[0-9]+.[0-9]+.[0-9]+
     tags:
       - v*
   workflow_dispatch:
@@ -27,16 +28,16 @@ jobs:
     environment: e2e-test
     steps:
       - name: Checkout v1.0.1
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: "v1.0.1"
       - name: Clone PGCMP
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: cbbrowne/pgcmp
           path: pgcmp
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
       - name: Setup Postgres Client (psql)
@@ -46,9 +47,9 @@ jobs:
       - name: Setup Hasura CLI
         run: sudo curl -L https://github.com/hasura/graphql-engine/raw/stable/cli/get.sh | bash
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/wrapper-validation-action@v2
       - name: Distribute SQL and Assemble Java
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
         with:
           arguments: distributeSQL
       - name: Start Postgres
@@ -78,13 +79,13 @@ jobs:
           PGURI=postgres://"${AERIE_USERNAME}":"${AERIE_PASSWORD}"@localhost:5432/aerie_ui PGCMPOUTPUT=./pgdumpv1_0_1/AerieUIV1_0_1 PGCLABEL=AerieUIV1_0_1 PGBINDIR=/usr/bin ./pgcmp/pgcmp-dump
         shell: bash
       - name: Share Database Dump
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: v1_0_1-db-dump
           path: pgdumpv1_0_1
           retention-days: 1
       - name: Checkout Latest
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Restart Hasura
         run: |
           docker compose down
@@ -115,7 +116,7 @@ jobs:
           AERIE_USERNAME: "${{secrets.AERIE_USERNAME}}"
           AERIE_PASSWORD: "${{secrets.AERIE_PASSWORD}}"
       - name: Clone PGCMP
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: cbbrowne/pgcmp
           path: pgcmp
@@ -131,7 +132,7 @@ jobs:
           PGURI=postgres://"${AERIE_USERNAME}":"${AERIE_PASSWORD}"@localhost:5432/aerie_ui PGCMPOUTPUT=./pgdumpmigrated/AerieUIMigrated PGCLABEL=AerieUIMigrated PGBINDIR=/usr/bin ./pgcmp/pgcmp-dump
         shell: bash
       - name: Share Database Dump
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: migrated-db-dump
           path: pgdumpmigrated
@@ -152,19 +153,19 @@ jobs:
     environment: e2e-test
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Postgres Client (psql)
         run: |
           sudo apt-get update
           sudo apt-get install --yes postgresql-client
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/wrapper-validation-action@v2
       - name: Distribute SQL
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
         with:
           arguments: distributeSQL
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
       - name: Setup Hasura CLI
@@ -185,7 +186,7 @@ jobs:
         run: sleep 60s
         shell: bash
       - name: Clone PGCMP
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: cbbrowne/pgcmp
           path: pgcmp
@@ -201,7 +202,7 @@ jobs:
           PGURI=postgres://"${AERIE_USERNAME}":"${AERIE_PASSWORD}"@localhost:5432/aerie_ui PGCMPOUTPUT=./pgdumpraw/AerieUIRaw PGCLABEL=AerieUIRaw PGBINDIR=/usr/bin ./pgcmp/pgcmp-dump
         shell: bash
       - name: Share Database Dump
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: raw-sql-db-dump
           path: pgdumpraw
@@ -231,7 +232,7 @@ jobs:
           PGURI=postgres://"${AERIE_USERNAME}":"${AERIE_PASSWORD}"@localhost:5432/aerie_ui PGCMPOUTPUT=./pgdumpmigrateddown/AerieUIMigratedDown PGCLABEL=AerieUIMigratedDown PGBINDIR=/usr/bin ./pgcmp/pgcmp-dump
         shell: bash
       - name: Share Database Dump
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: migrated-down-db-dump
           path: pgdumpmigrateddown
@@ -251,9 +252,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Clone PGCMP
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: cbbrowne/pgcmp
           path: pgcmp
@@ -267,11 +268,11 @@ jobs:
         run: sleep 5s
         shell: bash
       - name: Download Shared Dumps
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: migrated-db-dump
           path: pgcmp/pgdumpmigrated
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: raw-sql-db-dump
           path: pgcmp/pgdumpraw
@@ -284,7 +285,7 @@ jobs:
         shell: bash
       - name: Upload Invalid
         if: ${{ failure() && steps.dbcmp.conclusion == 'failure' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pgcmpresultsup
           path: "**/results/"
@@ -304,9 +305,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Clone PGCMP
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: cbbrowne/pgcmp
           path: pgcmp
@@ -320,11 +321,11 @@ jobs:
         run: sleep 5s
         shell: bash
       - name: Download Shared Dumps
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: v1_0_1-db-dump
           path: pgcmp/pgdumpv1_0_1
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: migrated-down-db-dump
           path: pgcmp/pgdumpmigrateddown
@@ -339,7 +340,7 @@ jobs:
         shell: bash
       - name: Upload Invalid
         if: ${{ failure() && steps.dbcmp.conclusion == 'failure' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pgcmpresultsdown
           path: "**/results/"