Skip to content

Commit

Permalink
ci(GITHUB): add ventura builds
Browse files Browse the repository at this point in the history
  • Loading branch information
niall-byrne committed Jul 10, 2023
1 parent 399751b commit b758dd9
Show file tree
Hide file tree
Showing 4 changed files with 105 additions and 47 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
os: [11, 12]
os: [11, 12, 13]
platform: [x86_64]
python-version: [3.9.16]

Expand Down Expand Up @@ -133,7 +133,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
os: [11, 12]
os: [11, 12, 13]
platform: [x86_64]
python-version: [3.9.16]

Expand Down Expand Up @@ -476,7 +476,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
os: [11, 12]
os: [11, 12, 13]
platform: [x86_64]
python-version: [3.9.16]

Expand Down
25 changes: 13 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,28 +33,29 @@ If you'd like to try it out, head over to the [Mac Maker Releases](https://githu

If you are unsure, use the tables below to help you find the right binary for your Mac:

|Version Number| OS Name |
|--------------|--------------|
|12 | Monterey |
|11 | Big Sur |
|10 | Catalina |

|Architecture | CPU Type |
|--------------|--------------|
|arm64 | Apple Silicon|
|x86_64 | Intel |
| Version Number | OS Name |
|-----------------|----------|
| 13 | Ventura |
| 12 | Monterey |
| 11 | Big Sur |
| 10 | Catalina |

| Architecture | CPU Type |
|--------------|---------------|
| arm64 | Apple Silicon |
| x86_64 | Intel |

**Please Note**:
- They are unsigned, and not notarized by Apple.
- As such, they will trigger a warning about software from an unidentified developer.

### OK, but you still didn't tell me how to get started...

Are you on Monterey? It may not ship with python anymore! We better check:
Are you on Monterey or Ventura? It may not ship with python anymore! We better check:
- open a terminal and type `python3`, and if prompted to install the [x-code](https://developer.apple.com/xcode/) cli tools click `install`.
- this is less than ideal, but it gets you into a compatible state quickly

For Catalina, Big Sur and Monterey (once you've confirmed [python](https://python.org) is present):
For Catalina, Big Sur, Monterey and Ventura (once you've confirmed [python](https://python.org) is present):
- Copy the `mac_maker` binary to the OSX machine you'd like to put under configuration management.
- If you have a working internet connection, you can start working with `Mac Maker Profiles`.
- To try creating your own `Profile`, check out [this](https://github.com/osx-provisioner/profile-generator) repository.
Expand Down
97 changes: 65 additions & 32 deletions bitrise.yml
Original file line number Diff line number Diff line change
@@ -1,49 +1,82 @@
---
format_version: '11'
default_step_lib_source: "https://github.com/bitrise-io/bitrise-steplib.git"
project_type: macos

trigger_map:
- push_branch: "production"
workflow: build_binary
project_type: macos
pipeline: build_all

pipelines:
build_all:
stages:
- monterey: {}
- ventura: {}

stages:
monterey:
workflows:
- build_binary_monterey: {}
ventura:
workflows:
- build_binary_ventura: {}

workflows:
build_binary:
build_binary_monterey:
meta:
bitrise.io:
stack: osx-xcode-13.0.x # Monterey
machine_type_id: g2-m1.4core # g2-m1.4core (M1)
envs:
- BITRISE_DEPLOY_DIR: "/Users/vagrant/artifacts"
- OS_VERSION: "12"
- PYTHON_VERSION: "3.9.16"
steps:
- git-clone@7: {}
- git-clone@8: {}
- script@1:
inputs:
- runner: bash
- content: |-
#!/bin/bash
set -eo pipefail
# Initialize Environment
rm -rf ~/.pyenv
mkdir "${BITRISE_DEPLOY_DIR}"
# Build Python Distribution
bash scripts/build.sh pyenv "${PYTHON_VERSION}"
# Build Mac Maker Binary
eval $(~/.pyenv/bin/pyenv init --path)
pip install poetry
BUILD_NAME="${BITRISE_GIT_TAG}"
if [[ -z "${BUILD_NAME}" ]]; then
BUILD_NAME="${BITRISE_GIT_BRANCH}"
fi
bash scripts/build.sh binary "${OS_VERSION}" "${BUILD_NAME}"
# Move Built Binary to Artifacts Folder
mv ./dist/*.tar.gz "${BITRISE_DEPLOY_DIR}"
- content: ./scripts/bitrise.sh
- deploy-to-bitrise-io@2:
inputs:
- notify_user_groups: none
- slack@3:
inputs:
- webhook_url: $SLACK_URL
- title: 'Bitrise Status'
- text: 'Monterey build was successful!'
- slack@3:
run_if: .IsBuildFailed
inputs:
- webhook_url: $SLACK_URL
- title: 'Bitrise Status'
- text: 'Monterey build has failed!'
build_binary_ventura:
meta:
bitrise.io:
stack: osx-xcode-14.3.x-ventura # Ventura
machine_type_id: g2-m1.4core # g2-m1.4core (M1)
envs:
- BITRISE_DEPLOY_DIR: "/Users/vagrant/artifacts"
- OS_VERSION: "13"
- PYTHON_VERSION: "3.9.16"
steps:
- git-clone@8: {}
- script@1:
inputs:
- runner: bash
- content: ./scripts/bitrise.sh
- deploy-to-bitrise-io@2:
inputs:
- notify_user_groups: none
meta:
bitrise.io:
stack: osx-xcode-13.0.x # Monterey
machine_type_id: g2-m1.8core # g2.4core (intel) or g2-m1.8core (M1)
- slack@3:
inputs:
- webhook_url: $SLACK_URL
- title: 'Bitrise Status'
- text: 'Ventura build was successful!'
- slack@3:
run_if: .IsBuildFailed
inputs:
- webhook_url: $SLACK_URL
- title: 'Bitrise Status'
- text: 'Ventura build has failed!'
24 changes: 24 additions & 0 deletions scripts/bitrise.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/bin/bash

export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1

set -eo pipefail

# Initialize Environment
rm -rf ~/.pyenv
mkdir "${BITRISE_DEPLOY_DIR}"

# Build Python Distribution
bash scripts/build.sh pyenv "${PYTHON_VERSION}"

# Build Mac Maker Binary
eval "$(~/.pyenv/bin/pyenv init --path)"
pip install poetry
BUILD_NAME="${BITRISE_GIT_TAG}"
if [[ -z "${BUILD_NAME}" ]]; then
BUILD_NAME="${BITRISE_GIT_BRANCH}"
fi
bash scripts/build.sh binary "${OS_VERSION}" "${BUILD_NAME}"

# Move Built Binary to Artifacts Folder
mv ./dist/*.tar.gz "${BITRISE_DEPLOY_DIR}"

0 comments on commit b758dd9

Please sign in to comment.