Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change archive type from bz2 to gz #88

Merged
merged 2 commits into from
Jul 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ jobs:
# so we need to add execution permission back.
chmod +x dist/macos64/arduino-fwuploader
TAG=${GITHUB_REF/refs\/tags\//}
tar cjf dist/arduino-fwuploader_${TAG}_macOS_64bit.tar.bz2 \
firmwares \
tar czf dist/arduino-fwuploader_${TAG}_macOS_64bit.tar.gz \
LICENSE.txt \
-C dist/macos64/ arduino-fwuploader

Expand Down
40 changes: 20 additions & 20 deletions DistTasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ tasks:
cmds:
- |
go build -o {{ .DIST_DIR}}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }} {{.LDFLAGS}}
tar cj LICENSE.txt -C {{ .DIST_DIR}}/{{ .PLATFORM_DIR }} {{ .PROJECT_NAME }} -f {{ .DIST_DIR }}/{{ .PACKAGE_NAME }}
tar cz LICENSE.txt -C {{ .DIST_DIR}}/{{ .PLATFORM_DIR }} {{ .PROJECT_NAME }} -f {{ .DIST_DIR }}/{{ .PACKAGE_NAME }}
vars:
PLATFORM_DIR: "linux32"
PACKAGE_PLATFORM: "Linux_32bit"
PACKAGE_NAME: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}.tar.bz2"
PACKAGE_NAME: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}.tar.gz"

Linux_64bit:
desc: Builds Linux 64 bit binaries
Expand All @@ -66,11 +66,11 @@ tasks:
cmds:
- |
go build -o {{ .DIST_DIR}}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }} {{.LDFLAGS}}
tar cj LICENSE.txt -C {{ .DIST_DIR}}/{{ .PLATFORM_DIR }} {{ .PROJECT_NAME }} -f {{ .DIST_DIR }}/{{ .PACKAGE_NAME }}
tar cz LICENSE.txt -C {{ .DIST_DIR}}/{{ .PLATFORM_DIR }} {{ .PROJECT_NAME }} -f {{ .DIST_DIR }}/{{ .PACKAGE_NAME }}
vars:
PLATFORM_DIR: "linux64"
PACKAGE_PLATFORM: "Linux_64bit"
PACKAGE_NAME: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}.tar.bz2"
PACKAGE_NAME: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}.tar.gz"

Linux_ARM:
desc: Builds Linux ARM binaries
Expand All @@ -80,11 +80,11 @@ tasks:
cmds:
- |
go build -o {{ .DIST_DIR}}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }} {{.LDFLAGS}}
tar cj LICENSE.txt -C {{ .DIST_DIR}}/{{ .PLATFORM_DIR }} {{ .PROJECT_NAME }} -f {{ .DIST_DIR }}/{{ .PACKAGE_NAME }}
tar cz LICENSE.txt -C {{ .DIST_DIR}}/{{ .PLATFORM_DIR }} {{ .PROJECT_NAME }} -f {{ .DIST_DIR }}/{{ .PACKAGE_NAME }}
vars:
PLATFORM_DIR: "linuxarm"
PACKAGE_PLATFORM: "Linux_ARM"
PACKAGE_NAME: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}.tar.bz2"
PACKAGE_NAME: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}.tar.gz"

Linux_ARM64:
desc: Builds Linux ARM64 binaries
Expand All @@ -94,11 +94,11 @@ tasks:
cmds:
- |
go build -o {{ .DIST_DIR}}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }} {{.LDFLAGS}}
tar cj LICENSE.txt -C {{ .DIST_DIR}}/{{ .PLATFORM_DIR }} {{ .PROJECT_NAME }} -f {{ .DIST_DIR }}/{{ .PACKAGE_NAME }}
tar cz LICENSE.txt -C {{ .DIST_DIR}}/{{ .PLATFORM_DIR }} {{ .PROJECT_NAME }} -f {{ .DIST_DIR }}/{{ .PACKAGE_NAME }}
vars:
PLATFORM_DIR: "linuxarm64"
PACKAGE_PLATFORM: "Linux_ARM64"
PACKAGE_NAME: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}.tar.bz2"
PACKAGE_NAME: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}.tar.gz"

macOS_64bit:
desc: Builds Mac OS X 64 bit binaries
Expand All @@ -108,11 +108,11 @@ tasks:
cmds:
- |
go build -o {{ .DIST_DIR}}/{{ .PLATFORM_DIR }}/{{ .PROJECT_NAME }} {{.LDFLAGS}}
tar cj LICENSE.txt -C {{ .DIST_DIR}}/{{ .PLATFORM_DIR }} {{ .PROJECT_NAME }} -f {{ .DIST_DIR }}/{{ .PACKAGE_NAME }}
tar cz LICENSE.txt -C {{ .DIST_DIR}}/{{ .PLATFORM_DIR }} {{ .PROJECT_NAME }} -f {{ .DIST_DIR }}/{{ .PACKAGE_NAME }}
vars:
PLATFORM_DIR: "macos64"
PACKAGE_PLATFORM: "macOS_64bit"
PACKAGE_NAME: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}.tar.bz2"
PACKAGE_NAME: "{{ .PROJECT_NAME }}_{{ .VERSION }}_{{ .PACKAGE_PLATFORM }}.tar.gz"

generate-index-data:
desc: Generates json for platform index
Expand All @@ -122,29 +122,29 @@ tasks:
WINDOWS64_SHA:
sh: sha256sum {{ .DIST_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}_Windows_64bit.zip | cut -f1 -d " "
LINUX32_SHA:
sh: sha256sum {{ .DIST_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}_Linux_32bit.tar.bz2 | cut -f1 -d " "
sh: sha256sum {{ .DIST_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}_Linux_32bit.tar.gz | cut -f1 -d " "
LINUX64_SHA:
sh: sha256sum {{ .DIST_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}_Linux_64bit.tar.bz2 | cut -f1 -d " "
sh: sha256sum {{ .DIST_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}_Linux_64bit.tar.gz | cut -f1 -d " "
LINUXARM_SHA:
sh: sha256sum {{ .DIST_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}_Linux_ARM.tar.bz2 | cut -f1 -d " "
sh: sha256sum {{ .DIST_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}_Linux_ARM.tar.gz | cut -f1 -d " "
LINUXARM64_SHA:
sh: sha256sum {{ .DIST_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}_Linux_ARM64.tar.bz2 | cut -f1 -d " "
sh: sha256sum {{ .DIST_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}_Linux_ARM64.tar.gz | cut -f1 -d " "
OSX_SHA:
sh: sha256sum {{ .DIST_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}_macOS_64bit.tar.bz2 | cut -f1 -d " "
sh: sha256sum {{ .DIST_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}_macOS_64bit.tar.gz | cut -f1 -d " "
WINDOWS32_SIZE:
sh: ls -la {{ .DIST_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}_Windows_32bit.zip | cut -f5 -d " "
WINDOWS64_SIZE:
sh: ls -la {{ .DIST_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}_Windows_64bit.zip | cut -f5 -d " "
LINUX32_SIZE:
sh: ls -la {{ .DIST_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}_Linux_32bit.tar.bz2 | cut -f5 -d " "
sh: ls -la {{ .DIST_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}_Linux_32bit.tar.gz | cut -f5 -d " "
LINUX64_SIZE:
sh: ls -la {{ .DIST_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}_Linux_64bit.tar.bz2 | cut -f5 -d " "
sh: ls -la {{ .DIST_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}_Linux_64bit.tar.gz | cut -f5 -d " "
LINUXARM_SIZE:
sh: ls -la {{ .DIST_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}_Linux_ARM.tar.bz2 | cut -f5 -d " "
sh: ls -la {{ .DIST_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}_Linux_ARM.tar.gz | cut -f5 -d " "
LINUXARM64_SIZE:
sh: ls -la {{ .DIST_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}_Linux_ARM64.tar.bz2 | cut -f5 -d " "
sh: ls -la {{ .DIST_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}_Linux_ARM64.tar.gz | cut -f5 -d " "
OSX_SIZE:
sh: ls -la {{ .DIST_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}_macOS_64bit.tar.bz2 | cut -f5 -d " "
sh: ls -la {{ .DIST_DIR }}/{{ .PROJECT_NAME }}_{{ .VERSION }}_macOS_64bit.tar.gz | cut -f5 -d " "
cmds:
- |
cat extras/package_index.json.template |
Expand Down
20 changes: 10 additions & 10 deletions extras/package_index.json.template
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
"systems": [
{
"host": "i686-linux-gnu",
"url": "http://downloads.arduino.cc/arduino-fwuploader/%%FILENAME%%_%%VERSION%%_Linux_32bit.tar.bz2",
"archiveFileName": "%%FILENAME%%_%%VERSION%%_Linux_32bit.tar.bz2",
"url": "http://downloads.arduino.cc/arduino-fwuploader/%%FILENAME%%_%%VERSION%%_Linux_32bit.tar.gz",
"archiveFileName": "%%FILENAME%%_%%VERSION%%_Linux_32bit.tar.gz",
"checksum": "SHA-256:%%LINUX32_SHA%%",
"size": "%%LINUX32_SIZE%%"
},
{
"host": "x86_64-pc-linux-gnu",
"url": "http://downloads.arduino.cc/arduino-fwuploader/%%FILENAME%%_%%VERSION%%_Linux_64bit.tar.bz2",
"archiveFileName": "%%FILENAME%%_%%VERSION%%_Linux_64bit.tar.bz2",
"url": "http://downloads.arduino.cc/arduino-fwuploader/%%FILENAME%%_%%VERSION%%_Linux_64bit.tar.gz",
"archiveFileName": "%%FILENAME%%_%%VERSION%%_Linux_64bit.tar.gz",
"checksum": "SHA-256:%%LINUX64_SHA%%",
"size": "%%LINUX64_SIZE%%"
},
Expand All @@ -32,22 +32,22 @@
},
{
"host": "i386-apple-darwin11",
"url": "http://downloads.arduino.cc/arduino-fwuploader/%%FILENAME%%_%%VERSION%%_macOS_64bit.tar.bz2",
"archiveFileName": "%%FILENAME%%_%%VERSION%%_macOS_64bit.tar.bz2",
"url": "http://downloads.arduino.cc/arduino-fwuploader/%%FILENAME%%_%%VERSION%%_macOS_64bit.tar.gz",
"archiveFileName": "%%FILENAME%%_%%VERSION%%_macOS_64bit.tar.gz",
"checksum": "SHA-256:%%OSX_SHA%%",
"size": "%%OSX_SIZE%%"
},
{
"host": "arm-linux-gnueabihf",
"url": "http://downloads.arduino.cc/arduino-fwuploader/%%FILENAME%%_%%VERSION%%_Linux_ARM.tar.bz2",
"archiveFileName": "%%FILENAME%%_%%VERSION%%_Linux_ARM.tar.bz2",
"url": "http://downloads.arduino.cc/arduino-fwuploader/%%FILENAME%%_%%VERSION%%_Linux_ARM.tar.gz",
"archiveFileName": "%%FILENAME%%_%%VERSION%%_Linux_ARM.tar.gz",
"checksum": "SHA-256:%%LINUXARM_SHA%%",
"size": "%%LINUXARM_SIZE%%"
},
{
"host": "aarch64-linux-gnu",
"url": "http://downloads.arduino.cc/arduino-fwuploader/%%FILENAME%%_%%VERSION%%_Linux_ARM64.tar.bz2",
"archiveFileName": "%%FILENAME%%_%%VERSION%%_Linux_ARM64.tar.bz2",
"url": "http://downloads.arduino.cc/arduino-fwuploader/%%FILENAME%%_%%VERSION%%_Linux_ARM64.tar.gz",
"archiveFileName": "%%FILENAME%%_%%VERSION%%_Linux_ARM64.tar.gz",
"checksum": "SHA-256:%%LINUXARM64_SHA%%",
"size": "%%LINUXARM64_SIZE%%"
}
Expand Down