Merge pull request #6248 from rjsparks/merge_with_conflictfixes

chore: merge main and fix conflicts

.github/workflows/build.yml

@@ -71,7 +71,7 @@ jobs:
         echo "NEXT_VERSION=$nextStrict" >> $GITHUB_ENV
         
     - name: Create Draft Release
-      uses: ncipollo/release-action@v1.12.0
+      uses: ncipollo/release-action@v1.13.0
       if: ${{ github.ref_name == 'release' }}
       with:
         prerelease: true
@@ -137,9 +137,9 @@ jobs:
         echo "Running tests..."
         if [[ "x${{ github.event.inputs.ignoreLowerCoverage }}" == "xtrue" ]]; then
           echo "Lower coverage failures will be ignored."
-          ./ietf/manage.py test --validate-html-harder --settings=settings_postgrestest --ignore-lower-coverage
+          ./ietf/manage.py test --validate-html-harder --settings=settings_test --ignore-lower-coverage
         else
-          ./ietf/manage.py test --validate-html-harder --settings=settings_postgrestest
+          ./ietf/manage.py test --validate-html-harder --settings=settings_test
         fi
         coverage xml
 
@@ -352,7 +352,7 @@ jobs:
         histCoveragePath: historical-coverage.json
         
     - name: Create Release
-      uses: ncipollo/release-action@v1.12.0
+      uses: ncipollo/release-action@v1.13.0
       if: ${{ env.SHOULD_DEPLOY == 'true' }}
       with:
         allowUpdates: true
@@ -365,7 +365,7 @@ jobs:
         token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Update Baseline Coverage
-      uses: ncipollo/release-action@v1.12.0
+      uses: ncipollo/release-action@v1.13.0
       if: ${{ github.event.inputs.updateCoverage == 'true' }}
       with:
         allowUpdates: true

.github/workflows/ci-run-tests.yml

@@ -46,7 +46,7 @@ jobs:
           exit 1
         fi
         echo "Running tests..."
-        ./ietf/manage.py test --validate-html-harder --settings=settings_postgrestest
+        ./ietf/manage.py test --validate-html-harder --settings=settings_test
         coverage xml
 
     - name: Upload Coverage Results to Codecov

.vscode/tasks.json

@@ -48,7 +48,7 @@
             "args": [
                 "${workspaceFolder}/ietf/manage.py",
                 "test",
-                "--settings=settings_postgrestest"
+                "--settings=settings_test"
             ],
             "group": "test",
             "presentation": {
@@ -68,7 +68,7 @@
             "args": [
                 "${workspaceFolder}/ietf/manage.py",
                 "test",
-                "--settings=settings_postgrestest",
+                "--settings=settings_test",
                 "--pattern=tests_js.py"
             ],
             "group": "test",