Skip to content
This repository has been archived by the owner on Aug 18, 2020. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Resolve merge conflicts
  • Loading branch information
rvl committed Jan 4, 2019
1 parent 47ea239 commit e0802a2
Show file tree
Hide file tree
Showing 10 changed files with 4 additions and 230 deletions.
172 changes: 0 additions & 172 deletions appveyor.yml
Expand Up @@ -3,177 +3,5 @@ image: Visual Studio 2015

build: off

<<<<<<< HEAD
environment:
global:
# Avoid long paths on Windows
STACK_ROOT: "c:\\s"
STACK_WORK: ".w"
WORK_DIR: "c:\\w"
# Override the temp directory to avoid sed escaping issues
# See https://github.com/haskell/cabal/issues/5386
TMP: "c:\\tmp"
CACHE_S3_VERSION: v0.1.4
CACHE_S3_MAX_SIZE: 1600MB # AppVeyor limits the amount uploaded to approx 2GB
AWS_REGION: us-west-1
S3_BUCKET: appveyor-ci-cache
AWS_ACCESS_KEY_ID:
secure: sQWt5CpaN0H+jwUVoTsrET46pADUDEcrJ5D9MHmKX0M=
AWS_SECRET_ACCESS_KEY:
secure: m5sQYd16K8HA0zoZaD0gOl4EEWUso1D51L5rp+kT3hLaIE3tt4iT+b+iW8F4F0FU

init:
- ps: $env:CACHE_S3_READY = (("$env:CACHE_S3_VERSION" -ne "") -and ("$env:S3_BUCKET" -ne "") -and ("$env:AWS_ACCESS_KEY_ID" -ne "") -and ("$env:AWS_SECRET_ACCESS_KEY" -ne ""))

before_test:
# Avoid long paths not to each MAX_PATH of 260 chars
- xcopy /q /s /e /r /k /i /v /h /y "%APPVEYOR_BUILD_FOLDER%" "%WORK_DIR%"
- cd "%WORK_DIR%"
# Restore cache
- Echo %APPVEYOR_BUILD_VERSION% > build-id
- ps: >-
Write-Host "in pagefile script" ;
$c = Get-WmiObject Win32_computersystem -EnableAllPrivileges ;
if($c.AutomaticManagedPagefile){
Write-Host "disabling managed page file settings"
$c.AutomaticManagedPagefile = $false
$c.Put() | Out-Null
} ;
$new_page_size=25000 ;
$CurrentPageFile = Get-WmiObject -Class Win32_PageFileSetting ;
if ($CurrentPageFile.InitialSize -ne $new_page_size) {
Write-Host "setting new page file size to $new_page_size"
$CurrentPageFile.InitialSize=$new_page_size
$CurrentPageFile.MaximumSize=$new_page_size
$CurrentPageFile.Put() | Out-Null
} ;
if ( $env:CACHE_S3_READY -eq $true ) {
Start-FileDownload https://github.com/fpco/cache-s3/releases/download/$env:CACHE_S3_VERSION/cache-s3-$env:CACHE_S3_VERSION-windows-x86_64.zip -FileName cache-s3.zip
7z x cache-s3.zip cache-s3.exe
.\cache-s3 --max-size=$env:CACHE_S3_MAX_SIZE --prefix=$env:APPVEYOR_PROJECT_NAME --git-branch=$env:APPVEYOR_REPO_BRANCH --suffix=windows -v info -c restore stack --base-branch=develop
.\cache-s3 --max-size=$env:CACHE_S3_MAX_SIZE --prefix=$env:APPVEYOR_PROJECT_NAME --git-branch=$env:APPVEYOR_REPO_BRANCH --suffix=windows -v info -c restore stack work --base-branch=develop
}
# Get custom GHC
- ps: >-
mkdir C:\ghc
Invoke-WebRequest "https://s3.eu-central-1.amazonaws.com/ci-static/ghc-8.4.4-x86_64-unknown-mingw32-20181113-b907eb0f9b.tar.xz" -OutFile "C:\ghc\ghc.tar.xz" -UserAgent "Curl"
7z x C:\ghc\ghc.tar.xz -oC:\ghc
7z x C:\ghc\ghc.tar -oC:\ghc
$env:PATH="$env:PATH;C:\ghc\ghc-8.4.4\bin"
# Install OpenSSL 1.0.2 (see https://github.com/appveyor/ci/issues/1665)
- ps: (New-Object Net.WebClient).DownloadFile('https://slproweb.com/download/Win64OpenSSL-1_0_2q.exe', "$($env:USERPROFILE)\Win64OpenSSL.exe")
- ps: cmd /c start /wait "$($env:USERPROFILE)\Win64OpenSSL.exe" /silent /verysilent /sp- /suppressmsgboxes /DIR=C:\OpenSSL-Win64-v102
- ps: Install-Product node 6
# Install stack
- ps: Start-FileDownload http://www.stackage.org/stack/windows-x86_64 -FileName stack.zip
- 7z x stack.zip stack.exe


# Install rocksdb
- git clone https://github.com/facebook/rocksdb.git --branch v4.13.5
- ps: Start-FileDownload 'https://s3.eu-central-1.amazonaws.com/ci-static/serokell-rocksdb-haskell-325427fc709183c8fdf777ad5ea09f8d92bf8585.zip' -FileName rocksdb.zip
- 7z x rocksdb.zip

# CSL-1509: After moving the 'cardano-sl' project itself into a separate folder ('lib/'), the 'cardano-text.exe' executable fails on AppVeyor CI.
# After some investigation, it was discovered that this was because 'rocksdb.dll' has to be located in this folder as well, or else the test executable doesn't work.
- copy rocksdb.dll node
- copy rocksdb.dll lib
- copy rocksdb.dll wallet

# Install liblzma/xz
- ps: Start-FileDownload https://tukaani.org/xz/xz-5.2.3-windows.zip -Filename xz-5.2.3-windows.zip
- 7z -oC:\xz_extracted x xz-5.2.3-windows.zip

test_script:
- cd "%WORK_DIR%"
- stack config --system-ghc set system-ghc --global true
- stack exec -- ghc-pkg recache
- stack --verbosity warn setup --no-reinstall > nul
# Install happy separately: https://github.com/commercialhaskell/stack/issues/3151#issuecomment-310642487. Also install cpphs because it's a build-tool and Stack can't figure out by itself that it should be installed
- scripts\ci\appveyor-retry call stack --verbosity warn install happy cpphs
-j 2
--no-terminal
--local-bin-path %SYSTEMROOT%\system32
--extra-include-dirs="C:\OpenSSL-Win64-v102\include"
--extra-lib-dirs="C:\OpenSSL-Win64-v102"
--extra-include-dirs="C:\xz_extracted\include"
--extra-lib-dirs="C:\xz_extracted\bin_x86-64"
--extra-include-dirs="%WORK_DIR%\rocksdb\include"
--extra-lib-dirs="%WORK_DIR%"
--ghc-options="-copy-libs-when-linking"
# TODO: CSL-1133. To be reenabled.
# - stack test --coverage
# - stack hpc report cardano-sl cardano-sl-txp cardano-sl-core cardano-sl-db cardano-sl-update cardano-sl-infra cardano-sl-lrc cardano-sl-ssc
# Retry transient failures due to https://github.com/haskell/cabal/issues/4005
# We intentionally don't build auxx here, because this build is for installer.
- scripts\ci\appveyor-retry call stack --dump-logs install cardano-sl cardano-sl-tools cardano-wallet
-j 3
--no-terminal
--local-bin-path %WORK_DIR%
--no-haddock-deps
--flag cardano-sl-core:-asserts
--flag cardano-sl-tools:for-installer
--extra-include-dirs="C:\OpenSSL-Win64-v102\include"
--extra-lib-dirs="C:\OpenSSL-Win64-v102"
--extra-include-dirs="C:\xz_extracted\include"
--extra-lib-dirs="C:\xz_extracted\bin_x86-64"
--extra-include-dirs="%WORK_DIR%\rocksdb\include"
--extra-lib-dirs="%WORK_DIR%"
--ghc-options="-copy-libs-when-linking"
# Cardano pieces, modulo the frontend
- mkdir daedalus
# log config is called `log-config-prod.yaml` just in case, it's the old name
- copy log-configs\daedalus.yaml daedalus\log-config-prod.yaml
- copy lib\configuration.yaml daedalus\
- copy lib\*genesis*.json daedalus\
- copy cardano-launcher.exe daedalus\
- copy cardano-node.exe daedalus\
- copy cardano-x509-certificates.exe daedalus\
- cd daedalus
- Echo %APPVEYOR_BUILD_VERSION% > build-id
- Echo %APPVEYOR_REPO_COMMIT% > commit-id
- Echo https://ci.appveyor.com/project/%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%/build/%APPVEYOR_BUILD_VERSION% > ci-url

after_test:
- xcopy /q /s /e /r /k /i /v /h /y "%WORK_DIR%\daedalus" "%APPVEYOR_BUILD_FOLDER%\daedalus"
- cd "%WORK_DIR%/daedalus"
- 7z a "%APPVEYOR_REPO_COMMIT%.zip" *
- appveyor PushArtifact "%APPVEYOR_REPO_COMMIT%.zip"
- cd "%WORK_DIR%" # Get back to where cache-s3.exe is located
- ps: >-
if ( ($env:CACHE_S3_READY -eq $true) -and (-not $env:APPVEYOR_PULL_REQUEST_NUMBER) ) {
if ($env:APPVEYOR_REPO_BRANCH -eq "master" -Or $env:APPVEYOR_REPO_BRANCH -eq "develop" -Or $env:APPVEYOR_REPO_BRANCH -like "release*") {
Write-Host "saving stack"
.\cache-s3 --max-size=$env:CACHE_S3_MAX_SIZE --prefix=$env:APPVEYOR_PROJECT_NAME --git-branch=$env:APPVEYOR_REPO_BRANCH --suffix=windows -c -v info save stack
Write-Host "done stack"
}
Write-Host "saving stack work"
.\cache-s3 --max-size=$env:CACHE_S3_MAX_SIZE --prefix=$env:APPVEYOR_PROJECT_NAME --git-branch=$env:APPVEYOR_REPO_BRANCH --suffix=windows -c -v info save stack work
Write-Host "done stack work"
}
artifacts:
- path: daedalus/
name: CardanoSL
type: zip

deploy:
provider: S3
access_key_id:
secure: IEky6PsMzHaKHNBMxR8tQaQI8X7qWRB9+HuEroTVRBk=
secret_access_key:
secure: cqjzG96hWB1x3JDbVSbF9E+aJ5jKvIGacJRUDWATHaTOYfSt6Rvive/NrF4lKBIm
bucket: appveyor-ci-deploy
region: ap-northeast-1
set_public: true
folder: cardano-sl
artifact: $(APPVEYOR_REPO_COMMIT).zip
=======
test_script:
- ps: echo "No Longer Used, check buildkite windows job"
>>>>>>> release/2.0.0
3 changes: 0 additions & 3 deletions bors.toml
Expand Up @@ -4,12 +4,9 @@ status = [

# Buildkite: stack2nix checks, etc.
"buildkite/cardano-sl",
<<<<<<< HEAD

# Windows: builds are too unreliable to use at present
# "continuous-integration/appveyor/branch",
=======
>>>>>>> release/2.0.0
]
timeout_sec = 7200
required_approvals = 1
Expand Down
7 changes: 0 additions & 7 deletions default.nix
Expand Up @@ -285,16 +285,9 @@ let
cardano-sl-tools
cardano-sl-tools-post-mortem
cardano-sl-util
<<<<<<< HEAD
cardano-sl-x509
cardano-wallet
cardano-wallet-static;
=======
cardano-sl-wallet
cardano-sl-wallet-new
cardano-sl-wallet-new-static
cardano-sl-x509;
>>>>>>> release/2.0.0
inherit (self.haskellPackages)
cardano-report-server; }
# nix-tools setup
Expand Down
4 changes: 0 additions & 4 deletions docs/how-to/build-cardano-sl-and-daedalus-from-source-code.md
Expand Up @@ -65,11 +65,7 @@ NOTE: the various other Cardano components can be obtained through other attribu
- `cardano-explorer`, `cardano-explorer-swagger`, `cardano-explorer-mock`
- `cardano-sl-tools`:
- `cardano-analyzer`, `cardano-dht-keygen`, `cardano-genupdate`, `cardano-keygen`, `cardano-launcher`, `cardano-addr-convert`, `cardano-cli-docs`, `cardano-block-gen`, `cardano-post-mortem`
<<<<<<< HEAD
- `cardano-wallet-static`:
=======
- `cardano-sl-wallet-new-static`:
>>>>>>> release/2.0.0
- `cardano-node`, `cardano-generate-swagger-file`

In general, for any given cabal `PACKAGE` provided by Cardano, there is a
Expand Down
1 change: 1 addition & 0 deletions nix/.stack.nix/cardano-sl-db.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion nix/.stack.nix/cardano-sl-tools.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions nix/stack2nix.nix
@@ -1,14 +1,7 @@
{pkgs, fetchFromGitHub }:

<<<<<<< HEAD
import (fetchFromGitHub {
owner = "input-output-hk";
=======
let
hostPkgs = import pkgs.path { config = {}; system = builtins.currentSystem; overlays = []; };
in import (hostPkgs.fetchFromGitHub {
owner = "avieth";
>>>>>>> release/2.0.0
repo = "stack2nix";
rev = "60c36985f07ab87ed01a8a68b6978aba58c8afbd";
sha256 = "13swg8wxsvy91gkbqs0j661kk4gz2mhqbjghwhhsjqqpwxp2wlns";
Expand Down
13 changes: 0 additions & 13 deletions pkgs/default.nix
Expand Up @@ -13409,14 +13409,9 @@ version = "0.5.10";
src = fetchgit {

url = "https://github.com/input-output-hk/cardano-report-server.git";
<<<<<<< HEAD
sha256 = "04zsgrmnlyjymry6fsqnz692hdp89ykqb8jyxib8yklw101gdn3x";
rev = "93f2246c54436e7f98cc363b4e0f8f1cb5e78717";
fetchSubmodules = true;
=======
sha256 = "10hqaxc07rkqaj7br4kki4drg2hz45rp7wr1b8s9b6cfg3apriwp";
rev = "62f04801ef9fce4c8e856607400a2bb05ab732e9";
>>>>>>> release/2.0.0

};
isLibrary = true;
Expand Down Expand Up @@ -15367,10 +15362,6 @@ license = stdenv.lib.licenses.mit;
, aeson
, base
, bytestring
<<<<<<< HEAD
=======
, cardano-sl-chain
>>>>>>> release/2.0.0
, cardano-sl-client
, cardano-sl-core
, cardano-sl-crypto
Expand Down Expand Up @@ -15431,10 +15422,6 @@ libraryHaskellDepends = [
aeson
base
bytestring
<<<<<<< HEAD
=======
cardano-sl-chain
>>>>>>> release/2.0.0
cardano-sl-client
cardano-sl-core
cardano-sl-crypto
Expand Down
19 changes: 0 additions & 19 deletions release.nix
Expand Up @@ -172,7 +172,6 @@ let
dockerImage = wrapDockerImage cluster;
};
};
<<<<<<< HEAD
# return an attribute set containing the result of running every test-suite in cardano, on the given system
makeCardanoTestRuns = system:
let
Expand All @@ -181,53 +180,35 @@ let
f = name: value: value.testrun;
in pkgs.lib.mapAttrs f (lib.filterAttrs pred cardanoPkgs);
in pkgs.lib.fix (jobsets: mapped // mapped-nix-tools' // {
=======
in pkgs.lib.fix (jobsets: mapped // {
>>>>>>> release/2.0.0
inherit tests;
inherit (pkgs) cabal2nix;
nixpkgs = let
wrapped = pkgs.runCommand "nixpkgs" {} ''
ln -sv ${fixedNixpkgs} $out
'';
in if 0 <= builtins.compareVersions builtins.nixVersion "1.12" then wrapped else fixedNixpkgs;
<<<<<<< HEAD
# the result of running every cardano test-suite on 64bit linux
all-cardano-tests.x86_64-linux = makeCardanoTestRuns "x86_64-linux";
# hydra will create a special aggregate job, that relies on all of these sub-jobs passing
=======
>>>>>>> release/2.0.0
required = pkgs.lib.hydraJob (pkgs.releaseTools.aggregate {
name = "cardano-required-checks";
constituents =
let
<<<<<<< HEAD
allLinux = x: map (system: x.${system}) [ "x86_64-linux" ];
all = x: map (system: x.${system}) supportedSystems;
in
[
(builtins.concatLists (map lib.attrValues (allLinux jobsets.all-cardano-tests)))
=======
all = x: map (system: x.${system}) supportedSystems;
in
[
>>>>>>> release/2.0.0
(all jobsets.all-cardano-sl)
(all jobsets.daedalus-bridge)
jobsets.mainnet.connectScripts.wallet.x86_64-linux
jobsets.tests.hlint
jobsets.tests.shellcheck
jobsets.tests.stylishHaskell
jobsets.tests.swaggerSchemaValidation
<<<<<<< HEAD
(builtins.concatLists (lib.attrValues (lib.mapAttrs (_: allLinux) jobsets.nix-tools.libs)))
(builtins.concatLists (lib.attrValues (lib.mapAttrs (_: allLinux) jobsets.nix-tools.exes)))
];
});
}
// (builtins.listToAttrs (map makeRelease [ "mainnet" "staging" ])))
=======
];
});
} // (builtins.listToAttrs (map makeRelease [ "mainnet" "staging" ])))
>>>>>>> release/2.0.0
4 changes: 0 additions & 4 deletions stack.yaml
Expand Up @@ -47,11 +47,7 @@ packages:

- location:
git: https://github.com/input-output-hk/cardano-report-server.git
<<<<<<< HEAD
commit: 93f2246c54436e7f98cc363b4e0f8f1cb5e78717
=======
commit: 62f04801ef9fce4c8e856607400a2bb05ab732e9
>>>>>>> release/2.0.0
extra-dep: true

- location:
Expand Down

0 comments on commit e0802a2

Please sign in to comment.