From 56ef1582391646305ecaaff32c696da60febb954 Mon Sep 17 00:00:00 2001 From: skosito Date: Mon, 29 Jul 2024 23:53:01 +0200 Subject: [PATCH] add test v2 and cleanup v1 actions --- .github/workflows/generated-files_v1.yaml | 5 --- .github/workflows/lint_v1.yaml | 5 --- .github/workflows/publish-npm_v1.yaml | 5 --- .github/workflows/test_v1.yaml | 5 --- .github/workflows/test_v2.yaml | 45 +++++++++++++++++++++++ v2/package.json | 3 +- 6 files changed, 46 insertions(+), 22 deletions(-) create mode 100644 .github/workflows/test_v2.yaml diff --git a/.github/workflows/generated-files_v1.yaml b/.github/workflows/generated-files_v1.yaml index a807a6c4..d02aa7f5 100644 --- a/.github/workflows/generated-files_v1.yaml +++ b/.github/workflows/generated-files_v1.yaml @@ -25,8 +25,6 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 - with: - submodules: recursive - name: Setup Node.js uses: actions/setup-node@v4 @@ -46,9 +44,6 @@ jobs: tar -zxvf geth-alltools-linux-amd64-1.11.5-a38f4108.tar.gz sudo mv geth-alltools-linux-amd64-1.11.5-a38f4108/abigen /usr/local/bin/ - - name: Install Foundry - uses: foundry-rs/foundry-toolchain@v1 - - name: Generate Go packages and typechain-types run: | yarn generate diff --git a/.github/workflows/lint_v1.yaml b/.github/workflows/lint_v1.yaml index 60415ccc..d0f46c07 100644 --- a/.github/workflows/lint_v1.yaml +++ b/.github/workflows/lint_v1.yaml @@ -26,8 +26,6 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v3 - with: - submodules: recursive - name: Setup Node.js uses: actions/setup-node@v3 @@ -35,9 +33,6 @@ jobs: node-version: "18" registry-url: "https://registry.npmjs.org" - - name: Install Foundry - uses: foundry-rs/foundry-toolchain@v1 - - name: Install Dependencies run: yarn install diff --git a/.github/workflows/publish-npm_v1.yaml b/.github/workflows/publish-npm_v1.yaml index 1688d33a..848a2218 100644 --- a/.github/workflows/publish-npm_v1.yaml +++ b/.github/workflows/publish-npm_v1.yaml @@ -15,8 +15,6 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v3 - with: - submodules: recursive - name: Setup Node.js uses: actions/setup-node@v3 @@ -24,9 +22,6 @@ jobs: node-version: "18" registry-url: "https://registry.npmjs.org" - - name: Install Foundry - uses: foundry-rs/foundry-toolchain@v1 - - name: Install Dependencies run: yarn install diff --git a/.github/workflows/test_v1.yaml b/.github/workflows/test_v1.yaml index 8f65b9ef..05698a5c 100644 --- a/.github/workflows/test_v1.yaml +++ b/.github/workflows/test_v1.yaml @@ -26,8 +26,6 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v4 - with: - submodules: recursive - name: Setup Node.js uses: actions/setup-node@v4 @@ -35,9 +33,6 @@ jobs: node-version: "18.0.0" registry-url: "https://registry.npmjs.org" - - name: Install Foundry - uses: foundry-rs/foundry-toolchain@v1 - - name: Install Dependencies run: yarn install diff --git a/.github/workflows/test_v2.yaml b/.github/workflows/test_v2.yaml new file mode 100644 index 00000000..85e48601 --- /dev/null +++ b/.github/workflows/test_v2.yaml @@ -0,0 +1,45 @@ +name: Test (V2) + +on: + push: + branches: + - main + paths: + - 'v2/**' + pull_request: + branches: + - "*" + types: + - synchronize + - opened + - reopened + - ready_for_review + +defaults: + run: + working-directory: ./v2 + +jobs: + test: + runs-on: ubuntu-latest + + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + with: + submodules: recursive + + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: "21.0.0" + registry-url: "https://registry.npmjs.org" + + - name: Install Foundry + uses: foundry-rs/foundry-toolchain@v1 + + - name: Install Dependencies + run: yarn install + + - name: Test (hardhat) + run: yarn test diff --git a/v2/package.json b/v2/package.json index d2fba154..4965b099 100644 --- a/v2/package.json +++ b/v2/package.json @@ -1,8 +1,7 @@ { "name": "v2", "version": "1.0.0", - "description": "**Foundry is a blazing fast, portable and modular toolkit for Ethereum application development written in Rust.**", - "main": "index.js", + "author": "zetachain", "directories": { "lib": "lib", "test": "test"