Skip to content

Commit 20cd0c9

Browse files
tersectersec
authored
rm useless windeps.dll downloading; make syncer batch size --debug (#3328)
* rm useless windeps.dll downloading; make syncer batch size --debug * add arm64 platform detection The reasons for removing windeps.zip downloading are primarily twofold: it's a useless/unused network fetch which could fail; and given that, that it contains an EOL OpenSSL 1.1 DLL makes it potential attack surface to leave in the CI path. There's no point (at least initially for sure, but probably ever) in supporting x86 macOS. It's rapidly fading. If nothing else, the defaults should be switched to ARM macOS, and if x86 really needs to be re-added, that can be looked at later. But right now the CI should be focusing on testing ARM. --persist-batch-size looks very much like a debugging option we probably won't want to ship/document as an end-user supported command-line flag, so signal that appropriately. As with x86 macOS, this can be reviewed later, but as we approach an initial alpha release, it's better to err on the side of not having command-line options which are/were largely debugging artifacts enshrined in the supported set.
1 parent 13c6924 commit 20cd0c9

File tree

6 files changed

+11
-88
lines changed

6 files changed

+11
-88
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,6 @@ jobs:
106106
[[ -z "$ncpu" || $ncpu -le 0 ]] && ncpu=1
107107
echo "ncpu=${ncpu}" >> $GITHUB_ENV
108108
109-
if [[ '${{ matrix.target.evmc }}' == 'evmc' ]]; then
110-
echo "ENABLE_EVMC=1" >> $GITHUB_ENV
111-
else
112-
echo "ENABLE_EVMC=0" >> $GITHUB_ENV
113-
fi
114-
115109
- name: Install build dependencies (Macos)
116110
# Some home brew modules were reported missing
117111
if: runner.os == 'Macos'
@@ -127,16 +121,6 @@ jobs:
127121
path: external/mingw-${{ matrix.target.cpu }}
128122
key: 'mingw-llvm-17-${{ matrix.target.cpu }}'
129123

130-
- name: Restore Nim DLLs dependencies (Windows) from cache
131-
if: runner.os == 'Windows'
132-
id: windows-dlls-cache
133-
uses: actions/cache@v4
134-
with:
135-
path: external/dlls-${{ matrix.target.cpu }}
136-
# according to docu, idle caches are kept for up to 7 days
137-
# so change dlls# to force new cache contents (for some number #)
138-
key: dlls1-${{ matrix.target.cpu }}
139-
140124
- name: Install llvm-mingw dependency (Windows)
141125
if: >
142126
steps.windows-mingw-cache.outputs.cache-hit != 'true' &&
@@ -155,22 +139,11 @@ jobs:
155139
7z x -y "external/mingw-${{ matrix.target.cpu }}.zip" -oexternal/mingw-${{ matrix.target.cpu }}/
156140
mv external/mingw-${{ matrix.target.cpu }}/**/* ./external/mingw-${{ matrix.target.cpu }}
157141
158-
- name: Install DLLs dependencies (Windows)
159-
if: >
160-
steps.windows-dlls-cache.outputs.cache-hit != 'true' &&
161-
runner.os == 'Windows'
162-
run: |
163-
DLLPATH=external/dlls-${{ matrix.target.cpu }}
164-
mkdir -p external
165-
curl -L "https://nim-lang.org/download/windeps.zip" -o external/windeps.zip
166-
7z x -y external/windeps.zip -o"$DLLPATH"
167-
168142
- name: Path to cached dependencies (Windows)
169143
if: >
170144
runner.os == 'Windows'
171145
run: |
172146
echo '${{ github.workspace }}'"/external/mingw-${{ matrix.target.cpu }}/bin" >> $GITHUB_PATH
173-
echo '${{ github.workspace }}'"/external/dlls-${{ matrix.target.cpu }}" >> $GITHUB_PATH
174147
175148
- name: Get latest nimbus-build-system commit hash
176149
id: versions

‎.github/workflows/nimbus_verified_proxy.yml‎

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
# - os: linux
4545
# cpu: i386
4646
- os: macos
47-
cpu: amd64
47+
cpu: arm64
4848
- os: windows
4949
cpu: amd64
5050
include:
@@ -72,6 +72,8 @@ jobs:
7272
run: |
7373
if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then
7474
PLATFORM=x64
75+
elif [[ '${{ matrix.target.cpu }}' == 'arm64' ]]; then
76+
PLATFORM=arm64
7577
else
7678
PLATFORM=x86
7779
fi
@@ -133,14 +135,6 @@ jobs:
133135
path: external/mingw-${{ matrix.target.cpu }}
134136
key: 'mingw-llvm-17-${{ matrix.target.cpu }}'
135137

136-
- name: Restore Nim DLLs dependencies (Windows) from cache
137-
if: runner.os == 'Windows'
138-
id: windows-dlls-cache
139-
uses: actions/cache@v4
140-
with:
141-
path: external/dlls-${{ matrix.target.cpu }}
142-
key: 'dlls-${{ matrix.target.cpu }}-verified-proxy'
143-
144138
- name: Install llvm-mingw dependency (Windows)
145139
if: >
146140
steps.windows-mingw-cache.outputs.cache-hit != 'true' &&
@@ -159,22 +153,11 @@ jobs:
159153
7z x -y "external/mingw-${{ matrix.target.cpu }}.zip" -oexternal/mingw-${{ matrix.target.cpu }}/
160154
mv external/mingw-${{ matrix.target.cpu }}/**/* ./external/mingw-${{ matrix.target.cpu }}
161155
162-
- name: Install DLLs dependencies (Windows)
163-
if: >
164-
steps.windows-dlls-cache.outputs.cache-hit != 'true' &&
165-
runner.os == 'Windows'
166-
run: |
167-
DLLPATH=external/dlls-${{ matrix.target.cpu }}
168-
mkdir -p external
169-
curl -L "https://nim-lang.org/download/windeps.zip" -o external/windeps.zip
170-
7z x -y external/windeps.zip -o"$DLLPATH"
171-
172156
- name: Path to cached dependencies (Windows)
173157
if: >
174158
runner.os == 'Windows'
175159
run: |
176160
echo '${{ github.workspace }}'"/external/mingw-${{ matrix.target.cpu }}/bin" >> $GITHUB_PATH
177-
echo '${{ github.workspace }}'"/external/dlls-${{ matrix.target.cpu }}" >> $GITHUB_PATH
178161
179162
- name: Get latest nimbus-build-system commit hash
180163
id: versions

‎.github/workflows/portal.yml‎

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ jobs:
113113
- os: linux
114114
cpu: amd64
115115
- os: macos
116-
cpu: amd64
116+
cpu: arm64
117117
- os: windows
118118
cpu: amd64
119119
include:
@@ -141,6 +141,8 @@ jobs:
141141
run: |
142142
if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then
143143
PLATFORM=x64
144+
elif [[ '${{ matrix.target.cpu }}' == 'arm64' ]]; then
145+
PLATFORM=arm64
144146
else
145147
PLATFORM=x86
146148
fi
@@ -201,14 +203,6 @@ jobs:
201203
path: external/mingw-${{ matrix.target.cpu }}
202204
key: 'mingw-llvm-17-${{ matrix.target.cpu }}'
203205

204-
- name: Restore Nim DLLs dependencies (Windows) from cache
205-
if: runner.os == 'Windows'
206-
id: windows-dlls-cache
207-
uses: actions/cache@v4
208-
with:
209-
path: external/dlls-${{ matrix.target.cpu }}
210-
key: 'dlls-${{ matrix.target.cpu }}-portal'
211-
212206
- name: Install llvm-mingw dependency (Windows)
213207
if: >
214208
steps.windows-mingw-cache.outputs.cache-hit != 'true' &&
@@ -227,22 +221,11 @@ jobs:
227221
7z x -y "external/mingw-${{ matrix.target.cpu }}.zip" -oexternal/mingw-${{ matrix.target.cpu }}/
228222
mv external/mingw-${{ matrix.target.cpu }}/**/* ./external/mingw-${{ matrix.target.cpu }}
229223
230-
- name: Install DLLs dependencies (Windows)
231-
if: >
232-
steps.windows-dlls-cache.outputs.cache-hit != 'true' &&
233-
runner.os == 'Windows'
234-
run: |
235-
DLLPATH=external/dlls-${{ matrix.target.cpu }}
236-
mkdir -p external
237-
curl -L "https://nim-lang.org/download/windeps.zip" -o external/windeps.zip
238-
7z x -y external/windeps.zip -o"$DLLPATH"
239-
240224
- name: Path to cached dependencies (Windows)
241225
if: >
242226
runner.os == 'Windows'
243227
run: |
244228
echo '${{ github.workspace }}'"/external/mingw-${{ matrix.target.cpu }}/bin" >> $GITHUB_PATH
245-
echo '${{ github.workspace }}'"/external/dlls-${{ matrix.target.cpu }}" >> $GITHUB_PATH
246229
247230
- name: Get latest nimbus-build-system commit hash
248231
id: versions

‎.github/workflows/simulators.yml‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Nimbus
2-
# Copyright (c) 2021-2024 Status Research & Development GmbH
2+
# Copyright (c) 2021-2025 Status Research & Development GmbH
33
# Licensed under either of
44
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
55
# http://www.apache.org/licenses/LICENSE-2.0)
@@ -109,23 +109,6 @@ jobs:
109109
- name: Checkout code
110110
uses: actions/checkout@v4
111111

112-
- name: Restore Nim DLLs dependencies from cache
113-
id: windows-dlls-cache
114-
uses: actions/cache@v4
115-
with:
116-
path: external/dlls
117-
# according to docu, idle caches are kept for up to 7 days
118-
# so change dlls# to force new cache contents (for some number #)
119-
key: dlls1
120-
121-
- name: Install DLLs dependencies
122-
if: steps.windows-dlls-cache.outputs.cache-hit != 'true'
123-
run: |
124-
DLLPATH=external/dlls
125-
mkdir -p external
126-
curl -L "https://nim-lang.org/download/windeps.zip" -o external/windeps.zip
127-
7z x -y external/windeps.zip -o"$DLLPATH"
128-
129112
- name: Restore llvm-mingw from cache
130113
id: windows-mingw-cache
131114
uses: actions/cache@v4
@@ -146,7 +129,6 @@ jobs:
146129
- name: Path to cached dependencies
147130
run: |
148131
echo '${{ github.workspace }}'"/external/mingw-amd64/bin" >> $GITHUB_PATH
149-
echo '${{ github.workspace }}'"/external/dlls" >> $GITHUB_PATH
150132
151133
- name: Get latest nimbus-build-system commit hash
152134
id: versions

‎config.nims‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,8 @@ if canEnableDebuggingSymbols:
164164

165165
--define:nimOldCaseObjects # https://github.com/status-im/nim-confutils/issues/9
166166

167+
switch("warningAsError", "BareExcept:on")
168+
167169
# `switch("warning[CaseTransition]", "off")` fails with "Error: invalid command line option: '--warning[CaseTransition]'"
168170
switch("warning", "CaseTransition:off")
169171

‎execution_chain/config.nim‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,9 +340,9 @@ type
340340
name: "num-threads" .}: int
341341

342342
persistBatchSize* {.
343-
desc: ""
343+
hidden
344344
defaultValue: 32'u64
345-
name: "persist-batch-size" .}: uint64
345+
name: "debug-persist-batch-size" .}: uint64
346346

347347
beaconSyncTargetFile* {.
348348
hidden

0 commit comments

Comments
 (0)