Skip to content

Commit

Permalink
Merge branch 'master' into aa/feat/fuels-cli
Browse files Browse the repository at this point in the history
  • Loading branch information
danielbate authored Nov 2, 2023
2 parents fb15d91 + d70560f commit b98d4c1
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .changeset/young-dots-knock.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 1 addition & 1 deletion .github/actions/ci-setup/action.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "CI setup"
name: "CI Setup"
inputs:
node-version:
description: "Node version"
Expand Down
34 changes: 34 additions & 0 deletions .github/actions/test-setup/action.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: "Test Setup"
inputs:
node-version:
description: "Node version"
default: 18.14.1
pnpm-version:
description: "PNPM version"
default: 8.9.0
runs:
using: "composite"
steps:
- name: Cache PNPM modules
uses: actions/cache@v3
with:
path: ~/.local/share/pnpm/store/v4
key: ${{ runner.os }}-node-${{ inputs.node-version }}-pnpm-${{ inputs.pnpm-version }}-lock-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm
- name: Setup Node.js
uses: actions/setup-node@v2
with:
node-version: ${{ inputs.node-version }}
registry-url: "https://registry.npmjs.org"

- name: Setup PNPM
uses: pnpm/[email protected]
with:
version: ${{ inputs.pnpm-version }}
run_install: true

- name: Build
run: pnpm build
shell: bash
10 changes: 2 additions & 8 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,11 @@ jobs:
uses: actions/checkout@v3

- name: CI Setup
uses: ./.github/actions/ci-setup
uses: ./.github/actions/test-setup

- name: Forc Format Check
run: pnpm forc:check

- name: Build
run: pnpm build

# linting of some tests depends on pretest being run so that it generates the necessary files
- name: Pretest
run: pnpm pretest
Expand Down Expand Up @@ -83,10 +80,7 @@ jobs:
fetch-depth: 0

- name: CI Setup
uses: ./.github/actions/ci-setup

- name: Build
run: pnpm build
uses: ./.github/actions/test-setup

- name: Pretest
run: pnpm pretest
Expand Down

0 comments on commit b98d4c1

Please sign in to comment.