git.iko.soy/project-m36
on master help sign in
build with travis-ci
commitc6259980c2da46b1511622c7ae06714564a58fd6 authorHugh JF Chen <hugh.jf.chen@gmail.com> dateSun 10 May 2020, 20:57 (6 years ago) parenta5c3f0b
4 files changed+15−55
compare with master
unifiedsplit
.travis.yml+11−40 ci/DevOps/local/test/build/build.sh+2−2 ci/DevOps/local/test/build/nix/default.nix−11 ci/DevOps/local/test/deploy/prepare.sh+2−2
.travis.yml+11−40
@@ -1,64 +1,35 @@
11# For more information, see https://github.com/ChrisPenner/haskell-stack-travis-ci
22language: c
3−sudo: false
3+sudo: true
44
55git:
66 submodules: false # whether to recursively clone submodules
77
8−cache:
9− directories:
10− - $HOME/.ghc
11− - $HOME/.cabal
12− - $HOME/.stack
13− - .stack-work
14− timeout: 1000
15−
168matrix:
179 fast_finish: true
1810 include:
19− - env: CACHE_NAME=8.2.2 STACK_YAML=stack.ghc8.2.yaml
20− compiler: ": #stack 8.2.2"
21−
22− - env: CACHE_NAME=osx-8.2.2 STACK_YAML=stack.ghc8.2.yaml
11+ - env: BUILD_NAME=OSX
2312 os: osx
24− osx_image: xcode7.3
25− compiler: ": #stack 8.2.2"
26−
27− - env: CACHE_NAME=8.4.4 STACK_YAML=stack.ghc8.4.yaml
28− compiler: ": #stack 8.4.4"
2913
30− - env: CACHE_NAME=8.6.5 STACK_YAML=stack.ghc8.6.yaml
31− compiler: ": #stack 8.6.5"
14+ - env: BUILD_NAME=LINUX-AMD64
15+ os: linux
16+ dist: bionic
17+ arch: amd64
3218
33− - env: CACHE_NAME=osx-8.6.5 STACK_YAML=stack.ghc8.6.yaml
34− os: osx
35− osx_image: xcode11
36− compiler: ": #stack 8.6.5"
19+ - env: BUILD_NAME=LINUX-ARM64
20+ os: linux
21+ dist: bionic
22+ arch: arm64
3723
3824before_script:
3925 - unset CC
40− - export PATH=$HOME/.local/bin:/opt/ghc/$GHC_VERSION/bin:$PATH
41− - ./.travis/install-ghr.sh
42− - ./.travis/install-stack.sh
4326
4427# Here starts the actual work to be performed for the package under test;
4528# any command which exits with a non-zero exit code causes the build to fail.
4629script:
4730 - |
4831 # Run tests
49− set -e
50− ./.travis/install-dependencies.sh
51− stack --no-terminal --jobs=2 --system-ghc test
52− - |
53− #Run HLint
54− if [[ "$(uname)" = "Linux" ]]; then
55− curl -sL https://raw.github.com/ndmitchell/hlint/master/misc/travis.sh | sh -s lint src test examples --cpp-define VERSION_project_m36=HLINT
56− fi
57− - |
58− #Run Haddock
59− if [[ "$(uname)" = "Linux" ]]; then
60− stack --no-install-ghc --system-ghc --no-haddock-deps haddock
61− fi
32+ ./ci/DevOps/local/test/cb.sh
6233
6334after_success:
6435 - |
ci/DevOps/local/test/build/build.sh+2−2
@@ -21,8 +21,8 @@ if [ -f ${SCRIPT_ABS_PATH}/nix/project-m36.nix ]; then
2121 [ -x ~/.emacs.d/bin/doom ] && echo "((nil . ((dante-target . \"project-m36\"))))" > ${SCRIPT_ABS_PATH}/../../../../.dir-locals.el && nix-shell --run "~/.emacs.d/bin/doom env > /dev/null 2>&1" ${SCRIPT_ABS_PATH}/nix/shell.nix
2222 nix-shell ${SCRIPT_ABS_PATH}/nix/shell.nix
2323 else
24− #nix-shell --run "cd ${SCRIPT_ABS_PATH}/../../../../.. ; cabal new-update ; cabal new-clean ; cabal new-test" ${SCRIPT_ABS_PATH}/nix/shell.nix
25− #nix-shell --run "cd ${SCRIPT_ABS_PATH}/../../../../.. ; cabal new-clean" ${SCRIPT_ABS_PATH}/nix/shell.nix
24+ nix-shell --run "cd ${SCRIPT_ABS_PATH}/../../../../.. ; cabal new-update ; cabal new-clean ; cabal new-test" ${SCRIPT_ABS_PATH}/nix/shell.nix
25+ nix-shell --run "cd ${SCRIPT_ABS_PATH}/../../../../.. ; cabal new-clean" ${SCRIPT_ABS_PATH}/nix/shell.nix
2626 nix-build -A project-m36-docker ${SCRIPT_ABS_PATH}/nix/default.nix
2727 fi
2828else
ci/DevOps/local/test/build/nix/default.nix−11
@@ -242,17 +242,6 @@ divert 258 DIVERT # Divert pseudo-protocol
242242 name = "project-m36";
243243 tag = project-m36.version;
244244 created = "now";
245− # This is a quick and dirty hack to fix the hard-coding architecture
246− extraCommands = ''
247− myar=$(uname -m)
248− case $myar in
249− aarch64)
250− cat $out/json | sed 's/"amd64"/"arm64"/g' > $out/json1
251− cp $out/json1 $out/json
252− ;;
253− *) ;;
254− esac
255− '';
256245
257246 contents = [ static-project-m36
258247 project-m36-env ];
ci/DevOps/local/test/deploy/prepare.sh+2−2
@@ -21,7 +21,7 @@ myGroup2=$(awk -F":" '{print $1}' /etc/group | grep -w project-m36)
2121set -e
2222if [ "X${myGroup2}" = "X" ]; then
2323 info "no project-m36 group defined yet, create it..."
24− sudo groupadd -f --gid 90001 project-m36
24+ sudo groupadd -f --gid 90009 project-m36
2525fi
2626
2727set +e
@@ -29,7 +29,7 @@ myUser2=$(awk -F":" '{print $1}' /etc/passwd | grep -w project-m36)
2929set -e
3030if [ "X${myUser2}" = "X" ]; then
3131 info "no project-m36 user defined yet, create it..."
32− sudo useradd -G docker -m -p Passw0rd --uid 90001 --gid 90001 project-m36
32+ sudo useradd -G docker -m -p Passw0rd --uid 90009 --gid 90009 project-m36
3333fi
3434
3535if [ ! -d /var/project-m36 ]; then