Skip to content

Commit e5a5731

Browse files
committed
Fix the cross-compilation for macOS and re-enable its packaging
1 parent e6a6019 commit e5a5731

File tree

2 files changed

+41
-2
lines changed

2 files changed

+41
-2
lines changed

.github/workflows/release.yml

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,40 @@ jobs:
268268
name: Windows_amd64_checksum
269269
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_validator_client.sha512sum
270270
retention-days: 2
271+
build-macos-amd64:
272+
name: macOS AMD64 release asset
273+
runs-on: ubuntu-latest
274+
steps:
275+
- name: Checkout code
276+
uses: actions/checkout@v2
277+
- name: Build project
278+
id: make_dist
279+
run: |
280+
make dist-macos
281+
cd dist
282+
ARCHIVE=$(echo nimbus-eth2_macOS_amd64_*.tar.gz)
283+
echo "::set-output name=archive::"${ARCHIVE}
284+
echo "::set-output name=archive_dir::"${ARCHIVE%.tar.gz}
285+
tar -xzf ${ARCHIVE} ${ARCHIVE%.tar.gz}/build/nimbus_beacon_node.sha512sum
286+
tar -xzf ${ARCHIVE} ${ARCHIVE%.tar.gz}/build/nimbus_validator_client.sha512sum
287+
- name: Upload archive artefact
288+
uses: actions/upload-artifact@v2
289+
with:
290+
name: macOS_amd64_archive
291+
path: ./dist/${{ steps.make_dist.outputs.archive }}
292+
retention-days: 2
293+
- name: Upload BN checksum artefact
294+
uses: actions/upload-artifact@v2
295+
with:
296+
name: macOS_amd64_checksum
297+
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_beacon_node.sha512sum
298+
retention-days: 2
299+
- name: Upload VC checksum artefact
300+
uses: actions/upload-artifact@v2
301+
with:
302+
name: macOS_amd64_checksum
303+
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_validator_client.sha512sum
304+
retention-days: 2
271305
build-macos-arm64:
272306
name: macOS ARM64 release asset
273307
runs-on: ubuntu-latest
@@ -304,7 +338,7 @@ jobs:
304338
retention-days: 2
305339
prepare-release:
306340
name: Prepare release draft
307-
needs: [build-amd64, build-arm64, build-arm, build-win64, build-macos-arm64]
341+
needs: [build-amd64, build-arm64, build-arm, build-win64, build-macos-amd64, build-macos-arm64]
308342
runs-on: ubuntu-latest
309343
steps:
310344
- name: Download artefacts
@@ -334,6 +368,8 @@ jobs:
334368
cat Linux_arm_checksum/* >> release_notes.md
335369
echo '# Windows AMD64' >> release_notes.md
336370
cat Windows_amd64_checksum/* >> release_notes.md
371+
echo '# macOS AMD64' >> release_notes.md
372+
cat macOS_amd64_checksum/* >> release_notes.md
337373
echo '# macOS ARM64' >> release_notes.md
338374
cat macOS_arm64_checksum/* >> release_notes.md
339375
echo '```' >> release_notes.md
@@ -354,6 +390,7 @@ jobs:
354390
Linux_arm_archive/*
355391
Linux_arm_packages/*
356392
Windows_amd64_archive/*
393+
macOS_amd64_archive/*
357394
macOS_arm64_archive/*
358395
- name: Delete artefacts
359396
uses: geekyeggo/delete-artifact@v1
@@ -371,6 +408,8 @@ jobs:
371408
Linux_arm_packages
372409
Windows_amd64_archive
373410
Windows_amd64_checksum
411+
macOS_amd64_archive
412+
macOS_amd64_checksum
374413
macOS_arm64_archive
375414
macOS_arm64_checksum
376415

vendor/nim-nat-traversal

0 commit comments

Comments
 (0)