Skip to content
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.

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

Ci fix #119

Merged
merged 8 commits into from
Mar 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 0 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,3 @@ jobs:

- name: Typecheck
run: turbo typecheck

comment-if-failed:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Setup
uses: ./tooling/github/setup

- uses: juliusmarminge/gh-failed-action-commenter@main
44 changes: 7 additions & 37 deletions .github/workflows/pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,43 +28,13 @@ concurrency:

jobs:
# Build job
build:
build_and_deploy:
runs-on: ubuntu-latest
defaults:
run:
working-directory: apps/docs
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: "3.1" # Not needed with a .ruby-version file
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
cache-version: 0 # Increment this number if you need to re-download cached gems
working-directory: "${{ github.workspace }}/apps/docs"
- name: Setup Pages
id: pages
uses: actions/configure-pages@v3
- name: Build with Jekyll
# Outputs to the './_site' directory by default
run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
- uses: actions/checkout@v1
- name: Build & Deploy to GitHub Pages
env:
JEKYLL_ENV: production
- name: Upload artifact
# Automatically uploads an artifact from the './_site' directory by default
uses: actions/upload-pages-artifact@v1
with:
path: "apps/docs/_site/"

# Deployment job
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
needs: build
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_REPOSITORY: ${{ secrets.GITHUB_REPOSITORY }}
GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}
uses: BryanSchuetz/jekyll-deploy-gh-pages@master
8 changes: 4 additions & 4 deletions apps/auth-proxy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
"@auth/core": "^0.26.3"
},
"devDependencies": {
"@realms-world/eslint-config": "workspace:*",
"@realms-world/prettier-config": "workspace:*",
"@realms-world/tailwind-config": "workspace:*",
"@realms-world/tsconfig": "workspace:*",
"@realms-world/eslint-config": "*",
"@realms-world/prettier-config": "*",
"@realms-world/tailwind-config": "*",
"@realms-world/tsconfig": "*",
"eslint": "^8.56.0",
"nitropack": "^2.8.1",
"prettier": "^3.2.5",
Expand Down
4 changes: 1 addition & 3 deletions apps/auth-proxy/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{
"extends": "@realms-world/tsconfig/base.json",
"include": [
"routes"
]
"include": ["routes"]
}
6 changes: 4 additions & 2 deletions apps/nextjs/mdx-components.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
import Image from "next/image";
import type { MDXComponents } from "mdx/types";
import Image from "next/image";

import { Button } from "@realms-world/ui";

export function useMDXComponents(components: MDXComponents): MDXComponents {
return {
img: (props) => (
//@ts-expect-error wrong match with mdx
<Image
{...props}
width={1600}
height={900}
className="max-w-screen my-8"
{...props}
/>
),
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
Button: (props) => <Button {...props}>{props.text}</Button>,
...components,
};
Expand Down
32 changes: 17 additions & 15 deletions apps/nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
"@mui/styles": "^5.15.10",
"@next/mdx": "^14.1.0",
"@rainbow-me/rainbowkit": "^2",
"@realms-world/api": "workspace:*",
"@realms-world/auth": "workspace:*",
"@realms-world/constants": "workspace:*",
"@realms-world/db": "workspace:*",
"@realms-world/graphql-server": "workspace:*",
"@realms-world/styles": "workspace:*",
"@realms-world/ui": "workspace:*",
"@realms-world/utils": "workspace:*",
"@reservoir0x/reservoir-kit-ui": "^1.25.10",
"@realms-world/api": "*",
"@realms-world/auth": "*",
"@realms-world/constants": "*",
"@realms-world/db": "*",
"@realms-world/graphql-server": "*",
"@realms-world/styles": "*",
"@realms-world/ui": "*",
"@realms-world/utils": "*",
"@reservoir0x/reservoir-kit-ui": "^1.25.11",
"@starknet-react/chains": "^0.1.7",
"@starknet-react/core": "^2.2.5",
"@starkware-industries/commons-js-enums": "^1.2.0",
Expand All @@ -50,26 +50,28 @@
"embla-carousel-react": "8.0.0-rc22",
"framer-motion": "^11.0.5",
"inngest": "^3.14.0",
"keccak256": "^1.0.6",
"lodash": "4.17.21",
"lucide-react": "^0.331.0",
"merkletreejs": "^0.3.11",
"next": "^14.1.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"starknet": "^5.24.3",
"starknetkit": "^1.1.3",
"superjson": "2.2.1",
"viem": "^2.7.9",
"viem": "^2.7.10",
"wagmi": "^2.5.7",
"zod": "^3.22.4"
},
"devDependencies": {
"@realms-world/eslint-config": "workspace:*",
"@realms-world/prettier-config": "workspace:*",
"@realms-world/tailwind-config": "workspace:*",
"@realms-world/tsconfig": "workspace:*",
"@realms-world/eslint-config": "*",
"@realms-world/prettier-config": "*",
"@realms-world/tailwind-config": "*",
"@realms-world/tsconfig": "*",
"@types/mdx": "^2.0.11",
"@types/node": "^20.11.19",
"@types/react": "^18.2.55",
"@types/react": "^18.2.56",
"@types/react-dom": "^18.2.19",
"dotenv-cli": "^7.3.0",
"eslint": "^8.56.0",
Expand Down
Loading