Skip to content

Commit c6cffa0

Browse files
fix(release): stabilize CI deps, aarch64 toolchain, and utils spdlog fallback (#209)
1 parent 3b79b9e commit c6cffa0

File tree

2 files changed

+4
-16
lines changed

2 files changed

+4
-16
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,11 @@ jobs:
7979
shell: bash
8080
run: |
8181
set -euxo pipefail
82-
sudo apt-get update
83-
sudo apt-get install -y \
84-
gcc-aarch64-linux-gnu g++-aarch64-linux-gnu \
85-
pkg-config cmake ninja-build
8682
87-
# Cross sysroot libs (only needed if your build links system libs)
88-
sudo dpkg --add-architecture arm64
83+
# Retry apt (exit 100 is often transient)
8984
sudo apt-get update
90-
sudo apt-get install -y \
91-
libssl-dev:arm64 zlib1g-dev:arm64 libsqlite3-dev:arm64
85+
sudo apt-get install -y --no-install-recommends gcc-aarch64-linux-gnu g++-aarch64-linux-gnu || \
86+
(sleep 5 && sudo apt-get update && sudo apt-get install -y --no-install-recommends gcc-aarch64-linux-gnu g++-aarch64-linux-gnu)
9287
9388
cat > toolchain-aarch64.cmake <<'EOF'
9489
set(CMAKE_SYSTEM_NAME Linux)
@@ -98,17 +93,10 @@ jobs:
9893
set(CMAKE_CXX_COMPILER aarch64-linux-gnu-g++)
9994
10095
set(CMAKE_FIND_ROOT_PATH /usr/aarch64-linux-gnu)
101-
10296
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
10397
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
10498
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
10599
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
106-
107-
# Help pkg-config during cross configure
108-
set(ENV{PKG_CONFIG_ALLOW_SYSTEM_CFLAGS} "1")
109-
set(ENV{PKG_CONFIG_ALLOW_SYSTEM_LIBS} "1")
110-
set(ENV{PKG_CONFIG_LIBDIR} "/usr/lib/aarch64-linux-gnu/pkgconfig:/usr/share/pkgconfig")
111-
set(ENV{PKG_CONFIG_PATH} "/usr/lib/aarch64-linux-gnu/pkgconfig:/usr/share/pkgconfig")
112100
EOF
113101
114102
# -------------------------

modules/utils

0 commit comments

Comments
 (0)