Skip to content

Commit

Permalink
Revert "chore: Add volta config"
Browse files Browse the repository at this point in the history
This reverts commit a7e7ac2.
  • Loading branch information
cyril-sf committed Nov 8, 2024
1 parent a7e7ac2 commit 1a995d3
Show file tree
Hide file tree
Showing 5 changed files with 1,650 additions and 1,707 deletions.
69 changes: 22 additions & 47 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
name: CI

env:
VOLTA_FEATURE_PNPM: 1

on:
push:
branches:
Expand All @@ -21,22 +18,15 @@ jobs:
timeout-minutes: 10

steps:
- uses: actions/checkout@v4
- name: Install volta
uses: volta-cli/action@v4
- name: Get pnpm store directory
id: pnpm-cache
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path -s)" >> $GITHUB_OUTPUT
- name: Setup pnpm cache
uses: actions/cache@v4
id: cache
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v3
with:
version: 7
- name: Install Node
uses: actions/setup-node@v3
with:
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
node-version: 14.x
cache: pnpm
- name: Install Dependencies
run: pnpm install --frozen-lockfile
- name: Lint
Expand All @@ -50,22 +40,14 @@ jobs:
timeout-minutes: 10

steps:
- uses: actions/checkout@v4
- name: Install volta
uses: volta-cli/action@v4
- name: Get pnpm store directory
id: pnpm-cache
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path -s)" >> $GITHUB_OUTPUT
- name: Setup pnpm cache
uses: actions/cache@v4
id: cache
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v3
with:
version: 7
- uses: actions/setup-node@v3
with:
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
node-version: 14.x
cache: pnpm
- name: Install Dependencies
run: pnpm install --no-lockfile
- name: Run Tests
Expand Down Expand Up @@ -93,21 +75,14 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Install volta
uses: volta-cli/action@v4
- name: Get pnpm store directory
id: pnpm-cache
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path -s)" >> $GITHUB_OUTPUT
- name: Setup pnpm cache
uses: actions/cache@v4
id: cache
- uses: pnpm/action-setup@v3
with:
version: 7
- name: Install Node
uses: actions/setup-node@v3
with:
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
node-version: 14.x
cache: pnpm
- name: Install Dependencies
run: pnpm install --frozen-lockfile
- name: Run Tests
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
/pnpm-lock.yaml.ember-try

# broccoli-debug
/DEBUG/
2 changes: 0 additions & 2 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
/.watchmanconfig
/CONTRIBUTING.md
/ember-cli-build.js
/pnpm-lock.yaml
/testem.js
/tests/
/yarn-error.log
Expand All @@ -34,5 +33,4 @@
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/pnpm-lock.yaml.ember-try
/yarn.lock.ember-try
4 changes: 0 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,5 @@
"release": true,
"tokenRef": "GITHUB_AUTH"
}
},
"volta": {
"node": "16.20.0",
"pnpm": "8.6.2"
}
}
Loading

0 comments on commit 1a995d3

Please sign in to comment.