From 2e6aca270a6ddb164850a708edbb451c48c1adf2 Mon Sep 17 00:00:00 2001 From: Finagolfin Date: Mon, 4 Mar 2024 13:17:31 +0530 Subject: [PATCH] Get hashes for latest 5.10 Mar 2 snapshot --- .github/workflows/packages.yml | 2 +- packages/swift/build.sh | 17 +++++++++-------- scripts/build/setup/termux_setup_swift.sh | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index 131cf5ced42f643..ce00df6a5a131fb 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - target_arch: [aarch64, arm, x86_64] + target_arch: [aarch64] #, arm, x86_64] fail-fast: false steps: - name: Setup arm and aarch64 CPU emulators diff --git a/packages/swift/build.sh b/packages/swift/build.sh index a919b7928efc94c..8d5a8eba9981a1c 100644 --- a/packages/swift/build.sh +++ b/packages/swift/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Swift is a high-performance system programming language" TERMUX_PKG_LICENSE="Apache-2.0, NCSA" TERMUX_PKG_MAINTAINER="@finagolfin" TERMUX_PKG_VERSION=5.10 -SWIFT_RELEASE="DEVELOPMENT-SNAPSHOT-2024-02-02-a" +SWIFT_RELEASE="DEVELOPMENT-SNAPSHOT-2024-03-02-a" TERMUX_PKG_SRCURL=https://github.com/apple/swift/archive/swift-$TERMUX_PKG_VERSION-$SWIFT_RELEASE.tar.gz -TERMUX_PKG_SHA256=8e7c48edb0309c3374c5ffa96caf08963804e3f0f7dc0d0f7b2b5aacdf562129 +TERMUX_PKG_SHA256=0d7837055ea6fdcf5e08b3d8c95217a4f8812aab77e9e1bf49a1b76263683b46 TERMUX_PKG_AUTO_UPDATE=false TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_DEPENDS="clang, libandroid-glob, libandroid-posix-semaphore, libandroid-spawn, libcurl, libicu, libicu-static, libsqlite, libuuid, libxml2, libdispatch, llbuild, pkg-config, swift-sdk-${TERMUX_ARCH/_/-}" @@ -68,7 +68,7 @@ termux_step_post_get_source() { SRC_VERSION="1.0.1" TAR_NAME=$SRC_VERSION elif [ "$library" = "swift-collections" ]; then - SRC_VERSION="1.0.1" + SRC_VERSION="1.0.5" TAR_NAME=$SRC_VERSION elif [ "$library" = "swift-crypto" ]; then SRC_VERSION="3.0.0" @@ -85,12 +85,13 @@ termux_step_post_get_source() { TAR_NAME=swift-$TERMUX_PKG_VERSION-$SWIFT_RELEASE fi - termux_download \ + wget -q \ https://github.com/$GH_ORG/$library/archive/$TAR_NAME.tar.gz \ - $TERMUX_PKG_CACHEDIR/$library-$SRC_VERSION.tar.gz \ - ${library_checksums[$library]} - tar xf $TERMUX_PKG_CACHEDIR/$library-$SRC_VERSION.tar.gz - mv $library-$TAR_NAME $library + -O $TERMUX_PKG_BUILDER_DIR/$library-$SRC_VERSION.tar.gz +# ${library_checksums[$library]} + echo "library_checksums[$library]=$(sha256sum $TERMUX_PKG_BUILDER_DIR/$library-$SRC_VERSION.tar.gz | cut -f1 -d' ')" + #tar xf $TERMUX_PKG_CACHEDIR/$library-$SRC_VERSION.tar.gz + #mv $library-$TAR_NAME $library done mv swift-cmark cmark diff --git a/scripts/build/setup/termux_setup_swift.sh b/scripts/build/setup/termux_setup_swift.sh index 428cd697dd73593..b28e0abd2c3bb43 100644 --- a/scripts/build/setup/termux_setup_swift.sh +++ b/scripts/build/setup/termux_setup_swift.sh @@ -19,7 +19,7 @@ termux_setup_swift() { termux_download \ https://download.swift.org/swift-$TERMUX_SWIFT_VERSION-branch/ubuntu2204/swift-$TERMUX_SWIFT_VERSION-$SWIFT_RELEASE/$SWIFT_BIN.tar.gz \ $SWIFT_TAR \ - b96c0693265703fdb831cd7e919f4cccc7e5929cf295e0718c19a50d69db7f2e + 3bf965873e5460d2459979d484d98c5290ef47660fad7dff6702b5fe03cb1699 (cd $TERMUX_PKG_TMPDIR ; tar xf $SWIFT_TAR ; mv $SWIFT_BIN $SWIFT_FOLDER; rm $SWIFT_TAR) fi