From 273ed0dee5d19e001b8994596970d53a9e5b1b18 Mon Sep 17 00:00:00 2001 From: pseudo-rnd-thoughts Date: Thu, 22 Aug 2024 12:03:22 +0100 Subject: [PATCH 1/3] Improve build CI --- .../{build-docs-dev.yml => docs-build-dev.yml} | 0 ...-docs-version.yml => docs-build-version.yml} | 0 ...d-docs-version.yml => docs-manual-build.yml} | 0 .github/workflows/pre-commit.yml | 5 +---- .../{build-publish.yml => publish-build.yml} | 0 .github/workflows/test-cpp.yml | 16 +++++++++++----- .github/workflows/test-python.yml | 17 ++++++++++++----- 7 files changed, 24 insertions(+), 14 deletions(-) rename .github/workflows/{build-docs-dev.yml => docs-build-dev.yml} (100%) rename .github/workflows/{build-docs-version.yml => docs-build-version.yml} (100%) rename .github/workflows/{manual-build-docs-version.yml => docs-manual-build.yml} (100%) rename .github/workflows/{build-publish.yml => publish-build.yml} (100%) diff --git a/.github/workflows/build-docs-dev.yml b/.github/workflows/docs-build-dev.yml similarity index 100% rename from .github/workflows/build-docs-dev.yml rename to .github/workflows/docs-build-dev.yml diff --git a/.github/workflows/build-docs-version.yml b/.github/workflows/docs-build-version.yml similarity index 100% rename from .github/workflows/build-docs-version.yml rename to .github/workflows/docs-build-version.yml diff --git a/.github/workflows/manual-build-docs-version.yml b/.github/workflows/docs-manual-build.yml similarity index 100% rename from .github/workflows/manual-build-docs-version.yml rename to .github/workflows/docs-manual-build.yml diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 2f11b8bfe..13a9b0176 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -1,6 +1,6 @@ # https://pre-commit.com # This GitHub Action assumes that the repo contains a valid .pre-commit-config.yaml file. -name: pre-commit +name: Run Pre-commit on: pull_request: push: @@ -15,9 +15,6 @@ jobs: steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 - with: - python-version: '3.9' - run: python -m pip install pre-commit - run: python -m pre_commit --version - - run: python -m pre_commit install - run: python -m pre_commit run --all-files diff --git a/.github/workflows/build-publish.yml b/.github/workflows/publish-build.yml similarity index 100% rename from .github/workflows/build-publish.yml rename to .github/workflows/publish-build.yml diff --git a/.github/workflows/test-cpp.yml b/.github/workflows/test-cpp.yml index bc2a06848..29a359068 100644 --- a/.github/workflows/test-cpp.yml +++ b/.github/workflows/test-cpp.yml @@ -1,4 +1,4 @@ -name: Test C++ Stable-Retro code +name: Run CTest on: [pull_request, push] @@ -7,14 +7,20 @@ permissions: jobs: build: - runs-on: ubuntu-latest # todo, add more OS systems to see if they work as well - + name: ${{ matrix.runs_on }} + strategy: + matrix: + include: + - runs-on: ubuntu-latest + - runs-on: mac-12 + - runs-on: mac-14 + + runs-on: ${{ matrix.runs-on }} steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 with: - python-version: 3.9 + python-version: 3.12 - name: Install system packages run: | diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml index cbd44b4ad..49916b797 100644 --- a/.github/workflows/test-python.yml +++ b/.github/workflows/test-python.yml @@ -1,4 +1,4 @@ -name: Test Stable-Retro +name: Run PyTest on: [pull_request, push] @@ -7,11 +7,18 @@ permissions: jobs: build: - runs-on: ubuntu-latest # todo, add more OS systems to see if they work as well strategy: matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] - + include: + - runs-on: ubuntu-latest + python: '3.8' + - runs-on: mac-12 # x86_64 + python: '3.8' + - runs-on: mac-14 # arm64 + python: '3.8' + + runs-on: ${{ matrix.runs-on }} + name: ${{ matrix.runs_on }} • py${{ matrix.python }} steps: - uses: actions/checkout@v3 @@ -27,7 +34,7 @@ jobs: - name: Install pip packages run: | python3 -m pip install --upgrade pip pytest - python3 -m pip install -e . + python3 -m pip install . - name: Run tests run: | From f0a4b1b5256da904969c53f655e7160c88e38cf2 Mon Sep 17 00:00:00 2001 From: pseudo-rnd-thoughts Date: Thu, 22 Aug 2024 12:13:49 +0100 Subject: [PATCH 2/3] Re-enable the publish archs and add editable to pip install --- .github/workflows/publish-build.yml | 8 ++++---- .github/workflows/test-python.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish-build.yml b/.github/workflows/publish-build.yml index bf21ff8b8..75103a6b2 100644 --- a/.github/workflows/publish-build.yml +++ b/.github/workflows/publish-build.yml @@ -21,7 +21,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-22.04] #, macos-11] - disable macos, as it's not working for a moment + os: [ubuntu-latest, macos-12] steps: - uses: actions/checkout@v3 @@ -33,11 +33,11 @@ jobs: platforms: all - name: Build wheels - uses: pypa/cibuildwheel@v2.15.0 + uses: pypa/cibuildwheel@v2.20.0 env: # Configure cibuildwheel to build native archs, and some emulated ones - CIBW_ARCHS_LINUX: x86_64 # aarch64 - disable ARM, as it's not working for a moment - #CIBW_ARCHS_MACOS: x86_64 arm64 - macos is disabled for a moment + CIBW_ARCHS_LINUX: x86_64 aarch64 + CIBW_ARCHS_MACOS: x86_64 arm64 CIBW_BUILD_VERBOSITY: 3 # Increase verbosity to see what's going on CIBW_REPAIR_WHEEL_COMMAND_LINUX: > # Print additional info from auditwheel auditwheel show {wheel} && auditwheel repair -w {dest_dir} {wheel} diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml index 49916b797..3e43e397f 100644 --- a/.github/workflows/test-python.yml +++ b/.github/workflows/test-python.yml @@ -18,7 +18,7 @@ jobs: python: '3.8' runs-on: ${{ matrix.runs-on }} - name: ${{ matrix.runs_on }} • py${{ matrix.python }} + name: ${{ matrix.runs-on }} • py${{ matrix.python }} steps: - uses: actions/checkout@v3 @@ -34,7 +34,7 @@ jobs: - name: Install pip packages run: | python3 -m pip install --upgrade pip pytest - python3 -m pip install . + python3 -m pip install -e . - name: Run tests run: | From 4e6247073f340f51127e583b67c339e94e979a5a Mon Sep 17 00:00:00 2001 From: pseudo-rnd-thoughts Date: Thu, 22 Aug 2024 12:22:49 +0100 Subject: [PATCH 3/3] Add fast-fail: false --- .github/workflows/publish-build.yml | 1 + .github/workflows/test-cpp.yml | 1 + .github/workflows/test-python.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/publish-build.yml b/.github/workflows/publish-build.yml index 75103a6b2..a63bb52cf 100644 --- a/.github/workflows/publish-build.yml +++ b/.github/workflows/publish-build.yml @@ -20,6 +20,7 @@ jobs: name: Build wheels on ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: os: [ubuntu-latest, macos-12] diff --git a/.github/workflows/test-cpp.yml b/.github/workflows/test-cpp.yml index 29a359068..bc1d7433d 100644 --- a/.github/workflows/test-cpp.yml +++ b/.github/workflows/test-cpp.yml @@ -9,6 +9,7 @@ jobs: build: name: ${{ matrix.runs_on }} strategy: + fail-fast: false matrix: include: - runs-on: ubuntu-latest diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml index 3e43e397f..bf013f6ac 100644 --- a/.github/workflows/test-python.yml +++ b/.github/workflows/test-python.yml @@ -8,6 +8,7 @@ permissions: jobs: build: strategy: + fail-fast: false matrix: include: - runs-on: ubuntu-latest