Skip to content

Commit 37891f7

Browse files
jangkojangko
authored
Lfs quota issue with dockerfile (#3521)
* Update lfs.fetchexclude in Makefile * Merge update-from-ci into update * use make update instead of make update-from-ci * fix portal.yml * update kurtosis docker file
1 parent a30ff4a commit 37891f7

File tree

5 files changed

+48
-53
lines changed

5 files changed

+48
-53
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ jobs:
160160

161161
- name: Build Nim and Nimbus-eth1 dependencies
162162
run: |
163-
make -j${ncpu} ARCH_OVERRIDE=${PLATFORM} CI_CACHE=NimBinCache update-from-ci
163+
make -j${ncpu} ARCH_OVERRIDE=${PLATFORM} CI_CACHE=NimBinCache update
164164
165165
- name: Run nimbus-eth1 tests (Windows)
166166
if: runner.os == 'Windows'

‎.github/workflows/nimbus_verified_proxy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ jobs:
177177

178178
- name: Build Nim and Nimbus-eth1 dependencies
179179
run: |
180-
make V=1 -j${ncpu} ARCH_OVERRIDE=${PLATFORM} CI_CACHE=NimBinCache update-from-ci
180+
make V=1 -j${ncpu} ARCH_OVERRIDE=${PLATFORM} CI_CACHE=NimBinCache update
181181
182182
- name: Run verified proxy tests (Windows)
183183
if: runner.os == 'Windows'

‎.github/workflows/portal.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373

7474
- name: Build Nim and Nimbus-eth1 dependencies
7575
run: |
76-
make -j${ncpu} ARCH_OVERRIDE=${PLATFORM} CI_CACHE=NimBinaries update-from-ci
76+
make -j${ncpu} ARCH_OVERRIDE=${PLATFORM} CI_CACHE=NimBinaries update
7777
7878
- name: build uTP test app container
7979
run: |
@@ -248,7 +248,7 @@ jobs:
248248
run: |
249249
# use CC to make sure Nim compiler and subsequent test
250250
# using the same glibc version.
251-
env CC=gcc make -j${ncpu} ARCH_OVERRIDE=${PLATFORM} CI_CACHE=NimBinaries update-from-ci
251+
env CC=gcc make -j${ncpu} ARCH_OVERRIDE=${PLATFORM} CI_CACHE=NimBinaries update
252252
253253
- name: Run Nimbus Portal tests (Windows)
254254
if: runner.os == 'Windows'

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN ldd --version
2020
ADD . /root/nimbus-eth1
2121

2222
RUN cd /root/nimbus-eth1 \
23-
&& make -j$(nproc) update-from-ci \
23+
&& make -j$(nproc) update \
2424
&& make -j$(nproc) DISABLE_MARCH_NATIVE=1 V=1 nimbus_execution_client
2525

2626
# --------------------------------- #

‎Makefile‎

Lines changed: 43 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -13,47 +13,47 @@ BUILD_SYSTEM_DIR := vendor/nimbus-build-system
1313
LINK_PCRE := 0
1414

1515
EXCLUDED_NIM_PACKAGES := \
16-
vendor/nimbus-eth2/vendor/nim-bearssl \
17-
vendor/nimbus-eth2/vendor/nim-blscurve \
18-
vendor/nimbus-eth2/vendor/nim-bearssl \
19-
vendor/nimbus-eth2/vendor/nim-blscurve \
20-
vendor/nimbus-eth2/vendor/nimbus-build-system \
21-
vendor/nimbus-eth2/vendor/nim-chronicles \
22-
vendor/nimbus-eth2/vendor/nim-chronos \
23-
vendor/nimbus-eth2/vendor/nim-confutils \
24-
vendor/nimbus-eth2/vendor/nimcrypto \
25-
vendor/nimbus-eth2/vendor/nim-eth \
26-
vendor/nimbus-eth2/vendor/nim-faststreams \
27-
vendor/nimbus-eth2/vendor/nim-http-utils \
28-
vendor/nimbus-eth2/vendor/nim-json-rpc \
29-
vendor/nimbus-eth2/vendor/nim-json-serialization\
30-
vendor/nimbus-eth2/vendor/nim-libbacktrace \
31-
vendor/nimbus-eth2/vendor/nim-metrics \
32-
vendor/nimbus-eth2/vendor/nim-nat-traversal \
33-
vendor/nimbus-eth2/vendor/nim-results \
34-
vendor/nimbus-eth2/vendor/nim-secp256k1 \
35-
vendor/nimbus-eth2/vendor/nim-serialization \
36-
vendor/nimbus-eth2/vendor/nim-snappy \
37-
vendor/nimbus-eth2/vendor/nim-sqlite3-abi \
38-
vendor/nimbus-eth2/vendor/nim-ssz-serialization \
39-
vendor/nimbus-eth2/vendor/nim-stew \
40-
vendor/nimbus-eth2/vendor/nim-stint \
41-
vendor/nimbus-eth2/vendor/nim-testutils \
42-
vendor/nimbus-eth2/vendor/nim-toml-serialization\
43-
vendor/nimbus-eth2/vendor/nim-unittest2 \
44-
vendor/nimbus-eth2/vendor/nim-web3 \
45-
vendor/nimbus-eth2/vendor/nim-websock \
46-
vendor/nimbus-eth2/vendor/nim-zlib \
47-
vendor/nimbus-eth2/vendor/nim-taskpools \
48-
vendor/nimbus-eth2/vendor/nim-normalize \
49-
vendor/nimbus-eth2/vendor/nim-unicodedb \
50-
vendor/nimbus-eth2/vendor/nim-libp2p \
51-
vendor/nimbus-eth2/vendor/nim-presto \
52-
vendor/nimbus-eth2/vendor/nim-zxcvbn \
53-
vendor/nimbus-eth2/vendor/nim-kzg4844 \
54-
vendor/nimbus-eth2/vendor/nim-minilru \
55-
vendor/nimbus-eth2/vendor/nimbus-security-resources \
56-
vendor/nimbus-eth2/vendor/NimYAML
16+
vendor/nimbus-eth2/vendor/nim-bearssl \
17+
vendor/nimbus-eth2/vendor/nim-blscurve \
18+
vendor/nimbus-eth2/vendor/nim-bearssl \
19+
vendor/nimbus-eth2/vendor/nim-blscurve \
20+
vendor/nimbus-eth2/vendor/nimbus-build-system \
21+
vendor/nimbus-eth2/vendor/nim-chronicles \
22+
vendor/nimbus-eth2/vendor/nim-chronos \
23+
vendor/nimbus-eth2/vendor/nim-confutils \
24+
vendor/nimbus-eth2/vendor/nimcrypto \
25+
vendor/nimbus-eth2/vendor/nim-eth \
26+
vendor/nimbus-eth2/vendor/nim-faststreams \
27+
vendor/nimbus-eth2/vendor/nim-http-utils \
28+
vendor/nimbus-eth2/vendor/nim-json-rpc \
29+
vendor/nimbus-eth2/vendor/nim-json-serialization \
30+
vendor/nimbus-eth2/vendor/nim-libbacktrace \
31+
vendor/nimbus-eth2/vendor/nim-metrics \
32+
vendor/nimbus-eth2/vendor/nim-nat-traversal \
33+
vendor/nimbus-eth2/vendor/nim-results \
34+
vendor/nimbus-eth2/vendor/nim-secp256k1 \
35+
vendor/nimbus-eth2/vendor/nim-serialization \
36+
vendor/nimbus-eth2/vendor/nim-snappy \
37+
vendor/nimbus-eth2/vendor/nim-sqlite3-abi \
38+
vendor/nimbus-eth2/vendor/nim-ssz-serialization \
39+
vendor/nimbus-eth2/vendor/nim-stew \
40+
vendor/nimbus-eth2/vendor/nim-stint \
41+
vendor/nimbus-eth2/vendor/nim-testutils \
42+
vendor/nimbus-eth2/vendor/nim-toml-serialization \
43+
vendor/nimbus-eth2/vendor/nim-unittest2 \
44+
vendor/nimbus-eth2/vendor/nim-web3 \
45+
vendor/nimbus-eth2/vendor/nim-websock \
46+
vendor/nimbus-eth2/vendor/nim-zlib \
47+
vendor/nimbus-eth2/vendor/nim-taskpools \
48+
vendor/nimbus-eth2/vendor/nim-normalize \
49+
vendor/nimbus-eth2/vendor/nim-unicodedb \
50+
vendor/nimbus-eth2/vendor/nim-libp2p \
51+
vendor/nimbus-eth2/vendor/nim-presto \
52+
vendor/nimbus-eth2/vendor/nim-zxcvbn \
53+
vendor/nimbus-eth2/vendor/nim-kzg4844 \
54+
vendor/nimbus-eth2/vendor/nim-minilru \
55+
vendor/nimbus-eth2/vendor/nimbus-security-resources \
56+
vendor/nimbus-eth2/vendor/NimYAML
5757

5858
# we don't want an error here, so we can handle things later, in the ".DEFAULT" target
5959
-include $(BUILD_SYSTEM_DIR)/makefiles/variables.mk
@@ -133,12 +133,11 @@ ifeq ($(NIM_PARAMS),)
133133

134134
# We don't need these `vendor/holesky` files but fetching them
135135
# may trigger 'This repository is over its data quota' from GitHub
136-
GIT_SUBMODULE_CONFIG := -c lfs.fetchexclude=/public-keys/all.txt,/custom_config_data/genesis.ssz
136+
GIT_SUBMODULE_CONFIG := -c lfs.fetchexclude=/public-keys/all.txt,/metadata/genesis.ssz,/parsed/parsedConsensusGenesis.json
137137

138138
GIT_SUBMODULE_UPDATE := git -c submodule."vendor/nimbus-eth2".update=none submodule update --init --recursive; \
139139
git $(GIT_SUBMODULE_CONFIG) submodule update vendor/nimbus-eth2; \
140140
cd vendor/nimbus-eth2; \
141-
git $(GIT_SUBMODULE_CONFIG) submodule update --init vendor/eth2-networks; \
142141
git $(GIT_SUBMODULE_CONFIG) submodule update --init vendor/holesky; \
143142
git $(GIT_SUBMODULE_CONFIG) submodule update --init vendor/sepolia; \
144143
git $(GIT_SUBMODULE_CONFIG) submodule update --init vendor/hoodi; \
@@ -195,11 +194,7 @@ endif
195194
NIM_PARAMS := $(NIM_PARAMS) $(NIM_ETH_PARAMS)
196195

197196
#- deletes and recreates "nimbus.nims" which on Windows is a copy instead of a proper symlink
198-
update: | update-common
199-
rm -rf nimbus.nims && \
200-
$(MAKE) nimbus.nims $(HANDLE_OUTPUT)
201-
202-
update-from-ci: | sanity-checks update-test
197+
update: | sanity-checks update-test
203198
rm -rf nimbus.nims && \
204199
$(MAKE) nimbus.nims $(HANDLE_OUTPUT)
205200
+ "$(MAKE)" --no-print-directory deps-common

0 commit comments

Comments
 (0)