Skip to content

Commit

Permalink
WIP: Return back mac x86_64 wheels
Browse files Browse the repository at this point in the history
  • Loading branch information
ods committed Jul 13, 2024
1 parent 31e03fe commit 4ab512d
Show file tree
Hide file tree
Showing 3 changed files with 96 additions and 42 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: "CodeQL"

on:
push:
branches: [ 'master' ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ 'master' ]
schedule:
- cron: '36 22 * * 0'
on: []
# push:
# branches: [ 'master' ]
# pull_request:
# # The branches below must be a subset of the branches above
# branches: [ 'master' ]
# schedule:
# - cron: '36 22 * * 0'

jobs:
analyze:
Expand Down Expand Up @@ -37,11 +37,11 @@ jobs:
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
queries: +security-and-quality


# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
Expand All @@ -50,7 +50,7 @@ jobs:
# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# If the Autobuild fails above, remove it and uncomment the following three lines.
# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

# - run: |
Expand Down
100 changes: 77 additions & 23 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

name: Publish

on:
release:
types: [created]
workflow_dispatch: {}
on: push
# release:
# types: [created]
# workflow_dispatch: {}

jobs:
package-source:
Expand Down Expand Up @@ -35,13 +35,19 @@ jobs:
strategy:
fail-fast: false
matrix:
# Available runner images:
# https://github.com/actions/runner-images#available-images
os: [ubuntu-latest, macos-latest, windows-latest]
arch: [auto]
include:
# Available runner images:
# https://github.com/actions/runner-images#available-images
- os: ubuntu-latest
arch: x86_64
- os: ubuntu-latest
arch: aarch64
- os: macos-13
arch: x86_64
- os: macos-latest
arch: arm64
- os: windows-latest
arch: amd64
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
Expand Down Expand Up @@ -116,6 +122,49 @@ jobs:
shell: bash

test-wheels-mac:
needs: [package-source, package-wheel]
runs-on: macos-13

strategy:
matrix:
python: ["3.8", "3.9", "3.10", "3.11", "3.12"]
include:
- python: "3.8"
aiokafka_whl: dist/aiokafka-*-cp38-cp38-macosx_*_x86_64.whl
- python: "3.9"
aiokafka_whl: dist/aiokafka-*-cp39-cp39-macosx_*_x86_64.whl
- python: "3.10"
aiokafka_whl: dist/aiokafka-*-cp310-cp310-macosx_*_x86_64.whl
- python: "3.11"
aiokafka_whl: dist/aiokafka-*-cp311-cp311-macosx_*_x86_64.whl
- python: "3.12"
aiokafka_whl: dist/aiokafka-*-cp312-cp312-macosx_*_x86_64.whl

steps:
- uses: actions/checkout@v2
- name: Download distributions
uses: actions/download-artifact@v2
with:
name: dist
path: dist/
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python }}

- name: Install python dependencies
run: |
pip install --upgrade pip setuptools wheel
pip install -r requirements-ci.txt
pip install ${{ matrix.aiokafka_whl }}
- name: Run Unit Tests
run: |
# Remove source code to be sure we use wheel code
rm -rf aiokafka
make ci-test-unit
test-wheels-arm64-mac:
needs: [package-source, package-wheel]
runs-on: macos-latest

Expand Down Expand Up @@ -252,20 +301,25 @@ jobs:
make ci-test-unit && \
deactivate'
deploy:
# deploy:

runs-on: ubuntu-latest
needs: [test-wheels-linux, test-wheels-aarch64-linux, test-wheels-mac, test-wheels-windows]
# runs-on: ubuntu-latest
# needs:
# - test-wheels-linux
# - test-wheels-aarch64-linux
# - test-wheels-mac
# - test-wheels-arm64-mac
# - test-wheels-windows

steps:
- uses: actions/checkout@v2
- name: Download distributions
uses: actions/download-artifact@v2
with:
name: dist
path: dist/
- name: Publish to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: ${{ secrets.PYPI_USERNAME }}
password: ${{ secrets.PYPI_PASSWORD }}
# steps:
# - uses: actions/checkout@v2
# - name: Download distributions
# uses: actions/download-artifact@v2
# with:
# name: dist
# path: dist/
# - name: Publish to PyPI
# uses: pypa/gh-action-pypi-publish@release/v1
# with:
# user: ${{ secrets.PYPI_USERNAME }}
# password: ${{ secrets.PYPI_PASSWORD }}
16 changes: 8 additions & 8 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@

name: Tests

on:
push:
branches: [ master, '**' ]
tags:
- "v0.[0-9]+.[0-9]+"
- "v0.[0-9]+.[0-9]+.dev*"
pull_request:
branches: [ master ]
on: []
# push:
# branches: [ master, '**' ]
# tags:
# - "v0.[0-9]+.[0-9]+"
# - "v0.[0-9]+.[0-9]+.dev*"
# pull_request:
# branches: [ master ]

jobs:
test-sanity:
Expand Down

0 comments on commit 4ab512d

Please sign in to comment.