From cb2b5a68766606c1c262894863ffd4e688eb18df Mon Sep 17 00:00:00 2001 From: Eridian <86061486+EridianAlpha@users.noreply.github.com> Date: Mon, 16 Sep 2024 20:26:00 +0100 Subject: [PATCH] Fix dependency name case --- .github/workflows/deployGitHubPages.yml | 2 +- Makefile | 17 +++-------------- src/SettlementNft.sol | 2 +- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/.github/workflows/deployGitHubPages.yml b/.github/workflows/deployGitHubPages.yml index 01db527..7bc0d03 100644 --- a/.github/workflows/deployGitHubPages.yml +++ b/.github/workflows/deployGitHubPages.yml @@ -18,7 +18,7 @@ jobs: uses: foundry-rs/foundry-toolchain@v1 - name: Install Dependencies - run: git submodule init; git submodule update; make install + run: forge install - name: Generate Documentation run: forge doc diff --git a/Makefile b/Makefile index f59946d..5f45027 100644 --- a/Makefile +++ b/Makefile @@ -118,20 +118,9 @@ remove-value: # │ CONTRACT SPECIFIC CONFIGURATION │ # ================================================================ install: - # Clone forge-std and checkout the specific tag - rm -rf lib/forge-std - git clone https://github.com/foundry-rs/forge-std.git lib/forge-std && \ - cd lib/forge-std && git checkout v1.9.2 && cd ../.. - - # Clone foundry-devops and checkout the specific tag - rm -rf lib/foundry-devops - git clone https://github.com/Cyfrin/foundry-devops.git lib/foundry-devops && \ - cd lib/foundry-devops && git checkout 0.2.2 && cd ../.. - - # Clone openzeppelin-contracts and checkout the specific tag - rm -rf lib/openzeppelin-contracts - git clone https://github.com/OpenZeppelin/openzeppelin-contracts.git lib/openzeppelin-contracts && \ - cd lib/openzeppelin-contracts && git checkout v5.0.2 && cd ../.. + forge install foundry-rs/forge-std@v1.9.2 --no-commit && \ + forge install Cyfrin/foundry-devops@0.2.2 --no-commit && \ + forge install openzeppelin/openzeppelin-contracts@v5.0.2 --no-commit # ================================================================ # │ RUN COMMANDS │ diff --git a/src/SettlementNft.sol b/src/SettlementNft.sol index 400f0aa..9a97b75 100644 --- a/src/SettlementNft.sol +++ b/src/SettlementNft.sol @@ -8,7 +8,7 @@ pragma solidity 0.8.27; // OpenZeppelin Imports import "@openzeppelin/contracts/token/ERC721/ERC721.sol"; import "@openzeppelin/contracts/utils/Strings.sol"; -import "@openzeppelin/contracts/utils/base64.sol"; +import "@openzeppelin/contracts/utils/Base64.sol"; // Contract Imports import {SettlerToken} from "./SettlerToken.sol";