From 4d2a16bd836ea70822117c46cc2795e5ef90a08c Mon Sep 17 00:00:00 2001
From: "zapaz.eth" <alain@kredeum.com>
Date: Fri, 17 May 2024 16:43:22 +0200
Subject: [PATCH] test7

---
 .github/workflows/deploy-wp-plugin.yml |  2 +-
 .github/workflows/test-forge.yml       | 31 +++++++++++---------------
 contracts/package.json                 |  9 ++++----
 3 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/deploy-wp-plugin.yml b/.github/workflows/deploy-wp-plugin.yml
index 81870675..0b896db9 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:
-      - dev
+      - integ
   #   tags:
   #     - "v*"
 
diff --git a/.github/workflows/test-forge.yml b/.github/workflows/test-forge.yml
index 8412761f..5eca4008 100644
--- a/.github/workflows/test-forge.yml
+++ b/.github/workflows/test-forge.yml
@@ -1,31 +1,26 @@
-name: TEST forge
-
 on:
   push:
     branches:
-      - deployWithGitHubAction
+      - dev
 
 jobs:
   check:
-    name: Test smartcontracts with forge
-    runs-on: ubuntu-22.04
-
+    name: Foundry project
+    runs-on: ubuntu-latest
     steps:
-      - name: CHECKOUT kredeum nfts
-
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
 
-      - name: INSTALL foundry
+      - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
-        with:
-          version: nightly
 
-      - name: BUILD forge
-        working-directory: contracts
-        run: forge build
+      - name: Print forge location
+        run: which forge
+
+      - name: Print $HOME
+        run: echo $HOME
+
+      - name: Get forge version
+        run: forge --version
 
-      - name: TEST forge
-        working-directory: contracts
-        run: forge test -vvv
diff --git a/contracts/package.json b/contracts/package.json
index 38fef385..6c5b15e4 100644
--- a/contracts/package.json
+++ b/contracts/package.json
@@ -22,10 +22,9 @@
   "main": "index.js",
   "scripts": {
     "clean": "forge clean && rm -rf cache-forge out node_modules lib types artifacts broadcast .turbo && git restore lib",
-    "postinstall": "pnpm install:foundry && pnpm forge:update",
-    "install:foundry": "command -v forge >/dev/null 2>&1 || pnpm foundry:install",
+    "postinstall": "pnpm foundry:install && pnpm forge:update",
     "build": "pnpm build:forge && pnpm build:typechain",
-    "build:forge": "$HOME/.foundry/bin/forge build",
+    "build:forge": "forge build",
     "build:typechain": "typechain --target ethers-v5 --out-dir types out/**/*.json",
     "check": "pnpm check:solidity",
     "check:solidity": "solhint src/**/*.sol",
@@ -38,8 +37,8 @@
     "deploy:all": "forge script scripts/DeployAllCurrent.s.sol",
     "validate:only": "pnpm deploy:all --sender $SENDER",
     "format": "pnpm format:solidity",
-    "format:solidity": "$HOME/.foundry/bin/forge fmt",
-    "foundry:install": "curl -L https://foundry.paradigm.xyz | bash && $HOME/.foundry/bin/foundryup",
+    "format:solidity": "forge fmt",
+    "foundry:install": "command -v forge >/dev/null 2>&1 || curl -L https://foundry.paradigm.xyz | bash foundryup",
     "forge:update": "git submodule update --recursive",
     "tests": "pnpm tests:forge",
     "tests:forge": "forge test"