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

Use Pants'-managed runs-on runners for Linux aarch64 CI #427

Merged
merged 9 commits into from
Dec 4, 2024
Merged
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
127 changes: 0 additions & 127 deletions .circleci/config.yml

This file was deleted.

23 changes: 19 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,27 @@ jobs:
- name: Noop
run: "true"
ci:
name: (${{ matrix.os }}) CI
name: (${{ matrix.name }}) CI
needs: org-check
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-22.04, macOS-10.15-X64, macOS-11-ARM64, windows-2022]
include:
- os: ubuntu-22.04
name: ubuntu-22.04

- 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-11-ARM64
name: macOS-11-ARM64

- os: windows-2022
name: windows-2022

env:
PY: python3.9
SCIE_PANTS_DEV_CACHE: .scie_pants_dev_cache
Expand Down Expand Up @@ -64,7 +79,7 @@ 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@9b1ee5b22b0a3f1feb8c2ff99b32c89b3c3191e9
if: ${{ matrix.os == 'macOS-10.15-X64' || matrix.os == 'macOS-11-ARM64' || matrix.os == 'ubuntu-22.04' }}
if: ${{ matrix.os == 'macOS-10.15-X64' || matrix.os == 'macOS-11-ARM64' || matrix.os == 'ubuntu-22.04' || matrix.name == 'linux-arm64' }}
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
version: 23.x
Expand All @@ -85,7 +100,7 @@ jobs:
PANTS_BOOTSTRAP_GITHUB_API_BEARER_TOKEN=${{ secrets.GITHUB_TOKEN }} \
cargo run -p package -- test --check --tools-pex-mismatch-warn
- name: Build, Package & Integration Tests (Ubuntu)
if: ${{ matrix.os == 'ubuntu-22.04' }}
if: ${{ matrix.os == 'ubuntu-22.04' || matrix.name == 'linux-arm64' }}
run: |
cargo run -p package -- --dest-dir dist/ tools
docker run --rm \
Expand Down
40 changes: 15 additions & 25 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,23 +54,34 @@ jobs:
exit 1
fi
github-release:
name: (${{ matrix.os }}) Create Github Release
name: (${{ matrix.name }}) Create Github Release
needs: determine-tag
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ ubuntu-22.04, macOS-10.15-X64, macOS-11-ARM64 ]
include:
- os: ubuntu-22.04
name: ubuntu-22.04

- 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-11-ARM64
name: macOS-11-ARM64
environment: Release
steps:
- name: Checkout scie-pants ${{ needs.determine-tag.outputs.release-tag }}
uses: actions/checkout@v3
with:
ref: ${{ needs.determine-tag.outputs.release-tag }}
- name: Package scie-pants ${{ needs.determine-tag.outputs.release-tag }} binary
if: ${{ matrix.os != 'ubuntu-22.04' }}
if: ${{ matrix.os != 'ubuntu-22.04' && matrix.name != 'linux-arm64' }}
run: cargo run -p package -- --dest-dir dist/ scie
- name: Package scie-pants ${{ needs.determine-tag.outputs.release-tag }} binary
if: ${{ matrix.os == 'ubuntu-22.04' }}
if: ${{ matrix.os == 'ubuntu-22.04' || matrix.name == 'linux-arm64' }}
run: |
cargo run -p package -- --dest-dir dist/ tools
docker run --rm \
Expand Down Expand Up @@ -103,25 +114,11 @@ jobs:
files: dist/scie-pants-*
fail_on_unmatched_files: true
discussion_category_name: Announcements
aarch64-release-trigger:
name: Trigger Circle CI Linux aarch64 Github Release
needs:
- determine-tag
- github-release
runs-on: ubuntu-22.04
steps:
- name: Trigger aarch64 release
uses: CircleCI-Public/[email protected]
with:
GHA_Meta: "${{ needs.determine-tag.outputs.release-tag }}"
env:
CCI_TOKEN: ${{ secrets.CCI_TOKEN }}
announce-release:
name: Announce Release
needs:
- determine-tag
- github-release
- aarch64-release-trigger
runs-on: ubuntu-22.04
steps:
- name: Post Release Announcement to Pants Slack `#announce`
Expand All @@ -141,13 +138,6 @@ jobs:
"type": "mrkdwn",
"text": "The `pants` launcher binary (scie-pants) ${{ needs.determine-tag.outputs.release-tag }} is released:\n* https://github.com/pantsbuild/scie-pants/releases/tag/${{ needs.determine-tag.outputs.release-tag }}\n* https://www.pantsbuild.org/docs/installation"
}
},
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": "_N.B.: The Linux aarch64 release will lag by ~15 minutes._"
}
}
]
}
Expand Down
Loading