Skip to content

Commit c628947

Browse files
author
Stuart Padley
committed
Verified works in local repo as well as ADO
1 parent 2d5cf1e commit c628947

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Binaries for programs and plugins
2-
*.exe
2+
output
3+
.exe
34
*.exe~
45
*.dll
56
*.so

release/linux/rpm/pipeline-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ for i in ${!ZYPPER_DISTRO_BASE_IMAGE[@]}; do
9494

9595
script="zypper --non-interactive install curl && \
9696
rpm -v --import https://packages.microsoft.com/keys/microsoft.asc && \
97-
zypper --non-interactive install --allow-unsigned-rpm /mnt/artifacts/${rpmPkg} && \
97+
zypper --non-interactive install /mnt/artifacts/${rpmPkg} && \
9898
sqlcmd --help"
9999

100100
docker pull ${image}

release/linux/rpm/pipeline.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ set -exv
2121

2222
: "${REPO_ROOT_DIR:=`cd $(dirname $0); cd ../../../; pwd`}"
2323

24-
cp ${BUILD_OUTPUT}/SqlcmdLinuxAmd64/sqlcmd ${REPO_ROOT_DIR}/sqlcmd
24+
if [[ "${BUILD_OUTPUT}" != "" ]]; then
25+
cp ${BUILD_OUTPUT}/SqlcmdLinuxAmd64/sqlcmd ${REPO_ROOT_DIR}/sqlcmd
26+
fi
2527

2628
DIST_DIR=${BUILD_STAGINGDIRECTORY:=${REPO_ROOT_DIR}/output/rpm}
2729
DISTRO_BASE_IMAGE=( centos:centos7 fedora:29 )

0 commit comments

Comments
 (0)