Skip to content
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.

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

Build on newer-versions of Github-hosted macOS runners #441

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 16 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ concurrency:
cancel-in-progress: ${{ github.ref != 'refs/heads/main' || !startsWith(github.ref, 'refs/tags/') }}
env:
CARGO_TERM_COLOR: always
# We were previously building and publishing on macOS 10.15 (x86-64) and 11 (arm64), so let's
# maintain that support
MACOSX_DEPLOYMENT_TARGET: 10.15
jobs:
org-check:
name: Check GitHub Organization
Expand All @@ -31,18 +34,23 @@ jobs:
include:
- os: ubuntu-22.04
name: ubuntu-22.04
requires-setup-python: true

- os: [runs-on, runner=4cpu-linux-arm64, image=ubuntu22-full-arm64-python3.7-3.13, "run-id=${{ github.run_id }}"]
name: linux-arm64
requires-setup-python: false

- os: macOS-10.15-X64
name: macOS-10.15-X64
- os: macos-13
name: "macos-13 x86-64"
requires-setup-python: true

- os: macOS-11-ARM64
name: macOS-11-ARM64
- os: macos-14
name: "macos-14 arm64"
requires-setup-python: true

- os: windows-2022
name: windows-2022
requires-setup-python: false

env:
PY: python3.9
Expand All @@ -57,8 +65,8 @@ jobs:
run: cargo clippy --locked --all
- name: Unit Tests
run: cargo test --all
- name: Setup Python 3.9 (Ubuntu only)
if: ${{ matrix.os == 'ubuntu-22.04' }}
- name: Setup Python 3.9
if: ${{ matrix.requires-setup-python }}
uses: actions/setup-python@v4
with:
# N.B.: We need Python 3.9 for running Pants goals against our tools.pex Python tools
Expand All @@ -79,13 +87,13 @@ jobs:
# required for the PANTS_SOURCE tests, which build a version of Pants that requires an external protoc
- name: Install Protoc
uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # v3.0.0
if: ${{ matrix.os == 'macOS-10.15-X64' || matrix.os == 'macOS-11-ARM64' || matrix.os == 'ubuntu-22.04' || matrix.name == 'linux-arm64' }}
if: ${{ matrix.os != 'windows-2022' }}
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
version: 23.x

- name: Build, Package & Integration Tests (MacOS)
if: ${{ matrix.os == 'macOS-10.15-X64' || matrix.os == 'macOS-11-ARM64'}}
if: ${{ matrix.os == 'macos-13' || matrix.os == 'macos-14'}}
run: |
# TODO(John Sirois): Kill --tools-pex-mismatch-warn:
# https://github.com/pantsbuild/scie-pants/issues/2
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ on:
required: true
env:
CARGO_TERM_COLOR: always
# We were previously building and publishing on macOS 10.15 (x86-64) and 11 (arm64), so let's
# maintain that support
MACOSX_DEPLOYMENT_TARGET: 10.15
jobs:
org-check:
name: Check GitHub Organization
Expand Down Expand Up @@ -66,11 +69,11 @@ jobs:
- os: [runs-on, runner=4cpu-linux-arm64, image=ubuntu22-full-arm64-python3.7-3.13, "run-id=${{ github.run_id }}"]
name: linux-arm64

- os: macOS-10.15-X64
name: macOS-10.15-X64
- os: macos-13
name: "macos-13 x86-64"

- os: macOS-11-ARM64
name: macOS-11-ARM64
- os: macos-14
name: "macos-14 arm64"
environment: Release
steps:
- name: Checkout scie-pants ${{ needs.determine-tag.outputs.release-tag }}
Expand Down
2 changes: 1 addition & 1 deletion package/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ use crate::utils::fs::{base_name, canonicalize, copy, ensure_directory};
const BINARY: &str = "scie-pants";

// The version of a-scie/lift to use by default.
const SCIENCE_TAG: &str = "v0.3.1";
const SCIENCE_TAG: &str = "v0.8.2";

#[derive(Clone)]
struct SpecifiedPath(PathBuf);
Expand Down
Loading