IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Replace curl by wget

Browse Source
This commit is contained in:
Julien Reichardt
2019-03-11 16:58:05 +01:00
parent 3a69a63daa
commit f40323c3d2
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/Dockerfile.buildenv
View File

@@ -1,3 +1,3 @@
FROM golang:1.12
RUN apt-get update && apt-get install -y make git apt-transport-https ca-certificates curl software-properties-common build-essential zip wget xmlsec1
RUN apt-get update && apt-get install -y make git apt-transport-https ca-certificates software-properties-common build-essential zip wget xmlsec1

2
build/Jenkinsfile.k8s
View File

@@ -168,7 +168,7 @@ podTemplate(label: 'jenkins-slave',
sh "cd /go/src/github.com/mattermost/mattermost-server && make build BUILD_NUMBER=${env.BUILD_NUMBER}"
}
container('mattermost-node') {
sh "cd mattermost-webapp && curl -f -o ./dist.tar.gz https://releases.mattermost.com/mattermost-webapp/commit/`git rev-parse HEAD`/mattermost-webapp.tar.gz && mkdir ./dist && tar -xvf ./dist.tar.gz -C ./dist --strip-components=1 || make build"
sh "cd mattermost-webapp && wget -qO ./dist.tar.gz https://releases.mattermost.com/mattermost-webapp/commit/`git rev-parse HEAD`/mattermost-webapp.tar.gz && mkdir ./dist && tar -xvf ./dist.tar.gz -C ./dist --strip-components=1 || make build"
}
container('golang') {
sh "cd /go/src/github.com/mattermost/mattermost-server && make package BUILD_NUMBER=${env.BUILD_NUMBER}"

4
build/Jenkinsfile.pr
View File

@@ -63,7 +63,7 @@ pipeline {
echo Webapp Commit: \${WEBAPP_GIT_COMMIT}
curl -f -o ./dist.tar.gz https://releases.mattermost.com/mattermost-webapp/commit/\${WEBAPP_GIT_COMMIT}/mattermost-webapp.tar.gz && mkdir ./dist && tar -xvf ./dist.tar.gz -C ./dist --strip-components=1 || make node_modules test build
wget -qO ./dist.tar.gz https://releases.mattermost.com/mattermost-webapp/commit/\${WEBAPP_GIT_COMMIT}/mattermost-webapp.tar.gz && mkdir ./dist && tar -xvf ./dist.tar.gz -C ./dist --strip-components=1 || make node_modules test build
"""
}
}
@@ -137,7 +137,7 @@ pipeline {
withCredentials([string(credentialsId: 'CODECOV_TOKEN', variable: 'CODECOV')]) {
sh '''
cd /go/src/github.com/mattermost/mattermost-server
curl -s https://codecov.io/bash | bash -s - -t $CODECOV || echo 'Codecov failed to upload'
wget -qO- https://codecov.io/bash | bash -s - -t $CODECOV || echo 'Codecov failed to upload'
'''
}
}

2
build/release.mk
View File

@@ -65,7 +65,7 @@ endif
@# Download prepackaged plugins
@for plugin_package in $(PLUGIN_PACKAGES) ; do \
curl -s https://api.github.com/repos/mattermost/$$plugin_package/releases/latest | grep browser_download_url | cut -d '"' -f 4 | wget -qi - -P $(DIST_PATH)/prepackaged_plugins/ ;\
wget -qO- https://api.github.com/repos/mattermost/$$plugin_package/releases/latest | awk -F\" '/browser_download_url/ { system("wget " $$4 " -P $(DIST_PATH)/prepackaged_plugins/") }';\
done
@# ----- PLATFORM SPECIFIC -----