Skip to content

Commit 18bcebb

Browse files
authored
fix: add gas price arg if BTP_GAS_PRICE is set (#3)
1. Sets the gas-price in the CLI if the env is set 2. Fixed the GHA error: ```bash docker exporter does not currently support exporting manifest lists ``` Currently we can't load multi arch images in the docker store (docker/build-push-action#733 (comment), old issue, but ref: docker/buildx#59, there are still issues); so we don't load the output and always push it
1 parent 6695cfd commit 18bcebb

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

.github/workflows/branch.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,9 @@ jobs:
102102
- name: Build and push
103103
uses: docker/build-push-action@v5
104104
with:
105+
load: false
106+
push: true
105107
platforms: linux/amd64,linux/arm64
106-
push: ${{ github.event_name != 'pull_request' }}
107108
tags: ${{ steps.meta.outputs.tags }}
108109
labels: ${{ steps.meta.outputs.labels }}
109110
no-cache: true

Makefile

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,17 @@ deploy-anvil:
2929
deploy:
3030
@eval $$(curl -H "x-auth-token: $${BPT_SERVICE_TOKEN}" -s $${BTP_CLUSTER_MANAGER_URL}/ide/foundry/$${BTP_SCS_ID}/env | sed 's/^/export /')
3131
@if [ -z "${ETH_FROM}" ]; then \
32-
echo "\033[1;33mWARNING: No keys are activated on the node, falling back to interactive mode...\033[0m"; \
33-
echo ""; \
34-
forge create ./src/Counter.sol:Counter ${EXTRA_ARGS} --rpc-url ${BTP_RPC_URL} --interactive | tee deployment.txt; \
32+
if [ -z "${BTP_GAS_PRICE}" ]; then \
33+
forge create ./src/Counter.sol:Counter ${EXTRA_ARGS} --rpc-url ${BTP_RPC_URL} --interactive | tee deployment.txt; \
34+
else \
35+
forge create ./src/Counter.sol:Counter ${EXTRA_ARGS} --rpc-url ${BTP_RPC_URL} --interactive --gas-price ${BTP_GAS_PRICE} | tee deployment.txt; \
36+
fi; \
3537
else \
36-
forge create ./src/Counter.sol:Counter ${EXTRA_ARGS} --rpc-url ${BTP_RPC_URL} --unlocked | tee deployment.txt; \
38+
if [ -z "${BTP_GAS_PRICE}" ]; then \
39+
forge create ./src/Counter.sol:Counter ${EXTRA_ARGS} --rpc-url ${BTP_RPC_URL} --unlocked | tee deployment.txt; \
40+
else \
41+
forge create ./src/Counter.sol:Counter ${EXTRA_ARGS} --rpc-url ${BTP_RPC_URL} --unlocked --gas-price ${BTP_GAS_PRICE} | tee deployment.txt; \
42+
fi; \
3743
fi
3844

3945
script-anvil:

0 commit comments

Comments
 (0)