Fix js build task by having turbo run build (#314)

ourzora · Nov 1, 2023 · d789935 · d789935
1 parent 71a2d92
commit d789935
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/.github/workflows/foundry.yml b/.github/workflows/foundry.yml
@@ -121,7 +121,6 @@ jobs:
         run: npx turbo run storage-inspect:check
 
   build_js:
-    needs: build
     strategy:
       fail-fast: true
 
@@ -133,14 +132,9 @@ jobs:
       - name: Install node deps and founry
         uses: ./.github/actions/setup_deps
 
-      - name: Download foundry artifacts
-        uses: actions/download-artifact@v3
-        with:
-          name: $build_artifact
-
       - name: Build js package
         run: |
-          npx turbo run prepack
+          npx turbo run build
 
   coverage-1155:
     uses: ./.github/workflows/coverage.yml
@@ -155,4 +149,3 @@ jobs:
     with:
       package: "protocol-rewards"
       files_to_ignore: '"*lib*"'
-
diff --git a/packages/1155-contracts/test/factory/ZoraCreator1155Factory_Fork.t.sol b/packages/1155-contracts/test/factory/ZoraCreator1155Factory_Fork.t.sol
@@ -138,9 +138,9 @@ contract ZoraCreator1155FactoryForkTest is ForkDeploymentConfig, Test {
 
         // make sure that the address from the factory matches the stored fixed price address
         // sanity check - check minters match config
-        assertEq(address(factory.merkleMinter()), deployment.merkleMintSaleStrategy);
-        assertEq(address(factory.fixedPriceMinter()), deployment.fixedPriceSaleStrategy);
-        assertEq(address(factory.redeemMinterFactory()), deployment.redeemMinterFactory);
+        assertEq(address(factory.merkleMinter()), deployment.merkleMintSaleStrategy, "merkle minter incorrect");
+        assertEq(address(factory.fixedPriceMinter()), deployment.fixedPriceSaleStrategy, "fixed priced minter incorrect");
+        assertEq(address(factory.redeemMinterFactory()), deployment.redeemMinterFactory, "redeem minter not correct");
     }
 
     function test_fork_canCreateContractAndMint() external {