Skip to content

Commit

Permalink
Merge branch 'develop' into filter-scale-tuples
Browse files Browse the repository at this point in the history
  • Loading branch information
hasparus committed Jan 24, 2024
2 parents d979429 + 20e17a9 commit 0a7330c
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 70 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
needs: [build]
steps:
- id: can_release
run: echo '::set-output name=CAN_RELEASE::${{ env.CAN_RELEASE }}'
run: echo 'CAN_RELEASE=${{ env.CAN_RELEASE }}' >> $GITHUB_OUTPUT
env:
CAN_RELEASE: ${{ secrets.AUTO_RELEASE_GH_TOKEN != '' }}
outputs:
Expand Down
4 changes: 2 additions & 2 deletions examples/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
"@emotion/react": "^11.11.1",
"@mdx-js/loader": "^2.3.0",
"@mdx-js/react": "^2.3.0",
"@next/mdx": "^13.4.5",
"@next/mdx": "^14.0.4",
"@theme-ui/css": "workspace:^",
"next": "^13.4.5",
"next": "^14.0.4",
"react": "^18.1.0",
"react-dom": "^18",
"theme-ui": "workspace:^"
Expand Down
2 changes: 1 addition & 1 deletion packages/e2e/integration/docs-navigation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ describe('docs navigation', () => {
(link) => link.textContent === 'Packages'
)!

packagesLink.click()
packagesLink.click({ force: true })
})

for (const packageName of [
Expand Down
138 changes: 72 additions & 66 deletions pnpm-lock.yaml

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

0 comments on commit 0a7330c

Please sign in to comment.