Skip to content

Commit

Permalink
chore: add separate dist directory for linux builds
Browse files Browse the repository at this point in the history
  • Loading branch information
dreadl0ck committed Aug 22, 2021
1 parent 33443dd commit 5b241e7
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion version.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ package netcap
var Version = "v0.6.2"

// Commit is the git commit id of the current version.
var Commit = "43066d76037cd2495e14aef077237f2aa6cb93ac"
var Commit = "33443dd9dd244f917fed631e1d752bde09ab9890"
2 changes: 1 addition & 1 deletion zeus/commands.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ commands:
##

remove-dist:
exec: rm -rf dist
exec: rm -rf dist; rm -rf dist-linux

# run a prod release
release:
Expand Down
14 changes: 7 additions & 7 deletions zeus/scripts/build-alpine-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,24 +50,24 @@ fi

ARCHIVE="netcap_${VERSION}_linux_amd64_musl"

echo "[INFO] preparing dist folder, CONTAINER_ID: $CONTAINER_ID"
echo "[INFO] preparing dist-linux folder, CONTAINER_ID: $CONTAINER_ID"

# clean up
rm -rf dist/${ARCHIVE}
rm -rf dist-linux/${ARCHIVE}

# create path in dist
mkdir -p dist/${ARCHIVE}
mkdir -p dist-linux/${ARCHIVE}

# copy binaries from container
docker cp $CONTAINER_ID:/usr/bin/net dist/${ARCHIVE}/net
docker cp $CONTAINER_ID:/usr/bin/net dist-linux/${ARCHIVE}/net

# remove container
docker rm $CONTAINER_ID

cp LICENSE dist/${ARCHIVE}
cp README.md dist/${ARCHIVE}
cp LICENSE dist-linux/${ARCHIVE}
cp README.md dist-linux/${ARCHIVE}

cd dist
cd dist-linux

# create tar archive for linux
tar -cvf ${ARCHIVE}.tar.gz ${ARCHIVE}
Expand Down
14 changes: 7 additions & 7 deletions zeus/scripts/build-ubuntu-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,24 +48,24 @@ fi

ARCHIVE="netcap_${VERSION}_linux_amd64_libc"

echo "[INFO] preparing dist folder, CONTAINER_ID: $CONTAINER_ID, archive: $ARCHIVE"
echo "[INFO] preparing dist-linux folder, CONTAINER_ID: $CONTAINER_ID, archive: $ARCHIVE"

# clean up
rm -rf dist/${ARCHIVE}
rm -rf dist-linux/${ARCHIVE}

# create path in dist
mkdir -p dist/${ARCHIVE}
mkdir -p dist-linux/${ARCHIVE}

# copy binaries from container
docker cp $CONTAINER_ID:/usr/bin/net dist/${ARCHIVE}/net
docker cp $CONTAINER_ID:/usr/bin/net dist-linux/${ARCHIVE}/net

# remove container
docker rm $CONTAINER_ID

cp LICENSE dist/${ARCHIVE}
cp README.md dist/${ARCHIVE}
cp LICENSE dist-linux/${ARCHIVE}
cp README.md dist-linux/${ARCHIVE}

cd dist
cd dist-linux

# create tar archive for linux
tar -cvf ${ARCHIVE}.tar.gz ${ARCHIVE}
Expand Down

0 comments on commit 5b241e7

Please sign in to comment.