Skip to content

Commit

Permalink
Remove Volta usage; always breaks (volta-cli/action#77)
Browse files Browse the repository at this point in the history
  • Loading branch information
jpwilliams committed Jul 27, 2023
1 parent cf0042f commit 2a5c4b9
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 24 deletions.
23 changes: 4 additions & 19 deletions .github/actions/setup-and-build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,31 +12,16 @@ inputs:
runs:
using: composite
steps:
- uses: volta-cli/action@v4
- uses: teaxyz/setup@v0

- uses: pnpm/action-setup@v2
with:
run_install: false

- name: Get pnpm store directory
id: pnpm-cache
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
- uses: actions/cache@v3
name: Setup pnpm cache
- 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-
- run: volta install node
shell: bash

- run: volta install @antfu/ni
shell: bash
node-version-file: 'package.json'
cache: 'pnpm'

- name: Install dependencies
run: pnpm install
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- uses: actions/checkout@v3
- uses: ./.github/actions/setup-and-build
# Uses npm as pnpm doesn't support Node < 16
- run: volta run --node ${{ matrix.nodeVersion }} npm run test
- run: tea +nodejs.org~${{ matrix.nodeVersion }} npm run test

types:
name: Types
Expand Down Expand Up @@ -138,12 +138,12 @@ jobs:
# Don't use "npm ci", "--immutable" etc., as example repos won't be
# shipped with lock files.
- name: Install example dependencies
run: ni
run: tea +github.com/antfu/ni ni
working-directory: examples/apps/${{ matrix.example }}

- name: Add local SDK to example
working-directory: examples/apps/${{ matrix.example }}
run: ni ./inngest.tgz
run: tea +github.com/antfu/ni ni ./inngest.tgz

# Copy any SDK function examples to the example repo so that we're always
# testing many functions against many handlers.
Expand All @@ -165,7 +165,7 @@ jobs:

# Try to build the example
- name: Build the example
run: nr build
run: tea +github.com/antfu/ni nr build
working-directory: examples/apps/${{ matrix.example }}

- name: Run the Inngest dev server
Expand All @@ -181,7 +181,7 @@ jobs:

# Run the example
- name: Run the example's dev server
run: (nr dev > dev.log 2>&1 &)
run: (tea +github.com/antfu/ni nr dev > dev.log 2>&1 &)
working-directory: examples/apps/${{ matrix.example }}
# Provide the example any env vars it might need
env:
Expand Down

0 comments on commit 2a5c4b9

Please sign in to comment.