Skip to content

Commit 41009f3

Browse files
committed
build using docker image
1 parent d06b526 commit 41009f3

File tree

4 files changed

+12
-47
lines changed

4 files changed

+12
-47
lines changed

build.sh

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/bash
22

33
echo GOPATH: $GOPATH
4-
echo GOVERSION:
54
go version
5+
echo Node version $(node -v)
66
BASE_PATH=/go/src/github.com/alphapeter/filecommander
77
SETTINGS_PATH=$BASE_PATH/exampleconfig
88
ARTIFACT_PATH=$BASE_PATH/release/artifacts
@@ -35,19 +35,3 @@ cp $SETTINGS_PATH/linux/settings.json $OUTPUT_PATH/linux/amd64/
3535

3636
cp $SETTINGS_PATH/linux/settings.json $OUTPUT_PATH/osx/
3737

38-
mkdir $ARTIFACT_PATH
39-
40-
cd $OUTPUT_PATH/windows/x86/
41-
zip $ARTIFACT_PATH/filecommander-$TRAVIS_TAG-windows-32bit.zip ./*
42-
43-
cd $OUTPUT_PATH/windows/amd64
44-
zip $ARTIFACT_PATH/filecommander-$TRAVIS_TAG-windows-64bit.zip ./*
45-
46-
cd $OUTPUT_PATH/linux/x86
47-
tar -cvzf $ARTIFACT_PATH/filecommander-$TRAVIS_TAG-linux-x86.tar.gz ./*
48-
cd $OUTPUT_PATH/linux/amd64
49-
tar -cvzf $ARTIFACT_PATH/filecommander-$TRAVIS_TAG-linux-amd64.tar.gz ./*
50-
51-
cd $OUTPUT_PATH/osx
52-
zip $ARTIFACT_PATH/filecommander-$TRAVIS_TAG-osx.zip ./*
53-

local_build.sh

100644100755
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#!/bin/bash
22

33
echo using docker to build
4-
docker run --rm -v $(pwd):/go/src/github.com/alphapeter/filecommander -it -w /go/src/github.com/alphapeter/filecommander alphapeter/buildimage:20180710 ./build.sh
4+
docker run --rm -v $(pwd):/go/src/github.com/alphapeter/filecommander -it -w /go/src/github.com/alphapeter/filecommander -e "RELEASE_VERSION=latest" alphapeter/buildimage:20180710 bash -c "./build.sh && ./zip_artifacts.sh"
55

6-
TRAVIS_TAG=latest
7-
./zip_artifacts.sh

travis_build.sh

100644100755
Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,5 @@
11
#!/bin/bash
22

33
echo using docker to build
4-
docker run --rm -v $(pwd):/go/src/github.com/alphapeter/filecommander -it -w /go/src/github.com/alphapeter/filecommander alphapeter/buildimage:20180710 ./build.sh
4+
docker run --rm -v $(pwd):/go/src/github.com/alphapeter/filecommander -it -w /go/src/github.com/alphapeter/filecommander -e "RELEASE_VERSION=$TRAVIS_TAG" alphapeter/buildimage:20180710 bash -c "./build.sh && ./zip_artifacts.sh"
55

6-
OUTPUT_PATH=$TRAVIS_BUILD_DIR/release/output
7-
ARTIFACT_PATH=$TRAVIS_BUILD_DIR/release/artifacts/
8-
9-
mkdir $ARTIFACT_PATH
10-
11-
cd $OUTPUT_PATH/windows/x86/
12-
zip $ARTIFACT_PATH/filecommander-$TRAVIS_TAG-windows-32bit.zip ./*
13-
14-
cd $OUTPUT_PATH/windows/amd64
15-
zip $ARTIFACT_PATH/filecommander-$TRAVIS_TAG-windows-64bit.zip ./*
16-
17-
cd $OUTPUT_PATH/linux/x86
18-
tar -cvzf $ARTIFACT_PATH/filecommander-$TRAVIS_TAG-linux-x86.tar.gz ./*
19-
cd $OUTPUT_PATH/linux/amd64
20-
tar -cvzf $ARTIFACT_PATH/filecommander-$TRAVIS_TAG-linux-amd64.tar.gz ./*
21-
22-
cd $OUTPUT_PATH/osx
23-
zip $ARTIFACT_PATH/filecommander-$TRAVIS_TAG-osx.zip ./*

zip_artifacts.sh

100644100755
Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
#!/bin/bash
22

3-
OUTPUT_PATH=release/output
4-
ARTIFACT_PATH=release/artifacts/
3+
OUTPUT_PATH=$(pwd)/release/output
4+
ARTIFACT_PATH=$(pwd)/release/artifacts
5+
echo Creating artifacts for version $RELEASE_VERSION
56

6-
mkdir $ARTIFACT_PATH
7+
mkdir -p $ARTIFACT_PATH
78

89
cd $OUTPUT_PATH/windows/x86/
9-
zip $ARTIFACT_PATH/filecommander-$TRAVIS_TAG-windows-32bit.zip ./*
10+
zip $ARTIFACT_PATH/filecommander-$RELEASE_VERSION-windows-32bit.zip ./*
1011

1112
cd $OUTPUT_PATH/windows/amd64
12-
zip $ARTIFACT_PATH/filecommander-$TRAVIS_TAG-windows-64bit.zip ./*
13+
zip $ARTIFACT_PATH/filecommander-$RELEASE_VERSION-windows-64bit.zip ./*
1314

1415
cd $OUTPUT_PATH/linux/x86
15-
tar -cvzf $ARTIFACT_PATH/filecommander-$TRAVIS_TAG-linux-x86.tar.gz ./*
16+
tar -cvzf $ARTIFACT_PATH/filecommander-$RELEASE_VERSION-linux-x86.tar.gz ./*
1617
cd $OUTPUT_PATH/linux/amd64
17-
tar -cvzf $ARTIFACT_PATH/filecommander-$TRAVIS_TAG-linux-amd64.tar.gz ./*
18+
tar -cvzf $ARTIFACT_PATH/filecommander-$RELEASE_VERSION-linux-amd64.tar.gz ./*
1819

1920
cd $OUTPUT_PATH/osx
20-
zip $ARTIFACT_PATH/filecommander-$TRAVIS_TAG-osx.zip ./*
21+
zip $ARTIFACT_PATH/filecommander-$RELEASE_VERSION-osx.zip ./*

0 commit comments

Comments
 (0)