This reverts commit 5ede63badc.
Этот коммит содержится в:
Carlos Tadeu Panato Junior
коммит произвёл
GitHub
GitHub
родитель
7a0131ee14
Коммит
2865ad9221
@@ -14,7 +14,7 @@ executors:
|
||||
COMPOSE_PROJECT_NAME: "circleci"
|
||||
|
||||
jobs:
|
||||
setup-webapp:
|
||||
setup:
|
||||
working_directory: ~/mattermost/mattermost-server
|
||||
docker:
|
||||
- image: mattermost/mattermost-build-webapp:20210524_node-16
|
||||
@@ -55,24 +55,6 @@ jobs:
|
||||
- mattermost-webapp
|
||||
- mattermost-server
|
||||
|
||||
setup-mmctl:
|
||||
working_directory: ~/mattermost/mattermost-server
|
||||
docker:
|
||||
- image: mattermost/mattermost-build-server:20210810_golang-1.16.7
|
||||
steps:
|
||||
- checkout
|
||||
- run: |
|
||||
cd ../
|
||||
git clone --depth=1 --no-single-branch https://github.com/mattermost/mmctl.git
|
||||
cd mmctl
|
||||
git checkout $CIRCLE_BRANCH || git checkout master
|
||||
make package
|
||||
cd -
|
||||
- persist_to_workspace:
|
||||
root: ~/mattermost
|
||||
paths:
|
||||
- mmctl/build
|
||||
|
||||
check-deps:
|
||||
parameters:
|
||||
cve_data_directory:
|
||||
@@ -503,22 +485,21 @@ workflows:
|
||||
version: 2
|
||||
untagged-build:
|
||||
jobs:
|
||||
- setup-webapp:
|
||||
filters:
|
||||
branches:
|
||||
ignore:
|
||||
- master
|
||||
- /^release-.*/
|
||||
- setup-mmctl:
|
||||
- setup:
|
||||
filters:
|
||||
branches:
|
||||
ignore:
|
||||
- master
|
||||
- /^release-.*/
|
||||
# Disabling check-deps since the new version is not on bintray and all builds will fail
|
||||
# we've are on top of this, and it's going to be temporary.
|
||||
#- check-deps:
|
||||
# context: sast-webhook
|
||||
# requires:
|
||||
# - setup
|
||||
# - check-i18n:
|
||||
# requires:
|
||||
# - setup-webapp
|
||||
# - setup-mmctl
|
||||
# - setup
|
||||
- check-golangci-lint:
|
||||
filters:
|
||||
branches:
|
||||
@@ -527,32 +508,25 @@ workflows:
|
||||
- /^release-.*/
|
||||
- check-app-layers:
|
||||
requires:
|
||||
- setup-webapp
|
||||
- setup-mmctl
|
||||
- setup
|
||||
- check-store-layers:
|
||||
requires:
|
||||
- setup-webapp
|
||||
- setup-mmctl
|
||||
- setup
|
||||
- check-mocks:
|
||||
requires:
|
||||
- setup-webapp
|
||||
- setup-mmctl
|
||||
- setup
|
||||
- check-migrations:
|
||||
requires:
|
||||
- setup-webapp
|
||||
- setup-mmctl
|
||||
- setup
|
||||
- check-email-templates:
|
||||
requires:
|
||||
- setup-webapp
|
||||
- setup-mmctl
|
||||
- setup
|
||||
- check-mattermost-vet:
|
||||
requires:
|
||||
- setup-webapp
|
||||
- setup-mmctl
|
||||
- setup
|
||||
- build-api-spec:
|
||||
requires:
|
||||
- setup-webapp
|
||||
- setup-mmctl
|
||||
- setup
|
||||
- build:
|
||||
requires:
|
||||
- check-app-layers
|
||||
@@ -606,24 +580,22 @@ workflows:
|
||||
- check-email-templates
|
||||
release-build:
|
||||
jobs:
|
||||
- setup-webapp:
|
||||
filters:
|
||||
branches:
|
||||
only:
|
||||
- master
|
||||
- /^release-.*/
|
||||
- cloud
|
||||
- setup-mmctl:
|
||||
- setup:
|
||||
filters:
|
||||
branches:
|
||||
only:
|
||||
- master
|
||||
- /^release-.*/
|
||||
- cloud
|
||||
# Disabling check-deps since the new version is not on bintray and all builds will fail
|
||||
# we've are on top of this, and it's going to be temporary.
|
||||
#- check-deps:
|
||||
# context: sast-webhook
|
||||
# requires:
|
||||
# - setup
|
||||
# - check-i18n:
|
||||
# requires:
|
||||
# - setup-webapp
|
||||
# - setup-mmctl
|
||||
# - setup
|
||||
- check-golangci-lint:
|
||||
filters:
|
||||
branches:
|
||||
@@ -633,32 +605,25 @@ workflows:
|
||||
- cloud
|
||||
- check-app-layers:
|
||||
requires:
|
||||
- setup-webapp
|
||||
- setup-mmctl
|
||||
- setup
|
||||
- check-store-layers:
|
||||
requires:
|
||||
- setup-webapp
|
||||
- setup-mmctl
|
||||
- setup
|
||||
- build-api-spec:
|
||||
requires:
|
||||
- setup-webapp
|
||||
- setup-mmctl
|
||||
- setup
|
||||
- check-mocks:
|
||||
requires:
|
||||
- setup-webapp
|
||||
- setup-mmctl
|
||||
- setup
|
||||
- check-migrations:
|
||||
requires:
|
||||
- setup-webapp
|
||||
- setup-mmctl
|
||||
- setup
|
||||
- check-email-templates:
|
||||
requires:
|
||||
- setup-webapp
|
||||
- setup-mmctl
|
||||
- setup
|
||||
- check-mattermost-vet:
|
||||
requires:
|
||||
- setup-webapp
|
||||
- setup-mmctl
|
||||
- setup
|
||||
- sentry:
|
||||
context: matterbuild-sentry
|
||||
requires:
|
||||
|
||||
@@ -164,7 +164,8 @@ ifeq ("darwin_arm64","$(CURRENT_PACKAGE_ARCH)")
|
||||
else ifeq ("linux_arm64","$(CURRENT_PACKAGE_ARCH)")
|
||||
echo "No plugins or mmctl yet for $(CURRENT_PACKAGE_ARCH) platform, skipping..."
|
||||
else
|
||||
tar xf ../mmctl/build/$(CURRENT_PACKAGE_ARCH).tar -C $(DIST_PATH_GENERIC)/bin
|
||||
#Download MMCTL for $(MMCTL_PLATFORM)
|
||||
scripts/download_mmctl_release.sh $(MMCTL_PLATFORM) $(DIST_PATH_GENERIC)/bin
|
||||
@# Prepackage plugins
|
||||
@for plugin_package in $(PLUGIN_PACKAGES) ; do \
|
||||
ARCH=$(PLUGIN_ARCH); \
|
||||
@@ -227,7 +228,8 @@ ifeq ($(BUILDER_GOOS_GOARCH),"windows_amd64")
|
||||
else
|
||||
cp $(GOBIN)/windows_amd64/mattermost.exe $(DIST_PATH_WIN)/bin # from cross-compiled bin dir
|
||||
endif
|
||||
unzip -o ../mmctl/build/windows_amd64.zip -d $(DIST_PATH_WIN)/bin
|
||||
#Download MMCTL for Windows
|
||||
scripts/download_mmctl_release.sh "Windows" $(DIST_PATH_WIN)/bin
|
||||
@# Prepackage plugins
|
||||
@for plugin_package in $(PLUGIN_PACKAGES) ; do \
|
||||
ARCH="windows-amd64"; \
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -xe
|
||||
|
||||
if [[ "$(basename "$PWD")" != "mattermost-server" ]]; then
|
||||
echo "please run this script from the root project folder of mattermost-server with ./scripts/mmctl-dev.sh"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ ! -d "../mmctl" ]; then
|
||||
echo "please clone mmctl as a companion repository on the same level next to mattermost-server (git@github.com:mattermost/mmctl.git)"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cd ../mmctl
|
||||
make build
|
||||
cd -
|
||||
|
||||
cp ../mmctl/mmctl bin/mmctl
|
||||
|
||||
./bin/mmctl version
|
||||
Ссылка в новой задаче
Block a user