aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2017-06-15 16:13:58 +0800
committerGitHub <noreply@github.com>2017-06-15 16:13:58 +0800
commit1636602fc434da0b2d1a939870d2886facee209c (patch)
tree90b9c9ad9c4659fe9af70e20bb94479f2b3365fe
parent9084d48750afeed128e4d1b7cfe5e836d773d3f3 (diff)
parenta87b22c1229f9f5bec8dafd43d42365c7459a7c7 (diff)
downloaddexon-solidity-1636602fc434da0b2d1a939870d2886facee209c.tar
dexon-solidity-1636602fc434da0b2d1a939870d2886facee209c.tar.gz
dexon-solidity-1636602fc434da0b2d1a939870d2886facee209c.tar.bz2
dexon-solidity-1636602fc434da0b2d1a939870d2886facee209c.tar.lz
dexon-solidity-1636602fc434da0b2d1a939870d2886facee209c.tar.xz
dexon-solidity-1636602fc434da0b2d1a939870d2886facee209c.tar.zst
dexon-solidity-1636602fc434da0b2d1a939870d2886facee209c.zip
Merge pull request #2363 from ethereum/windows_bytecodedir
Change windows CI to use the same bytecode directory as linux.
-rw-r--r--appveyor.yml3
-rw-r--r--scripts/bytecodecompare/storebytecode.bat6
2 files changed, 5 insertions, 4 deletions
diff --git a/appveyor.yml b/appveyor.yml
index 22ec30a0..55c80a21 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -65,7 +65,8 @@ build_script:
- msbuild solidity.sln /p:Configuration=%CONFIGURATION% /m:%NUMBER_OF_PROCESSORS% /v:minimal
- cd %APPVEYOR_BUILD_FOLDER%
- scripts\release.bat %CONFIGURATION%
- - scripts\bytecodecompare\storebytecode.bat %CONFIGURATION% %APPVEYOR_REPO_COMMIT%
+ - ps: $bytecodedir = git show -s --format="%cd-%H" --date=short
+ - ps: scripts\bytecodecompare\storebytecode.bat $Env:CONFIGURATION $bytecodedir
test_script:
- cd %APPVEYOR_BUILD_FOLDER%
diff --git a/scripts/bytecodecompare/storebytecode.bat b/scripts/bytecodecompare/storebytecode.bat
index 969a42a4..aa829d20 100644
--- a/scripts/bytecodecompare/storebytecode.bat
+++ b/scripts/bytecodecompare/storebytecode.bat
@@ -20,7 +20,7 @@ REM Copyright (c) 2017 solidity contributors.
REM ---------------------------------------------------------------------------
set CONFIGURATION=%1
-set COMMIT=%2
+set DIRECTORY=%2
mkdir bytecode
cd bytecode
@@ -33,8 +33,8 @@ git config user.name "travis"
git config user.email "chris@ethereum.org"
git clean -f -d -x
-mkdir %COMMIT%
-set REPORT=%COMMIT%/windows.txt
+if not exist %DIRECTORY% mkdir %DIRECTORY%
+set REPORT=%DIRECTORY%/windows.txt
cp ../report.txt %REPORT%
git add %REPORT%
git commit -a -m "Added report."