chore: merge main and fix conflicts
This commit is contained in:
parent
c085f0f8ec
commit
f9c9644263
10
.github/workflows/build.yml
vendored
10
.github/workflows/build.yml
vendored
|
@ -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
|
||||
|
|
2
.github/workflows/ci-run-tests.yml
vendored
2
.github/workflows/ci-run-tests.yml
vendored
|
@ -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
|
||||
|
|
4
.vscode/tasks.json
vendored
4
.vscode/tasks.json
vendored
|
@ -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",
|
||||
|
|
BIN
.yarn/cache/@aashutoshrathi-word-wrap-npm-1.2.6-5b1d95e487-ada901b9e7.zip
vendored
Normal file
BIN
.yarn/cache/@aashutoshrathi-word-wrap-npm-1.2.6-5b1d95e487-ada901b9e7.zip
vendored
Normal file
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@esbuild-darwin-arm64-npm-0.18.20-00b3504077-8.zip
vendored
Normal file
BIN
.yarn/cache/@esbuild-darwin-arm64-npm-0.18.20-00b3504077-8.zip
vendored
Normal file
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@esbuild-darwin-x64-npm-0.18.20-767fe27d1b-8.zip
vendored
Normal file
BIN
.yarn/cache/@esbuild-darwin-x64-npm-0.18.20-767fe27d1b-8.zip
vendored
Normal file
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@esbuild-linux-arm64-npm-0.18.20-7b48b328fe-8.zip
vendored
Normal file
BIN
.yarn/cache/@esbuild-linux-arm64-npm-0.18.20-7b48b328fe-8.zip
vendored
Normal file
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@esbuild-linux-x64-npm-0.18.20-de8e99b449-8.zip
vendored
Normal file
BIN
.yarn/cache/@esbuild-linux-x64-npm-0.18.20-de8e99b449-8.zip
vendored
Normal file
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@esbuild-win32-arm64-npm-0.18.20-a58fe6c6a3-8.zip
vendored
Normal file
BIN
.yarn/cache/@esbuild-win32-arm64-npm-0.18.20-a58fe6c6a3-8.zip
vendored
Normal file
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@esbuild-win32-x64-npm-0.18.20-37a9ab2bda-8.zip
vendored
Normal file
BIN
.yarn/cache/@esbuild-win32-x64-npm-0.18.20-37a9ab2bda-8.zip
vendored
Normal file
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@eslint-community-regexpp-npm-4.8.0-92ece47e3d-601e6d033d.zip
vendored
Normal file
BIN
.yarn/cache/@eslint-community-regexpp-npm-4.8.0-92ece47e3d-601e6d033d.zip
vendored
Normal file
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@eslint-eslintrc-npm-2.1.2-feb0771c9f-bc742a1e3b.zip
vendored
Normal file
BIN
.yarn/cache/@eslint-eslintrc-npm-2.1.2-feb0771c9f-bc742a1e3b.zip
vendored
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@parcel-codeframe-npm-2.9.3-2580057b7a-f86a4d90eb.zip
vendored
Normal file
BIN
.yarn/cache/@parcel-codeframe-npm-2.9.3-2580057b7a-f86a4d90eb.zip
vendored
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@parcel-fs-npm-2.9.3-f6cd93298b-c9bf9ca9e6.zip
vendored
Normal file
BIN
.yarn/cache/@parcel-fs-npm-2.9.3-f6cd93298b-c9bf9ca9e6.zip
vendored
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@parcel-optimizer-image-npm-2.9.3-f742dd90da-5053b27244.zip
vendored
Normal file
BIN
.yarn/cache/@parcel-optimizer-image-npm-2.9.3-f742dd90da-5053b27244.zip
vendored
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@parcel-package-manager-npm-2.9.3-c065cee1b5-46acc905b8.zip
vendored
Normal file
BIN
.yarn/cache/@parcel-package-manager-npm-2.9.3-c065cee1b5-46acc905b8.zip
vendored
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@parcel-reporter-cli-npm-2.9.3-d81ba5564f-f274aa2959.zip
vendored
Normal file
BIN
.yarn/cache/@parcel-reporter-cli-npm-2.9.3-d81ba5564f-f274aa2959.zip
vendored
Normal file
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@parcel-reporter-dev-server-npm-2.9.3-60ff1088fd-e8beff5f94.zip
vendored
Normal file
BIN
.yarn/cache/@parcel-reporter-dev-server-npm-2.9.3-60ff1088fd-e8beff5f94.zip
vendored
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@parcel-resolver-default-npm-2.9.3-f1c2ca1c12-9e14d5b9bc.zip
vendored
Normal file
BIN
.yarn/cache/@parcel-resolver-default-npm-2.9.3-f1c2ca1c12-9e14d5b9bc.zip
vendored
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@parcel-utils-npm-2.9.3-6666fec42c-4c1df52754.zip
vendored
Normal file
BIN
.yarn/cache/@parcel-utils-npm-2.9.3-6666fec42c-4c1df52754.zip
vendored
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@rollup-pluginutils-npm-5.0.3-33f9e7f020-8efbdeac53.zip
vendored
Normal file
BIN
.yarn/cache/@rollup-pluginutils-npm-5.0.3-33f9e7f020-8efbdeac53.zip
vendored
Normal file
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@vitejs-plugin-vue-npm-4.3.3-ffc8f9f2ac-17f8d73708.zip
vendored
Normal file
BIN
.yarn/cache/@vitejs-plugin-vue-npm-4.3.3-ffc8f9f2ac-17f8d73708.zip
vendored
Normal file
Binary file not shown.
BIN
.yarn/cache/acorn-npm-8.10.0-2230c9e83e-538ba38af0.zip
vendored
Normal file
BIN
.yarn/cache/acorn-npm-8.10.0-2230c9e83e-538ba38af0.zip
vendored
Normal file
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/array-buffer-byte-length-npm-1.0.0-331671f28a-044e101ce1.zip
vendored
Normal file
BIN
.yarn/cache/array-buffer-byte-length-npm-1.0.0-331671f28a-044e101ce1.zip
vendored
Normal file
Binary file not shown.
BIN
.yarn/cache/array.prototype.findlastindex-npm-1.2.2-dc5ee7bf67-8a166359f6.zip
vendored
Normal file
BIN
.yarn/cache/array.prototype.findlastindex-npm-1.2.2-dc5ee7bf67-8a166359f6.zip
vendored
Normal file
Binary file not shown.
BIN
.yarn/cache/arraybuffer.prototype.slice-npm-1.0.1-d44cb5acc0-e3e9b2a3e9.zip
vendored
Normal file
BIN
.yarn/cache/arraybuffer.prototype.slice-npm-1.0.1-d44cb5acc0-e3e9b2a3e9.zip
vendored
Normal file
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/bootstrap-npm-5.3.0-240c38a3b2-29a83cc8ca.zip
vendored
Normal file
BIN
.yarn/cache/bootstrap-npm-5.3.0-240c38a3b2-29a83cc8ca.zip
vendored
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/caniuse-lite-npm-1.0.30001519-1d6b5bc825-66085133ed.zip
vendored
Normal file
BIN
.yarn/cache/caniuse-lite-npm-1.0.30001519-1d6b5bc825-66085133ed.zip
vendored
Normal file
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/define-properties-npm-1.2.0-3547cd0fd2-e60aee6a19.zip
vendored
Normal file
BIN
.yarn/cache/define-properties-npm-1.2.0-3547cd0fd2-e60aee6a19.zip
vendored
Normal file
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue