From ed86fd9f779ef60cf7e5b54145c16c8d1f6e646f Mon Sep 17 00:00:00 2001 From: Vyacheslav Matyukhin Date: Sat, 8 Oct 2022 19:13:44 +0400 Subject: [PATCH] separate job for coverage, fix infinite loop --- .github/workflows/ci.yml | 17 +++++++++++++++-- packages/squiggle-lang/package.json | 2 +- turbo.json | 4 +--- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index af7b11b2..ac2b131e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,8 +15,8 @@ env: TURBO_TEAM: quantified-uncertainty jobs: - build-check-coverage: - name: Build, check, coverage + build-test-lint: + name: Build, test, lint runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -29,5 +29,18 @@ jobs: run: yarn - name: Turbo run run: npx turbo run build test lint bundle + + coverage: + name: Build, check, coverage + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Setup Node.js environment + uses: actions/setup-node@v2 + with: + node-version: 16 + cache: 'yarn' + - name: Install dependencies + run: yarn - name: Coverage run: npx turbo run coverage --no-cache # coverage builds for squiggle-lang can generate slower code that should never be cached diff --git a/packages/squiggle-lang/package.json b/packages/squiggle-lang/package.json index 497b803c..d8d33770 100644 --- a/packages/squiggle-lang/package.json +++ b/packages/squiggle-lang/package.json @@ -25,7 +25,7 @@ "coverage:rescript:local": "rm -f *.coverage && yarn clean && BISECT_ENABLE=yes yarn build && yarn test:rescript && bisect-ppx-report html", "coverage:ts:local": "yarn clean && yarn build && nyc --reporter=lcov yarn test:ts", "coverage:rescript": "yarn clean && BISECT_ENABLE=yes yarn build:rescript && yarn test:rescript && bisect-ppx-report send-to Codecov", - "coverage:ts": "yarn coverage:ts && codecov", + "coverage:ts": "yarn coverage:ts:local && codecov", "coverage": "yarn coverage:rescript && yarn coverage:ts", "coverage:local": "yarn coverage:rescript:local && yarn coverage:ts:local", "lint:rescript": "./lint.sh", diff --git a/turbo.json b/turbo.json index c667c7cd..04a28873 100644 --- a/turbo.json +++ b/turbo.json @@ -25,8 +25,6 @@ "bundle": { "dependsOn": ["^build", "build"] }, - "coverage": { - "dependsOn": ["build"] - } + "coverage": {} } }