2 Commits

Author SHA1 Message Date
Mason Rowe
873f780055 fix malformed json for null gb scores (#127) 2026-05-11 23:40:22 -04:00
Mason Rowe
ba162efb87 update geekbench v6.5.0 -> v6.7.1 2026-04-29 00:39:10 -04:00
2 changed files with 13 additions and 8 deletions

View File

@@ -10,6 +10,9 @@ jobs:
latest-version: ${{ steps.get-version.outputs.version }} latest-version: ${{ steps.get-version.outputs.version }}
should-build: ${{ steps.check-version.outputs.should-build }} should-build: ${{ steps.check-version.outputs.should-build }}
steps: steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Get latest fio release - name: Get latest fio release
id: get-version id: get-version
run: | run: |
@@ -55,6 +58,9 @@ jobs:
host: arm-linux-gnueabihf host: arm-linux-gnueabihf
steps: steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v3
@@ -101,10 +107,9 @@ jobs:
cd ~ cd ~
curl -L -4 --retry 5 --retry-delay 2 --connect-timeout 15 "https://github.com/axboe/fio/archive/\$VERSION.tar.gz" -o "fio.tar.gz" curl -L -4 --retry 5 --retry-delay 2 --connect-timeout 15 "https://github.com/axboe/fio/archive/\$VERSION.tar.gz" -o "fio.tar.gz"
tar xf fio.tar.gz tar xf fio.tar.gz
cd fio* cd fio-\${VERSION#fio-}*
CFLAGS+=' -include linux/falloc.h'
CC=/root/\$CROSS-cross/bin/\$CROSS-gcc ./configure --disable-native --build-static CC=/root/\$CROSS-cross/bin/\$CROSS-gcc ./configure --disable-native --build-static
make EXTLIBS+=' -latomic' make
# verify no external shared library links # verify no external shared library links
libcheck fio libcheck fio

10
yabs.sh
View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Yet Another Bench Script by Mason Rowe # Yet Another Bench Script by Mason Rowe
# Initial Oct 2019; Last update Apr 2025 # Initial Oct 2019; Last update May 2026
# Disclaimer: This project is a work in progress. Any errors or suggestions should be # Disclaimer: This project is a work in progress. Any errors or suggestions should be
# relayed to me via the GitHub project page linked below. # relayed to me via the GitHub project page linked below.
@@ -12,7 +12,7 @@
# performance via fio. The script is designed to not require any dependencies # performance via fio. The script is designed to not require any dependencies
# - either compiled or installed - nor admin privileges to run. # - either compiled or installed - nor admin privileges to run.
YABS_VERSION="v2025-04-20" YABS_VERSION="v2026-05-11"
echo -e '# ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## #' echo -e '# ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## #'
echo -e '# Yet-Another-Bench-Script #' echo -e '# Yet-Another-Bench-Script #'
@@ -972,8 +972,8 @@ function launch_geekbench {
|| GB_URL="https://cdn.geekbench.com/Geekbench-5.5.1-Linux.tar.gz" || GB_URL="https://cdn.geekbench.com/Geekbench-5.5.1-Linux.tar.gz"
GB_CMD="geekbench5" GB_CMD="geekbench5"
else # Geekbench v6 else # Geekbench v6
[[ $ARCH = *aarch64* || $ARCH = *arm* ]] && GB_URL="https://cdn.geekbench.com/Geekbench-6.5.0-LinuxARMPreview.tar.gz" \ [[ $ARCH = *aarch64* || $ARCH = *arm* ]] && GB_URL="https://cdn.geekbench.com/Geekbench-6.7.1-LinuxARMPreview.tar.gz" \
|| GB_URL="https://cdn.geekbench.com/Geekbench-6.5.0-Linux.tar.gz" || GB_URL="https://cdn.geekbench.com/Geekbench-6.7.1-Linux.tar.gz"
GB_CMD="geekbench6" GB_CMD="geekbench6"
fi fi
GB_RUN="True" GB_RUN="True"
@@ -1037,7 +1037,7 @@ function launch_geekbench {
printf "%-15s | %-30s\n" "Full Test" "$GEEKBENCH_URL" printf "%-15s | %-30s\n" "Full Test" "$GEEKBENCH_URL"
if [[ -n $JSON ]]; then if [[ -n $JSON ]]; then
JSON_RESULT+='{"version":'$VERSION',"single":'$GEEKBENCH_SCORES_SINGLE',"multi":'$GEEKBENCH_SCORES_MULTI JSON_RESULT+='{"version":'$VERSION',"single":'${GEEKBENCH_SCORES_SINGLE:-null}',"multi":'${GEEKBENCH_SCORES_MULTI:-null}
JSON_RESULT+=',"url":"'$GEEKBENCH_URL'"},' JSON_RESULT+=',"url":"'$GEEKBENCH_URL'"},'
fi fi