Skip to content

Commit

Permalink
Merge pull request #969 from input-output-hk/devops-900-version
Browse files Browse the repository at this point in the history
[DEVOPS-900] Bump version to 0.10.1-cardano-sl-1.2.1
  • Loading branch information
nikolaglumac committed Jun 11, 2018
2 parents f87ae59 + 00f260f commit 53caf28
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .buildkite/pipeline.yml
Expand Up @@ -2,20 +2,20 @@ steps:
- label: 'daedalus-x86_64-darwin'
command: 'scripts/nix-shell.sh --run "scripts/build-installer-unix.sh $VERSION --build-id $BUILDKITE_BUILD_NUMBER --pull-request $BUILDKITE_PULL_REQUEST"'
env:
VERSION: 1.2.0
VERSION: 1.2.1
NIX_SSL_CERT_FILE: /nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt
NETWORK: mainnet
agents:
system: x86_64-darwin
- label: 'daedalus-x86_64-linux'
command: 'scripts/nix-shell.sh --run "scripts/build-installer-unix.sh $VERSION --build-id $BUILDKITE_BUILD_NUMBER --pull-request $BUILDKITE_PULL_REQUEST"'
env:
VERSION: 1.2.0
VERSION: 1.2.1
agents:
system: x86_64-linux
- label: 'daedalus-x86_64-linux-nix'
command: 'scripts/nix-shell.sh --run "scripts/build-installer-nix.sh"'
env:
VERSION: 1.2.0
VERSION: 1.2.1
agents:
system: x86_64-linux
2 changes: 1 addition & 1 deletion appveyor.yml
@@ -1,4 +1,4 @@
version: 1.2.0.{build}
version: 1.2.1.{build}

environment:
nodejs_version: "8"
Expand Down
4 changes: 2 additions & 2 deletions installers/WindowsInstaller.hs
Expand Up @@ -120,7 +120,7 @@ writeInstallerNSIS (Version fullVersion') clusterName = do
_ <- constantStr "Version" (str fullVersion)
_ <- constantStr "Cluster" (str $ unpack $ lshowText clusterName)
name "Daedalus ($Version)" -- The name of the installer
outFile "daedalus-0.10.0-cardano-sl-$Version-$Cluster-windows.exe" -- Where to produce the installer
outFile "daedalus-0.10.1-cardano-sl-$Version-$Cluster-windows.exe" -- Where to produce the installer
unsafeInjectGlobal $ "!define MUI_ICON \"icons\\64x64.ico\""
unsafeInjectGlobal $ "!define MUI_HEADERIMAGE"
unsafeInjectGlobal $ "!define MUI_HEADERIMAGE_BITMAP \"icons\\installBanner.bmp\""
Expand Down Expand Up @@ -207,7 +207,7 @@ main :: Options -> IO ()
main opts@Options{..} = do
echo "Writing version.txt"
let fullVersion = Version $ fromVer oDaedalusVer <> ".0"
fullName = "daedalus-0.10.0-cardano-sl-" <> (fromVer fullVersion) <> "-" <> (lshowText oCluster) <> "-windows.exe"
fullName = "daedalus-0.10.1-cardano-sl-" <> (fromVer fullVersion) <> "-" <> (lshowText oCluster) <> "-windows.exe"
TIO.writeFile "version.txt" $ fromVer fullVersion

generateOSClusterConfigs "./dhall" "." opts
Expand Down
4 changes: 2 additions & 2 deletions release.nix
@@ -1,11 +1,11 @@
{ version ? "1.2.0", buildNr ? "nix" }:
{ version ? "1.2.1", buildNr ? "nix" }:
let
makeJobs = cluster: with import ./. { inherit cluster; version = "${version}.${buildNr}"; }; {
inherit daedalus;
installer = wrappedBundle newBundle pkgs cluster;
};
wrappedBundle = newBundle: pkgs: cluster: let
fn = "daedalus-0.10.0-cardano-sl-${version}.${buildNr}-${cluster}-linux.bin";
fn = "daedalus-0.10.1-cardano-sl-${version}.${buildNr}-${cluster}-linux.bin";
in pkgs.runCommand "daedaus-installer" {} ''
mkdir -pv $out/nix-support
cp ${newBundle} $out/${fn}
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-installer-unix.sh
Expand Up @@ -128,7 +128,7 @@ cd installers
do
echo "~~~ Generating installer for cluster ${cluster}.."
export DAEDALUS_CLUSTER=${cluster}
INSTALLER_PKG="daedalus-0.10.0-cardano-sl-${DAEDALUS_VERSION}-${cluster}-macos.pkg"
INSTALLER_PKG="daedalus-0.10.1-cardano-sl-${DAEDALUS_VERSION}-${cluster}-macos.pkg"

INSTALLER_CMD="$INSTALLER/bin/make-installer ${pull_request} ${test_installer}"
INSTALLER_CMD+=" --cardano ${DAEDALUS_BRIDGE}"
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-installer-win64.bat
Expand Up @@ -143,7 +143,7 @@ FOR %%C IN (%CLUSTERS:"=%) DO (
@echo ###
@echo ##############################################################################

make-installer %XARGS:"=% -c %%C -o daedalus-0.10.0-cardano-sl-%DAEDALUS_VERSION%-%%C-windows.exe
make-installer %XARGS:"=% -c %%C -o daedalus-0.10.1-cardano-sl-%DAEDALUS_VERSION%-%%C-windows.exe
@if %errorlevel% neq 0 ( @echo FATAL: failed to build installer
popd & exit /b 1)
copy /y launcher-config.yaml launcher-config-%%C.win64.yaml
Expand Down

0 comments on commit 53caf28

Please sign in to comment.