Merge 9a64052 into 920716e

TokTok · Apr 4, 2020 · 7d8f6ed · 7d8f6ed
2 parents 920716e + 9a64052
commit 7d8f6ed
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,10 +5,10 @@ workflows:
   version: 2
   build_android:
     jobs:
-      - aarch64
+#      - aarch64
       - arm
-      - i686
-      - x86_64
+#      - i686
+#      - x86_64
 
 jobs:
   # aarch64-linux-android-4.9
@@ -30,16 +30,16 @@ jobs:
   arm:
     working_directory: ~/work
     docker:
-      - image: toktoknet/ghc-android:latest.arm
+      - image: toktoknet/ghc-android:8.6.5.arm
 
     steps:
       - checkout
-      - restore_cache:
-          key: v1-cabal-cache-arm
+#      - restore_cache:
+#          key: v1-cabal-cache-arm
       - run: android/build.sh
-      - save_cache:
-          key: v1-cabal-cache-arm
-          paths: [~/.ghc/android-9/arm-linux-androideabi-4.9]
+#      - save_cache:
+#          key: v1-cabal-cache-arm
+#          paths: [~/.ghc/android-9/arm-linux-androideabi-4.9]
 
   # x86-4.9
   i686:

diff --git a/android/user-scripts/cabal-install-clock.sh b/android/user-scripts/cabal-install-clock.sh
@@ -5,15 +5,15 @@ source $HOME/ghc-build/set-env.sh
 set -x
 ####################################################################################################
 
-CLOCK_PACKAGE=$NDK/cabal/packages/hackage.haskell.org/clock/0.7.2/clock-0.7.2.tar.gz
+CLOCK_PACKAGE=$NDK/cabal/packages/hackage.haskell.org/clock/0.8/clock-0.8.tar.gz
 
 if [ -f "$CLOCK_PACKAGE" ]; then
   exit 0
 fi
 
-$NDK_TARGET-cabal fetch clock-0.7.2
+$NDK_TARGET-cabal fetch clock-0.8
 tar zxf $CLOCK_PACKAGE
-pushd clock-0.7.2
+pushd clock-0.8
 patch -p1 < $SCRIPT_DIR/patches/hs-clock-ffi.patch
 $NDK_TARGET-cabal install
 popd