From c5bc12da7cb60af46e67e59398f55599a345b070 Mon Sep 17 00:00:00 2001 From: Daniel Ziltener Date: Mon, 2 Mar 2020 00:06:25 +0100 Subject: [PATCH] CircleCI --- .circleci/config.yml | 2 +- build.ps1 | 8 ++++---- chicken.nuspec | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4f9756d..5e54bcf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,4 +16,4 @@ jobs: - run: choco install -y msys2 - run: .\build.ps1 - run: choco apikey --key $Env:CHOCO_API_KEY --source https://push.chocolatey.org - - run: choco push chicken.$version.nupkg --source https://push.chocolatey.org + - run: choco push chicken.$Env:version.nupkg --source https://push.chocolatey.org diff --git a/build.ps1 b/build.ps1 index 7ef702f..007d3ea 100644 --- a/build.ps1 +++ b/build.ps1 @@ -3,7 +3,7 @@ #$binaryversion=11 # Fetching and unpacking remote files -Invoke-WebRequest -UseBasicParsing -Uri "https://code.call-cc.org/releases/$version/chicken-$version.tar.gz" -OutFile '.\chicken.tar.gz' +Invoke-WebRequest -UseBasicParsing -Uri "https://code.call-cc.org/releases/$Env:version/chicken-$Env:version.tar.gz" -OutFile '.\chicken.tar.gz' #Expand-7Zip chicken.tar.gz -TargetPath '.\' #Expand-7Zip chicken.tar -TargetPath '.\' 7z x chicken.tar.gz @@ -16,7 +16,7 @@ mv chicken-* chickenbuild C:\tools\msys64\usr\bin\bash.exe --login -c 'pacboy -Sy --needed --noconfirm binutils:x make:x gcc:x gettext:x readline:x' $env:Path+=";C:\tools\msys64\mingw64\bin" mingw32-make.exe -C chickenbuild PLATFORM=mingw ARCH=x86-64 PREFIX=C:/tools/chicken -choco new chicken --version $version --maintainername="'Daniel Ziltener'" +choco new chicken --version $Env:version --maintainername="'Daniel Ziltener'" Remove-Item -Recurse -Force chicken\tools\ Remove-Item -Force chicken\ReadMe.md @@ -67,8 +67,8 @@ foreach ($file in $files) { cd .. # Cleanup and packaging Remove-Item -Recurse -Force chickenbuild -(Get-Content chicken.nuspec).replace("CHICKEN_VERSION", "$version") | Set-Content chicken\chicken.nuspec +(Get-Content chicken.nuspec).replace("CHICKEN_VERSION", "$Env:version") | Set-Content chicken\chicken.nuspec cd chicken choco pack cd .. -mv .\chicken\chicken.$version.nupkg .\ +mv .\chicken\chicken.$Env:version.nupkg .\ diff --git a/chicken.nuspec b/chicken.nuspec index 62948ad..153e673 100644 --- a/chicken.nuspec +++ b/chicken.nuspec @@ -2,7 +2,7 @@ chicken - 5.2.0 + CHICKEN_VERSION Chicken Scheme Felix Winkelmann, Peter Bex, Evan Hanson Daniel Ziltener