From a885e8370a7c5b77381aae11e5761fef9cf5a08c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Tue, 15 Jul 2025 02:26:28 +0200 Subject: [PATCH] ci: partial revert of f3f2a56859f96cee6f9bc8e8fe14b99ec653abaf While I experiment with ways to cut down run times, run on master only. --- .github/workflows/ci.yaml | 9 ---- ci/riscv64-linux-releasesafe.sh | 76 --------------------------------- 2 files changed, 85 deletions(-) delete mode 100755 ci/riscv64-linux-releasesafe.sh diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 86887ea016..5e6cec1c28 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -68,15 +68,6 @@ jobs: uses: actions/checkout@v4 - name: Build and Test run: sh ci/riscv64-linux-release.sh - riscv64-linux-releasesafe: - if: ${{ github.event_name == 'pull_request' }} - timeout-minutes: 900 - runs-on: [self-hosted, Linux, riscv64] - steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Build and Test - run: sh ci/riscv64-linux-releasesafe.sh x86_64-macos-release: runs-on: "macos-13" env: diff --git a/ci/riscv64-linux-releasesafe.sh b/ci/riscv64-linux-releasesafe.sh deleted file mode 100755 index 0a2f37c354..0000000000 --- a/ci/riscv64-linux-releasesafe.sh +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh - -# Requires cmake ninja-build - -set -x -set -e - -ARCH="$(uname -m)" -TARGET="$ARCH-linux-musl" -MCPU="spacemit_x60" -CACHE_BASENAME="zig+llvm+lld+clang-riscv64-linux-musl-0.15.0-dev.929+31e46be74" -PREFIX="$HOME/deps/$CACHE_BASENAME" -ZIG="$PREFIX/bin/zig" - -export PATH="$HOME/local/bin:$PATH" - -# Make the `zig version` number consistent. -# This will affect the cmake command below. -git fetch --unshallow || true -git fetch --tags - -# Override the cache directories because they won't actually help other CI runs -# which will be testing alternate versions of zig, and ultimately would just -# fill up space on the hard drive for no reason. -export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache" -export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache" - -mkdir build-releasesafe -cd build-releasesafe - -export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" -export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" - -cmake .. \ - -DCMAKE_INSTALL_PREFIX="stage3-releasesafe" \ - -DCMAKE_PREFIX_PATH="$PREFIX" \ - -DCMAKE_BUILD_TYPE=Release \ - -DZIG_RELEASE_SAFE=ON \ - -DZIG_TARGET_TRIPLE="$TARGET" \ - -DZIG_TARGET_MCPU="$MCPU" \ - -DZIG_STATIC=ON \ - -DZIG_NO_LIB=ON \ - -GNinja - -# Now cmake will use zig as the C/C++ compiler. We reset the environment variables -# so that installation and testing do not get affected by them. -unset CC -unset CXX - -ninja install - -# No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts. -stage3-releasesafe/bin/zig build test docs \ - --maxrss 34359738368 \ - -Dstatic-llvm \ - -Dskip-non-native \ - -Dtarget=native-native-musl \ - --search-prefix "$PREFIX" \ - --zig-lib-dir "$PWD/../lib" - -# Ensure that stage3 and stage4 are byte-for-byte identical. -stage3-releasesafe/bin/zig build \ - --prefix stage4-releasesafe \ - -Denable-llvm \ - -Dno-lib \ - -Doptimize=ReleaseSafe \ - -Dstrip \ - -Dtarget=$TARGET \ - -Dcpu=$MCPU \ - -Duse-zig-libcxx \ - -Dversion-string="$(stage3-releasesafe/bin/zig version)" - -# diff returns an error code if the files differ. -echo "If the following command fails, it means nondeterminism has been" -echo "introduced, making stage3 and stage4 no longer byte-for-byte identical." -diff stage3-releasesafe/bin/zig stage4-releasesafe/bin/zig