Skip to content

Commit

Permalink
Merge pull request #17 from dannyYassine/fix-ci
Browse files Browse the repository at this point in the history
update actions
  • Loading branch information
dannyYassine authored Oct 30, 2024
2 parents e30ac53 + a8445d7 commit d133571
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 26 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/client-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,17 @@ jobs:
vitest:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
working-directory: .
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Build containers
run: docker-compose -f docker-compose.ci.yml build client
run: docker compose -f docker-compose.ci.yml build client
- name: Install node_modules
run: docker-compose run client yarn
run: docker compose run client yarn
- name: Run tests
run: docker-compose run client yarn ci:test:unit
run: docker compose run client yarn ci:test:unit
- name: Stop containers
if: always()
run: docker-compose -f docker-compose.ci.yml down
run: docker compose -f docker-compose.ci.yml down
20 changes: 11 additions & 9 deletions .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,27 @@ jobs:
playwright:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
working-directory: .
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Build containers
run: docker-compose -f "./docker-compose.pw.yml" build --parallel
run: docker compose -f "./docker-compose.pw.yml" build --parallel
- name: Install playwright dependencies
run: docker-compose -f "./docker-compose.pw.yml" run playwright yarn
run: docker compose -f "./docker-compose.pw.yml" run playwright yarn
- name: Install chromium
run: docker-compose -f "./docker-compose.pw.yml" run playwright yarn pw:install
run: docker compose -f "./docker-compose.pw.yml" run playwright yarn pw:install
- name: Install client dependencies
run: docker-compose -f "./docker-compose.pw.yml" run client yarn
run: docker compose -f "./docker-compose.pw.yml" run client yarn
- name: Install client-dev dependencies
run: docker-compose -f "./docker-compose.pw.yml" run client sh -c "cd dev ; yarn"
run: docker compose -f "./docker-compose.pw.yml" run client sh -c "cd dev ; yarn"
- name: Up environment
run: docker-compose -f "./docker-compose.pw.yml" up --detach client
run: docker compose -f "./docker-compose.pw.yml" up --detach client
- name: Wait
run: sleep 5
- name: Run tests
run: docker-compose -f "./docker-compose.pw.yml" run playwright yarn pw:test
run: docker compose -f "./docker-compose.pw.yml" run playwright yarn pw:test
- name: Stop containers
if: always()
run: docker-compose -f "./docker-compose.pw.yml" down
run: docker compose -f "./docker-compose.pw.yml" down
2 changes: 1 addition & 1 deletion .github/workflows/publish-to-npm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
publish-to-npm:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: '18.x'
Expand Down
22 changes: 12 additions & 10 deletions .github/workflows/upload-converage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,29 +13,31 @@ jobs:
coverage:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
working-directory: .
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Build containers
run: docker-compose -f docker-compose.pw.yml build --parallel client playwright
run: docker compose -f docker-compose.pw.yml build --parallel client playwright
- name: Install dependencies
run: docker-compose -f "./docker-compose.pw.yml" run client yarn
- name: Install client-dev dependencies
run: docker-compose -f "./docker-compose.pw.yml" run client sh -c "cd dev ; yarn"
run: docker compose -f "./docker-compose.pw.yml" run client sh -c "cd dev ; yarn"
- name: Install playwright dependencies
run: docker-compose -f "./docker-compose.pw.yml" run playwright yarn
run: docker compose -f "./docker-compose.pw.yml" run playwright yarn
- name: Install nyc for playwright
run: docker-compose -f "./docker-compose.pw.yml" run playwright npm install -D nyc
run: docker compose -f "./docker-compose.pw.yml" run playwright npm install -D nyc
- name: Up environment
run: docker-compose -f "./docker-compose.pw.yml" up --detach client
run: docker compose -f "./docker-compose.pw.yml" up --detach client
- name: Run playwright tests with coverage
run: docker-compose -f "./docker-compose.pw.yml" run playwright yarn pw:test:coverage
run: docker compose -f "./docker-compose.pw.yml" run playwright yarn pw:test:coverage
- name: Remove unwanted files detection
run: docker-compose run client rm -rf dev docs playwright.config.ts e2e
run: docker compose run client rm -rf dev docs playwright.config.ts e2e
- name: Run unit tests with coverage
run: docker-compose run client yarn ci:test:unit:coverage
run: docker compose run client yarn ci:test:unit:coverage
- name: Upload coverage
run: CODECOV_TOKEN=${{secrets.CODECOV_TOKEN}} . send-coverage.sh
- name: Stop containers
if: always()
run: docker-compose -f docker-compose.ci.yml down
run: docker compose -f docker-compose.ci.yml down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vuuri",
"version": "0.4.5",
"version": "0.4.6",
"description": "Muuri Vue Integration",
"homepage": "https://dannyyassine.github.io/vuuri/",
"main": "src/index.js",
Expand Down

0 comments on commit d133571

Please sign in to comment.