summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Davison <dandavison7@gmail.com>2019-07-21 22:07:06 -0400
committerDan Davison <dandavison7@gmail.com>2019-07-22 09:52:10 -0400
commitbd12fbe58658279f02fd5ef8816f2aef12628f85 (patch)
tree4ce171062a2321bdd48ad21c0047fe45119304d5
parent334d4ed0d665560838cd3798ec9195791b7c9b33 (diff)
Update Windows build0.0.5
l---------ci1
-rw-r--r--ci/.gitattributes (renamed from src/bat/ci/.gitattributes)0
-rwxr-xr-xci/before_deploy.sh (renamed from src/bat/ci/before_deploy.bash)10
-rwxr-xr-xci/before_install.sh (renamed from src/bat/ci/before_install.bash)0
-rwxr-xr-xci/script.sh (renamed from src/bat/ci/script.bash)0
-rw-r--r--src/bat/.travis.yml7
-rw-r--r--src/bat/ci/before_deploy.ps125
7 files changed, 11 insertions, 32 deletions
diff --git a/ci b/ci
deleted file mode 120000
index c4e7ba7e..00000000
--- a/ci
+++ /dev/null
@@ -1 +0,0 @@
-src/bat/ci \ No newline at end of file
diff --git a/src/bat/ci/.gitattributes b/ci/.gitattributes
index 36eaad9f..36eaad9f 100644
--- a/src/bat/ci/.gitattributes
+++ b/ci/.gitattributes
diff --git a/src/bat/ci/before_deploy.bash b/ci/before_deploy.sh
index 2b6b2115..22ae7e3a 100755
--- a/src/bat/ci/before_deploy.bash
+++ b/ci/before_deploy.sh
@@ -30,7 +30,9 @@ pack() {
# copying the main binary
cp "target/$TARGET/release/$PROJECT_NAME" "$tempdir/$package_name/"
- "${gcc_prefix}"strip "$tempdir/$package_name/$PROJECT_NAME"
+ if [ "$TRAVIS_OS_NAME" != windows ]; then
+ "${gcc_prefix}"strip "$tempdir/$package_name/$PROJECT_NAME"
+ fi
# manpage, readme and license
cp README.md "$tempdir/$package_name"
@@ -38,7 +40,11 @@ pack() {
# archiving
pushd "$tempdir"
- tar czf "$out_dir/$package_name.tar.gz" "$package_name"/*
+ if [ "$TRAVIS_OS_NAME" = windows ]; then
+ 7z a "$out_dir/$package_name.zip" "$package_name"/*
+ else
+ tar czf "$out_dir/$package_name.tar.gz" "$package_name"/*
+ fi
popd
rm -r "$tempdir"
}
diff --git a/src/bat/ci/before_install.bash b/ci/before_install.sh
index 9acf6025..9acf6025 100755
--- a/src/bat/ci/before_install.bash
+++ b/ci/before_install.sh
diff --git a/src/bat/ci/script.bash b/ci/script.sh
index 3b717e5f..3b717e5f 100755
--- a/src/bat/ci/script.bash
+++ b/ci/script.sh
diff --git a/src/bat/.travis.yml b/src/bat/.travis.yml
index 804d89f4..02ef3497 100644
--- a/src/bat/.travis.yml
+++ b/src/bat/.travis.yml
@@ -57,8 +57,7 @@ matrix:
sudo: required
before_install:
- - cd src/bat
- - ci/before_install.bash
+ - ci/before_install.sh
env:
global:
@@ -73,10 +72,10 @@ install:
- if [[ $TRAVIS_OS_NAME = linux && $HOST != $TARGET ]]; then rustup target add $TARGET; fi
script:
- - ci/script.bash
+ - ci/script.sh
before_deploy:
- - bash ci/before_deploy.bash
+ - bash ci/before_deploy.sh
deploy:
provider: releases
diff --git a/src/bat/ci/before_deploy.ps1 b/src/bat/ci/before_deploy.ps1
deleted file mode 100644
index 918b1d93..00000000
--- a/src/bat/ci/before_deploy.ps1
+++ /dev/null
@@ -1,25 +0,0 @@
-# This script takes care of packaging the build artifacts that will go in the
-# release zipfile
-
-$SRC_DIR = $PWD.Path
-$STAGE = [System.Guid]::NewGuid().ToString()
-
-Set-Location $ENV:Temp
-New-Item -Type Directory -Name $STAGE
-Set-Location $STAGE
-
-$ZIP = "$SRC_DIR\$($Env:CRATE_NAME)-$($Env:APPVEYOR_REPO_TAG_NAME)-$($Env:TARGET).zip"
-
-Copy-Item "$SRC_DIR\target\release\delta.exe" '.\'
-
-# readme and license
-Copy-Item $SRC_DIR\README.md '.\'
-Copy-Item $SRC_DIR\LICENSE '.\'
-
-7z a "$ZIP" *
-
-Push-AppveyorArtifact "$ZIP"
-
-Set-Location ..
-Remove-Item $STAGE -Force -Recurse
-Set-Location $SRC_DIR