mmctl is not being included in the package (#16105)
It's was including it in the bin folder but when we package we need to include it in the dist/bin so right now the `download_mmctl` script accepts a second parameter to define the path where the binary is going to be stored
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
27dbe9e182
Коммит
bb095c2a1a
@@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
dist: | check-style test package
|
dist: | check-style test package
|
||||||
|
|
||||||
build-linux:
|
build-linux:
|
||||||
@@ -98,7 +97,7 @@ package:
|
|||||||
cp -RL $(BUILD_WEBAPP_DIR)/dist/* $(DIST_PATH)/client
|
cp -RL $(BUILD_WEBAPP_DIR)/dist/* $(DIST_PATH)/client
|
||||||
|
|
||||||
@#Download MMCTL
|
@#Download MMCTL
|
||||||
scripts/download_mmctl_release.sh
|
scripts/download_mmctl_release.sh "" $(DIST_PATH)/bin
|
||||||
|
|
||||||
@# Help files
|
@# Help files
|
||||||
ifeq ($(BUILD_ENTERPRISE_READY),true)
|
ifeq ($(BUILD_ENTERPRISE_READY),true)
|
||||||
@@ -137,7 +136,7 @@ else
|
|||||||
cp $(GOBIN)/darwin_amd64/platform $(DIST_PATH)/bin # from cross-compiled bin dir
|
cp $(GOBIN)/darwin_amd64/platform $(DIST_PATH)/bin # from cross-compiled bin dir
|
||||||
endif
|
endif
|
||||||
#Download MMCTL for OSX
|
#Download MMCTL for OSX
|
||||||
scripts/download_mmctl_release.sh "Darwin"
|
scripts/download_mmctl_release.sh "Darwin" $(DIST_PATH)/bin
|
||||||
@# Prepackage plugins
|
@# Prepackage plugins
|
||||||
@for plugin_package in $(PLUGIN_PACKAGES) ; do \
|
@for plugin_package in $(PLUGIN_PACKAGES) ; do \
|
||||||
ARCH="osx-amd64"; \
|
ARCH="osx-amd64"; \
|
||||||
@@ -172,7 +171,7 @@ else
|
|||||||
cp $(GOBIN)/windows_amd64/platform.exe $(DIST_PATH)/bin # from cross-compiled bin dir
|
cp $(GOBIN)/windows_amd64/platform.exe $(DIST_PATH)/bin # from cross-compiled bin dir
|
||||||
endif
|
endif
|
||||||
#Download MMCTL for Windows
|
#Download MMCTL for Windows
|
||||||
scripts/download_mmctl_release.sh "Windows"
|
scripts/download_mmctl_release.sh "Windows" $(DIST_PATH)/bin
|
||||||
@# Prepackage plugins
|
@# Prepackage plugins
|
||||||
@for plugin_package in $(PLUGIN_PACKAGES) ; do \
|
@for plugin_package in $(PLUGIN_PACKAGES) ; do \
|
||||||
ARCH="windows-amd64"; \
|
ARCH="windows-amd64"; \
|
||||||
@@ -207,7 +206,7 @@ else
|
|||||||
cp $(GOBIN)/linux_amd64/platform $(DIST_PATH)/bin # from cross-compiled bin dir
|
cp $(GOBIN)/linux_amd64/platform $(DIST_PATH)/bin # from cross-compiled bin dir
|
||||||
endif
|
endif
|
||||||
#Download MMCTL for Linux
|
#Download MMCTL for Linux
|
||||||
scripts/download_mmctl_release.sh "Linux"
|
scripts/download_mmctl_release.sh "Linux" $(DIST_PATH)/bin
|
||||||
@# Prepackage plugins
|
@# Prepackage plugins
|
||||||
@for plugin_package in $(PLUGIN_PACKAGES) ; do \
|
@for plugin_package in $(PLUGIN_PACKAGES) ; do \
|
||||||
ARCH="linux-amd64"; \
|
ARCH="linux-amd64"; \
|
||||||
|
|||||||
@@ -13,6 +13,8 @@ then
|
|||||||
OVERRIDE_OS=$1
|
OVERRIDE_OS=$1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
BIN_PATH=${2:-bin}
|
||||||
|
|
||||||
# strip whitespace
|
# strip whitespace
|
||||||
THIS_BRANCH=$(git rev-parse --abbrev-ref HEAD)
|
THIS_BRANCH=$(git rev-parse --abbrev-ref HEAD)
|
||||||
if [[ "$THIS_BRANCH" =~ 'release-'[0-9] ]];
|
if [[ "$THIS_BRANCH" =~ 'release-'[0-9] ]];
|
||||||
@@ -34,15 +36,15 @@ fi
|
|||||||
case "$PLATFORM" in
|
case "$PLATFORM" in
|
||||||
|
|
||||||
Linux)
|
Linux)
|
||||||
MMCTL_FILE="linux_amd64.tar" && curl -f -O -L https://releases.mattermost.com/mmctl/"$RELEASE_TO_DOWNLOAD"/"$MMCTL_FILE" && tar -xvf "$MMCTL_FILE" -C bin && rm "$MMCTL_FILE";
|
MMCTL_FILE="linux_amd64.tar" && curl -f -O -L https://releases.mattermost.com/mmctl/"$RELEASE_TO_DOWNLOAD"/"$MMCTL_FILE" && tar -xvf "$MMCTL_FILE" -C "$BIN_PATH" && rm "$MMCTL_FILE";
|
||||||
;;
|
;;
|
||||||
|
|
||||||
Darwin)
|
Darwin)
|
||||||
MMCTL_FILE="darwin_amd64.tar" && curl -f -O -L https://releases.mattermost.com/mmctl/"$RELEASE_TO_DOWNLOAD"/"$MMCTL_FILE" && tar -xvf "$MMCTL_FILE" -C bin && rm "$MMCTL_FILE";
|
MMCTL_FILE="darwin_amd64.tar" && curl -f -O -L https://releases.mattermost.com/mmctl/"$RELEASE_TO_DOWNLOAD"/"$MMCTL_FILE" && tar -xvf "$MMCTL_FILE" -C "$BIN_PATH" && rm "$MMCTL_FILE";
|
||||||
;;
|
;;
|
||||||
|
|
||||||
Windows)
|
Windows)
|
||||||
MMCTL_FILE="windows_amd64.zip" && curl -f -O -L https://releases.mattermost.com/mmctl/"$RELEASE_TO_DOWNLOAD"/"$MMCTL_FILE" && unzip -o "$MMCTL_FILE" -d bin && rm "$MMCTL_FILE";
|
MMCTL_FILE="windows_amd64.zip" && curl -f -O -L https://releases.mattermost.com/mmctl/"$RELEASE_TO_DOWNLOAD"/"$MMCTL_FILE" && unzip -o "$MMCTL_FILE" -d "$BIN_PATH" && rm "$MMCTL_FILE";
|
||||||
;;
|
;;
|
||||||
|
|
||||||
*)
|
*)
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user