From 1bdf0041bceaf96936c8d617dbfd0e03089a63fc Mon Sep 17 00:00:00 2001 From: jfreegman Date: Sat, 12 Feb 2022 21:17:19 -0500 Subject: [PATCH] Bump toxic and curl versions in static build script --- .github/workflows/ci.yml | 3 +++ script/build-minimal-static-toxic.sh | 10 ++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c117e02..8daf3ed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,6 +18,7 @@ jobs: libalut-dev libconfig-dev libcurl4-gnutls-dev + libmsgpack-dev libnotify-dev libopenal-dev libopus-dev @@ -72,6 +73,7 @@ jobs: libalut-dev libconfig-dev libcurl4-gnutls-dev + libmsgpack-dev libncurses-dev libnotify-dev libopenal-dev @@ -103,6 +105,7 @@ jobs: libnotify libpng libqrencode + msgpack ncurses openal python3 diff --git a/script/build-minimal-static-toxic.sh b/script/build-minimal-static-toxic.sh index 63e1213..c99da52 100755 --- a/script/build-minimal-static-toxic.sh +++ b/script/build-minimal-static-toxic.sh @@ -64,7 +64,6 @@ set -eu ARTIFACT_DIR="/artifact" TOXIC_SRC_DIR="/toxic" - if [ ! -f /etc/os-release ] || ! grep -qi 'Alpine Linux' /etc/os-release then echo "Error: This script expects to be run on Alpine Linux." @@ -137,10 +136,10 @@ mkdir -p "$BUILD_DIR" cd "$BUILD_DIR" # The git hash of the c-toxcore version we're using -TOXCORE_VERSION="v0.2.13" +TOXCORE_VERSION="v0.2.15" # The sha256sum of the c-toxcore tarball for TOXCORE_VERSION -TOXCORE_HASH="67114fa57504c58b695f5dce8ef85124d555f2c3c353d0d2615e6d4845114ab8" +TOXCORE_HASH="577e23fe52f8be6739a9fffb2b16bfefd3a0ef4994d0714cb28a1ecca3669ca6" TOXCORE_FILENAME="c-toxcore-$TOXCORE_VERSION.tar.gz" @@ -169,8 +168,8 @@ cmake --build _build --target install # location with SSL_CERT_FILE env variable. cd "$BUILD_DIR" -CURL_VERSION="7.80.0" -CURL_HASH="dab997c9b08cb4a636a03f2f7f985eaba33279c1c52692430018fae4a4878dc7" +CURL_VERSION="7.81.0" +CURL_HASH="ac8e1087711084548d788ef18b9b732c8de887457b81f616fc681d1044b32f98" CURL_FILENAME="curl-$CURL_VERSION.tar.gz" wget --timeout=10 -O "$CURL_FILENAME" "https://curl.haxx.se/download/$CURL_FILENAME" @@ -307,4 +306,3 @@ mv "$PREPARE_ARTIFACT_DIR" "$PREPARE_ARTIFACT_DIR/../$ARTIFACT_NAME" tar -cJf "$ARTIFACT_NAME.tar.xz" "$ARTIFACT_NAME" mv "$ARTIFACT_NAME.tar.xz" "$ARTIFACT_DIR" chmod 777 -R "$ARTIFACT_DIR" -