Skip to content

Merge main into releases/v3 #2334

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
henrymercer merged 27 commits into from
Jun 12, 2024
Merged

Merge main into releases/v3 #2334

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
df52537
Update supported GitHub Enterprise Server versions
github-actions[bot] May 29, 2024
25cffc6
Update changelog and version after v3.25.8
github-actions[bot] Jun 4, 2024
c481707
Update checked-in dependencies
github-actions[bot] Jun 4, 2024
8f1a6fe
Merge pull request #2324 from github/mergeback/v3.25.8-to-main-2e230e8f
cklin Jun 4, 2024
c65a150
Bump the npm group with 5 updates
dependabot[bot] Jun 10, 2024
358d5e7
Merge branch 'main' into update-supported-enterprise-server-versions
henrymercer Jun 11, 2024
2838ced
Add shebang to update Node modules script
henrymercer Jun 11, 2024
b411f9b
Try installing npm without sudo
henrymercer Jun 11, 2024
c796494
Merge pull request #2315 from github/update-supported-enterprise-serv…
henrymercer Jun 11, 2024
0a64ae0
Use `--force-overwrite` for creating databases
aeisenberg Jun 11, 2024
b808216
Update changelog
aeisenberg Jun 11, 2024
2fc7222
Fix formatting
aeisenberg Jun 11, 2024
eb1d92b
Fix typo
aeisenberg Jun 11, 2024
81b8143
Merge pull request #2330 from github/aeisenberg/force-overwrite
aeisenberg Jun 11, 2024
b0944a2
Fix bash syntax
igfoo Jun 12, 2024
ca3043e
Merge branch 'main' into dependabot/npm_and_yarn/npm-8402b9d28a
nickfyson Jun 12, 2024
1354fe5
Attempt to clean up the database cluster directory
henrymercer Jun 11, 2024
c8fb403
Add PR check for cleaning up database cluster dir
henrymercer Jun 12, 2024
9ee83fa
Update checked-in dependencies
github-actions[bot] Jun 12, 2024
945bb87
Merge pull request #2331 from github/igfoo/bash
igfoo Jun 12, 2024
3d849e9
Include underlying error in error message
henrymercer Jun 12, 2024
d8d73c0
Clean up DB cluster directory at the end of each job
henrymercer Jun 12, 2024
31fe7dd
Merge pull request #2326 from github/dependabot/npm_and_yarn/npm-8402…
henrymercer Jun 12, 2024
ed34eb9
Skip init-post cleanup on GitHub-hosted runners
henrymercer Jun 12, 2024
159d911
Tweak changelog entries
henrymercer Jun 12, 2024
37809d1
Merge pull request #2332 from github/henrymercer/cleanup-db-location
henrymercer Jun 12, 2024
65db484
Update changelog for v3.25.9
github-actions[bot] Jun 12, 2024
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
5 changes: 4 additions & 1 deletion .github/workflows/script/update-node-modules.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
#!/bin/bash
set -eu

if [ "$1" != "update" && "$1" != "check-only" ]; then
>&2 echo "Failed: Invalid argument. Must be 'update' or 'check-only'"
exit 1
fi

sudo npm install --force -g npm@9.2.0
npm install --force -g npm@9.2.0

# clean the npm cache to ensure we don't have any files owned by root
sudo npm cache clean --force
Expand Down
2 changes: 1 addition & 1 deletion lib/api-compatibility.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{ "maximumVersion": "3.13", "minimumVersion": "3.9" }
{ "maximumVersion": "3.14", "minimumVersion": "3.9" }
2 changes: 1 addition & 1 deletion src/api-compatibility.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"maximumVersion": "3.13", "minimumVersion": "3.9"}
{"maximumVersion": "3.14", "minimumVersion": "3.9"}