Skip to content

Commit

Permalink
Merge pull request #473 from NullVoxPopuli/pnpm
Browse files Browse the repository at this point in the history 
Switch to pnpm from yarn@v1
  • Loading branch information
@NullVoxPopuli
NullVoxPopuli authored May 1, 2022
2 parents 39a1553 + 8e5c114 commit 1eaf395
Show file tree
Hide file tree
Showing 20 changed files with 14,715 additions and 13,370 deletions.
129 changes: 92 additions & 37 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,21 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: volta-cli/action@v1
- uses: actions/cache@v2
- name: Cache
uses: actions/cache@v3
with:
path: '**/node_modules'
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
- run: yarn install
path: |
~/.pnpm-store
'node_modules/'
'node_modules/.cache'
key: ${{ runner.os }}-${{ hashFiles('node_modules/.cache/**') }}
restore-keys: |
${{ runner.os }}-
- uses: pnpm/action-setup@v2.2.1
with:
version: 6.32.1
- run: pnpm install

##############################################################

Expand All @@ -42,15 +52,22 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: volta-cli/action@v1
- uses: actions/cache@v2
- name: Cache
uses: actions/cache@v3
with:
path: '**/node_modules'
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
- uses: actions/cache@v2
path: |
~/.pnpm-store
'node_modules/'
'node_modules/.cache'
key: ${{ runner.os }}-${{ hashFiles('node_modules/.cache/**') }}
restore-keys: |
${{ runner.os }}-
- uses: pnpm/action-setup@v2.2.1
with:
path: '**/dist'
key: ${{ runner.os }}-modules-${{ hashFiles('packages/**') }}
- run: yarn build
version: 6.32.1
- run: pnpm install
- run: pnpm run build

##############################################################

Expand All @@ -63,16 +80,22 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: volta-cli/action@v1
- uses: actions/cache@v2
- name: Cache
uses: actions/cache@v3
with:
path: '**/node_modules'
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
- uses: actions/cache@v2
path: |
~/.pnpm-store
'node_modules/'
'node_modules/.cache'
key: ${{ runner.os }}-${{ hashFiles('node_modules/.cache/**') }}
restore-keys: |
${{ runner.os }}-
- uses: pnpm/action-setup@v2.2.1
with:
path: '**/dist'
key: ${{ runner.os }}-modules-${{ hashFiles('packages/**') }}
version: 6.32.1
- run: pnpm install
- name: 'Build'
run: yarn workspace limber build
run: pnpm run predeploy
- name: Copy deploy host config
run: cp ./config/netlify/_redirects ./dist/
working-directory: ${{ env.app }}
Expand All @@ -94,15 +117,25 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: volta-cli/action@v1
- uses: actions/cache@v2
- name: Cache
uses: actions/cache@v3
with:
path: '**/node_modules'
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
- uses: actions/cache@v2
path: |
~/.pnpm-store
'node_modules/'
'node_modules/.cache'
key: ${{ runner.os }}-${{ hashFiles('node_modules/.cache/**') }}
restore-keys: |
${{ runner.os }}-
- uses: pnpm/action-setup@v2.2.1
with:
path: '**/dist'
key: ${{ runner.os }}-modules-${{ hashFiles('packages/**') }}
- run: yarn ember build --environment=development
version: 6.32.1
- run: pnpm install
# This could maybe be combined into one command, but
# pending: https://github.com/vercel/turborepo/discussions/1148
- run: pnpm run build
# - run: pnpm --filter=limber exec ember build --environment=development
- run: node_modules/.bin/ember build --environment=development
working-directory: ${{ env.app }}

- name: Upload Test Artifacts
Expand Down Expand Up @@ -130,10 +163,21 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: volta-cli/action@v1
- uses: actions/cache@v2
- name: Cache
uses: actions/cache@v3
with:
path: |
~/.pnpm-store
'node_modules/'
'node_modules/.cache'
key: ${{ runner.os }}-${{ hashFiles('node_modules/.cache/**') }}
restore-keys: |
${{ runner.os }}-
- uses: pnpm/action-setup@v2.2.1
with:
path: '**/node_modules'
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
version: 6.32.1
- run: pnpm install
- name: Download Built Test Artifacts
uses: actions/download-artifact@master
with:
Expand All @@ -145,10 +189,10 @@ jobs:
google-chrome --version
echo "Node: $( node --version )"
echo "NPM: $( npm --version )"
echo "Yarn: $( yarn --version )"
echo "pnpm: $( pnpm --version )"
- name: Test
run: yarn test:ember --path ./dist/
run: pnpm run test:ember -- --path ./dist/
working-directory: ${{ env.app }}
env:
CI_BROWSER: ${{ matrix.ci_browser }}
Expand All @@ -166,22 +210,33 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: volta-cli/action@v1
- uses: actions/cache@v2
- name: Cache
uses: actions/cache@v3
with:
path: |
~/.pnpm-store
'node_modules/'
'node_modules/.cache'
key: ${{ runner.os }}-${{ hashFiles('node_modules/.cache/**') }}
restore-keys: |
${{ runner.os }}-
- uses: pnpm/action-setup@v2.2.1
with:
path: '**/node_modules'
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
version: 6.32.1
- run: pnpm install
- name: Download Built Test Artifacts
uses: actions/download-artifact@master
with:
name: built_tests
path: ${{ env.app }}/dist/
- run: yarn browserstack:connect
- run: pnpm run browserstack:connect
working-directory: ${{ env.app }}
- run: yarn test:browserstack
- run: pnpm run test:browserstack
working-directory: ${{ env.app }}
- run: yarn browserstack:results
- run: pnpm run browserstack:results
working-directory: ${{ env.app }}
- run: yarn browserstack:disconnect
- run: pnpm run browserstack:disconnect
working-directory: ${{ env.app }}

##############################################################
Expand Down
Loading

0 comments on commit 1eaf395

Please sign in to comment.