Monorepo - condensed workflow tasks

.github/workflows/coverage.yml

@@ -30,12 +30,10 @@ jobs:
 
       - name: Setup LCOV
         uses: hrishikesh-kadam/setup-lcov@v1
-        with:
-          working-directory: ./$package_folder
 
       - name: Filter files to ignore
         run: |
-          cd $package_folder && lcov --rc lcov_branch_coverage=1 \
+          cd ./${{ env.package_folder }} && lcov --rc lcov_branch_coverage=1 \
           --remove lcov.info \
           --output-file lcov.info "*node_modules*" "*test*" "*script*" "*DeploymentConfig*" "*Redeem*" "*deployment*"
 
@@ -46,4 +44,4 @@ jobs:
           minimum-coverage: 89
           artifact-name: code-coverage-report
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          working-directory: ./$package_folder
+          working-directory: ./${{ env.package_folder }}

.github/workflows/foundry-base.yml

@@ -1,14 +1,10 @@
-on:
-  workflow_call:
-    inputs:
-      package:
-        required: true
-        type: string
+name: "Foundry"
+
+on: "push"
 
 env:
   # Setting an environment variable with the value of a configuration variable
-  package_folder: packages/${{ inputs.package }}
-  build_artifact: foundry-built-artifacts-${{ inputs.package }}
+  $build_artifact: foundry_artifact
 
 jobs:
   build:
@@ -22,22 +18,17 @@ jobs:
 
       - name: Build contracts
         run: |
-          cd $package_folder && forge build
+          npx turbo run build:contracts
 
       - name: Archive built artifacts
         uses: actions/upload-artifact@v3
         with:
           name: $build_artifact
           path: |
-            packages/${{ inputs.package }}/cache
-            packages/${{ inputs.package }}/out
+            **/*/cache
+            **/*/out
           retention-days: 1
 
-  coverage:
-    uses: ./.github/workflows/coverage.yml
-    with:
-      package: ${{ inputs.package }}
-
   contract_size_check:
     needs: build
     strategy:
@@ -58,7 +49,7 @@ jobs:
 
       - name: Check contract sizes
         run: |
-          cd $package_folder && forge build --sizes
+          npx turbo run check-contract-size
 
   test:
     needs: build
@@ -78,9 +69,9 @@ jobs:
         with:
           name: $build_artifact
 
-      - name: Run Forge tests
+      - name: Run tests
         run: |
-          cd $package_folder && forge test -vvv
+          npx turbo run test
 
   test_fork:
     needs: build
@@ -102,7 +93,7 @@ jobs:
 
       - name: Run fork tests
         run: |
-          cd $package_folder && forge test -vvv --match-test fork
+          npx turbo run test:fork
         env:
           FORK_TEST_CHAINS: mainnet,goerli,optimism,optimism_goerli,zora,zora_goerli,base_goerli,base
           ALCHEMY_KEY: ${{ secrets.ALCHEMY_KEY }}
@@ -127,7 +118,7 @@ jobs:
 
       - name: "Inspect Storage Layout"
         continue-on-error: false
-        run: cd $package_folder && yarn run storage-inspect:check
+        run: npx turbo run storage-inspect:check
 
   build_js:
     needs: build
@@ -149,4 +140,14 @@ jobs:
 
       - name: Build js package
         run: |
-          cd $package_folder && yarn prepack
+          npx turbo run prepack
+
+  coverage-1155:
+    uses: ./.github/workflows/coverage.yml
+    with:
+      package: "1155-contracts"
+
+  coverage-protocol-rewards:
+    uses: ./.github/workflows/coverage.yml
+    with:
+      package: "protocol-rewards"

.github/workflows/foundry-by-package.yml

@@ -1,14 +1,17 @@
-name: Foundry
+on:
+  workflow_call:
+    inputs:
+      package:
+        required: true
+        type: string
 
-on: push
+env:
+  # Setting an environment variable with the value of a configuration variable
+  package_folder: packages/${{ inputs.package }}
 
 jobs:
   # we need to prepend _ to conform to 1155 standards
-  _1155:
-    uses: ./.github/workflows/foundry-base.yml
+  coverage:
+    uses: ./.github/workflows/coverage.yml
     with:
-      package: "1155-contracts"
-  protocol-rewards:
-    uses: ./.github/workflows/foundry-base.yml
-    with:
-      package: "protocol-rewards"
+      package: ${{ inputs.package }}

packages/1155-contracts/package.json

@@ -9,6 +9,7 @@
   "type": "module",
   "scripts": {
     "test": "forge test",
+    "test:fork": "forge test -vvv --match-test fork",
     "test-gas": "forge test --gas-report",
     "prettier:check": "prettier --check 'src/**/*.sol' 'test/**/*.sol' 'package/**/*.ts' 'wagmi.config.ts'",
     "prettier": "prettier --write 'src/**/*.sol' 'test/**/*.sol' 'package/**/*.ts' 'script/**/*.ts' 'wagmi.config.ts'",
@@ -20,6 +21,7 @@
     "update-contract-version": "node script/update-contract-version.mjs",
     "build:contracts": "forge build",
     "build": "tsup",
+    "build:sizes": "forge build --sizes",
     "bundle-configs": "node script/bundle-chainConfigs.mjs && yarn prettier",
     "wagmi": "wagmi generate",
     "publish-packages": "yarn prepack && changeset publish",

packages/protocol-rewards/package.json

@@ -9,7 +9,9 @@
   ],
   "scripts": {
     "build": "forge build",
+    "build:sizes": "forge build --sizes",
     "test": "forge test",
+    "build:contracts": "forge build",
     "prettier:check": "prettier --check 'src/**/*.sol' 'test/**/*.sol' 'script/**/*.sol'",
     "prettier": "prettier --write 'src/**/*.sol' 'test/**/*.sol' 'script/**/*.sol'",
     "lint": "yarn run prettier"

turbo.json

@@ -5,9 +5,25 @@
       "dependsOn": ["^build"],
       "outputs": [".dist/**"]
     },
+    "build:contracts": {
+      "dependsOn": ["^build:contracts"],
+      "outputs": [".dist/**"]
+    },
+    "check-contract-size": {
+      "dependsOn": ["^build:sizes"]
+    },
     "test": {
       "dependsOn": ["^test"]
     },
+    "test:fork": {
+      "dependsOn": ["^test:fork"]
+    },
+    "storage-inspect:check": {
+      "dependsOn": ["^storage-inspect:check"]
+    },
+    "prepack": {
+      "dependsOn": ["^prepack"]
+    },
     "lint": {
       "dependsOn": ["^lint"]
     },