ci: merge main to release (pull request #7034 from ietf-tools/main)

ci: merge main to release
ietf-tools · Feb 7, 2024 · ac4062f · ac4062f
2 parents d31605e + d42215b
commit ac4062f
Show file tree

Hide file tree

Showing 89 changed files with 2,740 additions and 748 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -123,6 +123,9 @@ jobs:
     if: ${{ !failure() && !cancelled() }}
     needs: [tests, prepare]
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      packages: write
     env:
       SHOULD_DEPLOY: ${{needs.prepare.outputs.should_deploy}}
       PKG_VERSION: ${{needs.prepare.outputs.pkg_version}}
@@ -154,13 +157,17 @@ jobs:
     - name: Make Release Build
       env:
         DEBIAN_FRONTEND: noninteractive
+        BROWSERSLIST_IGNORE_OLD_DATA: 1
       run: |
         echo "PKG_VERSION: $PKG_VERSION"
         echo "GITHUB_SHA: $GITHUB_SHA"
         echo "GITHUB_REF_NAME: $GITHUB_REF_NAME"
-        echo "Running build script..."
-        chmod +x ./dev/deploy/build.sh
-        sh ./dev/deploy/build.sh
+        echo "Running frontend build script..."
+        echo "Compiling native node packages..."
+        yarn rebuild
+        echo "Packaging static assets..."
+        yarn build --base=https://static.ietf.org/dt/$PKG_VERSION/
+        yarn legacy:build
         echo "Setting version $PKG_VERSION..."
         sed -i -r -e "s|^__version__ += '.*'$|__version__ = '$PKG_VERSION'|" ietf/__init__.py
         sed -i -r -e "s|^__release_hash__ += '.*'$|__release_hash__ = '$GITHUB_SHA'|" ietf/__init__.py
@@ -178,7 +185,7 @@ jobs:
       run: |
         echo "Build release tarball..."
         mkdir -p /home/runner/work/release
-        tar -czf /home/runner/work/release/release.tar.gz -X dev/deploy/exclude-patterns.txt .
+        tar -czf /home/runner/work/release/release.tar.gz -X dev/build/exclude-patterns.txt .
 
     - name: Collect + Push Statics
       env:
@@ -189,10 +196,46 @@ jobs:
         AWS_ENDPOINT_URL: ${{ secrets.CF_R2_ENDPOINT }}
       run: |
         echo "Collecting statics..."
-        docker run --rm --name collectstatics -v $(pwd):/workspace ghcr.io/ietf-tools/datatracker-app-base:latest sh dev/deploy/collectstatics.sh
+        docker run --rm --name collectstatics -v $(pwd):/workspace ghcr.io/ietf-tools/datatracker-app-base:latest sh dev/build/collectstatics.sh
         echo "Pushing statics..."
         cd static
         aws s3 sync . s3://static/dt/$PKG_VERSION --only-show-errors
+
+    - name: Augment dockerignore for docker image build
+      env:
+        DEBIAN_FRONTEND: noninteractive
+      run: |
+        cat >> .dockerignore <<EOL
+        .devcontainer
+        .github
+        .vscode
+        helm
+        playwright
+        svn-history
+        docker-compose.yml
+        EOL
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Build Release Docker Image
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        file: dev/build/Dockerfile
+        platforms: linux/amd64,linux/arm64
+        push: true
+        tags: ghcr.io/ietf-tools/datatracker:${{ env.PKG_VERSION }}
 
     - name: Update CHANGELOG
       id: changelog
@@ -269,7 +312,7 @@ jobs:
     steps:      
     - name: Notify on Slack (Success)
       if: ${{ !contains(join(needs.*.result, ','), 'failure') }}
-      uses: slackapi/slack-github-action@v1.24.0
+      uses: slackapi/slack-github-action@v1.25.0
       with:
         channel-id: ${{ secrets.SLACK_GH_BUILDS_CHANNEL_ID }}
         payload: |
@@ -292,7 +335,7 @@ jobs:
         SLACK_BOT_TOKEN: ${{ secrets.SLACK_GH_BOT }}
     - name: Notify on Slack (Failure)
       if: ${{ contains(join(needs.*.result, ','), 'failure') }}
-      uses: slackapi/slack-github-action@v1.24.0
+      uses: slackapi/slack-github-action@v1.25.0
       with:
         channel-id: ${{ secrets.SLACK_GH_BUILDS_CHANNEL_ID }}
         payload: |

diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -17,6 +17,6 @@ jobs:
       - name: 'Checkout Repository'
         uses: actions/checkout@v4
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v3
+        uses: actions/dependency-review-action@v4
         with:
           vulnerability-check: false
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -59,7 +59,7 @@ jobs:
         path: geckodriver.log
 
     - name: Upload Coverage Results to Codecov
-      uses: codecov/codecov-action@v3.1.4
+      uses: codecov/codecov-action@v3.1.5
       with:
         files: coverage.xml
 

diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/.yarn/cache/@vue-compiler-core-npm-3.4.13-acb31588b3-5f486b5ca8.zip b/.yarn/cache/@vue-compiler-core-npm-3.4.13-acb31588b3-5f486b5ca8.zip
diff --git a/.yarn/cache/@vue-compiler-core-npm-3.4.15-4f131dda24-1610f715b8.zip b/.yarn/cache/@vue-compiler-core-npm-3.4.15-4f131dda24-1610f715b8.zip
diff --git a/.yarn/cache/@vue-compiler-dom-npm-3.4.13-419b24ea95-2afdacc038.zip b/.yarn/cache/@vue-compiler-dom-npm-3.4.13-419b24ea95-2afdacc038.zip
diff --git a/.yarn/cache/@vue-compiler-dom-npm-3.4.15-8299b45d96-373968c2c6.zip b/.yarn/cache/@vue-compiler-dom-npm-3.4.15-8299b45d96-373968c2c6.zip
diff --git a/.yarn/cache/@vue-compiler-sfc-npm-3.4.13-5fd28e3447-9252b9f10c.zip b/.yarn/cache/@vue-compiler-sfc-npm-3.4.13-5fd28e3447-9252b9f10c.zip
diff --git a/.yarn/cache/@vue-compiler-sfc-npm-3.4.15-3d3ce9fc16-4a707346c3.zip b/.yarn/cache/@vue-compiler-sfc-npm-3.4.15-3d3ce9fc16-4a707346c3.zip
diff --git a/.yarn/cache/@vue-compiler-ssr-npm-3.4.13-f1c98d5a6b-99fae88e13.zip b/.yarn/cache/@vue-compiler-ssr-npm-3.4.13-f1c98d5a6b-99fae88e13.zip
diff --git a/.yarn/cache/@vue-compiler-ssr-npm-3.4.15-05dd3d13a5-45a12ae2dd.zip b/.yarn/cache/@vue-compiler-ssr-npm-3.4.15-05dd3d13a5-45a12ae2dd.zip
diff --git a/.yarn/cache/@vue-reactivity-npm-3.4.13-ad954039b3-883ba2fb31.zip b/.yarn/cache/@vue-reactivity-npm-3.4.13-ad954039b3-883ba2fb31.zip
diff --git a/.yarn/cache/@vue-reactivity-npm-3.4.15-fde29aa046-e1f8ef7ec3.zip b/.yarn/cache/@vue-reactivity-npm-3.4.15-fde29aa046-e1f8ef7ec3.zip
diff --git a/.yarn/cache/@vue-runtime-core-npm-3.4.13-a92d1fdb22-196c6c894d.zip b/.yarn/cache/@vue-runtime-core-npm-3.4.13-a92d1fdb22-196c6c894d.zip
diff --git a/.yarn/cache/@vue-runtime-core-npm-3.4.15-b9057fef14-6ab6721410.zip b/.yarn/cache/@vue-runtime-core-npm-3.4.15-b9057fef14-6ab6721410.zip
diff --git a/.yarn/cache/@vue-runtime-dom-npm-3.4.13-b9f911a017-8811687c23.zip b/.yarn/cache/@vue-runtime-dom-npm-3.4.13-b9f911a017-8811687c23.zip
diff --git a/.yarn/cache/@vue-runtime-dom-npm-3.4.15-7dfc9b71f4-4f2e79d956.zip b/.yarn/cache/@vue-runtime-dom-npm-3.4.15-7dfc9b71f4-4f2e79d956.zip
diff --git a/.yarn/cache/@vue-server-renderer-npm-3.4.13-6a75a1f39c-f17fff6af2.zip b/.yarn/cache/@vue-server-renderer-npm-3.4.13-6a75a1f39c-f17fff6af2.zip
diff --git a/.yarn/cache/@vue-server-renderer-npm-3.4.15-fd81b21d4f-de93ccffe7.zip b/.yarn/cache/@vue-server-renderer-npm-3.4.15-fd81b21d4f-de93ccffe7.zip
diff --git a/.yarn/cache/@vue-shared-npm-3.4.13-4dcbacd500-c514944886.zip b/.yarn/cache/@vue-shared-npm-3.4.13-4dcbacd500-c514944886.zip
diff --git a/.yarn/cache/@vue-shared-npm-3.4.15-638dcb7e89-237db3a880.zip b/.yarn/cache/@vue-shared-npm-3.4.15-638dcb7e89-237db3a880.zip
diff --git a/.yarn/cache/caniuse-lite-npm-1.0.30001576-3d0983cdce-b8b332675f.zip b/.yarn/cache/caniuse-lite-npm-1.0.30001576-3d0983cdce-b8b332675f.zip
diff --git a/.yarn/cache/caniuse-lite-npm-1.0.30001581-7909cc6e66-ca4e2cd9d0.zip b/.yarn/cache/caniuse-lite-npm-1.0.30001581-7909cc6e66-ca4e2cd9d0.zip
diff --git a/.yarn/cache/postcss-npm-8.4.32-2004ba88b8-220d9d0bf5.zip b/.yarn/cache/postcss-npm-8.4.32-2004ba88b8-220d9d0bf5.zip
diff --git a/.yarn/cache/sass-npm-1.69.7-ac434a094c-c67cd32b69.zip b/.yarn/cache/sass-npm-1.69.7-ac434a094c-c67cd32b69.zip
diff --git a/.yarn/cache/sass-npm-1.70.0-153257249c-fd1b622cf9.zip b/.yarn/cache/sass-npm-1.70.0-153257249c-fd1b622cf9.zip
diff --git a/.../vite-npm-4.5.1-567bbcf9ff-72b3584b3d.zip → .../vite-npm-4.5.2-e430b2c117-9d1f84f703.zip b/.../vite-npm-4.5.1-567bbcf9ff-72b3584b3d.zip → .../vite-npm-4.5.2-e430b2c117-9d1f84f703.zip
diff --git a/.yarn/cache/vue-npm-3.4.13-668436a4a7-c9f8edf5fc.zip b/.yarn/cache/vue-npm-3.4.13-668436a4a7-c9f8edf5fc.zip
diff --git a/.yarn/cache/vue-npm-3.4.15-11fe9fcc84-6e9ff02c9b.zip b/.yarn/cache/vue-npm-3.4.15-11fe9fcc84-6e9ff02c9b.zip
diff --git a/bin/hourly b/bin/hourly
@@ -45,6 +45,7 @@ ID=/a/ietfdata/doc/draft/repository
 DERIVED=/a/ietfdata/derived
 DOWNLOAD=/a/www/www6s/download
 
+## Start of script refactored into idindex_update_task() ===
 export TMPDIR=/a/tmp
 
 TMPFILE1=`mktemp` || exit 1
@@ -85,6 +86,8 @@ mv $TMPFILE9 $DERIVED/1id-index.txt
 mv $TMPFILEA $DERIVED/1id-abstracts.txt
 mv $TMPFILEB $DERIVED/all_id2.txt
 
+## End of script refactored into idindex_update_task() ===
+
 $DTDIR/ietf/manage.py generate_idnits2_rfc_status
 $DTDIR/ietf/manage.py generate_idnits2_rfcs_obsoleted
 

diff --git a/dev/build/Dockerfile b/dev/build/Dockerfile
@@ -0,0 +1,17 @@
+FROM ghcr.io/ietf-tools/datatracker-app-base:latest
+LABEL maintainer="IETF Tools Team <tools-discuss@ietf.org>"
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+COPY . .
+COPY ./dev/build/start.sh ./start.sh
+RUN pip3 --disable-pip-version-check --no-cache-dir install -r requirements.txt
+RUN chmod +x start.sh && \
+    chmod +x docker/scripts/app-create-dirs.sh && \
+    sh ./docker/scripts/app-create-dirs.sh
+
+VOLUME [ "/assets" ]
+
+EXPOSE 8000
+
+CMD ["./start.sh"]
diff --git a/dev/build/collectstatics.sh b/dev/build/collectstatics.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# Copy temp local settings
+cp dev/build/settings_local_collectstatics.py ietf/settings_local.py
+
+# Install Python dependencies
+pip --disable-pip-version-check --no-cache-dir install -r requirements.txt
+
+# Collect statics
+ietf/manage.py collectstatic
+
+# Delete temp local settings
+rm ietf/settings_local.py
diff --git a/dev/deploy/exclude-patterns.txt → dev/build/exclude-patterns.txt b/dev/deploy/exclude-patterns.txt → dev/build/exclude-patterns.txt
diff --git a/dev/deploy/settings_local_collectstatics.py → dev/build/settings_local_collectstatics.py b/dev/deploy/settings_local_collectstatics.py → dev/build/settings_local_collectstatics.py
diff --git a/dev/build/start.sh b/dev/build/start.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+echo "Running Datatracker checks..."
+./ietf/manage.py check
+
+echo "Running Datatracker migrations..."
+./ietf/manage.py migrate --settings=settings_local
+
+echo "Starting Datatracker..."
+./ietf/manage.py runserver 0.0.0.0:8000 --settings=settings_local
diff --git a/dev/coverage-action/package-lock.json b/dev/coverage-action/package-lock.json
diff --git a/dev/coverage-action/package.json b/dev/coverage-action/package.json
@@ -19,6 +19,6 @@
     "eslint-plugin-import": "2.29.1",
     "eslint-plugin-node": "11.1.0",
     "eslint-plugin-promise": "6.1.1",
-    "npm-check-updates": "16.14.12"
+    "npm-check-updates": "16.14.14"
   }
 }
diff --git a/dev/deploy/build.sh b/dev/deploy/build.sh
diff --git a/dev/deploy/collectstatics.sh b/dev/deploy/collectstatics.sh
diff --git a/helm/.helmignore b/helm/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -0,0 +1,23 @@
+apiVersion: v2
+name: datatracker
+description: The day-to-day front-end to the IETF database for people who work on IETF standards.
+home: https://datatracker.ietf.org
+sources:
+  - https://github.com/ietf-tools/datatracker
+maintainers:
+  - name: IETF Tools Team
+    email: tools-discuss@ietf.org
+    url: https://github.com/ietf-tools
+
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 1.0.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "1.0.0"
diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl
@@ -0,0 +1,62 @@
+{{/*
+  Expand the name of the chart.
+  */}}
+{{- define "datatracker.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "datatracker.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "datatracker.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "datatracker.labels" -}}
+helm.sh/chart: {{ include "datatracker.chart" . }}
+{{ include "datatracker.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "datatracker.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "datatracker.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "datatracker.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "datatracker.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}