Skip to content

Commit a87b9ee

Browse files
nrichersvalidbeckgithub-actions[bot]
authored
Merge staging into prod (#993)
* Removing validmind version variable (#921) * infra: Merge main into staging PRs created by staging deploy now indicate original PR# (#924) * Updating main into staging workflow * Testing branch versions * Removing test file * Fix Makefile help * infra: Delete older PR preview comments from validate & execute flows (#932) * Adding deletion of old preview comments back in * Removing unused variable * Adding same thing to notebooks * Edit to notebook, should remove old comment * hm * Deleting test execution notebook * ValidMind Platform releases: Exclude `admin-ui` from roundup listing page (#933) * Exclude admin-ui from platform releases roundup * Adjust * Remove old variable usage --------- Co-authored-by: Nik Richers <nik@validmind.ai> * docs: Export findings (#939) * Setup: Customize model findings layout * Save point * Save point * Draft: Customize model finding layouts * Setup: Export findings * Draft: Export findings * Export documentation > Export documents * Editing * Cleanup * Proofread * Filter * Update API reference to use prod server (#938) * Update API reference to use prod server * Update Makefile for admin API as well * docs: Export inventory (#943) * Setup: Export inventory * Draft: Export inventory * Proofreading * Oops * docs: Updated Export findings (#944) * Setup * Proofread * Testing pinned Quarto version * docs: Customize Virtual Document Validator (#947) * Set up: Manage regulations and policies * WIP * Customize VDV draft * Edits: Check documentation for compliance * Proofread * Quick UI updates * Pin a Quarto version specified in Action variables for our deployment workflows (#951) * Testing pinned Quarto version * Applying pinned Quarto version to other workflows * Removing test notebook * docs: Workflow Wait step time delta configuration (#954) * Setup: Wait step time delta * Editing * Updating example screencap for Wait * Remove login button and make related CSS modular (#949) * Remove login button and make related CSS modular * Make login link specific to profile * Change scss/ to assets/style/ and update README.md * Fix double space * Check out .gitignore from main * Minor README.md tweak * One more minor README.md tweak * Add missing backticks * Fix Log In button for developer.css * Minor edits * Slight adjust to CSS in-progress message --------- Co-authored-by: Beck <164545837+validbeck@users.noreply.github.com> * docs: Updated "Manage model finding fields" (#958) * Edit: DElete model findings * Edit: Manage model finding fields * Editing UI wording * Editing... * Editing...... * Proofreading * Edit * docs: Updated "Manage document templates" (#960) * Draft: Delete document templates * Edit: View document templates * Wrapping up * Stupid broken link * Edit: VDV Findings > Observations (#962) * docs: Update inventory & finding field views (#964) * Edit: Manage model inventory fields * Save point * Edit: Manage model finding fields * Cleanup * Proofread * Adjustments * Final touch * Fix bug in Makefile (#935) * Bug bash: nrichers/sc 12201/disable algolia search on api reference pages (#968) * Disable Algolia search on Public API reference page * Fix stray comment indent * docs: Add shared text blocks to YAML templates (#970) * Setup: Add library blocks to YAML templates * Save point * Save point * Tidying up * docs & training: Virtual Document Validator, regulations & policies set up update (#973) * Draft: Questions from PDF uploads * Training: Setup for regulations & policies * Save point * Save point * Draft: Administrator Fundamentals update * Draft: Developer Fundamentals update * Proofreading * Hiding PDF upload for VDV (#975) * Add system access requirements (#977) * Add initial system access requirements topic * Text edits * More edits * Fix incomplete sentence * Basic version: Improve navigation for Python API and Public REST API (#966) * Apply the basic fixes we agreed on * Remove a:hover experiment * Update .gitignore * Underline specific links only * Address review comments from Beck * Final CSS tweak * Update release_notes_check.py (#981) * Enable release notes checks to post comment with instructions (#984) * Update release_notes_check.yaml * Update release_notes_check.py * Edit: Remove info for add finding via doc section (#978) * docs: Updated Workflows Approval Step info (#979) * Edit: Approval step & condition instructions * Update: Approval Step example * Add Tidy Layout callout * Bump versions to 25.10 & v2.9.5 + public release landing page improvements (#971) * Bump release versions * Add temporary branch ref * Fix Makefile help * Reorder all releases page, bump up length of descriptions shown * Turn older releases into collapsible section * Fix YAML * Fix YAML again * Add pagination style from release notes portal * Add button for all feature highlights & add whitespace * Wording tweak * Run make get-source * All releases page tweaks * Fix broken links * Change heading to Latest features for consistency * Address Beck's sidebar suggestion * Fix date in this repo, too * Add whitespace before heading * Remove the branch ref I had THREE reminders for to remove ... (#991) --------- Co-authored-by: Beck <164545837+validbeck@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent f65f4b7 commit a87b9ee

124 files changed

Lines changed: 4756 additions & 5757 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/scripts/release_notes_check.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import re
44

55
import requests
6-
from github import Github
6+
from github import Auth, Github
77

88

99
def get_pull_request_number(pr_url):
@@ -16,7 +16,8 @@ def get_pull_request_number(pr_url):
1616

1717

1818
def ci_check(pr_number, access_token):
19-
g = Github(access_token)
19+
auth = Auth.Token(access_token)
20+
g = Github(auth=auth)
2021
# Get repository, pull request, and labels
2122
repo = g.get_repo(os.environ["GITHUB_REPOSITORY"])
2223
pr = repo.get_pull(pr_number)
@@ -53,7 +54,7 @@ def ci_check(pr_number, access_token):
5354
if release_notes_match:
5455
release_notes_text = release_notes_match.group(1).strip()
5556
if release_notes_text and release_notes_text != "<!--- REPLACE THIS COMMENT WITH YOUR DESCRIPTION --->":
56-
comment = "Pull requests must include at least one of the required labels: `internal` (no release notes required), `highlight`, `enhancement`, `bug`, `deprecation`, `documentation`."
57+
comment = "Pull requests must include at least one of the required labels: `internal` (no release notes required), `highlight`, `enhancement`, `bug`, `deprecation`, `documentation`. Except for `internal`, pull requests must also include a description in the release notes section."
5758
pr.create_issue_comment(comment)
5859
return False
5960
# Pull request has neither a label nor a description

.github/workflows/deploy-docs-prod.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ jobs:
4949

5050
- name: Set up Quarto
5151
uses: quarto-dev/quarto-actions/setup@v2
52+
with:
53+
version: ${{ vars.QUARTO_VERSION }}
5254

5355
- name: Setup R environment
5456
uses: ./.github/actions/setup-r

.github/workflows/deploy-docs-staging.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ jobs:
4949

5050
- name: Set up Quarto
5151
uses: quarto-dev/quarto-actions/setup@v2
52+
with:
53+
version: ${{ vars.QUARTO_VERSION }}
5254

5355
- name: Setup R environment
5456
uses: ./.github/actions/setup-r

.github/workflows/execute-pr-preview.yaml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ jobs:
5050
- name: Set up Quarto
5151
if: steps.filter.outputs.notebooks == 'true'
5252
uses: quarto-dev/quarto-actions/setup@v2
53+
with:
54+
version: ${{ vars.QUARTO_VERSION }}
5355

5456
# If yes then create the dev.env file for use in execution step
5557
- name: Create dev.env file
@@ -96,10 +98,26 @@ jobs:
9698
uses: actions/github-script@v6
9799
with:
98100
script: |
99-
const base = 'https://docs-staging.validmind.ai/pr_previews/${{ github.head_ref }}';
101+
const base = `https://docs-staging.validmind.ai/pr_previews/${{ github.head_ref }}`;
100102
const devUrl = `${base}/notebooks/EXECUTED/model_development/1-set_up_validmind.html`;
101103
const valUrl = `${base}/notebooks/EXECUTED/model_validation/1-set_up_validmind_for_validation.html`;
102104
105+
// Delete old preview comments
106+
const { data: comments } = await github.rest.issues.listComments({
107+
owner: context.repo.owner,
108+
repo: context.repo.repo,
109+
issue_number: context.issue.number,
110+
});
111+
for (const comment of comments) {
112+
if (comment.user.login === 'github-actions[bot]' && comment.body.includes('## Execute training notebooks for PRs')) {
113+
await github.rest.issues.deleteComment({
114+
owner: context.repo.owner,
115+
repo: context.repo.repo,
116+
comment_id: comment.id,
117+
});
118+
}
119+
}
120+
103121
let comment = `## Execute training notebooks for PRs\n\n`;
104122
comment += `✓ INFO: Live previews are available —\n\n`;
105123
comment += `- [Open model development series](${devUrl})\n`;

.github/workflows/execute-prod.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ jobs:
3737

3838
- name: Set up Quarto
3939
uses: quarto-dev/quarto-actions/setup@v2
40+
with:
41+
version: ${{ vars.QUARTO_VERSION }}
4042

4143
- name: Create dev.env file
4244
id: create_dev_env

.github/workflows/execute-staging.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ jobs:
3737

3838
- name: Set up Quarto
3939
uses: quarto-dev/quarto-actions/setup@v2
40+
with:
41+
version: ${{ vars.QUARTO_VERSION }}
4042

4143
- name: Create dev.env file
4244
id: create_dev_env

.github/workflows/merge-main-into-staging.yaml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,29 @@ jobs:
3030
run: |
3131
git merge --no-ff origin/main
3232
33+
# NEW: detect the PR that triggered this push to main (if any)
34+
- name: Determine source PR (if any)
35+
id: source-pr
36+
env:
37+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
38+
run: |
39+
prs=$(gh api \
40+
repos/${{ github.repository }}/commits/${{ github.sha }}/pulls \
41+
-H "Accept: application/vnd.github+json")
42+
number=$(echo "$prs" | jq -r '.[0].number // empty')
43+
if [ -n "$number" ]; then
44+
echo "prefix=PR#$number — " >> "$GITHUB_OUTPUT"
45+
else
46+
echo "prefix=" >> "$GITHUB_OUTPUT"
47+
fi
48+
3349
- name: Create pull request
3450
id: pr-number
3551
uses: peter-evans/create-pull-request@v5
3652
with:
3753
token: ${{ secrets.GITHUB_TOKEN }}
3854
branch: update-staging-${{ github.run_id }}
39-
title: 'Merge main into staging'
55+
title: '${{ steps.source-pr.outputs.prefix }}Merge main into staging'
4056
body: 'Automatically merge main into staging branch.'
4157

4258
- name: Merge pull request (with retries)
@@ -54,4 +70,4 @@ jobs:
5470
if: ${{ success() && steps.pr-number.outputs.pull-request-number != '' }}
5571
run: gh api -X DELETE "repos/${{ github.repository }}/git/refs/heads/update-staging-${{ github.run_id }}"
5672
env:
57-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
73+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release_notes_check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
permissions:
88
contents: read
9-
pull-requests: read
9+
pull-requests: write
1010

1111
jobs:
1212
ci_check:

.github/workflows/validate-docs-site.yaml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ jobs:
4444

4545
- name: Set up Quarto
4646
uses: quarto-dev/quarto-actions/setup@v2
47+
with:
48+
version: ${{ vars.QUARTO_VERSION }}
4749

4850
- name: Setup R environment
4951
uses: ./.github/actions/setup-r
@@ -87,6 +89,22 @@ jobs:
8789
script: |
8890
const previewUrl = `https://docs-staging.validmind.ai/pr_previews/${{ github.head_ref }}/index.html`;
8991
92+
// Delete old preview comments
93+
const { data: comments } = await github.rest.issues.listComments({
94+
owner: context.repo.owner,
95+
repo: context.repo.repo,
96+
issue_number: context.issue.number,
97+
});
98+
for (const comment of comments) {
99+
if (comment.user.login === 'github-actions[bot]' && comment.body.includes('## Validate docs site')) {
100+
await github.rest.issues.deleteComment({
101+
owner: context.repo.owner,
102+
repo: context.repo.repo,
103+
comment_id: comment.id,
104+
});
105+
}
106+
}
107+
90108
let comment = `## Validate docs site\n\n`;
91109
comment += `✓ INFO: A live preview of the docs site is available — [Open the preview](${previewUrl})\n\n`;
92110
@@ -113,4 +131,4 @@ jobs:
113131
114132
- name: Final disk usage
115133
if: always()
116-
run: df -hT /
134+
run: df -hT /

.vscode/settings.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,8 @@
77
"latex",
88
"plaintext",
99
"quarto"
10-
]
10+
],
11+
"python-envs.defaultEnvManager": "ms-python.python:conda",
12+
"python-envs.defaultPackageManager": "ms-python.python:conda",
13+
"python-envs.pythonProjects": []
1114
}

0 commit comments

Comments
 (0)