Skip to content

chore: merge main to release #5698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjsparks merged 14 commits into from
May 26, 2023
Merged

chore: merge main to release #5698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
34d714c
chore: remove gather from CRSF_TRUSTED_ORIGINS (#5657)
rjsparks May 18, 2023
d0f8e11
chore: keep csp config in sync with production configuration (#5656)
rjsparks May 18, 2023
23ca7a9
ci: add environments to build workflow
NGPixel May 19, 2023
40765d8
chore: adjust to DNS changes for yangcatalog (#5666)
rjsparks May 22, 2023
6178519
fix: optimize queries for DocumentChangesFeed (#5675)
rjsparks May 23, 2023
ce3774d
chore(deps): Bump slackapi/slack-github-action from 1.23.0 to 1.24.0 …
dependabot[bot] May 23, 2023
b0c27a7
chore(deps): Bump codecov/codecov-action from 3.1.3 to 3.1.4 (#5673)
dependabot[bot] May 23, 2023
8e5adb9
chore(deps): update all npm dependencies for dev/coverage-action (#5671)
depfu[bot] May 24, 2023
04fbb8c
chore(deps): update all npm dependencies for dev/del-old-packages (#5…
depfu[bot] May 24, 2023
65bd689
fix: make chat room an overrideable property of Session (#5681)
pselkirk May 24, 2023
66f1ba3
fix: reflect publication of rfc9389 (#5685)
rjsparks May 25, 2023
5f4dfb8
fix: Use new fonts for PDFization (#5688)
larseggert May 25, 2023
0a11892
chore: use variable for static.ietf.org references (#5692)
NGPixel May 25, 2023
d595aac
fix: Skip title validation if only XML uploaded (#5694)
jennifer-richards May 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
"forwardPorts": [8000, 5432, 5433],
"forwardPorts": [3000, 5432, 5433, 8000, 8001],

"portsAttributes": {
"3000": {
Expand All @@ -84,6 +84,10 @@
"8000": {
"label": "Datatracker",
"onAutoForward": "notify"
},
"8001": {
"label": "Static",
"onAutoForward": "silent"
}
},

Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ jobs:
coverage xml

- name: Upload Coverage Results to Codecov
uses: codecov/codecov-action@v3.1.3
uses: codecov/codecov-action@v3.1.4
with:
files: coverage.xml

Expand Down Expand Up @@ -397,7 +397,7 @@ jobs:
steps:
- name: Notify on Slack (Success)
if: ${{ !contains(join(needs.*.result, ','), 'failure') }}
uses: slackapi/slack-github-action@v1.23.0
uses: slackapi/slack-github-action@v1.24.0
with:
channel-id: ${{ secrets.SLACK_GH_BUILDS_CHANNEL_ID }}
payload: |
Expand All @@ -420,7 +420,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.23.0
uses: slackapi/slack-github-action@v1.24.0
with:
channel-id: ${{ secrets.SLACK_GH_BUILDS_CHANNEL_ID }}
payload: |
Expand Down Expand Up @@ -450,6 +450,8 @@ jobs:
if: ${{ !failure() && !cancelled() && github.event.inputs.sandbox == 'true' }}
needs: [prepare, release]
runs-on: [self-hosted, dev-server]
environment:
name: sandbox
env:
PKG_VERSION: ${{needs.prepare.outputs.pkg_version}}

Expand Down Expand Up @@ -485,6 +487,9 @@ jobs:
if: ${{ !failure() && !cancelled() && github.event.inputs.legacySandbox == 'true' }}
needs: [prepare, release]
runs-on: [self-hosted, legacy-sandbox-server]
environment:
name: legacy-sandbox
url: "https://sandbox.ietf.org"
env:
PKG_VERSION: ${{needs.prepare.outputs.pkg_version}}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
coverage xml

- name: Upload Coverage Results to Codecov
uses: codecov/codecov-action@v3.1.3
uses: codecov/codecov-action@v3.1.4
with:
files: coverage.xml

Expand Down
2 changes: 1 addition & 1 deletion bin/daily
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ $DTDIR/ietf/manage.py update_external_command_info
rsync -avzq --delete /a/www/ietf-ftp/iana/yang-parameters/ /a/www/ietf-ftp/yang/ianamod/

# Get Yang models from Yangcatalog.
rsync -avzq rsync://yangcatalog.org:10873/yangdeps /a/www/ietf-ftp/yang/catalogmod/
rsync -avzq rsync://rsync.yangcatalog.org:10873/yangdeps /a/www/ietf-ftp/yang/catalogmod/

# Populate the yang repositories
$DTDIR/ietf/manage.py populate_yang_model_dirs -v0
Expand Down
Loading