Skip to content

Commit 9ccffee

Browse files
jangkojangko
authored
Restore 'make update' and introduce 'make init' (#3532)
Because of recent changes to 'make update' causing confusion among team members, I decide to restore 'make update' and introduce 'make init' to replace the former 'make update-from-ci'. Now 'make init' also can be used in docker file.
1 parent d3f58d1 commit 9ccffee

File tree

8 files changed

+19
-17
lines changed

8 files changed

+19
-17
lines changed

‎.github/workflows/ci.yml‎

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

174174
- name: Build Nim and Nimbus-eth1 dependencies
175175
run: |
176-
make -j${ncpu} ARCH_OVERRIDE=${PLATFORM} CI_CACHE=NimBinCache update
176+
make -j${ncpu} ARCH_OVERRIDE=${PLATFORM} CI_CACHE=NimBinCache init
177177
178178
- name: Run nimbus-eth1 tests (Windows)
179179
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
180+
make V=1 -j${ncpu} ARCH_OVERRIDE=${PLATFORM} CI_CACHE=NimBinCache init
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
76+
make -j${ncpu} ARCH_OVERRIDE=${PLATFORM} CI_CACHE=NimBinaries init
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
251+
env CC=gcc make -j${ncpu} ARCH_OVERRIDE=${PLATFORM} CI_CACHE=NimBinaries init
252252
253253
- name: Run Nimbus Portal tests (Windows)
254254
if: runner.os == 'Windows'

‎.github/workflows/simulators.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- name: Build Nim and deps
4343
run: |
4444
ncpu=$(nproc)
45-
make -j${ncpu} ARCH_OVERRIDE=x64 CI_CACHE=NimBinaries update
45+
make -j${ncpu} ARCH_OVERRIDE=x64 CI_CACHE=NimBinaries init
4646
make -j${ncpu} deps rocksdb
4747
4848
- name: Run Simulators
@@ -83,7 +83,7 @@ jobs:
8383
- name: Build Nim and deps
8484
run: |
8585
ncpu=$(sysctl -n hw.ncpu)
86-
make -j${ncpu} ARCH_OVERRIDE=x64 CI_CACHE=NimBinaries update
86+
make -j${ncpu} ARCH_OVERRIDE=x64 CI_CACHE=NimBinaries init
8787
make -j${ncpu} deps rocksdb
8888
8989
- name: Run Simulators
@@ -148,7 +148,7 @@ jobs:
148148
- name: Build Nim and deps
149149
run: |
150150
ncpu=${NUMBER_OF_PROCESSORS}
151-
mingw32-make -j${ncpu} ARCH_OVERRIDE=x64 CI_CACHE=NimBinaries update
151+
mingw32-make -j${ncpu} ARCH_OVERRIDE=x64 CI_CACHE=NimBinaries init
152152
mingw32-make -j${ncpu} deps
153153
154154
- name: Run Simulators

‎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 \
23+
&& make -j$(nproc) init \
2424
&& make -j$(nproc) DISABLE_MARCH_NATIVE=1 V=1 nimbus_execution_client
2525

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

‎Makefile‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,8 @@ VERIF_PROXY_OUT_PATH ?= build/libverifproxy/
120120
rocksdb \
121121
dist-amd64 \
122122
dist-arm64 \
123-
dist-arm \
124123
dist-win64 \
125124
dist-macos \
126-
dist-macos-arm64 \
127125
dist
128126

129127
ifeq ($(NIM_PARAMS),)
@@ -194,7 +192,11 @@ endif
194192
NIM_PARAMS := $(NIM_PARAMS) $(NIM_ETH_PARAMS)
195193

196194
#- deletes and recreates "nimbus.nims" which on Windows is a copy instead of a proper symlink
197-
update: | sanity-checks update-test
195+
update: | update-common
196+
rm -rf nimbus.nims && \
197+
$(MAKE) nimbus.nims $(HANDLE_OUTPUT)
198+
199+
init: | sanity-checks update-test
198200
rm -rf nimbus.nims && \
199201
$(MAKE) nimbus.nims $(HANDLE_OUTPUT)
200202
+ "$(MAKE)" --no-print-directory deps-common

‎docker/dist/Dockerfile.arm64‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ USER user
2424
STOPSIGNAL SIGINT
2525

2626
COPY "entry_point.sh" "/home/user/"
27-
ENTRYPOINT ["/home/user/entry_point.sh", "linux_arm64v8"]
27+
ENTRYPOINT ["/home/user/entry_point.sh", "linux_arm64"]
2828

‎docker/dist/entry_point.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ if [[ "${PLATFORM}" == "windows_amd64" ]]; then
8585

8686
build_rocksdb TARGET_OS=MINGW CXX="${CXX}"
8787

88-
make -j$(nproc) update-from-ci
88+
make -j$(nproc) init
8989

9090
make \
9191
-j$(nproc) \
@@ -126,14 +126,14 @@ if [[ "${PLATFORM}" == "windows_amd64" ]]; then
126126
LOG_LEVEL="TRACE" \
127127
NIMFLAGS="${NIMFLAGS_COMMON} --os:windows --gcc.exe=${CC} --gcc.linkerexe=${CXX} --passL:'-static -lshlwapi -lrpcrt4' -d:BLSTuseSSSE3=1" \
128128
${BINARIES}
129-
elif [[ "${PLATFORM}" == "linux_arm64v8" ]]; then
129+
elif [[ "${PLATFORM}" == "linux_arm64" ]]; then
130130
CC="aarch64-linux-gnu-gcc"
131131
CXX="aarch64-linux-gnu-g++"
132132
${CXX} --version
133133

134134
build_rocksdb TARGET_ARCHITECTURE=arm64 CXX="${CXX}"
135135

136-
make -j$(nproc) update-from-ci
136+
make -j$(nproc) init
137137

138138
make \
139139
-j$(nproc) \
@@ -162,7 +162,7 @@ elif [[ "${PLATFORM}" == "macOS_arm64" ]]; then
162162

163163
build_rocksdb TARGET_OS=Darwin TARGET_ARCHITECTURE=arm64 CXX="${CXX}" AR="${AR}"
164164

165-
make -j$(nproc) update-from-ci
165+
make -j$(nproc) init
166166

167167
make \
168168
-j$(nproc) \
@@ -196,7 +196,7 @@ else
196196

197197
build_rocksdb
198198

199-
make -j$(nproc) update-from-ci
199+
make -j$(nproc) init
200200

201201
make \
202202
-j$(nproc) \

0 commit comments

Comments
 (0)