From 0af3cc551899fc03acb7028ab9baf54e08b031bf Mon Sep 17 00:00:00 2001
From: "zapaz.eth" <alain@kredeum.com>
Date: Fri, 17 May 2024 19:14:55 +0200
Subject: [PATCH] zeaz

---
 .github/workflows/deploy-wp-plugin.yml | 56 +++++++++++++-------------
 .github/workflows/test-forge.yml       | 13 +++---
 contracts/package.json                 |  6 +--
 3 files changed, 36 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/deploy-wp-plugin.yml b/.github/workflows/deploy-wp-plugin.yml
index 4d1577b4..6957f731 100644
--- a/.github/workflows/deploy-wp-plugin.yml
+++ b/.github/workflows/deploy-wp-plugin.yml
@@ -2,7 +2,7 @@ name: DEPLOY wp plugin
 on:
   push:
     branches:
-      - none
+      - dev
   #   tags:
   #     - "v*"
 
@@ -22,37 +22,35 @@ jobs:
         with:
           version: nightly
 
-      - name: Print forge location
-        run: which forge
+      - run: echo $HOME
+      - run: which forge
+      - run: forge --version
 
-      - name: Print $HOME
-        run: echo $HOME
+      # - name: Install node
+      #   uses: actions/setup-node@v3
+      #   with:
+      #     node-version: 20
 
-      - name: Install node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - name: Install pnpm
-        uses: pnpm/action-setup@v2.2.4
-        with:
-          version: 8.15.8
+      # - name: Install pnpm
+      #   uses: pnpm/action-setup@v2.2.4
+      #   with:
+      #     version: 8.15.8
 
-      - name: Build wp plugin
-        run: pnpm deploy:plugin
-        env:
-          ENVIR: PROD
-          NODE_DEBUG: false
-          GIT_BRANCH: main
-          INFURA_API_KEY: ${{ secrets.INFURA_API_KEY }}
-          ALCHEMY_API_KEY: ${{ secrets.ALCHEMY_API_KEY }}
-          ALCHEMY_API_KEY_POLYGON: ${{ secrets.ALCHEMY_API_KEY_POLYGON }}
-          ALCHEMY_API_KEY_ARBITRUM: ${{ secrets.ALCHEMY_API_KEY_ARBITRUM }}
-          ALCHEMY_API_KEY_OPTIMISM: ${{ secrets.ALCHEMY_API_KEY_OPTIMISM }}
-          ALCHEMY_API_KEY_BASE: ${{ secrets.ALCHEMY_API_KEY_BASE }}
-          ANKR_API_KEY: ${{ secrets.ANKR_API_KEY }}
-          COVALENT_API_KEY: ${{ secrets.COVALENT_API_KEY }}
-          NFT_STORAGE_KEY: ${{ secrets.NFT_STORAGE_KEY }}
+      # - name: Build wp plugin
+      #   run: pnpm deploy:plugin
+      #   env:
+      #     ENVIR: PROD
+      #     NODE_DEBUG: false
+      #     GIT_BRANCH: main
+      #     INFURA_API_KEY: ${{ secrets.INFURA_API_KEY }}
+      #     ALCHEMY_API_KEY: ${{ secrets.ALCHEMY_API_KEY }}
+      #     ALCHEMY_API_KEY_POLYGON: ${{ secrets.ALCHEMY_API_KEY_POLYGON }}
+      #     ALCHEMY_API_KEY_ARBITRUM: ${{ secrets.ALCHEMY_API_KEY_ARBITRUM }}
+      #     ALCHEMY_API_KEY_OPTIMISM: ${{ secrets.ALCHEMY_API_KEY_OPTIMISM }}
+      #     ALCHEMY_API_KEY_BASE: ${{ secrets.ALCHEMY_API_KEY_BASE }}
+      #     ANKR_API_KEY: ${{ secrets.ANKR_API_KEY }}
+      #     COVALENT_API_KEY: ${{ secrets.COVALENT_API_KEY }}
+      #     NFT_STORAGE_KEY: ${{ secrets.NFT_STORAGE_KEY }}
 
       # - name: Deploy
       #   uses: nk-o/action-wordpress-plugin-deploy@master
diff --git a/.github/workflows/test-forge.yml b/.github/workflows/test-forge.yml
index a69955ec..81ee7a01 100644
--- a/.github/workflows/test-forge.yml
+++ b/.github/workflows/test-forge.yml
@@ -1,6 +1,9 @@
-on: [push]
+name: TEST Foundry Installation
+on:
+  push:
+    branches:
+      - none
 
-name: test
 
 jobs:
   check:
@@ -16,9 +19,5 @@ jobs:
         with:
           version: nightly
 
-      - name: Run tests
-        run: forge --version
-
-      - run: echo $HOME
-      - run: which forge
+      - run: forge --version
 
diff --git a/contracts/package.json b/contracts/package.json
index dfda686d..6bfb33dc 100644
--- a/contracts/package.json
+++ b/contracts/package.json
@@ -22,7 +22,7 @@
   "main": "index.js",
   "scripts": {
     "clean": "forge clean && rm -rf cache-forge out node_modules lib types artifacts broadcast .turbo && git restore lib",
-    "postinstall": "pnpm foundryup:install && pnpm forge:install && pnpm forge:update",
+    "postinstall": "pnpm forge:install && pnpm forge:update",
     "build": "pnpm build:forge && pnpm build:typechain",
     "build:forge": "$HOME/.foundry/bin/forge build",
     "build:typechain": "typechain --target ethers-v5 --out-dir types out/**/*.json",
@@ -38,8 +38,8 @@
     "validate:only": "pnpm deploy:all --sender $SENDER",
     "format": "pnpm format:solidity",
     "format:solidity": "$HOME/.foundry/bin/forge fmt",
-    "foundryup:install": "command -v foundryup >/dev/null 2>&1 || (curl -L https://foundry.paradigm.xyz | bash && command -v foundryup)",
-    "forge:install": "command -v forge >/dev/null 2>&1 || ($HOME/.foundry/bin/foundryup && command -v forge)",
+    "foundryup:install": "command -v foundryup >/dev/null 2>&1 || curl -L https://foundry.paradigm.xyz | bash",
+    "forge:install": "command -v forge >/dev/null 2>&1 || (pnpm foundryup:install && foundryup)",
     "forge:update": "git submodule update --recursive",
     "tests": "pnpm tests:forge",
     "tests:forge": "forge test"