Skip to content

Commit

Permalink
Merge pull request #266 from square/cs/combined-sha256sums
Browse files Browse the repository at this point in the history
Upload single sha256sums file for dist build
  • Loading branch information
csstaub committed Oct 21, 2019
2 parents 7e3bf78 + e7e7a30 commit 6631578
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
6 changes: 1 addition & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,11 @@ deploy:
secure: 'rxcM8Ttmo0zTd2i+NBgG6YIDwtRwNCL28vPvAQ4GZ/SS7+8/fZn1RF8ZI2wWbZB2SqQveAiPmO66ZPXcGDsf/ynOHVvppn7IwJRSJoh2Z+QNu5i97JqQEtcM3DY5DZKO+scYqeCvINmLXmwSLHYDij/Nnu0hBXeobPizBDhqnN7AD0FZq2zbbCxZFPrAwUsB1G6wZTKWRFl4lX7baKDqyICc6OgGzb3m127SgrseW2zR6vBfHbc3Ep1hoIqjTf0vVXyDhCpDaIXAkZP43Jp1FxBwryrhEtPzx/46KWvPJLRwZc5gnRRrXX0HqrhlD577OxE/8VnjI+32mRTTNjSD8aOBraZ1Q71U5uLXLMoL1LD3qAfYv5sJaUKdbGtDkfGGwQ4X70A97gqmQI5gpYWU1LUksHwVJMwUqO2cPWciQikOTXQrDUT3qnuauZ432IP7izNhYmFWYwOEoQOzUA8pF1dl2jvUURY9dgQ2AHcJfCYV9C5TnBQ/2nO4Xbc96eo/Ky5OIX+lsfHx4bJmqvT6N+o/b9TJQYg3o4t0rqGB95Zt8/SbapvKlIU5I8SKGyuEpnKN4yUGAQRg8heuAPJ8mz3bmGriT9oC3q577vAqaCm2JcmvHCVx9OME0B04vLzxjYJXPHAi9CRmhUOZ8haHby3BkI3KYjnAaasUBot7oPI='
file:
- dist/ghostunnel-${TRAVIS_TAG}-linux-amd64-with-pkcs11
- dist/ghostunnel-${TRAVIS_TAG}-linux-amd64-with-pkcs11.sha256sum
- dist/ghostunnel-${TRAVIS_TAG}-linux-arm64-with-pkcs11
- dist/ghostunnel-${TRAVIS_TAG}-linux-arm64-with-pkcs11.sha256sum
- dist/ghostunnel-${TRAVIS_TAG}-darwin-amd64-with-pkcs11
- dist/ghostunnel-${TRAVIS_TAG}-darwin-amd64-with-pkcs11.sha256sum
- dist/ghostunnel-${TRAVIS_TAG}-windows-386-with-pkcs11.exe
- dist/ghostunnel-${TRAVIS_TAG}-windows-386-with-pkcs11.exe.sha256sum
- dist/ghostunnel-${TRAVIS_TAG}-windows-amd64-with-pkcs11.exe
- dist/ghostunnel-${TRAVIS_TAG}-windows-amd64-with-pkcs11.exe.sha256sum
- dist/sha256sums.txt
- dist/ghostunnel-${TRAVIS_TAG}.man
draft: true
skip_cleanup: true
Expand Down
3 changes: 1 addition & 2 deletions Makefile.dist
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,10 @@ define make-xc-target
@xgo -go ${GO_VERSION} -image ${XGO_BASE_IMAGE} -targets '${1}-${WINDOWS_API_LEVEL}/${2}' \
-ldflags '${LD_FLAGS} -w -extldflags "-static" -extld ${WINDOWS_EXTLD_${2}}' .
@mv ghostunnel-${1}-${WINDOWS_API_LEVEL}-${2}.exe dist/ghostunnel-${VERSION}-${1}-${2}-with-pkcs11.exe
@sha256sum dist/ghostunnel-${VERSION}-${1}-${2}-with-pkcs11.exe > dist/ghostunnel-${VERSION}-${1}-${2}-with-pkcs11.exe.sha256sum
else
@printf "%s%20s %s\n" "-->" "${1}/${2}:" "${PROJECT}"
@xgo -go ${GO_VERSION} -image ${XGO_BASE_IMAGE} -ldflags "${LD_FLAGS}" -targets '${1}/${2}' .
@mv ghostunnel-${1}*-${2} dist/ghostunnel-${VERSION}-${1}-${2}-with-pkcs11
@sha256sum dist/ghostunnel-${VERSION}-${1}-${2}-with-pkcs11 > dist/ghostunnel-${VERSION}-${1}-${2}-with-pkcs11.sha256sum
endif
.PHONY: $1/$2

Expand All @@ -61,4 +59,5 @@ dist:
@$(MAKE) -f Makefile ghostunnel.man
@mv ghostunnel.man "${CURRENT_DIR}/dist/ghostunnel-${VERSION}.man"
@$(MAKE) -f "${MKFILE_PATH}" -j1 build
@cd "${CURRENT_DIR}/dist/" && sha256sum ghostunnel-* > sha256sums.txt
.PHONY: dist

0 comments on commit 6631578

Please sign in to comment.