From 88cd21fd0f679d96b44abbbb343f1d9eb66b2c28 Mon Sep 17 00:00:00 2001 From: Vidar Holen Date: Mon, 22 Feb 2021 21:28:14 -0800 Subject: [PATCH] Fix missing +x with new cabal and use previous release deps for caching --- .github/workflows/build.yml | 4 ++-- build/darwin.x86_64/Dockerfile | 2 +- build/darwin.x86_64/build | 2 +- build/linux.aarch64/Dockerfile | 2 +- build/linux.aarch64/build | 2 +- build/linux.armv6hf/Dockerfile | 2 +- build/linux.armv6hf/build | 2 +- build/linux.x86_64/build | 2 +- build/windows.x86_64/Dockerfile | 4 ++-- build/windows.x86_64/build | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cd9fca0..707b9a2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Build Lol +name: Build ShellCheck # Run this workflow every time a new commit pushed to your repository on: push @@ -21,7 +21,7 @@ jobs: run: | mkdir source cabal sdist - mv dist/*.tar.gz source/source.tar.gz + mv dist-newstyle/sdist/*.tar.gz source/source.tar.gz - name: Deduce tags run: | diff --git a/build/darwin.x86_64/Dockerfile b/build/darwin.x86_64/Dockerfile index e7425fe..ecd1cad 100644 --- a/build/darwin.x86_64/Dockerfile +++ b/build/darwin.x86_64/Dockerfile @@ -22,7 +22,7 @@ RUN curl -L "https://downloads.haskell.org/~cabal/cabal-install-3.2.0.0/cabal-in ENV CABALOPTS "--with-ghc=$TARGET-ghc;--with-hc-pkg=$TARGET-ghc-pkg" # Prebuild the dependencies -RUN cabal update && IFS=';' && cabal install $CABALOPTS --lib Diff-0.4.0 base-compat-0.11.2 base-orphans-0.8.4 dlist-1.0 hashable-1.3.0.0 indexed-traversable-0.1.1 integer-logarithms-1.0.3.1 primitive-0.7.1.0 regex-base-0.94.0.0 splitmix-0.1.0.3 tagged-0.8.6.1 th-abstraction-0.4.2.0 transformers-compat-0.6.6 base-compat-batteries-0.11.2 time-compat-1.9.5 unordered-containers-0.2.13.0 data-fix-0.3.1 vector-0.12.2.0 scientific-0.3.6.2 regex-tdfa-1.3.1.0 random-1.2.0 distributive-0.6.2.1 attoparsec-0.13.2.5 uuid-types-1.0.3 comonad-5.0.8 bifunctors-5.5.10 assoc-1.0.2 these-1.1.1.1 strict-0.4.0.1 aeson-1.5.5.1 +RUN cabal update && IFS=';' && cabal install --dependencies-only $CABALOPTS ShellCheck # Copy the build script COPY build /usr/bin diff --git a/build/darwin.x86_64/build b/build/darwin.x86_64/build index 03dfde7..53857e8 100755 --- a/build/darwin.x86_64/build +++ b/build/darwin.x86_64/build @@ -2,7 +2,7 @@ set -xe { tar xzv --strip-components=1 - ./striptests + chmod +x striptests && ./striptests mkdir "$TARGETNAME" cabal update ( IFS=';'; cabal build $CABALOPTS ) diff --git a/build/linux.aarch64/Dockerfile b/build/linux.aarch64/Dockerfile index 8bf8d6f..60537b3 100644 --- a/build/linux.aarch64/Dockerfile +++ b/build/linux.aarch64/Dockerfile @@ -21,7 +21,7 @@ RUN curl -L "https://downloads.haskell.org/~cabal/cabal-install-3.2.0.0/cabal-in ENV CABALOPTS "--ghc-options;-split-sections -optc-Os -optc-Wl,--gc-sections;--with-ghc=$TARGET-ghc;--with-hc-pkg=$TARGET-ghc-pkg" # Prebuild the dependencies -RUN cabal update && IFS=';' && cabal install $CABALOPTS --lib Diff-0.4.0 base-compat-0.11.2 base-orphans-0.8.4 dlist-1.0 hashable-1.3.0.0 indexed-traversable-0.1.1 integer-logarithms-1.0.3.1 primitive-0.7.1.0 regex-base-0.94.0.0 splitmix-0.1.0.3 tagged-0.8.6.1 th-abstraction-0.4.2.0 transformers-compat-0.6.6 base-compat-batteries-0.11.2 time-compat-1.9.5 unordered-containers-0.2.13.0 data-fix-0.3.1 vector-0.12.2.0 scientific-0.3.6.2 regex-tdfa-1.3.1.0 random-1.2.0 distributive-0.6.2.1 attoparsec-0.13.2.5 uuid-types-1.0.3 comonad-5.0.8 bifunctors-5.5.10 assoc-1.0.2 these-1.1.1.1 strict-0.4.0.1 aeson-1.5.5.1 +RUN cabal update && IFS=';' && cabal install --dependencies-only $CABALOPTS ShellCheck # Copy the build script COPY build /usr/bin diff --git a/build/linux.aarch64/build b/build/linux.aarch64/build index 1164dc1..f8001aa 100755 --- a/build/linux.aarch64/build +++ b/build/linux.aarch64/build @@ -2,7 +2,7 @@ set -xe { tar xzv --strip-components=1 - ./striptests + chmod +x striptests && ./striptests mkdir "$TARGETNAME" cabal update ( IFS=';'; cabal build $CABALOPTS --enable-executable-static ) diff --git a/build/linux.armv6hf/Dockerfile b/build/linux.armv6hf/Dockerfile index fee6d4c..bd5795c 100644 --- a/build/linux.armv6hf/Dockerfile +++ b/build/linux.armv6hf/Dockerfile @@ -51,7 +51,7 @@ RUN pirun apt-get install -y ghc cabal-install # Finally we can build the current dependencies. This takes hours. ENV CABALOPTS "--ghc-options;-split-sections -optc-Os -optc-Wl,--gc-sections;--gcc-options;-Os -Wl,--gc-sections -ffunction-sections -fdata-sections" RUN pirun cabal update -RUN IFS=";" && pirun cabal install --lib $CABALOPTS Diff-0.4.0 base-compat-0.11.2 base-orphans-0.8.4 dlist-1.0 hashable-1.3.1.0 indexed-traversable-0.1.1 integer-logarithms-1.0.3.1 primitive-0.7.1.0 regex-base-0.94.0.1 splitmix-0.1.0.3 tagged-0.8.6.1 th-abstraction-0.4.2.0 transformers-compat-0.6.6 base-compat-batteries-0.11.2 time-compat-1.9.5 unordered-containers-0.2.13.0 data-fix-0.3.1 vector-0.12.2.0 scientific-0.3.6.2 regex-tdfa-1.3.1.0 random-1.2.0 distributive-0.6.2.1 attoparsec-0.13.2.5 uuid-types-1.0.4 comonad-5.0.8 bifunctors-5.5.10 assoc-1.0.2 these-1.1.1.1 strict-0.4.0.1 aeson-1.5.6.0 +RUN IFS=";" && pirun cabal install --dependencies-only $CABALOPTS ShellCheck # Copy the build script WORKDIR /pi/scratch diff --git a/build/linux.armv6hf/build b/build/linux.armv6hf/build index 4f2c7bc..daa94d9 100755 --- a/build/linux.armv6hf/build +++ b/build/linux.armv6hf/build @@ -3,7 +3,7 @@ set -xe cd /scratch { tar xzv --strip-components=1 - ./striptests + chmod +x striptests && ./striptests mkdir "$TARGETNAME" # This script does not cabal update because compiling anything new is slow ( IFS=';'; cabal build $CABALOPTS --enable-executable-static ) diff --git a/build/linux.x86_64/build b/build/linux.x86_64/build index ba598e6..099f127 100755 --- a/build/linux.x86_64/build +++ b/build/linux.x86_64/build @@ -2,7 +2,7 @@ set -xe { tar xzv --strip-components=1 - ./striptests + chmod +x striptests && ./striptests mkdir "$TARGETNAME" cabal update ( IFS=';'; cabal build $CABALOPTS --enable-executable-static ) diff --git a/build/windows.x86_64/Dockerfile b/build/windows.x86_64/Dockerfile index 3eb20fa..b412c1c 100644 --- a/build/windows.x86_64/Dockerfile +++ b/build/windows.x86_64/Dockerfile @@ -19,8 +19,8 @@ ENV WINEPATH /haskell/bin # that necessitated this but I don't care enough to find out ENV CABALOPTS "--ghc-options;-split-sections -optc-Os -optc-Wl,--gc-sections" -# Precompile some deps to speed up later builds. This list is just copied from `cabal build` -RUN wine /haskell/bin/cabal.exe update && IFS=';' && wine /haskell/bin/cabal.exe install $CABALOPTS --lib Diff-0.4.0 base-compat-0.11.2 base-orphans-0.8.4 dlist-1.0 hashable-1.3.0.0 indexed-traversable-0.1.1 integer-logarithms-1.0.3.1 primitive-0.7.1.0 regex-base-0.94.0.0 splitmix-0.1.0.3 tagged-0.8.6.1 th-abstraction-0.4.2.0 transformers-compat-0.6.6 base-compat-batteries-0.11.2 time-compat-1.9.5 unordered-containers-0.2.13.0 data-fix-0.3.1 vector-0.12.2.0 scientific-0.3.6.2 regex-tdfa-1.3.1.0 random-1.2.0 distributive-0.6.2.1 attoparsec-0.13.2.5 uuid-types-1.0.3 comonad-5.0.8 bifunctors-5.5.10 assoc-1.0.2 these-1.1.1.1 strict-0.4.0.1 aeson-1.5.5.1 +# Precompile some deps to speed up later builds +RUN wine /haskell/bin/cabal.exe update && IFS=';' && wine /haskell/bin/cabal.exe install --lib --dependencies-only $CABALOPTS ShellCheck COPY build /usr/bin WORKDIR /scratch diff --git a/build/windows.x86_64/build b/build/windows.x86_64/build index bedb870..7bf186e 100755 --- a/build/windows.x86_64/build +++ b/build/windows.x86_64/build @@ -6,7 +6,7 @@ cabal() { set -xe { tar xzv --strip-components=1 - ./striptests + chmod +x striptests && ./striptests mkdir "$TARGETNAME" cabal update ( IFS=';'; cabal build $CABALOPTS )