Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 3 additions & 4 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,20 @@
"customizations": {
"vscode": {
"extensions": [
"arcanis.vscode-zipfs",
"vue.volar",
"batisteo.vscode-django",
"dbaeumer.vscode-eslint",
"eamodio.gitlens",
"editorconfig.editorconfig",
"vue.volar@2.2.10",
"mrmlnc.vscode-duplicate",
"ms-azuretools.vscode-docker",
"ms-playwright.playwright",
"ms-python.python",
"ms-python.pylint",
"ms-python.vscode-pylance",
"mutantdino.resourcemonitor",
"oderwat.indent-rainbow",
"oxc.oxc-vscode",
"redhat.vscode-yaml",
"ms-python.pylint",
"charliermarsh.ruff"
],
"settings": {
Expand Down
49 changes: 18 additions & 31 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,43 +6,24 @@ root = true

# Global settings for IETF datatracker
# ---------------------------------------------------------
# PEP8 Style

[*]
indent_size = 4
indent_size = 2
indent_style = space
charset = utf-8
trim_trailing_whitespace = false
trim_trailing_whitespace = true
insert_final_newline = true
end_of_line = lf

# Specializations below *add to* the above defaults

# Settings for .github folder
# ---------------------------------------------------------
# GitHub Markdown Style

[.github/**]
indent_size = 2

# Settings for client-side JS / Vue files
# ---------------------------------------------------------
# StandardJS Style

[client/**]
indent_size = 2

[dev/**.js]
indent_size = 2

[{package.json,.eslintrc.js,.yarnrc.yml,vite.config.js,jsconfig.json}]
indent_size = 2

# Settings for cypress tests
# Settings for Python files
# ---------------------------------------------------------
# StandardJS Style
# PEP8 Style

[cypress/**]
indent_size = 2
[*.{py,py.bak}]
indent_size = 4
trim_trailing_whitespace = false

# Settings for HTML templates
# ---------------------------------------------------------
Expand All @@ -51,8 +32,14 @@ indent_size = 2
[ietf/**.html]
insert_final_newline = false

# Settings for Kubernetes yaml
# Settings for Markdown
# ---------------------------------------------------------
# Use 2-space indents
[k8s/**.yaml]
indent_size = 2
# Avoid trimming trailing whitespace
[*.md]
trim_trailing_whitespace = false

# Unset for special / output files
# ---------------------------------------------------------
[{patch,vzic,bin}/**]
indent_style = unset
indent_size = unset
28 changes: 0 additions & 28 deletions .eslintrc.js

This file was deleted.

8 changes: 0 additions & 8 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,6 @@ updates:
npm:
patterns:
- "*"
- package-ecosystem: "npm"
directory: "/dev/deploy-to-container"
schedule:
interval: "weekly"
groups:
npm:
patterns:
- "*"
- package-ecosystem: "npm"
directory: "/dev/diff"
schedule:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
tests:
name: Run Tests
uses: ./.github/workflows/reusable-tests.yml
if: ${{ inputs.skipTests == 'false' }}
if: ${{ !inputs.skipTests }}
needs: [prepare]
secrets: inherit
with:
Expand Down
39 changes: 10 additions & 29 deletions .github/workflows/reusable-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,11 @@ jobs:
echo "GITHUB_SHA: $GITHUB_SHA"
echo "GITHUB_REF_NAME: $GITHUB_REF_NAME"
echo "Running frontend build script..."
echo "Compiling native node packages..."
yarn rebuild
echo "Installing node packages..."
npm ci
echo "Packaging static assets..."
yarn build --base=https://static.ietf.org/dt/${{ inputs.buildVersion }}/
yarn legacy:build
npm run build --base=https://static.ietf.org/dt/${{ inputs.buildVersion }}/
npm run legacy:build
echo "Setting version ${{ inputs.buildVersion }}..."
sed -i -r -e "s|^__version__ += '.*'$|__version__ = '${{ inputs.buildVersion }}'|" ietf/__init__.py
sed -i -r -e "s|^__release_hash__ += '.*'$|__release_hash__ = '$GITHUB_SHA'|" ietf/__init__.py
Expand All @@ -93,7 +93,7 @@ jobs:
run: |
echo "Setting production flags in settings.py..."
sed -i -r -e 's/^DEBUG *= *.*$/DEBUG = False/' -e "s/^SERVER_MODE *= *.*\$/SERVER_MODE = 'production'/" ietf/settings.py

- name: Make Tarball
env:
DEBIAN_FRONTEND: noninteractive
Expand Down Expand Up @@ -158,7 +158,7 @@ jobs:
ghcr.io/ietf-tools/datatracker:${{ inputs.buildVersion }}
${{ env.FEATURE_LATEST_TAG && format('ghcr.io/ietf-tools/datatracker:{0}-latest', env.FEATURE_LATEST_TAG) || null }}

- name: Update CHANGELOG
- name: Generate CHANGELOG
id: changelog
uses: Requarks/changelog-action@v1
if: ${{ inputs.isReleaseBuild }}
Expand All @@ -170,29 +170,10 @@ jobs:

- name: Download Coverage Results
if: ${{ inputs.handleCoverageResults }}
uses: actions/download-artifact@v8.0.1
uses: actions/download-artifact@v8
with:
name: coverage

- name: Prepare Coverage Action
if: ${{ inputs.handleCoverageResults }}
working-directory: ./dev/coverage-action
run: npm install

- name: Process Coverage Stats + Chart
id: covprocess
uses: ./dev/coverage-action/
if: ${{ inputs.handleCoverageResults }}
with:
token: ${{ github.token }}
tokenCommon: ${{ secrets.GH_COMMON_TOKEN }}
repoCommon: common
version: ${{ inputs.buildVersion }}
changelog: ${{ steps.changelog.outputs.changes }}
summary: ''
coverageResultsPath: coverage.json
histCoveragePath: historical-coverage.json

- name: Create Release
uses: ncipollo/release-action@v1.21.0
if: ${{ inputs.isReleaseBuild }}
Expand All @@ -202,8 +183,8 @@ jobs:
draft: false
tag: ${{ inputs.buildVersion }}
name: ${{ inputs.buildVersion }}
body: ${{ steps.covprocess.outputs.changelog }}
artifacts: "/home/runner/work/release/release.tar.gz,coverage.json,historical-coverage.json"
body: ${{ steps.changelog.outputs.changes }}
artifacts: "/home/runner/work/release/release.tar.gz,coverage.json"
token: ${{ secrets.GITHUB_TOKEN }}

- name: Update Baseline Coverage
Expand All @@ -218,7 +199,7 @@ jobs:
replacesArtifacts: true
artifacts: "coverage.json"
token: ${{ secrets.GITHUB_TOKEN }}

- name: Upload Build Artifacts
uses: actions/upload-artifact@v7
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/reusable-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,12 @@ jobs:

- uses: actions/setup-node@v6
with:
node-version: '18'
node-version: '26'

- name: Run all tests
run: |
echo "Installing dependencies..."
yarn
npm ci
echo "Installing Playwright..."
cd playwright
mkdir test-results
Expand Down Expand Up @@ -171,7 +171,7 @@ jobs:
HOME: ""
run: |
echo "Installing dependencies..."
yarn
npm ci
echo "Installing Playwright..."
cd playwright
mkdir test-results
Expand Down
2 changes: 2 additions & 0 deletions dev/deploy-to-container/.npmrc → .npmrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
audit = false
fund = false
save-exact = true
save-prefix = ""
update-notifier = false
9 changes: 9 additions & 0 deletions .oxfmtrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"$schema": "./node_modules/oxfmt/configuration_schema.json",
"semi": false,
"singleQuote": true,
"trailingComma": "none",
"bracketSameLine": true,
"endOfLine": "lf",
"insertFinalNewline": true
}
10 changes: 10 additions & 0 deletions .oxlintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"$schema": "./node_modules/oxlint/configuration_schema.json",
"plugins": ["eslint", "typescript", "unicorn", "oxc", "vue"],
"env": {
"browser": true
},
"categories": {
"correctness": "error"
}
}
Loading
Loading