From 024e9e3bfdf0e5140144dd51f29a6c8243684789 Mon Sep 17 00:00:00 2001 From: Bartek Tofel Date: Wed, 7 Aug 2024 16:27:31 +0200 Subject: [PATCH] apply CR changes --- .github/actions/setup-slither/action.yaml | 4 ++-- .github/actions/setup-solc-select/action.yaml | 1 - .github/workflows/solidity-foundry.yml | 5 ----- contracts/scripts/ci/generate_slither_report.sh | 2 +- contracts/scripts/ci/modify_remappings.sh | 4 +++- contracts/scripts/ci/select_solc_version.sh | 2 +- 6 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/actions/setup-slither/action.yaml b/.github/actions/setup-slither/action.yaml index d8e7bef9e5e..b8bef38575d 100644 --- a/.github/actions/setup-slither/action.yaml +++ b/.github/actions/setup-slither/action.yaml @@ -1,5 +1,5 @@ name: Setup Slither -description: Installs Slither for contract analysis. Requires Python 3.6 or higher. +description: Installs Slither 0.10.3 for contract analysis. Requires Python 3.6 or higher. runs: using: composite steps: @@ -7,4 +7,4 @@ runs: shell: bash run: | python -m pip install --upgrade pip - pip install slither-analyzer + pip install slither-analyzer==0.10.3 diff --git a/.github/actions/setup-solc-select/action.yaml b/.github/actions/setup-solc-select/action.yaml index 7903b7acd3c..780fb6d3117 100644 --- a/.github/actions/setup-solc-select/action.yaml +++ b/.github/actions/setup-solc-select/action.yaml @@ -15,7 +15,6 @@ runs: shell: bash run: | sudo apt-get update - sudo apt-get install -y python3-pip pip3 install solc-select sudo ln -s /usr/local/bin/solc-select /usr/bin/solc-select diff --git a/.github/workflows/solidity-foundry.yml b/.github/workflows/solidity-foundry.yml index 63319d187b1..b4d9ec9066f 100644 --- a/.github/workflows/solidity-foundry.yml +++ b/.github/workflows/solidity-foundry.yml @@ -235,11 +235,6 @@ jobs: - name: Setup NodeJS uses: ./.github/actions/setup-nodejs - - name: Install semver - shell: bash - run: | - npm install -g semver - - name: Install Foundry uses: foundry-rs/foundry-toolchain@8f1998e9878d786675189ef566a2e4bf24869773 # v1.2.0 with: diff --git a/contracts/scripts/ci/generate_slither_report.sh b/contracts/scripts/ci/generate_slither_report.sh index 50fc991e894..e1c526604d1 100755 --- a/contracts/scripts/ci/generate_slither_report.sh +++ b/contracts/scripts/ci/generate_slither_report.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function check_chainlink_dir() { local param_dir="chainlink" diff --git a/contracts/scripts/ci/modify_remappings.sh b/contracts/scripts/ci/modify_remappings.sh index 72394a2fe89..a6736f966a7 100755 --- a/contracts/scripts/ci/modify_remappings.sh +++ b/contracts/scripts/ci/modify_remappings.sh @@ -1,4 +1,6 @@ -#!/bin/bash +#!/usr/bin/env bash + +set -euo pipefail if [ "$#" -ne 2 ]; then >&2 echo "Usage: $0 " diff --git a/contracts/scripts/ci/select_solc_version.sh b/contracts/scripts/ci/select_solc_version.sh index 316b261616a..057d2a29979 100755 --- a/contracts/scripts/ci/select_solc_version.sh +++ b/contracts/scripts/ci/select_solc_version.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function check_chainlink_dir() { local param_dir="chainlink"