Skip to content

Commit

Permalink
ci: merge main to release (pull request #7153)
Browse files Browse the repository at this point in the history
ci: merge main to release
  • Loading branch information
rjsparks committed Mar 7, 2024
2 parents 5ec1cf3 + b1d277c commit dd24558
Show file tree
Hide file tree
Showing 163 changed files with 1,834 additions and 1,725 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Expand Up @@ -150,7 +150,7 @@ jobs:

- name: Download a Coverage Results
if: ${{ github.event.inputs.skiptests == 'false' || github.ref_name == 'release' }}
uses: actions/download-artifact@v4.1.2
uses: actions/download-artifact@v4.1.4
with:
name: coverage

Expand Down Expand Up @@ -374,7 +374,7 @@ jobs:
- uses: actions/checkout@v4

- name: Download a Release Artifact
uses: actions/download-artifact@v4.1.2
uses: actions/download-artifact@v4.1.4
with:
name: release-${{ env.PKG_VERSION }}

Expand Down Expand Up @@ -410,7 +410,7 @@ jobs:

steps:
- name: Download a Release Artifact
uses: actions/download-artifact@v4.1.2
uses: actions/download-artifact@v4.1.4
with:
name: release-${{ env.PKG_VERSION }}
path: /a/www/ietf-datatracker/main.dev.${{ github.run_number }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Expand Up @@ -59,7 +59,7 @@ jobs:
path: geckodriver.log

- name: Upload Coverage Results to Codecov
uses: codecov/codecov-action@v4.0.1
uses: codecov/codecov-action@v4.1.0
with:
files: coverage.xml

Expand Down
1,575 changes: 796 additions & 779 deletions .pnp.cjs

Large diffs are not rendered by default.

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.
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.
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.
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.
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.
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.
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.
15 changes: 0 additions & 15 deletions bin/daily
Expand Up @@ -43,25 +43,10 @@ $DTDIR/ietf/manage.py populate_yang_model_dirs -v0
# Re-run yang checks on active documents
$DTDIR/ietf/manage.py run_yang_model_checks -v0

# Expire Internet-Drafts
# Enable when removed from /a/www/ietf-datatracker/scripts/Cron-runner:
$DTDIR/ietf/bin/expire-ids

# Send nomcom reminders about nomination acceptance and questionnaires
$DTDIR/ietf/manage.py send_reminders

# Expire last calls
# Enable when removed from /a/www/ietf-datatracker/scripts/Cron-runner:
$DTDIR/ietf/bin/expire-last-calls

# Run an extended version of the rfc editor update, to catch changes
# with backdated timestamps
# Enable when removed from /a/www/ietf-datatracker/scripts/Cron-runner:
$DTDIR/ietf/bin/rfc-editor-index-updates -d 1969-01-01

# Fetch meeting attendance data from ietf.org/registration/attendees
$DTDIR/ietf/manage.py fetch_meeting_attendance --latest 2

# Send reminders originating from the review app
$DTDIR/ietf/bin/send-review-reminders

Expand Down
28 changes: 0 additions & 28 deletions bin/every15m

This file was deleted.

64 changes: 0 additions & 64 deletions bin/hourly
Expand Up @@ -19,75 +19,11 @@ source $DTDIR/env/bin/activate

logger -p user.info -t cron "Running $DTDIR/bin/hourly"

# *** Enable when removed from /a/www/ietf-datatracker/scripts/Cron-runner: ***

# # Update community lists. Remove once the community rewrite (will be around 6.20.0 )
# $DTDIR/ietf/manage.py update_community_lists
#
# # Polling backup for iana and rfc-editory post APIs
$DTDIR/ietf/bin/iana-changes-updates
$DTDIR/ietf/bin/iana-protocols-updates
# $DTDIR/ietf/bin/rfc-editor-index-updates
# $DTDIR/ietf/bin/rfc-editor-queue-updates
#
# # Generate alias and virtual files for draft email aliases
# $DTDIR/ietf/bin/generate-draft-aliases && \
# ( cd /a/postfix; /usr/sbin/postalias -o draft-aliases; ) && \
# ( cd /a/postfix; /usr/sbin/postmap -o draft-virtual; )
#
# # Generate alias and virtual files for group email aliases
# $DTDIR/ietf/bin/generate-wg-aliases && \
# ( cd /a/postfix; /usr/sbin/postalias -o group-aliases; ) && \
# ( cd /a/postfix; /usr/sbin/postmap -o group-virtual; )
#
# Generate some static files
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
TMPFILE2=`mktemp` || exit 1
TMPFILE3=`mktemp` || exit 1
TMPFILE4=`mktemp` || exit 1
TMPFILE5=`mktemp` || exit 1
TMPFILE6=`mktemp` || exit 1
TMPFILE7=`mktemp` || exit 1
TMPFILE8=`mktemp` || exit 1
TMPFILE9=`mktemp` || exit 1
TMPFILEA=`mktemp` || exit 1
TMPFILEB=`mktemp` || exit 1

chmod a+r $TMPFILE1 $TMPFILE2 $TMPFILE3 $TMPFILE4 $TMPFILE5 $TMPFILE6 $TMPFILE7 $TMPFILE8 $TMPFILE9 $TMPFILEA $TMPFILEB

python -m ietf.idindex.generate_all_id_txt >> $TMPFILE1
python -m ietf.idindex.generate_id_index_txt >> $TMPFILE2
python -m ietf.idindex.generate_id_abstracts_txt >> $TMPFILE3
cp $TMPFILE1 $TMPFILE4
cp $TMPFILE2 $TMPFILE5
cp $TMPFILE3 $TMPFILE6
cp $TMPFILE1 $TMPFILE8
cp $TMPFILE2 $TMPFILE9
cp $TMPFILE3 $TMPFILEA
python -m ietf.idindex.generate_all_id2_txt >> $TMPFILE7
cp $TMPFILE7 $TMPFILEB

mv $TMPFILE1 $ID/all_id.txt
mv $TMPFILE2 $ID/1id-index.txt
mv $TMPFILE3 $ID/1id-abstracts.txt
mv $TMPFILE4 $DOWNLOAD/id-all.txt
mv $TMPFILE5 $DOWNLOAD/id-index.txt
mv $TMPFILE6 $DOWNLOAD/id-abstract.txt
mv $TMPFILE7 $ID/all_id2.txt
mv $TMPFILE8 $DERIVED/all_id.txt
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

Expand Down
3 changes: 0 additions & 3 deletions bin/weekly
Expand Up @@ -20,6 +20,3 @@ logger -p user.info -t cron "Running $DTDIR/bin/weekly"

$DTDIR/ietf/manage.py send_apikey_usage_emails

# Send notifications about coming expirations
$DTDIR/ietf/bin/notify-expirations

66 changes: 33 additions & 33 deletions dev/coverage-action/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dev/coverage-action/package.json
Expand Up @@ -14,7 +14,7 @@
"luxon": "3.4.4"
},
"devDependencies": {
"eslint": "8.56.0",
"eslint": "8.57.0",
"eslint-config-standard": "17.1.0",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-node": "11.1.0",
Expand Down
1 change: 1 addition & 0 deletions dev/deploy-to-container/cli.js
Expand Up @@ -67,6 +67,7 @@ async function main () {
.replace('__DBHOST__', `dt-db-${branch}`)
.replace('__SECRETKEY__', nanoid(36))
.replace('__MQCONNSTR__', `amqp://datatracker:${mqKey}@dt-mq-${branch}/dt`)
.replace('__HOSTNAME__', hostname)
)
await fs.copy(path.join(basePath, 'docker/scripts/app-create-dirs.sh'), path.join(releasePath, 'app-create-dirs.sh'))
await fs.copy(path.join(basePath, 'dev/deploy-to-container/start.sh'), path.join(releasePath, 'start.sh'))
Expand Down
14 changes: 7 additions & 7 deletions dev/deploy-to-container/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dev/deploy-to-container/package.json
Expand Up @@ -4,7 +4,7 @@
"dependencies": {
"dockerode": "^4.0.2",
"fs-extra": "^11.2.0",
"nanoid": "5.0.5",
"nanoid": "5.0.6",
"nanoid-dictionary": "5.0.0-beta.1",
"slugify": "1.6.6",
"tar": "^6.2.0",
Expand Down
3 changes: 3 additions & 0 deletions dev/deploy-to-container/settings_local.py
Expand Up @@ -69,3 +69,6 @@
SLIDE_STAGING_PATH = '/test/staging/'

DE_GFM_BINARY = '/usr/local/bin/de-gfm'

# OIDC configuration
SITE_URL = 'https://__HOSTNAME__'

0 comments on commit dd24558

Please sign in to comment.