Skip to content

Commit b1dd59d

Browse files
Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts: # .github/workflows/copy-staging-packages.yml
2 parents 029cdee + eae79a2 commit b1dd59d

16 files changed

Lines changed: 630 additions & 461 deletions

‎.github/workflows/checks.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
1414
with:
1515
persist-credentials: false
16-
- uses: prefix-dev/setup-pixi@9dabb60412d3d2d967a8d682f7ce01317af40514 # v0.11.0
16+
- uses: prefix-dev/setup-pixi@ad1da6449d9e506fd127fd67ab2d054a769f6a94 # v0.11.2
1717
- run: pixi run lint
1818
- run: pixi run build-docs
1919

@@ -29,7 +29,7 @@ jobs:
2929
with:
3030
ref: ${{ github.event.pull_request.base.sha }}
3131
persist-credentials: false
32-
- uses: prefix-dev/setup-pixi@9dabb60412d3d2d967a8d682f7ce01317af40514 # v0.11.0
32+
- uses: prefix-dev/setup-pixi@ad1da6449d9e506fd127fd67ab2d054a769f6a94 # v0.11.2
3333
with:
3434
# Do not restore executable environments populated by PR checks.
3535
cache: false
@@ -52,7 +52,7 @@ jobs:
5252
- name: Create merge token
5353
if: steps.policy.outputs.eligible == 'true'
5454
id: merge-token
55-
uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
55+
uses: actions/create-github-app-token@64ab729a6294000f5aa4a4bc0b73d1f32bc45510 # v3.3.0
5656
with:
5757
client-id: ${{ vars.ROBOSTACK_BOT_CLIENT_ID }}
5858
private-key: ${{ secrets.ROBOSTACK_BOT_PRIVATE_KEY }}

‎.github/workflows/deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
steps:
2727
# ghp-import pushes with the credentials persisted by checkout
2828
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
29-
- uses: prefix-dev/setup-pixi@9dabb60412d3d2d967a8d682f7ce01317af40514 # v0.11.0
29+
- uses: prefix-dev/setup-pixi@ad1da6449d9e506fd127fd67ab2d054a769f6a94 # v0.11.2
3030
# Regenerates every distro with a dataChannel in src/data/distros.json;
3131
# a distro without one (foxy, galactic) is a committed snapshot. A failed
3232
# distro does not stop the deploy: the ensure-tables task inside

‎.github/workflows/upgrade-dependencies.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
with:
1919
persist-credentials: false
2020
- name: Set up pixi
21-
uses: prefix-dev/setup-pixi@9dabb60412d3d2d967a8d682f7ce01317af40514 # v0.11.0
21+
uses: prefix-dev/setup-pixi@ad1da6449d9e506fd127fd67ab2d054a769f6a94 # v0.11.2
2222
with:
2323
run-install: false
2424
- name: Upgrade dependencies

‎astro.config.mjs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ export default defineConfig({
5050
},
5151
],
5252
editLink: {
53-
baseUrl:
54-
"https://github.com/RoboStack/robostack.github.io/edit/master/",
53+
baseUrl: "https://github.com/RoboStack/robostack.github.io/edit/main/",
5554
},
5655
customCss: ["./src/styles/custom.css"],
5756
routeMiddleware: "./src/routeData.ts",
@@ -64,7 +63,9 @@ export default defineConfig({
6463
sidebar: [
6564
// One top-level group per header tab (src/components/Header.astro);
6665
// the Sidebar override shows only the current page's group, so these
67-
// group labels never render. Slugs are set explicitly in each page's
66+
// group labels never render. List each page in exactly one group, the
67+
// one whose tab nav.ts highlights for it, so the sidebar and the
68+
// header tabs never disagree. Slugs are set explicitly in each page's
6869
// frontmatter to keep the published mixed-case URLs
6970
// (`GettingStarted.html`, `FAQ.html`, ...).
7071
{
@@ -80,9 +81,7 @@ export default defineConfig({
8081
},
8182
{ label: "JupyterRos", slug: "JupyterRos" },
8283
{ label: "FAQ", slug: "FAQ" },
83-
// Cross-listed; its primary section is Community (the last
84-
// group containing a page wins in the Sidebar override).
85-
{ label: "Contributing", slug: "Contributing" },
84+
{ label: "RoboStack monorepo", slug: "Monorepo" },
8685
],
8786
},
8887
{

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
},
1111
"dependencies": {
1212
"@astrojs/starlight": "^0.42.6",
13-
"@astrojs/svelte": "^9.0.1",
14-
"astro": "^7.3.8",
13+
"@astrojs/svelte": "^9.1.0",
14+
"astro": "^7.4.0",
1515
"svelte": "^5.57.2"
1616
},
1717
"devDependencies": {
1818
"@astrojs/check": "^0.9.10",
1919
"prettier": "^3.9.10",
2020
"prettier-plugin-astro": "^1.1.1",
2121
"prettier-plugin-svelte": "^4.1.1",
22-
"svelte-check": "^4.7.6",
22+
"svelte-check": "^4.7.7",
2323
"typescript": "^6.0.3"
2424
}
2525
}

0 commit comments

Comments
 (0)