Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
zekroTJA committed Jan 24, 2019
2 parents 51dffcd + 254c0fb commit 214c4cc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions scripts/getsqlschemes.bash
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ MYSQLSCHEME=$(cat scripts/mysqlDbScheme.sql | base64 -w 0)
SQLITESCHEME=$(cat scripts/sqliteDbScheme.sql | base64 -w 0)

SQLLDFLAGS="\
-X github.com/zekroTJA/shinpuru/core.MySqlDbSchemeB64=$MYSQLSCHEME \
-X github.com/zekroTJA/shinpuru/core.SqliteDbSchemeB64=$SQLITESCHEME "
-X github.com/zekroTJA/shinpuru/internal/core.MySqlDbSchemeB64=$MYSQLSCHEME \
-X github.com/zekroTJA/shinpuru/internal/core.SqliteDbSchemeB64=$SQLITESCHEME "
6 changes: 3 additions & 3 deletions scripts/travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ for BUILD in ${BUILDS[*]}; do
go build \
-o ${BUILDPATH}/${BUILDNAME}_${OS}_$ARCH \
-ldflags " \
-X github.com/zekroTJA/shinpuru/util.AppVersion=$TAG \
-X github.com/zekroTJA/shinpuru/util.AppCommit=$COMMIT \
-X github.com/zekroTJA/shinpuru/util.Release=TRUE \
-X github.com/zekroTJA/shinpuru/internal/util.AppVersion=$TAG \
-X github.com/zekroTJA/shinpuru/internal/util.AppCommit=$COMMIT \
-X github.com/zekroTJA/shinpuru/internal/util.Release=TRUE \
$SQLLDFLAGS" \
./cmd/shinpuru)

Expand Down

0 comments on commit 214c4cc

Please sign in to comment.