gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-07 00:42:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-enable ARM builds

Browse Source
This commit is contained in:
Michael Sproul
2023-10-11 14:37:46 +11:00
parent dfa3b4325a
commit b77de6958a
4 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/docker.yml vendored
View File

@@ -60,8 +60,9 @@ jobs:
runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "release"]') || 'ubuntu-22.04' }} runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "release"]') || 'ubuntu-22.04' }}
strategy: strategy:
matrix: matrix:
# FIXME(sproul) re-enable ARM builds binary: [aarch64,
binary: [x86_64, aarch64-portable,
x86_64,
x86_64-portable] x86_64-portable]
features: [ features: [
{version_suffix: "", env: "gnosis,slasher-lmdb,slasher-mdbx,jemalloc"}, {version_suffix: "", env: "gnosis,slasher-lmdb,slasher-mdbx,jemalloc"},
@@ -141,10 +142,9 @@ jobs:
echo "${DOCKER_PASSWORD}" | docker login --username ${DOCKER_USERNAME} --password-stdin echo "${DOCKER_PASSWORD}" | docker login --username ${DOCKER_USERNAME} --password-stdin
- name: Create and push multiarch manifest - name: Create and push multiarch manifest
# FIXME(sproul): Fix ARM builds and put this back
# ${IMAGE_NAME}:${VERSION}-arm64${VERSION_SUFFIX}${{ matrix.modernity }} \
run: | run: |
docker buildx imagetools create -t ${IMAGE_NAME}:${VERSION}${VERSION_SUFFIX}${{ matrix.modernity }} \ docker buildx imagetools create -t ${IMAGE_NAME}:${VERSION}${VERSION_SUFFIX}${{ matrix.modernity }} \
${IMAGE_NAME}:${VERSION}-arm64${VERSION_SUFFIX}${{ matrix.modernity }} \
${IMAGE_NAME}:${VERSION}-amd64${VERSION_SUFFIX}${{ matrix.modernity }}; ${IMAGE_NAME}:${VERSION}-amd64${VERSION_SUFFIX}${{ matrix.modernity }};
build-docker-lcli: build-docker-lcli:

11
.github/workflows/release.yml vendored
View File

@@ -29,15 +29,22 @@ jobs:
build: build:
name: Build Release name: Build Release
strategy: strategy:
# FIXME(sproul): fix xdelta build for ARM
matrix: matrix:
arch: [x86_64-unknown-linux-gnu, arch: [aarch64-unknown-linux-gnu,
aarch64-unknown-linux-gnu-portable,
x86_64-unknown-linux-gnu,
x86_64-unknown-linux-gnu-portable, x86_64-unknown-linux-gnu-portable,
x86_64-apple-darwin, x86_64-apple-darwin,
x86_64-apple-darwin-portable, x86_64-apple-darwin-portable,
x86_64-windows, x86_64-windows,
x86_64-windows-portable] x86_64-windows-portable]
include: include:
- arch: aarch64-unknown-linux-gnu
runner: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "release", "large"]') || 'ubuntu-latest' }}
profile: maxperf
- arch: aarch64-unknown-linux-gnu-portable
runner: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "release", "large"]') || 'ubuntu-latest' }}
profile: maxperf
- arch: x86_64-unknown-linux-gnu - arch: x86_64-unknown-linux-gnu
runner: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "release", "large"]') || 'ubuntu-latest' }} runner: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "release", "large"]') || 'ubuntu-latest' }}
profile: maxperf profile: maxperf

2
Cargo.lock generated
View File

@@ -9306,7 +9306,7 @@ dependencies = [
[[package]] [[package]]
name = "xdelta3" name = "xdelta3"
version = "0.1.5" version = "0.1.5"
source = "git+http://github.com/michaelsproul/xdelta3-rs?rev=cb3be8d445c0ed2adf815c62b14c197ca19bd94a#cb3be8d445c0ed2adf815c62b14c197ca19bd94a" source = "git+http://github.com/michaelsproul/xdelta3-rs?rev=d12f71b36a55b5ca0247a38151fb7c2be5c0e742#d12f71b36a55b5ca0247a38151fb7c2be5c0e742"
dependencies = [ dependencies = [
"bindgen 0.66.1", "bindgen 0.66.1",
"cc", "cc",

3
Cargo.toml
View File

@@ -168,8 +168,7 @@ url = "2"
uuid = { version = "0.8", features = ["serde", "v4"] } uuid = { version = "0.8", features = ["serde", "v4"] }
# TODO update to warp 0.3.6 after released. # TODO update to warp 0.3.6 after released.
warp = { git = "https://github.com/seanmonstar/warp.git", default-features = false, features = ["tls"] } warp = { git = "https://github.com/seanmonstar/warp.git", default-features = false, features = ["tls"] }
# FIXME(sproul): restore upstream xdelta3 = { git = "http://github.com/michaelsproul/xdelta3-rs", rev="d12f71b36a55b5ca0247a38151fb7c2be5c0e742" }
xdelta3 = { git = "http://github.com/michaelsproul/xdelta3-rs", rev="cb3be8d445c0ed2adf815c62b14c197ca19bd94a" }
zeroize = { version = "1", features = ["zeroize_derive"] } zeroize = { version = "1", features = ["zeroize_derive"] }
zip = "0.6" zip = "0.6"
zstd = "0.11.2" zstd = "0.11.2"