fix

ava-labs · Nov 27, 2023 · 9c724b1 · 9c724b1
1 parent 08ce76f
commit 9c724b1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/.github/workflows/abi_bindings_checker.yml b/.github/workflows/abi_bindings_checker.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.20.8"
+          go-version: ${{ env.GO_VERSION }}
 
       - name: Install Foundry
         run: ./scripts/install_foundry.sh

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -11,6 +11,8 @@ ARG ARCH=amd64
 
 ARG GO_VERSION
 
+COPY ../scripts/install_foundry.sh /scripts/install_foundry.sh
+
 # defaults to grep running in a container.
 ENV grepcmd=grep
 
@@ -38,14 +40,7 @@ ENV LANG en_US.utf8
 
 # Install foundry from specific commit
 SHELL ["/bin/bash", "-c"]
-ENV FOUNDRY_VERSION v0.1.0
-RUN curl -L https://raw.githubusercontent.com/ava-labs/foundry/${FOUNDRY_VERSION}/foundryup/install > /tmp/foundry-install-script && \
-    sed -i 's/\/ava-labs\/foundry\/master\/foundryup/\/ava-labs\/foundry\/${FOUNDRY_VERSION}\/foundryup/g' /tmp/foundry-install-script && \
-    cat /tmp/foundry-install-script | bash && \
-    echo "export PATH=\"$PATH:/$HOME/.foundry/bin\"">> ~/.bashrc && \
-    source ~/.bashrc && \
-    export PATH=$PATH:$HOME/.foundry/bin:$HOME/.cargo/bin && \
-    foundryup --version ${FOUNDRY_VERSION}
+RUN ./scripts/install_foundry.sh
 
 # Install python base58 decode library
 RUN apt-get update && \

diff --git a/scripts/install_foundry.sh b/scripts/install_foundry.sh
@@ -2,7 +2,7 @@
 # Copyright (C) 2023, Ava Labs, Inc. All rights reserved.
 # See the file LICENSE for licensing terms.
 
-set -ex
+set -e
 
 export XDG_CONFIG_HOME=$HOME
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     # Copyright (C) 2023, Ava Labs, Inc. All rights reserved.
     # See the file LICENSE for licensing terms.
-    set -ex
+    set -e
     export XDG_CONFIG_HOME=$HOME
@@ Expand Down @@