Skip to content

Commit

Permalink
changed workflows (#191)
Browse files Browse the repository at this point in the history
* changed workflows

* removed global env var

* fix

---------

Co-authored-by: Alem Tuzlak <[email protected]>
  • Loading branch information
thomasfr and AlemTuzlak authored Feb 5, 2025
1 parent fa60880 commit 53a40ca
Show file tree
Hide file tree
Showing 3 changed files with 91 additions and 79 deletions.
30 changes: 18 additions & 12 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ on:
types: [published]
workflow_dispatch:

env:
FLY_ORG: ${{ vars.FLY_ORG }}

jobs:
npm-publish:
runs-on: ubuntu-latest
Expand All @@ -22,13 +19,22 @@ jobs:
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

deploy-preview:

deploy-docs:
name: "🚀 Deploy Docs"
needs: [npm-publish]
uses: forge42dev/workflows/.github/workflows/deploy-to-fly.yaml@monorepo-matrix
with:
workspace_name: docs
set_cwd_to_workspace: true
github_environment: "docs-release"
secrets:
fly_api_token: ${{ secrets.FLY_API_TOKEN }}
runs-on: ubuntu-latest
environment:
name: docs-release
url: ${{ steps.deploy.outputs.app_url }}
steps:
- uses: actions/checkout@v4
- uses: forge-42/[email protected]
id: deploy
env:
FLY_ORG: ${{ vars.FLY_ORG }}
FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
FLY_REGION: fra
with:
workspace_name: docs
app_name: react-router-devtools-docs-release
use_isolated_workspace: true
30 changes: 18 additions & 12 deletions .github/workflows/validate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ on:
pull_request:
branches: [main]

env:
FLY_ORG: ${{ vars.FLY_ORG }}

permissions:
actions: write
contents: read
Expand Down Expand Up @@ -72,14 +69,23 @@ jobs:
# if: always()
# uses: davelosert/vitest-coverage-report-action@v2


deploy-preview:
deploy-docs-pr-preview:
if: ${{ github.event_name == 'pull_request' }}
name: "🚀 Deploy Docs"
needs: [lint, typecheck, vitest]
uses: forge42dev/workflows/.github/workflows/deploy-to-fly.yaml@monorepo-matrix
with:
workspace_name: docs
set_cwd_to_workspace: true
github_environment: "docs-previev"
secrets:
fly_api_token: ${{ secrets.FLY_API_TOKEN }}
runs-on: ubuntu-latest
environment:
name: docs-release
url: ${{ steps.deploy.outputs.app_url }}
steps:
- uses: actions/checkout@v4
- uses: forge-42/[email protected]
id: deploy
env:
FLY_ORG: ${{ vars.FLY_ORG }}
FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
FLY_REGION: fra
with:
workspace_name: docs
app_name: react-router-devtools-docs-pr-${{ github.event.number }}
use_isolated_workspace: true
110 changes: 55 additions & 55 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,80 +24,80 @@
},
"dependencies": {
"@epic-web/invariant": "^1.0.0",
"@headlessui/react": "^2.2.0",
"@octokit/request": "^9.2.0",
"@react-router/fs-routes": "7.1.4",
"@react-router/node": "7.1.4",
"@react-router/serve": "7.1.4",
"@headlessui/react": "^1.7.18",
"@octokit/request": "^8.1.6",
"@react-router/fs-routes": "7.0.0",
"@react-router/node": "7.0.0",
"@react-router/serve": "7.0.0",
"@sindresorhus/slugify": "^2.2.1",
"@tsparticles/engine": "^3.8.1",
"@tsparticles/engine": "^3.3.0",
"@tsparticles/react": "^3.0.0",
"@tsparticles/slim": "^3.8.1",
"acorn": "^8.14.0",
"clsx": "^2.1.1",
"cookie": "^1.0.2",
"dotenv": "^16.4.7",
"framer-motion": "^12.0.6",
"isbot": "^5.1.22",
"@tsparticles/slim": "^3.3.0",
"acorn": "^8.11.3",
"clsx": "^2.1.0",
"cookie": "^0.6.0",
"dotenv": "^16.4.1",
"framer-motion": "^11.0.8",
"isbot": "^3.6.8",
"json5": "^2.2.3",
"lucide-react": "^0.474.0",
"lucide-react": "^0.309.0",
"mdast-util-to-string": "^4.0.0",
"mdx-bundler": "^10.0.3",
"mdx-bundler": "^10.0.1",
"prismjs": "^1.29.0",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-router": "7.1.4",
"react-spring": "^9.7.5",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router": "7.0.0",
"react-spring": "^9.7.3",
"redent": "^4.0.0",
"rehype-slug": "^6.0.0",
"remark-emoji": "^5.0.1",
"remark-emoji": "^4.0.1",
"remark-gfm": "^4.0.0",
"remix-client-cache": "2.1.0",
"tailwind-merge": "^3.0.1",
"remix-client-cache": "2.0.0",
"tailwind-merge": "^2.2.1",
"unist-util-filter": "^5.0.1",
"unist-util-visit": "^5.0.0",
"react-router-devtools": "1.1.0",
"zod": "^3.24.1"
"react-router-devtools": "1.0.1",
"zod": "^3.22.4"
},
"devDependencies": {
"@playwright/test": "^1.50.0",
"@react-router/dev": "7.1.4",
"@tailwindcss/typography": "0.5.16",
"@types/prismjs": "^1.26.5",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
"@typescript-eslint/parser": "^8.22.0",
"@vitejs/plugin-react": "^4.3.4",
"@vitest/coverage-v8": "^3.0.4",
"autoprefixer": "^10.4.20",
"@playwright/test": "^1.41.1",
"@react-router/dev": "7.0.0",
"@tailwindcss/typography": "0.5.9",
"@types/prismjs": "^1.26.3",
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
"@typescript-eslint/parser": "^6.17.0",
"@vitejs/plugin-react": "^4.2.1",
"@vitest/coverage-v8": "^1.2.1",
"autoprefixer": "^10.4.16",
"cross-env": "^7.0.3",
"eslint": "^9.19.0",
"eslint-config-prettier": "^10.0.1",
"eslint": "^8.38.0",
"eslint-config-prettier": "^9.1.0",
"eslint-config-standard": "^17.1.0",
"eslint-import-resolver-typescript": "^3.7.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-disable": "^2.0.3",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-jsx-a11y": "^6.10.2",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^5.2.3",
"eslint-plugin-react": "^7.37.4",
"eslint-plugin-react-hooks": "^5.1.0",
"eslint-plugin-simple-import-sort": "^12.1.1",
"eslint-plugin-sort-destructure-keys": "^2.0.0",
"eslint-plugin-prettier": "^5.1.2",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-simple-import-sort": "^10.0.0",
"eslint-plugin-sort-destructure-keys": "^1.5.0",
"gray-matter": "^4.0.3",
"jsdom": "^26.0.0",
"prettier": "^3.4.2",
"prettier-plugin-tailwindcss": "^0.6.11",
"rimraf": "^6.0.1",
"tailwindcss": "^4.0.1",
"tsx": "^4.19.2",
"typescript": "^5.7.3",
"vite": "^6.0.11",
"vite-tsconfig-paths": "^5.1.4",
"vitest": "^3.0.4"
"jsdom": "^24.0.0",
"prettier": "^3.1.1",
"prettier-plugin-tailwindcss": "^0.5.10",
"rimraf": "^5.0.5",
"tailwindcss": "^3.4.0",
"tsx": "^4.7.0",
"typescript": "^5.1.6",
"vite": "^5.0.0",
"vite-tsconfig-paths": "^4.2.1",
"vitest": "^1.2.1"
},
"optionalDependencies": {
"@rollup/rollup-linux-x64-gnu": "^4.32.1"
"@rollup/rollup-linux-x64-gnu": "^4.4.1"
},
"engines": {
"node": ">=18.0.0"
Expand Down

0 comments on commit 53a40ca

Please sign in to comment.