Skip to content

Commit

Permalink
Merge branch 'main' into acre-sdk-current-position
Browse files Browse the repository at this point in the history
  • Loading branch information
ioay committed Feb 19, 2024
2 parents d058fa2 + 6588bf8 commit 8a660f8
Show file tree
Hide file tree
Showing 84 changed files with 8,946 additions and 2,146 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/dapp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ defaults:
working-directory: ./dapp

jobs:
sdk-build:
uses: ./.github/workflows/reusable-sdk-build.yaml

dapp-format:
needs: [sdk-build]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -23,6 +27,15 @@ jobs:

- name: Set up Node
uses: actions/setup-node@v4
with:
node-version-file: "dapp/.nvmrc"
cache: "pnpm"

- name: Download SDK Build Artifacts
uses: actions/download-artifact@v3
with:
name: sdk-build
path: sdk/dist

- name: Install Dependencies
run: pnpm install --prefer-offline --frozen-lockfile
Expand All @@ -31,6 +44,7 @@ jobs:
run: pnpm run format

dapp-build:
needs: [sdk-build]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -40,6 +54,15 @@ jobs:

- name: Set up Node
uses: actions/setup-node@v4
with:
node-version-file: "dapp/.nvmrc"
cache: "pnpm"

- name: Download SDK Build Artifacts
uses: actions/download-artifact@v3
with:
name: sdk-build
path: sdk/dist

- name: Install Dependencies
run: pnpm install --prefer-offline --frozen-lockfile
Expand Down
44 changes: 44 additions & 0 deletions .github/workflows/reusable-sdk-build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Build the SDK package
on:
workflow_call:

jobs:
core-build:
uses: ./.github/workflows/reusable-core-build.yaml

sdk-build:
defaults:
run:
working-directory: ./sdk
needs: [core-build]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Set up pnpm
uses: pnpm/action-setup@v2

- name: Set up Node
uses: actions/setup-node@v4
with:
node-version-file: "sdk/.nvmrc"
cache: "pnpm"

- name: Download Core Build Artifacts
uses: actions/download-artifact@v3
with:
name: core-build
path: core/

- name: Install Dependencies
run: pnpm install --prefer-offline --frozen-lockfile

- name: Build
run: pnpm run build

- name: Upload Build Artifacts
uses: actions/upload-artifact@v3
with:
name: sdk-build
path: sdk/dist/
if-no-files-found: error
19 changes: 11 additions & 8 deletions .github/workflows/sdk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ defaults:
working-directory: ./sdk

jobs:
core-build:
uses: ./.github/workflows/reusable-core-build.yaml
sdk-build:
uses: ./.github/workflows/reusable-sdk-build.yaml

sdk-format:
needs: [core-build]
needs: [sdk-build]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -27,6 +27,9 @@ jobs:

- name: Set up Node
uses: actions/setup-node@v4
with:
node-version-file: "sdk/.nvmrc"
cache: "pnpm"

- name: Download Core Build Artifacts
uses: actions/download-artifact@v3
Expand All @@ -40,8 +43,8 @@ jobs:
- name: Format
run: pnpm run format

sdk-build-and-test:
needs: [core-build]
sdk-test:
needs: [sdk-build]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -51,6 +54,9 @@ jobs:

- name: Set up Node
uses: actions/setup-node@v4
with:
node-version-file: "sdk/.nvmrc"
cache: "pnpm"

- name: Download Core Build Artifacts
uses: actions/download-artifact@v3
Expand All @@ -61,8 +67,5 @@ jobs:
- name: Install Dependencies
run: pnpm install --prefer-offline --frozen-lockfile

- name: Build
run: pnpm run build

- name: Tests
run: pnpm run test
99 changes: 0 additions & 99 deletions core/contracts/lib/ERC4626Fees.sol

This file was deleted.

Loading

0 comments on commit 8a660f8

Please sign in to comment.