Skip to content

Commit

Permalink
Merge pull request #3293 from pygame-community/ankith26-drop-circleci
Browse files Browse the repository at this point in the history
Drop circleci, use gh actions for arm manylinux
  • Loading branch information
ankith26 authored Jan 17, 2025
2 parents 28f5a32 + 3433bde commit 565cae6
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 229 deletions.
66 changes: 0 additions & 66 deletions .circleci/config.yml

This file was deleted.

2 changes: 0 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# define files/directories that won't be exported in an sdist
# Keep in sync with MANIFEST.in
.circleci/ export-ignore
.github/ export-ignore
buildconfig/ci/ export-ignore
buildconfig/macdependencies/ export-ignore
buildconfig/manylinux-build/ export-ignore

Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/build-manylinux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@ concurrency:
jobs:
build:
name: ${{ matrix.arch }}
runs-on: ubuntu-24.04
runs-on: ${{ matrix.arch == 'aarch64' && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
permissions:
contents: read
packages: write

strategy:
fail-fast: false # if a particular matrix build fails, don't skip the rest
matrix:
arch: [x86_64, i686]
arch: [x86_64, i686, aarch64]

env:
CIBW_ARCHS: ${{ matrix.arch }}
Expand Down Expand Up @@ -90,6 +90,8 @@ jobs:
CIBW_MANYLINUX_PYPY_X86_64_IMAGE: ghcr.io/${{ github.repository }}_x86_64:${{ steps.meta.outputs.version }}
CIBW_MANYLINUX_I686_IMAGE: ghcr.io/${{ github.repository }}_i686:${{ steps.meta.outputs.version }}
CIBW_MANYLINUX_PYPY_I686_IMAGE: ghcr.io/${{ github.repository }}_i686:${{ steps.meta.outputs.version }}
CIBW_MANYLINUX_AARCH64_IMAGE: ghcr.io/${{ github.repository }}_aarch64:${{ steps.meta.outputs.version }}
CIBW_MANYLINUX_PYPY_AARCH64_IMAGE: ghcr.io/${{ github.repository }}_aarch64:${{ steps.meta.outputs.version }}

uses: pypa/[email protected]

Expand Down
20 changes: 0 additions & 20 deletions .github/workflows/release-gh-draft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,6 @@ on:
branches: 'release/**'

jobs:
manylinux-aarch64:
runs-on: ubuntu-latest
outputs:
pipeline_id: ${{ steps.circleci.outputs.id }}

steps:
- name: Trigger CircleCI builds on release
id: circleci
uses: CircleCI-Public/[email protected]
env:
CCI_TOKEN: ${{ secrets.CCI_TOKEN }}

manylinux:
uses: ./.github/workflows/build-manylinux.yml

Expand Down Expand Up @@ -46,14 +34,6 @@ jobs:
path: pygame-wheels
merge-multiple: true

- name: Download manylinux-aarch64 artifacts from CircleCI
continue-on-error: true # incase things don't work here, can manually handle it
run: >
python3 buildconfig/ci/circleci/pull_circleci_artifacts.py
${{ secrets.CCI_TOKEN }}
${{ needs.manylinux-aarch64.outputs.pipeline_id }}
pygame-wheels
# Strips 'release/' from the ref_name, this helps us access the version
# name as 'steps.ver.outputs.VER'
- name: Get version
Expand Down
1 change: 0 additions & 1 deletion buildconfig/MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ recursive-include src_c *
recursive-include examples *
recursive-include test *

recursive-exclude buildconfig/ci *
recursive-exclude buildconfig/manylinux-build *
recursive-exclude buildconfig/macdependencies *
recursive-exclude buildconfig/stubs/.mypy_cache *
Expand Down
138 changes: 0 additions & 138 deletions buildconfig/ci/circleci/pull_circleci_artifacts.py

This file was deleted.

0 comments on commit 565cae6

Please sign in to comment.