diff --git a/.github/workflows/deploy-wp-plugin.yml b/.github/workflows/deploy-wp-plugin.yml index 0b896db9..4d1577b4 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: - - integ + - none # tags: # - "v*" diff --git a/.github/workflows/test-forge.yml b/.github/workflows/test-forge.yml index 5eca4008..4b6847bf 100644 --- a/.github/workflows/test-forge.yml +++ b/.github/workflows/test-forge.yml @@ -15,12 +15,8 @@ jobs: - name: Install Foundry uses: foundry-rs/foundry-toolchain@v1 - - name: Print forge location - run: which forge - - - name: Print $HOME - run: echo $HOME - - - name: Get forge version - run: forge --version + - run: echo $HOME + - run: which foundryup + - run: which forge + - run: forge --version diff --git a/contracts/package.json b/contracts/package.json index e19c6600..dfda686d 100644 --- a/contracts/package.json +++ b/contracts/package.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", - "forge:install": "command -v forge >/dev/null 2>&1 || $HOME/.foundry/bin/foundryup", + "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)", "forge:update": "git submodule update --recursive", "tests": "pnpm tests:forge", "tests:forge": "forge test"