Skip to content

Commit

Permalink
rm nightly x86 mac runner; change default mac runner to arm (#2031)
Browse files Browse the repository at this point in the history
* rm nightly x86 mac runner; change default mac runner to arm

* yank build-mac
  • Loading branch information
eyberg authored Jun 17, 2024
1 parent e9c8669 commit 0c267e7
Showing 1 changed file with 0 additions and 56 deletions.
56 changes: 0 additions & 56 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,61 +93,6 @@ jobs:
- run: gsutil cp nanos-nightly-linux.timestamp gs://nanos/release/nightly
- run: gsutil acl ch -u AllUsers:R gs://nanos/release/nightly/nanos-nightly-linux.timestamp

build-mac:
macos:
xcode: "12.2.0"
steps:
- checkout
- run: CI=1 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
- run: brew update && brew install nasm go wget qemu ent
- run: brew install binutils
- run: brew install x86_64-elf-binutils
- run: mkdir target-root && cd target-root && wget https://storage.googleapis.com/testmisc/target-root.tar.gz && tar xfvz target-root.tar.gz
- run: curl https://ops.city/get.sh -sSfL | sh
- run:
name: macbuild
environment:
NANOS_TARGET_ROOT: ~/project/target-root
command: |
OPS_DIR=$HOME/.ops
PATH=$HOME/.ops/bin:$PATH
make test-noaccel
nightly-build-mac:
macos:
xcode: "15.3.0"
steps:
- checkout
- run: CI=1 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
- run: brew update && brew install nasm go wget ent
- run: brew install binutils
- run: brew install x86_64-elf-binutils
- run: mkdir target-root && cd target-root && wget https://storage.googleapis.com/testmisc/target-root.tar.gz && tar xzf target-root.tar.gz
- run:
name: macbuild
environment:
NANOS_TARGET_ROOT: ~/project/target-root
command: make
- run: curl -O https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-452.0.0-darwin-x86_64.tar.gz
- run: tar xzf google-cloud-cli*.tar.gz
- run: ./google-cloud-sdk/install.sh -q
- run: source $HOME/project/google-cloud-sdk/path.bash.inc && echo export PATH=$PATH > $BASH_ENV
- run: echo $GCLOUD_SERVICE_KEY | gcloud auth activate-service-account --key-file=-
- run: gcloud config set project ${GOOGLE_PROJECT_ID}
- run: gcloud --quiet config set compute/zone ${GOOGLE_COMPUTE_ZONE}

- run:
name: copy build artifacts
command: |
shopt -s extglob
mkdir temp && cp output/platform/pc/bin/kernel.img temp/ && cp output/platform/pc/boot/boot.img temp/ && cp output/platform/pc/boot/bootx64.efi temp/ && mkdir temp/klibs && cp output/klib/bin/!(test|*.dbg) temp/klibs
- run: cd temp && tar cvzf nanos-nightly-darwin.tar.gz * && gsutil cp nanos-nightly-darwin.tar.gz gs://nanos/release/nightly
- run: gsutil acl ch -u AllUsers:R gs://nanos/release/nightly/nanos-nightly-darwin.tar.gz
- run: rm -r temp
- run: echo $(date +"%m%d%Y") > nanos-nightly-darwin.timestamp
- run: gsutil cp nanos-nightly-darwin.timestamp gs://nanos/release/nightly
- run: gsutil acl ch -u AllUsers:R gs://nanos/release/nightly/nanos-nightly-darwin.timestamp

build-virt:
docker:
- image: cimg/go:1.20.0
Expand Down Expand Up @@ -263,5 +208,4 @@ workflows:
- master
jobs:
- nightly-build
- nightly-build-mac
- nightly-build-virt

0 comments on commit 0c267e7

Please sign in to comment.