Merge branch 'main' into patch-1

Author: dhower-qc

.github/workflows/nightly.yml

@@ -13,15 +13,15 @@ jobs:
     outputs:
       should_run: ${{ steps.should_run.outputs.should_run }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: print latest_commit
         run: echo ${{ github.sha }}
 
       - id: should_run
         continue-on-error: true
         name: check latest commit is less than a day
         if: ${{ github.event_name == 'schedule' }}
-        run: test -z $(git rev-list  --after="24 hours"  ${{ github.sha }}) && echo "::set-output name=should_run::false"
+        run: test -z "$(git rev-list  --after='24 hours'  ${{ github.sha }})" && echo "name=should_run::false" >> "$GITHUB_OUTPUT"
   nightly:
     needs: check_date
     if: ${{ needs.check_date.outputs.should_run != 'false' }}
@@ -35,13 +35,13 @@ jobs:
         uses: eWaterCycle/[email protected]
       - name: Get container from cache
         id: cache-sif
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .singularity/image.sif
           key: ${{ hashFiles('container.def', 'bin/.container-tag') }}
       - name: Get gems and node files from cache
         id: cache-bundle-npm
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             .home/.gems

.github/workflows/pages.yml

@@ -26,13 +26,13 @@ jobs:
         uses: eWaterCycle/[email protected]
       - name: Get container from cache
         id: cache-sif
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .singularity/image.sif
           key: ${{ hashFiles('container.def', 'bin/.container-tag') }}
       - name: Get gems and node files from cache
         id: cache-bundle-npm
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             .home/.gems

.github/workflows/regress.yml

@@ -8,8 +8,8 @@ jobs:
   regress-pre-commit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
       - uses: pre-commit/[email protected]
   regress-smoke:
     runs-on: ubuntu-latest
@@ -22,13 +22,13 @@ jobs:
         uses: eWaterCycle/[email protected]
       - name: Get container from cache
         id: cache-sif
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .singularity/image.sif
           key: ${{ hashFiles('container.def', 'bin/.container-tag') }}
       - name: Get gems and node files from cache
         id: cache-bundle-npm
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             .home/.gems
@@ -55,13 +55,13 @@ jobs:
         uses: eWaterCycle/[email protected]
       - name: Get container from cache
         id: cache-sif
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .singularity/image.sif
           key: ${{ hashFiles('container.def', 'bin/.container-tag') }}
       - name: Get gems and node files from cache
         id: cache-bundle-npm
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             .home/.gems
@@ -86,13 +86,13 @@ jobs:
         uses: eWaterCycle/[email protected]
       - name: Get container from cache
         id: cache-sif
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .singularity/image.sif
           key: ${{ hashFiles('container.def', 'bin/.container-tag') }}
       - name: Get gems and node files from cache
         id: cache-bundle-npm
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             .home/.gems
@@ -115,13 +115,13 @@ jobs:
         uses: eWaterCycle/[email protected]
       - name: Get container from cache
         id: cache-sif
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .singularity/image.sif
           key: ${{ hashFiles('container.def', 'bin/.container-tag') }}
       - name: Get gems and node files from cache
         id: cache-bundle-npm
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             .home/.gems
@@ -144,13 +144,13 @@ jobs:
         uses: eWaterCycle/[email protected]
       - name: Get container from cache
         id: cache-sif
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .singularity/image.sif
           key: ${{ hashFiles('container.def', 'bin/.container-tag') }}
       - name: Get gems and node files from cache
         id: cache-bundle-npm
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             .home/.gems

cfgs/qc_iu/arch_overlay/csr/Xqci/qc_flags.yaml

@@ -8,7 +8,10 @@ base: 32
 length: 32
 description: |
   Condition Code Register with condition codes, plus a co-processor flags (_e.g._, to support floating point)
-definedBy: Xqci
+definedBy:
+  anyOf:
+    - Xqci
+    - Xqciint
 fields:
   CPFLAGS:
     location: 31-16

cfgs/qc_iu/arch_overlay/csr/Xqci/qc_mclicie0.yaml

@@ -8,7 +8,10 @@ address: 0x7f0
 length: 32
 base: 32
 priv_mode: M
-definedBy: Xqci
+definedBy:
+  anyOf:
+    - Xqci
+    - Xqciint
 description: |
   Enable bits for IRQs 0-31
 fields:

cfgs/qc_iu/arch_overlay/csr/Xqci/qc_mclicie1.yaml

@@ -8,7 +8,10 @@ address: 0x7f1
 length: 32
 base: 32
 priv_mode: M
-definedBy: Xqci
+definedBy:
+  anyOf:
+    - Xqci
+    - Xqciint
 description: |
   Enable bits for IRQs 32-63
 fields:

cfgs/qc_iu/arch_overlay/csr/Xqci/qc_mclicie2.yaml

@@ -8,7 +8,10 @@ address: 0x7f2
 length: 32
 base: 32
 priv_mode: M
-definedBy: Xqci
+definedBy:
+  anyOf:
+    - Xqci
+    - Xqciint
 description: |
   Enable bits for IRQs 64-95
 fields:

cfgs/qc_iu/arch_overlay/csr/Xqci/qc_mclicie3.yaml

@@ -8,7 +8,10 @@ address: 0x7f3
 length: 32
 base: 32
 priv_mode: M
-definedBy: Xqci
+definedBy:
+  anyOf:
+    - Xqci
+    - Xqciint
 description: |
   Enable bits for IRQs 96-127
 fields:

cfgs/qc_iu/arch_overlay/csr/Xqci/qc_mclicie4.yaml

@@ -8,7 +8,10 @@ address: 0x7f4
 length: 32
 base: 32
 priv_mode: M
-definedBy: Xqci
+definedBy:
+  anyOf:
+    - Xqci
+    - Xqciint
 description: |
   Enable bits for IRQs 128-159
 fields:

cfgs/qc_iu/arch_overlay/csr/Xqci/qc_mclicie5.yaml

@@ -8,7 +8,10 @@ address: 0x7f5
 length: 32
 base: 32
 priv_mode: M
-definedBy: Xqci
+definedBy:
+  anyOf:
+    - Xqci
+    - Xqciint
 description: |
   Enable bits for IRQs 160-191
 fields: