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.

Sign up for GitHub

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

Add FreeBSD aarch64 #123

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add FreeBSD aarch64 #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
841b40b
add aarch64 freebsd to CI
bjia56 Jan 9, 2025
779f33a
Merge remote-tracking branch 'origin/main' into freebsd-aarch64
bjia56 Mar 9, 2025
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
40 changes: 31 additions & 9 deletions .github/workflows/build_python.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
platforms:
required: true
type: string
default: "linux-x86_64,linux-aarch64,linux-i386,linux-arm,linux-riscv64,linux-loongarch64,linux-s390x,linux-powerpc64le,macos,windows,cosmo,freebsd13-x86_64,freebsd14-x86_64,freebsd15-x86_64,solaris11-x86_64"
default: "linux-x86_64,linux-aarch64,linux-i386,linux-arm,linux-riscv64,linux-loongarch64,linux-s390x,linux-powerpc64le,macos,windows,cosmo,freebsd13-x86_64,freebsd14-x86_64,freebsd15-x86_64,freebsd13-aarch64,freebsd14-aarch64,freebsd15-aarch64,solaris11-x86_64"
buildsystem_branch:
required: false
type: string
Expand Down Expand Up @@ -54,7 +54,7 @@ env:
PORTABLE_PYTHON_BUILDSYSTEM_BRANCH: ${{ inputs.buildsystem_branch || 'portable-python' }}
image_map: '{"x86_64": "amd64/ubuntu:18.04", "i386": "i386/ubuntu:18.04", "aarch64": "arm64v8/ubuntu:18.04", "arm": "arm32v7/debian:bullseye", "riscv64": "riscv64/debian:sid", "loongarch64": "loongarch64/debian:sid", "s390x": "s390x/debian:bullseye", "powerpc64le": "ppc64le/ubuntu:18.04"}'
platform_map: '{"x86_64": "linux/amd64", "i386": "linux/386", "aarch64": "linux/arm64/v8", "arm": "linux/arm/v7", "riscv64": "linux/riscv64", "loongarch64": "linux/loong64", "s390x": "linux/s390x", "powerpc64le": "linux/ppc64le"}'
freebsd_release_map: '{"15": "15.0", "14": "14.0", "13": "13.2"}'
freebsd_release_map: '{"15": "15.0", "14": "14.1", "13": "13.3"}'
solaris_release_map: '{"11": "11.4"}'

jobs:
Expand Down Expand Up @@ -316,18 +316,28 @@ jobs:
./scripts/launch_test.sh universal2 ${{ inputs.python_version }} ${{ matrix.distribution }} darwin "${{ env.RUN_TESTS }}"

build_freebsd:
name: FreeBSD ${{ matrix.release }} ${{ inputs.python_version }} x86_64 ${{ matrix.distribution }} (build)
name: FreeBSD ${{ matrix.release }} ${{ inputs.python_version }} ${{ matrix.arch }} ${{ matrix.distribution }} (build)
if: ${{ contains(inputs.platforms, 'freebsd') }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
release: [13, 14, 15]
arch: [x86_64, aarch64]
distribution: [full, headless]
exclude:
- release: ${{ !contains(inputs.platforms, 'freebsd13-x86_64') && '13' || '' }}
arch: ${{ !contains(inputs.platforms, 'freebsd13-x86_64') && 'x86_64' || '' }}
- release: ${{ !contains(inputs.platforms, 'freebsd14-x86_64') && '14' || '' }}
arch: ${{ !contains(inputs.platforms, 'freebsd14-x86_64') && 'x86_64' || '' }}
- release: ${{ !contains(inputs.platforms, 'freebsd15-x86_64') && '15' || '' }}
arch: ${{ !contains(inputs.platforms, 'freebsd15-x86_64') && 'x86_64' || '' }}
- release: ${{ !contains(inputs.platforms, 'freebsd13-aarch64') && '13' || '' }}
arch: ${{ !contains(inputs.platforms, 'freebsd13-aarch64') && 'aarch64' || '' }}
- release: ${{ !contains(inputs.platforms, 'freebsd14-aarch64') && '14' || '' }}
arch: ${{ !contains(inputs.platforms, 'freebsd14-aarch64') && 'aarch64' || '' }}
- release: ${{ !contains(inputs.platforms, 'freebsd15-aarch64') && '15' || '' }}
arch: ${{ !contains(inputs.platforms, 'freebsd15-aarch64') && 'aarch64' || '' }}

steps:
- name: Parse release
Expand All @@ -344,6 +354,7 @@ jobs:
with:
sync: nfs
release: ${{ steps.parse_release.outputs.release }}
arch: ${{ matrix.arch }}
prepare: |
pkg install -y cmake bash wget patch git zip python3 autoconf automake libtool gettext bison pkgconf gmake gperf patchelf texinfo
chsh -s /usr/local/bin/bash root
Expand All @@ -360,7 +371,7 @@ jobs:
export VERBOSE_CI="${{ env.VERBOSE_CI }}"
export PORTABLE_PYTHON_BUILDSYSTEM_BRANCH="${{ env.PORTABLE_PYTHON_BUILDSYSTEM_BRANCH }}"
export PLATFORM="freebsd${{ matrix.release }}"
bash ./scripts/build_freebsd.sh x86_64 ${{ inputs.python_version }} ${{ matrix.distribution }}
bash ./scripts/build_freebsd.sh ${{ matrix.arch }} ${{ inputs.python_version }} ${{ matrix.distribution }}

cp *.zip ${{ github.workspace }}
cp *.tar.gz ${{ github.workspace }}
Expand All @@ -372,29 +383,39 @@ jobs:
- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: python-freebsd${{ matrix.release }}-x86_64-${{ matrix.distribution }}-${{ inputs.python_version }}
name: python-freebsd${{ matrix.release }}-${{ matrix.arch }}-${{ matrix.distribution }}-${{ inputs.python_version }}
path: ./python*.zip

- name: Upload artifacts
if: ${{ always() && inputs.debug }}
uses: actions/upload-artifact@v4
with:
name: build-python-freebsd${{ matrix.release }}-x86_64-${{ matrix.distribution }}-${{ inputs.python_version }}
name: build-python-freebsd${{ matrix.release }}-${{ matrix.arch }}-${{ matrix.distribution }}-${{ inputs.python_version }}
path: ./*python*.tar.gz

test_freebsd:
name: FreeBSD ${{ matrix.release }} ${{ inputs.python_version }} x86_64 ${{ matrix.distribution }} (test)
name: FreeBSD ${{ matrix.release }} ${{ inputs.python_version }} ${{ matrix.arch }} ${{ matrix.distribution }} (test)
needs: build_freebsd
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
release: [13, 14, 15]
arch: [x86_64, aarch64]
distribution: [full, headless]
exclude:
- release: ${{ !contains(inputs.platforms, 'freebsd13-x86_64') && '13' || '' }}
arch: ${{ !contains(inputs.platforms, 'freebsd13-x86_64') && 'x86_64' || '' }}
- release: ${{ !contains(inputs.platforms, 'freebsd14-x86_64') && '14' || '' }}
arch: ${{ !contains(inputs.platforms, 'freebsd14-x86_64') && 'x86_64' || '' }}
- release: ${{ !contains(inputs.platforms, 'freebsd15-x86_64') && '15' || '' }}
arch: ${{ !contains(inputs.platforms, 'freebsd15-x86_64') && 'x86_64' || '' }}
- release: ${{ !contains(inputs.platforms, 'freebsd13-aarch64') && '13' || '' }}
arch: ${{ !contains(inputs.platforms, 'freebsd13-aarch64') && 'aarch64' || '' }}
- release: ${{ !contains(inputs.platforms, 'freebsd14-aarch64') && '14' || '' }}
arch: ${{ !contains(inputs.platforms, 'freebsd14-aarch64') && 'aarch64' || '' }}
- release: ${{ !contains(inputs.platforms, 'freebsd15-aarch64') && '15' || '' }}
arch: ${{ !contains(inputs.platforms, 'freebsd15-aarch64') && 'aarch64' || '' }}

steps:
- name: Parse release
Expand All @@ -409,14 +430,15 @@ jobs:
- name: Download artifact
uses: actions/download-artifact@v4
with:
name: python-freebsd${{ matrix.release }}-x86_64-${{ matrix.distribution }}-${{ inputs.python_version }}
name: python-freebsd${{ matrix.release }}-${{ matrix.arch }}-${{ matrix.distribution }}-${{ inputs.python_version }}
path: .

- name: Start VM
uses: vmactions/freebsd-vm@v1
with:
sync: nfs
release: ${{ steps.parse_release.outputs.release }}
arch: ${{ matrix.arch }}
prepare: |
pkg install -y bash
chsh -s /usr/local/bin/bash root
Expand All @@ -426,7 +448,7 @@ jobs:
run: |
set -e
cd ${{ github.workspace }}
bash ./scripts/launch_test.sh x86_64 ${{ inputs.python_version }} ${{ matrix.distribution }} freebsd${{ matrix.release }} "${{ env.RUN_TESTS }}"
bash ./scripts/launch_test.sh ${{ matrix.arch }} ${{ inputs.python_version }} ${{ matrix.distribution }} freebsd${{ matrix.release }} "${{ env.RUN_TESTS }}"

build_solaris:
name: Solaris ${{ matrix.release }} ${{ inputs.python_version }} x86_64 ${{ matrix.distribution }} (build)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_python_on_branch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
run_tests: ${{ inputs.run_tests || false }}
debug: ${{ inputs.debug || false }}
verbose: ${{ inputs.verbose || false }}
platforms: "linux-x86_64,linux-aarch64,linux-i386,linux-arm,linux-riscv64,linux-loongarch64,linux-s390x,linux-powerpc64le,macos,windows,cosmo,freebsd13-x86_64,freebsd14-x86_64,freebsd15-x86_64,solaris11-x86_64"
platforms: "linux-x86_64,linux-aarch64,linux-i386,linux-arm,linux-riscv64,linux-loongarch64,linux-s390x,linux-powerpc64le,macos,windows,cosmo,freebsd13-x86_64,freebsd14-x86_64,freebsd15-x86_64,freebsd13-aarch64,freebsd14-aarch64,freebsd15-aarch64,solaris11-x86_64"
buildsystem_branch: ${{ inputs.buildsystem_branch || 'portable-python' }}

graalpy:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_python.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
uses: ./.github/workflows/build_python.yml
with:
python_version: ${{ inputs.python_version }}
platforms: "linux-x86_64,linux-aarch64,linux-i386,linux-arm,linux-riscv64,linux-loongarch64,linux-s390x,linux-powerpc64le,macos,windows,cosmo,freebsd13-x86_64,freebsd14-x86_64,freebsd15-x86_64,solaris11-x86_64"
platforms: "linux-x86_64,linux-aarch64,linux-i386,linux-arm,linux-riscv64,linux-loongarch64,linux-s390x,linux-powerpc64le,macos,windows,cosmo,freebsd13-x86_64,freebsd14-x86_64,freebsd15-x86_64,freebsd13-aarch64,freebsd14-aarch64,freebsd15-aarch64,solaris11-x86_64"

publish:
name: Publish CPython ${{ inputs.python_version }}
Expand Down
Loading