From 2f6b4de3e90a71faa8b684561d190b0fd9bbff58 Mon Sep 17 00:00:00 2001 From: jangko Date: Thu, 23 Feb 2023 17:03:50 +0700 Subject: [PATCH] ci: fix nightly build --- .github/workflows/nightly_build.yml | 46 ++++++++++++++--------------- docker/dist/entry_point.sh | 12 ++++++++ scripts/make_dist.sh | 1 - 3 files changed, 35 insertions(+), 24 deletions(-) diff --git a/.github/workflows/nightly_build.yml b/.github/workflows/nightly_build.yml index 24e7c79e4..f47613aab 100644 --- a/.github/workflows/nightly_build.yml +++ b/.github/workflows/nightly_build.yml @@ -10,9 +10,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: - ref: master + ref: ${{ github.ref }} - name: Build project id: make_dist @@ -28,14 +28,14 @@ jobs: echo "::set-output name=archive_dir::"${NEW_ARCHIVE_DIR} - name: Upload archive artefact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: Linux_amd64_archive path: ./dist/${{ steps.make_dist.outputs.archive }} retention-days: 2 - name: Upload checksum artefact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: Linux_amd64_checksum path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus.sha512sum @@ -54,9 +54,9 @@ jobs: sudo apt-get -qq -y install binfmt-support qemu-user-static - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: - ref: master + ref: ${{ github.ref }} - name: Build project id: make_dist @@ -72,14 +72,14 @@ jobs: echo "::set-output name=archive_dir::"${NEW_ARCHIVE_DIR} - name: Upload archive artefact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: Linux_arm64_archive path: ./dist/${{ steps.make_dist.outputs.archive }} retention-days: 2 - name: Upload checksum artefact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: Linux_arm64_checksum path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus.sha512sum @@ -90,9 +90,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: - ref: master + ref: ${{ github.ref }} - name: Build project id: make_dist @@ -108,14 +108,14 @@ jobs: echo "::set-output name=archive_dir::"${NEW_ARCHIVE_DIR} - name: Upload archive artefact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: Windows_amd64_archive path: ./dist/${{ steps.make_dist.outputs.archive }} retention-days: 2 - name: Upload checksum artefact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: Windows_amd64_checksum path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus.sha512sum @@ -126,9 +126,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: - ref: master + ref: ${{ github.ref }} - name: Build project id: make_dist @@ -144,14 +144,14 @@ jobs: echo "::set-output name=archive_dir::"${NEW_ARCHIVE_DIR} - name: Upload archive artefact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: macOS_amd64_archive path: ./dist/${{ steps.make_dist.outputs.archive }} retention-days: 2 - name: Upload checksum artefact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: macOS_amd64_checksum path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus.sha512sum @@ -162,9 +162,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: - ref: master + ref: ${{ github.ref }} - name: Build project id: make_dist @@ -180,14 +180,14 @@ jobs: echo "::set-output name=archive_dir::"${NEW_ARCHIVE_DIR} - name: Upload archive artefact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: macOS_arm64_archive path: ./dist/${{ steps.make_dist.outputs.archive }} retention-days: 2 - name: Upload checksum artefact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: macOS_arm64_checksum path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus.sha512sum @@ -199,12 +199,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: - ref: master + ref: ${{ github.ref }} - name: Download artefacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 - name: Create release notes run: | diff --git a/docker/dist/entry_point.sh b/docker/dist/entry_point.sh index e3fce3c98..e5fc63c3e 100755 --- a/docker/dist/entry_point.sh +++ b/docker/dist/entry_point.sh @@ -85,6 +85,8 @@ if [[ "${PLATFORM}" == "Windows_amd64" ]]; then build_rocksdb TARGET_OS=MINGW CXX="${CXX}" + make -j$(nproc) update + make \ -j$(nproc) \ USE_LIBBACKTRACE=0 \ @@ -131,6 +133,8 @@ elif [[ "${PLATFORM}" == "Linux_arm32v7" ]]; then build_rocksdb TARGET_ARCHITECTURE=arm CXX="${CXX}" + make -j$(nproc) update + env CFLAGS="" make \ -j$(nproc) \ USE_LIBBACKTRACE=0 \ @@ -150,6 +154,8 @@ elif [[ "${PLATFORM}" == "Linux_arm64v8" ]]; then build_rocksdb TARGET_ARCHITECTURE=arm64 CXX="${CXX}" + make -j$(nproc) update + make \ -j$(nproc) \ USE_LIBBACKTRACE=0 \ @@ -177,6 +183,8 @@ elif [[ "${PLATFORM}" == "macOS_amd64" ]]; then build_rocksdb TARGET_OS=Darwin CXX="${CXX}" AR="${AR}" + make -j$(nproc) update + make \ -j$(nproc) \ USE_LIBBACKTRACE=0 \ @@ -217,6 +225,8 @@ elif [[ "${PLATFORM}" == "macOS_arm64" ]]; then build_rocksdb TARGET_OS=Darwin TARGET_ARCHITECTURE=arm64 CXX="${CXX}" AR="${AR}" + make -j$(nproc) update + make \ -j$(nproc) \ USE_LIBBACKTRACE=0 \ @@ -249,6 +259,8 @@ else build_rocksdb + make -j$(nproc) update + make \ -j$(nproc) \ LOG_LEVEL="TRACE" \ diff --git a/scripts/make_dist.sh b/scripts/make_dist.sh index 634cb76ab..52f402c50 100755 --- a/scripts/make_dist.sh +++ b/scripts/make_dist.sh @@ -39,4 +39,3 @@ ls -l dist # We rebuild everything inside the container, so we need to clean up afterwards. ${MAKE} --no-print-directory clean -