diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a7e8f2e..9c0d215 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,8 +35,8 @@ jobs: GITHUB_TOKEN: ${{ github.token }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: bin/mac_amd64 - asset_name: mac_amd64 + asset_path: bin/darwin_amd64 + asset_name: darwin_amd64 asset_content_type: application/octet-stream - name: upload darwin_arm64 binary uses: actions/upload-release-asset@v1 @@ -44,8 +44,8 @@ jobs: GITHUB_TOKEN: ${{ github.token }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: bin/mac_arm64 - asset_name: mac_arm64 + asset_path: bin/darwin_arm64 + asset_name: darwin_arm64 asset_content_type: application/octet-stream - name: upload linux_amd64 binary uses: actions/upload-release-asset@v1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 2efcd14..ddc18c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,5 @@ * Automate release process -* Add self update functionality \ No newline at end of file +* Add self update functionality +* Rename mac os binary name +* Add support for linux+mac arm64 +* Update installation script \ No newline at end of file diff --git a/build.sh b/build.sh index 41a2554..e4178c8 100755 --- a/build.sh +++ b/build.sh @@ -13,12 +13,12 @@ go generate export GOARCH="amd64" export GOOS="darwin" export CGO_ENABLED=0 -go build -ldflags "-X github.com/thedevsaddam/dl/cmd.GitCommit=$GIT_COMMIT -X github.com/thedevsaddam/dl/cmd.Version=$TAG -X github.com/thedevsaddam/dl/cmd.BuildDate=$DATE" -o bin/mac_amd64 -v . +go build -ldflags "-X github.com/thedevsaddam/dl/cmd.GitCommit=$GIT_COMMIT -X github.com/thedevsaddam/dl/cmd.Version=$TAG -X github.com/thedevsaddam/dl/cmd.BuildDate=$DATE" -o bin/darwin_amd64 -v . export GOARCH="arm64" export GOOS="darwin" export CGO_ENABLED=0 -go build -ldflags "-X github.com/thedevsaddam/dl/cmd.GitCommit=$GIT_COMMIT -X github.com/thedevsaddam/dl/cmd.Version=$TAG -X github.com/thedevsaddam/dl/cmd.BuildDate=$DATE" -o bin/mac_arm64 -v . +go build -ldflags "-X github.com/thedevsaddam/dl/cmd.GitCommit=$GIT_COMMIT -X github.com/thedevsaddam/dl/cmd.Version=$TAG -X github.com/thedevsaddam/dl/cmd.BuildDate=$DATE" -o bin/darwin_arm64 -v . #LINUX export GOARCH="amd64" diff --git a/install.sh b/install.sh index ecebff5..70a13e5 100755 --- a/install.sh +++ b/install.sh @@ -21,11 +21,22 @@ if [ "$VERSION" == "" ]; then fi if [ "$OS" == "Darwin" ]; then - exec_curl $URL/releases/download/$VERSION/mac_amd64 $TARGET + if [ "$ARCH" == "x86_64" ]; then + exec_curl $URL/releases/download/$VERSION/darwin_amd64 $TARGET echo "$MESSAGE_START" chmod +x $TARGET echo "$MESSAGE_END" dl + fi + + if [ "$ARCH" == "arm64" ] || [ "$ARCH" == "aarch64" ]; then + exec_curl $URL/releases/download/$VERSION/darwin_arm64 $TARGET + echo "$MESSAGE_START" + chmod +x $TARGET + echo "$MESSAGE_END" + dl + fi + elif [ "$OS" == "Linux" ]; then if [ "$ARCH" == "x86_64" ]; then exec_curl $URL/releases/download/$VERSION/linux_amd64 $TARGET @@ -35,6 +46,14 @@ elif [ "$OS" == "Linux" ]; then dl fi + if [ "$ARCH" == "arm64" ] || [ "$ARCH" == "aarch64" ]; then + exec_curl $URL/releases/download/$VERSION/linux_arm64 $TARGET + echo "$MESSAGE_START" + chmod +x $TARGET + echo "$MESSAGE_END" + dl + fi + if [ "$ARCH" == "i368" ]; then exec_curl $URL/releases/download/$VERSION/linux_386 $TARGET chmod +x $TARGET