diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml index d8a37e91d..0765789d1 100644 --- a/.github/workflows/chromatic.yml +++ b/.github/workflows/chromatic.yml @@ -20,18 +20,9 @@ jobs: uses: actions/setup-node@v3 with: node-version-file: ".nvmrc" - - name: Cache yarn dependencies - uses: actions/cache@v3 - id: cache-dependencies - with: - path: node_modules - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.ox }}-yarn- + cache: "yarn" - name: Install Dependencies - if: steps.cache-dependencies.outputs.cache-hit != 'true' - run: | - yarn install --frozen-lockfile + run: yarn install --frozen-lockfile - name: Build Packages run: yarn build - name: Publish to Chromatic @@ -40,4 +31,4 @@ jobs: projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }} buildScriptName: build-sb-chroma - + diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ff60c57f7..3870b7ed7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,89 +14,45 @@ concurrency: cancel-in-progress: true jobs: - install-cache: - name: "Install Dependencies" - runs-on: ubuntu-latest - steps: - - name: Checkout Commit - uses: actions/checkout@v3 - - name: Setup Node.js - uses: actions/setup-node@v3 - with: - node-version-file: ".nvmrc" - - name: Cache yarn dependencies - uses: actions/cache@v3 - id: cache-dependencies - with: - path: node_modules - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.ox }}-yarn- - - name: Install Dependencies - if: steps.cache-dependencies.outputs.cache-hit != 'true' - run: | - yarn install --frozen-lockfile - eslint: name: "Eslint" runs-on: ubuntu-latest - needs: install-cache steps: - uses: actions/checkout@v3 - name: Setup Node.js uses: actions/setup-node@v3 with: node-version-file: ".nvmrc" - - name: Restore yarn dependencies - uses: actions/cache@v3 - id: cache-dependencies - with: - path: node_modules - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.ox }}-yarn- + - name: Install Dependencies + run: yarn install --frozen-lockfile - name: Lint Eslint run: yarn lint-ci-eslint stylelint: name: "Stylelint" runs-on: ubuntu-latest - needs: install-cache steps: - uses: actions/checkout@v3 - name: Setup Node.js uses: actions/setup-node@v3 with: node-version-file: ".nvmrc" - - name: Restore yarn dependencies - uses: actions/cache@v3 - id: cache-dependencies - with: - path: node_modules - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.ox }}-yarn- + - name: Install Dependencies + run: yarn install --frozen-lockfile - name: Lint Stylelint run: yarn lint-ci-style build_and_tests: name: "Build and Tests" runs-on: ubuntu-latest - needs: install-cache steps: - uses: actions/checkout@v3 - name: Setup Node.js uses: actions/setup-node@v3 with: node-version-file: ".nvmrc" - - name: Restore yarn dependencies - uses: actions/cache@v3 - id: cache-dependencies - with: - path: node_modules - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.ox }}-yarn- + - name: Install Dependencies + run: yarn install --frozen-lockfile - name: Build Packages run: yarn build - name: Run Jest