diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-09-06 23:05:10 -0700 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-09-06 23:11:59 -0700 |
| commit | 29fca51821981079175adf336d303a474f5ef310 (patch) | |
| tree | a8866cb74ab28afa2c5c4af412454d58e250eb45 /build | |
| parent | d8bd57901e33a7057e26e782e295099ffcc0da89 (diff) | |
| download | chat-29fca51821981079175adf336d303a474f5ef310.tar.gz chat-29fca51821981079175adf336d303a474f5ef310.tar.bz2 chat-29fca51821981079175adf336d303a474f5ef310.zip | |
Renaming repo
Diffstat (limited to 'build')
| -rw-r--r-- | build/Jenkinsfile | 27 | ||||
| -rw-r--r-- | build/release.mk | 4 |
2 files changed, 17 insertions, 14 deletions
diff --git a/build/Jenkinsfile b/build/Jenkinsfile index ea22df617..795bb163a 100644 --- a/build/Jenkinsfile +++ b/build/Jenkinsfile @@ -81,9 +81,9 @@ podTemplate(label: 'jenkins-slave', node('jenkins-slave') { stage('Checkout') { container('golang') { - // Checkout platform - dir('platform') { - git branch: env.BRANCH_NAME, credentialsId: 'a8f2d76b-8a29-4525-b57a-eb0447d7779c', url: 'https://github.com/mattermost/platform.git' + // Checkout mattermost-server + dir('mattermost-server') { + git branch: env.BRANCH_NAME, credentialsId: 'a8f2d76b-8a29-4525-b57a-eb0447d7779c', url: 'https://github.com/mattermost/mattermost-server.git' } // Checkout enterprise @@ -97,16 +97,16 @@ podTemplate(label: 'jenkins-slave', container('golang') { // Link up the code to GOPATH. sh 'mkdir -p /go/src/github.com/mattermost' - sh 'ln -s `pwd`/platform /go/src/github.com/mattermost/platform' + sh 'ln -s `pwd`/mattermost-server /go/src/github.com/mattermost/mattermost-server' sh 'ln -s `pwd`/enterprise /go/src/github.com/mattermost/enterprise' // Install build deps sh 'apt-get update && apt-get install zip -y' // Modify config to run on jenkins - sh 'mv /go/src/github.com/mattermost/platform/config/default.json /go/src/github.com/mattermost/platform/config/config.json' - sh 'cd /go/src/github.com/mattermost/platform && sed -i \'s/dockerhost/localhost/g\' config/config.json' - sh 'cd /go/src/github.com/mattermost/platform && sed -i \'s/2500/10025/g\' config/config.json' + sh 'mv /go/src/github.com/mattermost/mattermost-server/config/default.json /go/src/github.com/mattermost/mattermost-server/config/config.json' + sh 'cd /go/src/github.com/mattermost/mattermost-server && sed -i \'s/dockerhost/localhost/g\' config/config.json' + sh 'cd /go/src/github.com/mattermost/mattermost-server && sed -i \'s/2500/10025/g\' config/config.json' } // Setup openldap container @@ -123,24 +123,27 @@ podTemplate(label: 'jenkins-slave', } stage('Style Checks') { container('golang') { - sh 'cd /go/src/github.com/mattermost/platform && make check-style BUILD_NUMBER=$BUILD_NUMBER' + sh 'cd /go/src/github.com/mattermost/mattermost-server && make check-style BUILD_NUMBER=$BUILD_NUMBER' } } stage('Build') { container('golang') { - sh 'cd /go/src/github.com/mattermost/platform && make build BUILD_NUMBER=$BUILD_NUMBER' + sh 'cd /go/src/github.com/mattermost/mattermost-server && make build BUILD_NUMBER=$BUILD_NUMBER' } container('mattermost-node') { - sh 'cd platform && make build-client BUILD_NUMBER=$BUILD_NUMBER' + sh 'cd mattermost-webapp && make build-client BUILD_NUMBER=$BUILD_NUMBER' } container('golang') { - sh 'cd /go/src/github.com/mattermost/platform && make package BUILD_NUMBER=$BUILD_NUMBER' + sh 'cd /go/src/github.com/mattermost/mattermost-server && make package BUILD_NUMBER=$BUILD_NUMBER' } } stage('Unit Tests') { container('golang') { - sh 'cd /go/src/github.com/mattermost/platform && make test BUILD_NUMBER=$BUILD_NUMBER TESTFLAGS= TESTFLAGSEE=' + sh 'cd /go/src/github.com/mattermost/mattermost-server && make test-te BUILD_NUMBER=$BUILD_NUMBER TESTFLAGS= TESTFLAGSEE=' } } + stage('S3 Publish') { + step([$class: 'S3BucketPublisher', dontWaitForConcurrentBuildCompletion: false, entries: [[bucket: 'releases.mattermost.com/mattermost-server/${env.BRAANCH_NAME}', excludedFile: '', flatten: true, gzipFiles: false, keepForever: false, managedArtifacts: false, noUploadOnFailure: true, selectedRegion: 'us-east-1', showDirectlyInBrowser: false, sourceFile: 'src/github.com/mattermost/platform/dist/mattermost-enterprise*', storageClass: 'STANDARD', uploadFromSlave: false, useServerSideEncryption: false, userMetadata: [[key: 'Cache-Control', value: 'no-cache']]]], profileName: 'Releases', userMetadata: []]) + } } } diff --git a/build/release.mk b/build/release.mk index af25b3901..563cf8cb4 100644 --- a/build/release.mk +++ b/build/release.mk @@ -47,8 +47,8 @@ package: sed -i'' -e 's|"SMTPPort": "2500",|"SMTPPort": "",|g' $(DIST_PATH)/config/config.json @# Package webapp - mkdir -p $(DIST_PATH)/webapp/dist - cp -RL $(BUILD_WEBAPP_DIR)/dist $(DIST_PATH)/webapp + mkdir -p $(DIST_PATH)/web + cp -RL $(BUILD_WEBAPP_DIR)/dist/ $(DIST_PATH)/web @# Help files ifeq ($(BUILD_ENTERPRISE_READY),true) |