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 ppbt toolchain when building. #191

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion .github/workflows/build-cross-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install -y build-essential bison python3-all patchelf swig
python3 -m pip install nox
python3 -m pip install nox ppbt

- name: Python Version
run: |
Expand Down
21 changes: 5 additions & 16 deletions .github/workflows/build-native-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,27 +46,16 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install -y build-essential bison python3-all patchelf swig cmake libldap2-dev libsasl2-dev ldap-utils libssl-dev pkg-config libvirt-dev default-libmysqlclient-dev
python3 -m pip install nox
python3 -m pip install nox ppbt

- name: Python Version
run: |
python3 --version
python3 -c 'import os; print(os.name)'

- name: Download Toolchain Artifact
uses: actions/download-artifact@v4
with:
name: toolchain-${{ matrix.host }}-${{ matrix.target }}-linux-gnu.tar.xz
path: .

- name: Extract Toolchain Artifact
run: |
mkdir -p toolchain
tar -C toolchain -xvf toolchain-${{ matrix.host }}-${{ matrix.target }}-linux-gnu.tar.xz

- name: Build
run: |
python3 -m relenv build --arch=${{ matrix.target }} --python=${{ matrix.version }}
python3 -m relenv build --no-pretty --arch=${{ matrix.target }} --python=${{ matrix.version }}

- name: Verify Build
if: ${{ matrix.host == matrix.target }}
Expand Down Expand Up @@ -120,7 +109,7 @@ jobs:

- name: Build
run: |
python3 -m relenv build --python=${{ matrix.version }}
python3 -m relenv build --no-pretty --python=${{ matrix.version }}

- name: Re-install gettext
run: |
Expand Down Expand Up @@ -176,7 +165,7 @@ jobs:

- name: Build
run: |
python3 -m relenv build --python=${{ matrix.version }}
python3 -m relenv build --no-pretty --python=${{ matrix.version }}

- name: Re-install gettext
run: |
Expand Down Expand Up @@ -241,7 +230,7 @@ jobs:
env:
RELENV_NATIVE_PY_VERSION: 3.10.12
run: |
python -m relenv build --arch=${{ matrix.arch }} --python=${{ matrix.version }}
python -m relenv build --no-pretty --arch=${{ matrix.arch }} --python=${{ matrix.version }}

- name: Verify Build
if: ${{ matrix.arch == 'amd64' }}
Expand Down
29 changes: 0 additions & 29 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,6 @@ jobs:
deleted:
- deleted:
- '**'
toolchain:
- added|modified:
- '.github/workflows/*toolchain*.yml'
- 'relenv/toolchain.py'
- 'relenv/_toolchain/**'

pre-commit:
name: Pre-Commit
uses: ./.github/workflows/pre-commit-action.yml
Expand All @@ -75,20 +69,11 @@ jobs:
kind: "${{ inputs.kind }}"
cmd: "${{ inputs.package_command }}"

toolchain:
name: Toolchain Builds
uses: ./.github/workflows/toolchain-action.yml
needs:
- get-changed-files
with:
changed-files: ${{ needs.get-changed-files.outputs.changed-files }}

build-native:
name: Python Native Builds
uses: ./.github/workflows/build-native-action.yml
needs:
- get-changed-files
- toolchain
with:
changed-files: ${{ needs.get-changed-files.outputs.changed-files }}

Expand All @@ -104,7 +89,6 @@ jobs:
# uses: ./.github/workflows/build-action.yml
# needs:
# - get-changed-files
# - toolchain
# - build-native
# with:
# changed-files: ${{ needs.get-changed-files.outputs.changed-files }}
Expand Down Expand Up @@ -138,16 +122,6 @@ jobs:
with:
version: "${{ needs.build-python-package.outputs.version }}"

upload-toolchain-artifacts:
name: Deploy Toolchain
if: ${{ inputs.kind == 'release' && success() }}
uses: ./.github/workflows/deploy-toolchain-action.yml
needs:
- build-python-package
- toolchain
with:
version: "${{ needs.build-python-package.outputs.version }}"

deploy-python-package:
name: Deploy Python Package
uses: ./.github/workflows/deploy-package-action.yml
Expand All @@ -159,7 +133,6 @@ jobs:
- build-python-package
- test-fips
- upload-build-artifacts
- upload-toolchain-artifacts

create-release:
name: Create Github Release
Expand All @@ -180,13 +153,11 @@ jobs:
if: always()
needs:
- pre-commit
- toolchain
- build-native
#- build-cross
- test
- docs
- upload-build-artifacts
- upload-toolchain-artifacts
- deploy-python-package
- create-release
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Install Nox
run: |
python -m pip install --upgrade pip
pip install nox
pip install nox ppbt

- name: Build Docs
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

- name: Install python dependencies
run: |
pip3 install nox
pip3 install nox ppbt

- name: Install Linux dependencies
if: ${{ matrix.runs-on == 'linux' }}
Expand Down
6 changes: 0 additions & 6 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,6 @@ def build(session, arch):
invoke_relenv(session, "build", f"--arch={arch}")


@nox.session
@nox.parametrize("arch", ("x86_64", "aarch64"))
def toolchain(session, arch):
invoke_relenv(session, "toolchain", "build", f"--arch={arch}")


# Convenience sessions
@nox.session
def build_x86_64(session):
Expand Down
Loading
Loading