From 97ec36f447f9801fa10d4d4b9499d84ccef263e7 Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Tue, 4 Sep 2018 22:38:34 -0600 Subject: [PATCH] ci: update readme: fix badges, license tests: fix nimble: add description --- .appveyor.yml | 132 ++++++++++++++++++++++++-------------------- .travis.yml | 24 +++++++- README.md | 13 +++-- hardy.nimble | 2 +- tests/all_tests.nim | 2 +- 5 files changed, 101 insertions(+), 72 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 86374cf..622ad58 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,77 +1,87 @@ -# Appveyor config. - version: '{build}' cache: -- nim-0.18.0_x64.zip -- x86_64-4.9.2-release-win32-seh-rt_v4-rev4.7z -- i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z -- packages -> **\packages.config -- '%LocalAppData%\NuGet\Cache -> **\packages.config' +- x86_64-4.9.2-release-win32-seh-rt_v4-rev4.7z -> .appveyor.yml +- i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z -> .appveyor.yml +- Nim -> .appveyor.yml matrix: - fast_finish: true + # We always want 32 and 64-bit compilation + fast_finish: false -environment: - matrix: - - MINGW_ARCHIVE: x86_64-4.9.2-release-win32-seh-rt_v4-rev4.7z - MINGW_DIR: mingw64 - # We need to hardcode a mirror otherwise the download fails - MINGW_URL: https://ayera.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/4.9.2/threads-win32/seh/x86_64-4.9.2-release-win32-seh-rt_v4-rev4.7z - # NIM_ARCHIVE: nim-0.18.0_x64.zip - # NIM_DIR: nim-0.18.0 - # NIM_URL: https://nim-lang.org/download/nim-0.18.0_x64.zip - platform: x64 - - MINGW_ARCHIVE: i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z - MINGW_DIR: mingw32 - # We need to hardcode a mirror otherwise the download fails - MINGW_URL: https://netcologne.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/4.9.2/threads-win32/dwarf/i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z - # NIM_ARCHIVE: nim-0.18.0_x64.zip - # NIM_DIR: nim-0.18.0 - # NIM_URL: https://nim-lang.org/download/nim-0.18.0_x32.zip - platform: x86 +platform: + - x86 + - x64 -## Use the following to test against stable -# install: -# - MKDIR %CD%\tools_tmp -# - IF not exist "%MINGW_ARCHIVE%" appveyor DownloadFile "%MINGW_URL%" -FileName "%MINGW_ARCHIVE%" -# - 7z x -y "%MINGW_ARCHIVE%" -o"%CD%\tools_tmp"> nul -# - IF not exist "%NIM_ARCHIVE%" appveyor DownloadFile "%NIM_URL%" -FileName "%NIM_ARCHIVE%" -# - 7z x -y "%NIM_ARCHIVE%" -o"%CD%\tools_tmp"> nul -# - SET PATH=%CD%\tools_tmp\%NIM_DIR%\bin;%CD%\tools_tmp\%MINGW_DIR%\bin;%PATH% -# # - ps: nuget install YourDependency -o "${env:APPVEYOR_BUILD_FOLDER}" -# # - ps: cp YourDependency.0.1.2.3/lib/native/bin/x64/libyourdependency.dll yourdependency.dll -# - SET PATH=%PATH%;%CD% - -## Test against devel with Status patches install: - setlocal EnableExtensions EnableDelayedExpansion - - IF not exist "%MINGW_ARCHIVE%" appveyor DownloadFile "%MINGW_URL%" -FileName "%MINGW_ARCHIVE%" - - 7z x -y "%MINGW_ARCHIVE%" > nul + + - IF "%PLATFORM%" == "x86" ( + SET "MINGW_ARCHIVE=i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z" & + SET "MINGW_URL=https://sourceforge.net/projects/mingw-w64/files/Toolchains%%20targetting%%20Win32/Personal%%20Builds/mingw-builds/4.9.2/threads-win32/dwarf/i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z" & + SET "MINGW_DIR=mingw32" + ) ELSE ( + IF "%PLATFORM%" == "x64" ( + SET "MINGW_ARCHIVE=x86_64-4.9.2-release-win32-seh-rt_v4-rev4.7z" & + SET "MINGW_URL=https://sourceforge.net/projects/mingw-w64/files/Toolchains%%20targetting%%20Win64/Personal%%20Builds/mingw-builds/4.9.2/threads-win32/seh/x86_64-4.9.2-release-win32-seh-rt_v4-rev4.7z" & + SET "MINGW_DIR=mingw64" + ) else ( + echo "Unknown platform" + ) + ) + - SET PATH=%CD%\%MINGW_DIR%\bin;%CD%\Nim\bin;%PATH% - - git clone https://github.com/nim-lang/Nim.git - - cd %CD%\Nim - - git remote add statusim https://github.com/status-im/Nim.git - - git fetch statusim - - git config --global user.email "you@example.com" - - git config --global user.name "Your Name" - - for /f "tokens=*" %%G IN ('git branch -a --list ^"statusim/status-autopatch-*^"') DO (git merge %%G) - - git clone --depth 1 https://github.com/nim-lang/csources - - cd csources - - IF "%PLATFORM%" == "x64" ( build64.bat ) else ( build.bat ) - - cd .. - - bin\nim c koch - - koch boot -d:release - - koch nimble + + # Unpack mingw + - IF NOT EXIST "%MINGW_ARCHIVE%" appveyor DownloadFile "%MINGW_URL%" -FileName "%MINGW_ARCHIVE%" + - 7z x -y "%MINGW_ARCHIVE%" > nul + + # build nim from our own branch - this to avoid the day-to-day churn and + # regressions of the fast-paced Nim development while maintaining the + # flexibility to apply patches + - SET "NEED_REBUILD=" + + - IF NOT EXIST "Nim\\.git\\" ( + git clone https://github.com/status-im/Nim.git + ) ELSE ( + ( cd Nim ) & + ( git pull ) & + ( cd .. ) + ) + + # Rebuild Nim if HEAD has moved or if we don't yet have a cached version + - IF NOT EXIST "Nim\\ver.txt" ( + SET NEED_REBUILD=1 + ) ELSE ( + ( CD Nim ) & + ( git rev-parse HEAD > ..\\cur_ver.txt ) & + ( fc ver.txt ..\\cur_ver.txt > nul ) & + ( IF NOT ERRORLEVEL == 0 SET NEED_REBUILD=1 ) & + ( cd .. ) + ) + + - IF NOT EXIST "Nim\\bin\\nim.exe" SET NEED_REBUILD=1 + - IF NOT EXIST "Nim\\bin\\nimble.exe" SET NEED_REBUILD=1 + + # after building nim, wipe csources to save on cache space + - IF DEFINED NEED_REBUILD ( + cd Nim & + ( IF EXIST "csources" rmdir /s /q csources ) & + git clone --depth 1 https://github.com/nim-lang/csources & + cd csources & + ( IF "%PLATFORM%" == "x64" ( build64.bat ) else ( build.bat ) ) & + cd .. & + bin\nim c koch & + koch boot -d:release & + koch nimble & + git rev-parse HEAD > ver.txt & + rmdir /s /q csources + ) + build_script: - cd C:\projects\%APPVEYOR_PROJECT_SLUG% - nimble install -y - -build_script: - - nimble.exe refresh - test_script: -# - git submodule update --init --recursive - - nimble.exe test + - nimble test deploy: off diff --git a/.travis.yml b/.travis.yml index ae3a02e..8e56f7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,9 @@ language: c # or other C/C++ variants sudo: false # https://docs.travis-ci.com/user/caching/ +# +# Caching the whole nim folder is better than relying on ccache - this way, we +# skip the expensive bootstrap process and linking cache: directories: - nim @@ -12,10 +15,25 @@ os: - osx install: - # build nim from our own branch, to avoid downtime due to nim regressions + # build nim from our own branch - this to avoid the day-to-day churn and + # regressions of the fast-paced Nim development while maintaining the + # flexibility to apply patches + # + # check version of remote branch - "export NIMVER=$(git ls-remote https://github.com/status-im/nim.git HEAD | cut -f 1)" - - "{ [ -f nim/$NIMVER/bin/nim ] && [ -f nim/$NIMVER/bin/nimble ] ; } || { rm -rf nim ; mkdir -p nim; git clone https://github.com/status-im/nim.git nim/$NIMVER; cd nim/$NIMVER; sh build_all.sh; cd ../.. ; }" + + # after building nim, wipe csources to save on cache space + - "{ [ -f nim/$NIMVER/bin/nim ] && [ -f nim/$NIMVER/bin/nimble ] ; } || + { rm -rf nim ; + mkdir -p nim ; + git clone --depth=1 https://github.com/status-im/nim.git nim/$NIMVER ; + cd nim/$NIMVER ; + sh build_all.sh ; + rm -rf csources ; + cd ../.. ; + }" - "export PATH=$PWD/nim/$NIMVER/bin:$PATH" script: - - nimble install -dy && nimble test + - nimble install -y + - nimble test diff --git a/README.md b/README.md index 8643826..b1dd992 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,9 @@ # Hardy - Hardened big int primitives + [![Build Status (Travis)](https://img.shields.io/travis/status-im/nim-hardy/master.svg?label=Linux%20/%20macOS "Linux/macOS build status (Travis)")](https://travis-ci.org/status-im/nim-hardy) -[![Windows build status (Appveyor)](https://img.shields.io/appveyor/ci/jarradh/nim-hardy/master.svg?label=Windows "Windows build status (Appveyor)")](https://travis-ci.org/jarradh/nim-hardy) -[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)[![License: Apache](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) +[![Windows build status (Appveyor)](https://img.shields.io/appveyor/ci/nimbus/nim-hardy/master.svg?label=Windows "Windows build status (Appveyor)")](https://ci.appveyor.com/project/nimbus/nim-hardy) +[![License: Apache](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) +[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT) ![Stability: experimental](https://img.shields.io/badge/stability-experimental-orange.svg) This library provides constant time big int primitives. @@ -16,8 +18,7 @@ nimble install https://github.com/status-im/nim-hardy@#master ## License -Licensed and distributed under either of - * MIT license (license terms in the root directory or at http://opensource.org/licenses/MIT). - * Apache v2 license (license terms in the root directory or at http://www.apache.org/licenses/LICENSE-2.0). -at your option. This file may not be copied, modified, or distributed except according to those terms. +Licensed under both of the following: + * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) + * MIT license: [LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT diff --git a/hardy.nimble b/hardy.nimble index 7650653..a176efe 100644 --- a/hardy.nimble +++ b/hardy.nimble @@ -1,7 +1,7 @@ packageName = "hardy" version = "0.0.1" author = "Status Research & Development GmbH" -description = "" +description = "This library provides constant time big int primitives." license = "MIT or Apache License 2.0" srcDir = "src" diff --git a/tests/all_tests.nim b/tests/all_tests.nim index 5f1a3ea..4255e6e 100644 --- a/tests/all_tests.nim +++ b/tests/all_tests.nim @@ -6,7 +6,7 @@ # at your option. This file may not be copied, modified, or distributed except according to those terms. import unittest, - ../src/hardy + ../hardy suite "Your first test suite": test "Your first test":