ci: merge main to release (PR #6932)

ci: merge main to release
This commit is contained in:
Robert Sparks 2024-01-17 15:43:33 -06:00 committed by GitHub
commit 2b38e664f7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
234 changed files with 2354 additions and 2016 deletions

View file

@ -9,11 +9,67 @@ updates:
directory: "/" directory: "/"
schedule: schedule:
interval: "weekly" interval: "weekly"
reviewers:
- "ngpixel"
- package-ecosystem: "docker" - package-ecosystem: "docker"
directory: "/docker" directory: "/docker"
schedule: schedule:
interval: "weekly" interval: "weekly"
reviewers:
- "ngpixel"
- package-ecosystem: "pip" - package-ecosystem: "pip"
directory: "/" directory: "/"
schedule: schedule:
interval: "weekly" interval: "weekly"
reviewers:
- "rjsparks"
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "weekly"
reviewers:
- "ngpixel"
groups:
yarn:
patterns:
- "*"
- package-ecosystem: "npm"
directory: "/playwright"
schedule:
interval: "weekly"
reviewers:
- "ngpixel"
groups:
npm:
patterns:
- "*"
- package-ecosystem: "npm"
directory: "/dev/coverage-action"
schedule:
interval: "weekly"
reviewers:
- "ngpixel"
groups:
npm:
patterns:
- "*"
- package-ecosystem: "npm"
directory: "/dev/deploy-to-container"
schedule:
interval: "weekly"
reviewers:
- "ngpixel"
groups:
npm:
patterns:
- "*"
- package-ecosystem: "npm"
directory: "/dev/diff"
schedule:
interval: "weekly"
reviewers:
- "ngpixel"
groups:
npm:
patterns:
- "*"

View file

@ -17,6 +17,11 @@ on:
default: true default: true
required: true required: true
type: boolean type: boolean
sandboxNoDbRefresh:
description: 'Sandbox Disable Daily DB Refresh'
default: false
required: true
type: boolean
legacySandbox: legacySandbox:
description: 'Deploy to Legacy Sandbox' description: 'Deploy to Legacy Sandbox'
default: false default: false
@ -54,7 +59,8 @@ jobs:
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 1
fetch-tags: false
- name: Get Next Version - name: Get Next Version
if: ${{ github.ref_name == 'release' }} if: ${{ github.ref_name == 'release' }}
@ -126,7 +132,8 @@ jobs:
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 1
fetch-tags: false
- name: Setup Node.js - name: Setup Node.js
uses: actions/setup-node@v4 uses: actions/setup-node@v4
@ -134,13 +141,13 @@ jobs:
node-version: '16' node-version: '16'
- name: Setup Python - name: Setup Python
uses: actions/setup-python@v4 uses: actions/setup-python@v5
with: with:
python-version: '3.x' python-version: '3.x'
- name: Download a Coverage Results - name: Download a Coverage Results
if: ${{ github.event.inputs.skiptests == 'false' || github.ref_name == 'release' }} if: ${{ github.event.inputs.skiptests == 'false' || github.ref_name == 'release' }}
uses: actions/download-artifact@v3.0.2 uses: actions/download-artifact@v4.1.1
with: with:
name: coverage name: coverage
@ -172,6 +179,20 @@ jobs:
echo "Build release tarball..." echo "Build release tarball..."
mkdir -p /home/runner/work/release 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/deploy/exclude-patterns.txt .
- name: Collect + Push Statics
env:
DEBIAN_FRONTEND: noninteractive
AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_KEY_SECRET }}
AWS_DEFAULT_REGION: auto
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
echo "Pushing statics..."
cd static
aws s3 sync . s3://static/dt/$PKG_VERSION --only-show-errors
- name: Update CHANGELOG - name: Update CHANGELOG
id: changelog id: changelog
@ -229,7 +250,7 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
- name: Upload Build Artifacts - name: Upload Build Artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: release-${{ env.PKG_VERSION }} name: release-${{ env.PKG_VERSION }}
path: /home/runner/work/release/release.tar.gz path: /home/runner/work/release/release.tar.gz
@ -310,7 +331,7 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Download a Release Artifact - name: Download a Release Artifact
uses: actions/download-artifact@v3.0.2 uses: actions/download-artifact@v4.1.1
with: with:
name: release-${{ env.PKG_VERSION }} name: release-${{ env.PKG_VERSION }}
@ -325,7 +346,7 @@ jobs:
npm ci npm ci
cd ../.. cd ../..
echo "Start Deploy..." echo "Start Deploy..."
node ./dev/deploy-to-container/cli.js --branch ${{ github.ref_name }} --domain dev.ietf.org --appversion ${{ env.PKG_VERSION }} --commit ${{ github.sha }} --ghrunid ${{ github.run_id }} node ./dev/deploy-to-container/cli.js --branch ${{ github.ref_name }} --domain dev.ietf.org --appversion ${{ env.PKG_VERSION }} --commit ${{ github.sha }} --ghrunid ${{ github.run_id }} --nodbrefresh ${{ github.event.inputs.sandboxNoDbRefresh }}
- name: Cleanup old docker resources - name: Cleanup old docker resources
env: env:
@ -346,7 +367,7 @@ jobs:
steps: steps:
- name: Download a Release Artifact - name: Download a Release Artifact
uses: actions/download-artifact@v3.0.2 uses: actions/download-artifact@v4.1.1
with: with:
name: release-${{ env.PKG_VERSION }} name: release-${{ env.PKG_VERSION }}
path: /a/www/ietf-datatracker/main.dev.${{ github.run_number }} path: /a/www/ietf-datatracker/main.dev.${{ github.run_number }}

View file

@ -29,9 +29,9 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Initialize CodeQL - name: Initialize CodeQL
uses: github/codeql-action/init@v2 uses: github/codeql-action/init@v3
with: with:
languages: ${{ matrix.language }} languages: ${{ matrix.language }}
- name: Perform CodeQL Analysis - name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2 uses: github/codeql-action/analyze@v3

View file

@ -18,3 +18,5 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: 'Dependency Review' - name: 'Dependency Review'
uses: actions/dependency-review-action@v3 uses: actions/dependency-review-action@v3
with:
vulnerability-check: false

View file

@ -38,7 +38,7 @@ jobs:
ssh-keyscan -t rsa $vminfo >> ~/.ssh/known_hosts ssh-keyscan -t rsa $vminfo >> ~/.ssh/known_hosts
- name: Remote SSH into VM - name: Remote SSH into VM
uses: appleboy/ssh-action@55dabf81b49d4120609345970c91507e2d734799 uses: appleboy/ssh-action@029f5b4aeeeb58fdfe1410a5d17f967dacf36262
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:

View file

@ -52,7 +52,7 @@ jobs:
coverage xml coverage xml
- name: Upload geckodriver.log - name: Upload geckodriver.log
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
if: ${{ failure() }} if: ${{ failure() }}
with: with:
name: geckodriverlog name: geckodriverlog
@ -69,7 +69,7 @@ jobs:
mv latest-coverage.json coverage.json mv latest-coverage.json coverage.json
- name: Upload Coverage Results as Build Artifact - name: Upload Coverage Results as Build Artifact
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
if: ${{ always() }} if: ${{ always() }}
with: with:
name: coverage name: coverage
@ -103,7 +103,7 @@ jobs:
npx playwright test --project=${{ matrix.project }} npx playwright test --project=${{ matrix.project }}
- name: Upload Report - name: Upload Report
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
if: ${{ always() }} if: ${{ always() }}
continue-on-error: true continue-on-error: true
with: with:
@ -162,7 +162,7 @@ jobs:
npx playwright test --project=${{ matrix.project }} -c playwright-legacy.config.js npx playwright test --project=${{ matrix.project }} -c playwright-legacy.config.js
- name: Upload Report - name: Upload Report
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
if: ${{ always() }} if: ${{ always() }}
continue-on-error: true continue-on-error: true
with: with:

1
.gitignore vendored
View file

@ -23,6 +23,7 @@ datatracker.sublime-workspace
/media /media
/node_modules /node_modules
/release-coverage.json /release-coverage.json
/static
/tmp-* /tmp-*
/.testresult /.testresult
*.pyc *.pyc

1850
.pnp.cjs generated

File diff suppressed because it is too large Load diff

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.

Some files were not shown because too many files have changed in this diff Show more