Skip to content

Commit

Permalink
simplifying things
Browse files Browse the repository at this point in the history
  • Loading branch information
abernier committed Aug 3, 2024
1 parent 0239aa8 commit 238dc73
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 15 deletions.
29 changes: 16 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,18 @@ jobs:
runs-on: ubuntu-latest
env:
TURBO_TELEMETRY_DISABLED: 1
TURBO_UI: 0

# Cancel multiple runs when pushing to main
concurrency:
group: ${{ github.event_name != 'pull_request' && 'group-pushmain' || github.run_id }}
cancel-in-progress: ${{ github.event_name != 'pull_request' }}

container:
image: ghcr.io/pmndrs/playwright:main
credentials:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
# container:
# image: ghcr.io/pmndrs/playwright:main
# credentials:
# username: ${{ github.actor }}
# password: ${{ secrets.GITHUB_TOKEN }}

steps:
#
Expand All @@ -41,19 +42,14 @@ jobs:
node-version: "20"
cache: "npm"
- run: npm ci
- uses: rharkor/[email protected]
# - uses: rharkor/[email protected]

#
# Test
#
- run: npm test
env:
BASE_PATH: ${{ steps.configurepages.outputs.base_path }}


#
# Build (only for pushes on main)
#
- run: npm run build
- run: npm run build -- --filter=@demo/aquarium
if: github.event_name != 'pull_request'
env:
BASE_PATH: ${{ steps.configurepages.outputs.base_path }}
Expand All @@ -62,6 +58,13 @@ jobs:
if: github.event_name != 'pull_request'
with:
path: ./out${{ steps.configurepages.outputs.base_path }}

#
# Test
#
- run: npm test -- --filter=@demo/aquarium -vvv --env-mode=loose
env:
BASE_PATH: ${{ steps.configurepages.outputs.base_path }}

deploy-job:
# only for pushes on main
Expand Down
2 changes: 1 addition & 1 deletion demos/aquarium/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"dev": "vite --host",
"dev2": "e2e-dev $npm_package_name",
"build": "tsc && vite build",
"build2": "tsc && e2e-build $npm_package_name",
"build2": "exit 0",
"preview": "vite preview",
"test": "e2e-test $npm_package_name"
},
Expand Down
1 change: 0 additions & 1 deletion turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"cache": true
},
"test": {
"dependsOn": ["build2"],
"inputs": [
"$TURBO_DEFAULT$",
"../../packages/e2e/bin/test.mjs",
Expand Down

0 comments on commit 238dc73

Please sign in to comment.