Merge branch 'stable' into unstable

This commit is contained in:
Zahary Karadjov 2023-01-18 19:42:20 +02:00
commit d40da67eef
No known key found for this signature in database
GPG Key ID: C1F42EAFF38D570F
4 changed files with 29 additions and 42 deletions

View File

@ -268,40 +268,6 @@ jobs:
name: Windows_amd64_checksum name: Windows_amd64_checksum
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_validator_client.sha512sum path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_validator_client.sha512sum
retention-days: 2 retention-days: 2
build-macos-amd64:
name: macOS AMD64 release asset
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Build project
id: make_dist
run: |
make dist-macos
cd dist
ARCHIVE=$(echo nimbus-eth2_macOS_amd64_*.tar.gz)
echo "::set-output name=archive::"${ARCHIVE}
echo "::set-output name=archive_dir::"${ARCHIVE%.tar.gz}
tar -xzf ${ARCHIVE} ${ARCHIVE%.tar.gz}/build/nimbus_beacon_node.sha512sum
tar -xzf ${ARCHIVE} ${ARCHIVE%.tar.gz}/build/nimbus_validator_client.sha512sum
- name: Upload archive artefact
uses: actions/upload-artifact@v2
with:
name: macOS_amd64_archive
path: ./dist/${{ steps.make_dist.outputs.archive }}
retention-days: 2
- name: Upload BN checksum artefact
uses: actions/upload-artifact@v2
with:
name: macOS_amd64_checksum
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_beacon_node.sha512sum
retention-days: 2
- name: Upload VC checksum artefact
uses: actions/upload-artifact@v2
with:
name: macOS_amd64_checksum
path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_validator_client.sha512sum
retention-days: 2
build-macos-arm64: build-macos-arm64:
name: macOS ARM64 release asset name: macOS ARM64 release asset
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -338,7 +304,7 @@ jobs:
retention-days: 2 retention-days: 2
prepare-release: prepare-release:
name: Prepare release draft name: Prepare release draft
needs: [build-amd64, build-arm64, build-arm, build-win64, build-macos-amd64, build-macos-arm64] needs: [build-amd64, build-arm64, build-arm, build-win64, build-macos-arm64]
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Download artefacts - name: Download artefacts
@ -368,8 +334,6 @@ jobs:
cat Linux_arm_checksum/* >> release_notes.md cat Linux_arm_checksum/* >> release_notes.md
echo '# Windows AMD64' >> release_notes.md echo '# Windows AMD64' >> release_notes.md
cat Windows_amd64_checksum/* >> release_notes.md cat Windows_amd64_checksum/* >> release_notes.md
echo '# macOS AMD64' >> release_notes.md
cat macOS_amd64_checksum/* >> release_notes.md
echo '# macOS ARM64' >> release_notes.md echo '# macOS ARM64' >> release_notes.md
cat macOS_arm64_checksum/* >> release_notes.md cat macOS_arm64_checksum/* >> release_notes.md
echo '```' >> release_notes.md echo '```' >> release_notes.md
@ -390,7 +354,6 @@ jobs:
Linux_arm_archive/* Linux_arm_archive/*
Linux_arm_packages/* Linux_arm_packages/*
Windows_amd64_archive/* Windows_amd64_archive/*
macOS_amd64_archive/*
macOS_arm64_archive/* macOS_arm64_archive/*
- name: Delete artefacts - name: Delete artefacts
uses: geekyeggo/delete-artifact@v1 uses: geekyeggo/delete-artifact@v1
@ -408,8 +371,6 @@ jobs:
Linux_arm_packages Linux_arm_packages
Windows_amd64_archive Windows_amd64_archive
Windows_amd64_checksum Windows_amd64_checksum
macOS_amd64_archive
macOS_amd64_checksum
macOS_arm64_archive macOS_arm64_archive
macOS_arm64_checksum macOS_arm64_checksum
@ -419,7 +380,7 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }} username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }} password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build multi-arch Docker image - name: Build multi-arch Docker images
run: | run: |
REFNAME="${{ github.ref }}" REFNAME="${{ github.ref }}"
TAG="${REFNAME#refs/tags/}" TAG="${REFNAME#refs/tags/}"
@ -435,4 +396,15 @@ jobs:
--amend statusim/nimbus-eth2:arm64-latest \ --amend statusim/nimbus-eth2:arm64-latest \
--amend statusim/nimbus-eth2:arm-latest --amend statusim/nimbus-eth2:arm-latest
docker manifest push statusim/nimbus-eth2:multiarch-latest docker manifest push statusim/nimbus-eth2:multiarch-latest
docker manifest create \
statusim/nimbus-validator-client:multiarch-${TAG} \
--amend statusim/nimbus-validator-client:amd64-${TAG} \
--amend statusim/nimbus-validator-client:arm64-${TAG} \
--amend statusim/nimbus-validator-client:arm-${TAG}
docker manifest push statusim/nimbus-validator-client:multiarch-${TAG}
docker manifest create \
statusim/nimbus-validator-client:multiarch-latest \
--amend statusim/nimbus-validator-client:amd64-latest \
--amend statusim/nimbus-validator-client:arm64-latest \
--amend statusim/nimbus-validator-client:arm-latest
docker manifest push statusim/nimbus-validator-client:multiarch-latest

View File

@ -11,5 +11,10 @@ USER user
STOPSIGNAL SIGINT STOPSIGNAL SIGINT
COPY "nimbus-eth2/build/nimbus_beacon_node" "/home/user/nimbus_beacon_node" COPY "nimbus-eth2/build/nimbus_beacon_node" "/home/user/nimbus_beacon_node"
RUN mkdir -p /home/user/nimbus-eth2/build && \
ln -s /home/user/nimbus_beacon_node /home/user/nimbus-eth2/build/nimbus_beacon_node && \
chown -R user:user /home/user/nimbus-eth2/build
WORKDIR "/home/user/" WORKDIR "/home/user/"
ENTRYPOINT ["/home/user/nimbus_beacon_node"] ENTRYPOINT ["/home/user/nimbus_beacon_node"]

View File

@ -15,5 +15,10 @@ USER user
STOPSIGNAL SIGINT STOPSIGNAL SIGINT
COPY "nimbus-eth2/build/nimbus_beacon_node" "/home/user/nimbus_beacon_node" COPY "nimbus-eth2/build/nimbus_beacon_node" "/home/user/nimbus_beacon_node"
RUN mkdir -p /home/user/nimbus-eth2/build && \
ln -s /home/user/nimbus_beacon_node /home/user/nimbus-eth2/build/nimbus_beacon_node && \
chown -R user:user /home/user/nimbus-eth2/build
WORKDIR "/home/user/" WORKDIR "/home/user/"
ENTRYPOINT ["/home/user/nimbus_beacon_node"] ENTRYPOINT ["/home/user/nimbus_beacon_node"]

View File

@ -15,5 +15,10 @@ USER user
STOPSIGNAL SIGINT STOPSIGNAL SIGINT
COPY "nimbus-eth2/build/nimbus_beacon_node" "/home/user/nimbus_beacon_node" COPY "nimbus-eth2/build/nimbus_beacon_node" "/home/user/nimbus_beacon_node"
RUN mkdir -p /home/user/nimbus-eth2/build && \
ln -s /home/user/nimbus_beacon_node /home/user/nimbus-eth2/build/nimbus_beacon_node && \
chown -R user:user /home/user/nimbus-eth2/build
WORKDIR "/home/user/" WORKDIR "/home/user/"
ENTRYPOINT ["/home/user/nimbus_beacon_node"] ENTRYPOINT ["/home/user/nimbus_beacon_node"]