Skip to content

First attempt building for Apple Silicon. #3675

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.

Sign up for GitHub

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

Merged
mitchell-as merged 1 commit into from
Apr 24, 2025
Merged

First attempt building for Apple Silicon. #3675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ jobs:
sys:
- {os: ubuntu-latest}
- {os: macos-13, shell: zsh}
- {os: macos-latest, shell: zsh}
- {os: windows-2019}
- {os: ubuntu-24.04-arm}
fail-fast: false
Expand Down Expand Up @@ -523,6 +524,7 @@ jobs:
with:
name: |
session-build-ubuntu-latest
session-build-macos-11
session-build-macos-13
session-build-macos-latest
session-build-windows-2019
session-build-ubuntu-24.04-arm
6 changes: 2 additions & 4 deletions activestate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@ constants:
export CGO_ENABLED=0
PATH="${GOROOT}/bin:${GOPATH}/bin:${PATH}"
BUILD_EXEC_TARGET=$constants.BUILD_EXEC_TARGET

# add the GOARCH as infix to BUILD_TARGET_DIR if not amd64
BUILD_TARGET_DIR=$constants.BUILD_TARGET_PREFIX_DIR/${GOARCH#amd64}
BUILD_TARGET_DIR=$constants.BUILD_TARGET_PREFIX_DIR/
- name: SCRIPT_EXT
if: ne .OS.Name "Windows"
value: .sh
Expand Down Expand Up @@ -245,7 +243,7 @@ scripts:
GOOS=windows go build -o .github/deps/Windows/amd64/bin/parallelize.exe github.com/ActiveState/cli/scripts/ci/parallelize/
GOOS=linux go build -o .github/deps/Linux/amd64/bin/parallelize github.com/ActiveState/cli/scripts/ci/parallelize/
GOOS=linux GOARCH=arm64 go build -o .github/deps/Linux/arm64/bin/parallelize github.com/ActiveState/cli/scripts/ci/parallelize/
GOOS=darwin go build -o .github/deps/macOS/amd64/bin/parallelize github.com/ActiveState/cli/scripts/ci/parallelize/
GOOS=darwin GOARCH=amd64 go build -o .github/deps/macOS/amd64/bin/parallelize github.com/ActiveState/cli/scripts/ci/parallelize/
- name: test
language: bash
standalone: true
Expand Down
2 changes: 2 additions & 0 deletions installers/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ Linux)
Darwin)
OS="darwin"
ARCH="amd64"
arch="`uname -m`"
if [ $arch = "arm64" ]; then ARCH="arm64"; fi
DOWNLOADEXT=".tar.gz"
SHA256SUM="shasum -a 256"
;;
Expand Down
3 changes: 0 additions & 3 deletions test/integration/upgen_int_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ func (suite *UpdateGenIntegrationTestSuite) TestUpdateBits() {
ext = ".zip"
}
hostArch := runtime.GOARCH
if runtime.GOOS == "darwin" && hostArch == "arm64" {
hostArch = "amd64"
}
platform := runtime.GOOS + "-" + hostArch

archivePath := filepath.Join(root, "build/update", constants.ChannelName, constants.VersionNumber, platform, fmt.Sprintf("state-%s-%s%s", platform, constants.Version, ext))
Expand Down
Loading