Skip to content

Commit

Permalink
more m2 fixes (#1468)
Browse files Browse the repository at this point in the history
  • Loading branch information
eyberg authored May 23, 2023
1 parent d83d9b7 commit 6f892b9
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 783 deletions.
6 changes: 5 additions & 1 deletion install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ ops_download() {

# Download ops
if [ "$ARCH" = "aarch64" ]; then
BINARY_URL="$RELEASES_URL/${OS}/${ARCH}/ops"
BINARY_URL="$RELEASES_URL/${OS}/aarch64/ops"
elif [ "$ARCH" = "arm64" ]; then
BINARY_URL="$RELEASES_URL/${OS}/aarch64/ops"
else
BINARY_URL="$RELEASES_URL/${OS}/ops"
fi
Expand Down Expand Up @@ -360,6 +362,8 @@ checkHWAccelSupport() {
ops_update() {
if [ "$ARCH" = "aarch64" ]; then
"$HOME/.ops/bin/ops" update --arm
elif [ "$ARCH" = "arm64" ]; then
"$HOME/.ops/bin/ops" update --arm
else
"$HOME/.ops/bin/ops" update
fi
Expand Down
27 changes: 20 additions & 7 deletions release.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

export VERSION="0.1.34"
export VERSION="0.1.36"
plat="$(uname -s | awk '{print tolower($0)}')"

GO111MODULE=on GOOS=linux go build -ldflags "-X github.com/nanovms/ops/lepton.Version=$VERSION"
Expand Down Expand Up @@ -47,12 +47,6 @@ gsutil setacl public-read gs://cli/darwin/release/"$VERSION"/ops
gsutil cp "$hash" gs://cli/darwin/release/"$VERSION"/"$hash"
gsutil setacl public-read gs://cli/darwin/release/"$VERSION"/"$hash"

# export AC_PASSWORD=
# export AC_EMAIL=
# gon config.hcl
# /usr/local/bin/packagesbuild -v ops-d/ops-d.pkgproj
# scp ~/ops-d/build/ops-d.pkg

GO111MODULE=on GOOS=linux GOARCH=arm64 go build -ldflags "-X github.com/nanovms/ops/lepton.Version=$VERSION"
gsutil cp ops gs://cli/linux/aarch64/

Expand All @@ -71,6 +65,25 @@ gsutil setacl public-read gs://cli/linux/aarch64/release/"$VERSION"/ops
gsutil cp "$hash" gs://cli/linux/aarch64/release/"$VERSION"/"$hash"
gsutil setacl public-read gs://cli/linux/aarch64/release/"$VERSION"/"$hash"

GO111MODULE=on GOOS=darwin GOARCH=arm64 go build -ldflags "-X github.com/nanovms/ops/lepton.Version=$VERSION"
gsutil cp ops gs://cli/darwin/aarch64/

hash="ops-darwin-aarch64-$VERSION.md5"

if [ "$plat" = 'darwin' ]
then
md5 -q ops > "$hash"
else
md5sum ops | awk '{print $1}' > "$hash"
fi

gsutil cp ops gs://cli/darwin/aarch64/release/"$VERSION"/ops
gsutil setacl public-read gs://cli/darwin/aarch64/release/"$VERSION"/ops

gsutil cp "$hash" gs://cli/darwin/aarch64/release/"$VERSION"/"$hash"
gsutil setacl public-read gs://cli/darwin/aarch64/release/"$VERSION"/"$hash"

gsutil -D setacl public-read gs://cli/linux/ops
gsutil -D setacl public-read gs://cli/linux/aarch64/ops
gsutil -D setacl public-read gs://cli/darwin/ops
gsutil -D setacl public-read gs://cli/darwin/aarch64/ops
22 changes: 0 additions & 22 deletions scripts/config.hcl

This file was deleted.

4 changes: 0 additions & 4 deletions scripts/link.sh

This file was deleted.

Loading

0 comments on commit 6f892b9

Please sign in to comment.