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

Move CI to GH-Actions #1250

Merged
merged 2 commits into from
Oct 25, 2023
Merged
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
236 changes: 236 additions & 0 deletions .github/workflows/cibuildwheel.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,236 @@
name: Build CI wheels

on:
push:
branches:
- master
- rls-*
pull_request:
branches:
- master
- rls-*

permissions:
contents: read

jobs:
checks:
name: Check Format
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Python 3.11
uses: actions/setup-python@v4
with:
python-version: "3.11"
- name: Install dependencies
run: pip install black isort jupyter-black

- name: Run checks
run: ./scripts/ci/check_format.sh
tests:
name: Run tests [${{ matrix.toolchain.cxx }}]
runs-on: ubuntu-latest
strategy:
matrix:
toolchain: [ {cc: clang, cxx: clang++}, {cc: gcc, cxx: g++} ]
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Python 3.11
uses: actions/setup-python@v4
with:
python-version: "3.11"
- name: Install dependencies
run: pip install -r requirements.txt

- name: Build & test with ${{ matrix.toolchain.cc }} / ${{ matrix.toolchain.cxx }}
env:
CC: ${{ matrix.toolchain.cc }}
CXX: ${{ matrix.toolchain.cxx }}
run: ./scripts/ci/gh_build_linux.sh
docs:
name: Documentation
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Python 3.11
uses: actions/setup-python@v4
with:
python-version: "3.11"

- name: Install jupedsim
run: |
python3 -m pip install .

- name: Build Documentation
run: |
python3 -m pip install -r docs/requirements.txt
sphinx-build -T -E -d doctree -b html docs/source docs/build -j $(nproc)

- name: Determine directory to publish docs to
id: docs-publish-dir
uses: jannekem/run-python-script-action@v1
with:
script: |
import os, re
github_ref = os.environ.get('GITHUB_REF')
m = re.match(r'^refs/tags/v([0-9]+\.[0-9]+\.[0-9]+(-dev\.[0-9]+)?)$',
github_ref)
if m:
target = "${{ github.ref_name }}"
else:
target = ''
set_output('target', target)

- name: Publish docs to GitHub pages
if: steps.docs-publish-dir.outputs.target != ''
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: docs/build
destination_dir: ${{ steps.docs-publish-dir.outputs.target }}
keep_files: false

- name: Upload documentation as artifacts
uses: actions/upload-artifact@v3
with:
name: pages
path: docs/build/

outputs:
docs-target: ${{ steps.docs-publish-dir.outputs.target }}
docs-publish:
name: Publish docs versions JSON
needs: docs
if: needs.docs.outputs.docs-target != ''
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
ref: gh-pages
- name: Write versions to JSON file
uses: jannekem/run-python-script-action@v1
with:
script: |
import json
from pathlib import Path
from packaging.version import Version

prefix = "https://www.jupedsim.org/"
cwd = Path.cwd()
versions = [item.name[1:] for item in cwd.iterdir() if item.is_dir() and not item.name.startswith('.') and item.name.startswith("v")]
versions.sort(key=Version, reverse=True)
versions = ["v" + v for v in versions]
versions.insert(0, "stable")

versions_url = [dict(name=version, version=version, url=f"{prefix}{version}/")
for version in versions]
target_file = Path('versions.json')
with target_file.open('w') as f:
json.dump(versions_url, f)

- name: Redirect stable to new release
run: |
rm -rf stable
ln -s ${{needs.docs.outputs.docs-target}} stable

- name: Update files in gh-pages branch
uses: stefanzweifel/git-auto-commit-action@v4
with:
branch: gh-pages
commit_message: Update versions and stable
build_sdist:
name: Build sdist
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- uses: actions/setup-python@v4
name: Install Python
with:
python-version: 3.11

- name: Install dependencies
run: python -m pip install wheel build setuptools

- name: Build sdist
run: |
python -m build -s

- name: Upload sdist
uses: actions/upload-artifact@v3
with:
name: python-packages
path: dist/jupedsim-*.tar.gz
if-no-files-found: error
build_wheels:
name: Build wheels on ${{ matrix.os }} for ${{ matrix.cibw_archs }}
runs-on: ${{ matrix.os }}
env:
CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
CIBW_SKIP: "*musllinux*"
MACOSX_DEPLOYMENT_TARGET: "13"
strategy:
matrix:
include:
- os: ubuntu-latest
cibw_archs: "x86_64"
cibw_build: "cp310-*"
- os: ubuntu-latest
cibw_archs: "x86_64"
cibw_build: "cp311-*"
- os: windows-latest
cibw_archs: "auto64"
cibw_build: "cp310-*"
- os: windows-latest
cibw_archs: "auto64"
cibw_build: "cp311-*"
- os: macos-13
cibw_archs: "x86_64"
cibw_build: "cp310-*"
- os: macos-13
cibw_archs: "x86_64"
cibw_build: "cp311-*"
- os: macos-13
cibw_archs: "arm64"
cibw_build: "cp310-*"
- os: macos-13
cibw_archs: "arm64"
cibw_build: "cp311-*"
steps:
- uses: actions/checkout@v4
- name: Build wheels for CPython ${{ matrix.cibw_build }} on ${{ matrix.cibw_archs }}
uses: pypa/[email protected]
env:
CIBW_BUILD: ${{ matrix.cibw_build }}
CIBW_ARCHS: ${{ matrix.cibw_archs }}

- uses: actions/upload-artifact@v3
with:
name: python-packages
path: ./wheelhouse/*.whl
if-no-files-found: error
pypi-publish:
needs: [build_wheels, build_sdist]
if: ${{ github.event_name == 'release' && github.event.action == 'released' }}
name: Publish to PyPI
runs-on: ubuntu-latest
environment: release
permissions:
id-token: write
steps:
# retrieve your distributions here
- name: Download paackages
uses: actions/Download-artifact@v3
with:
name: python-packages

- name: Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
110 changes: 0 additions & 110 deletions .github/workflows/docs.yml

This file was deleted.

2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Project setup
################################################################################
cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
project(JuPedSim VERSION 1.0.0 LANGUAGES CXX)
project(JuPedSim VERSION 1.0.1 LANGUAGES CXX)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
Expand Down
4 changes: 1 addition & 3 deletions cmake_templates/run-systemtests.unix.in
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
#! /usr/bin/env bash
export JPSCORE_EXECUTABLE_PATH="@CMAKE_BINARY_DIR@/bin/jpscore"
export JPSCORE_SOURCE_PATH="@CMAKE_SOURCE_DIR@"
export PYTHONPATH="@CMAKE_SOURCE_DIR@/systemtest/test_support:@CMAKE_SOURCE_DIR@/python_modules/jupedsim:@CMAKE_SOURCE_DIR@/python_modules/jupedsim_visualizer:@CMAKE_LIBRARY_OUTPUT_DIRECTORY@"
export PYTHONPATH="@CMAKE_SOURCE_DIR@/performancetest:@CMAKE_SOURCE_DIR@/systemtest/test_support:@CMAKE_SOURCE_DIR@/python_modules/jupedsim:@CMAKE_SOURCE_DIR@/python_modules/jupedsim_visualizer:@CMAKE_LIBRARY_OUTPUT_DIRECTORY@"

echo "Executable path ${JPSCORE_EXECUTABLE_PATH}"
echo "Source path ${JPSCORE_SOURCE_PATH}"
echo "PYTHONPATH=${PYTHONPATH}"

Expand Down
4 changes: 1 addition & 3 deletions cmake_templates/run-systemtests.windows.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
set JPSCORE_EXECUTABLE_PATH="@CMAKE_BINARY_DIR@/bin/Release/jpscore"
set JPSCORE_SOURCE_PATH="@CMAKE_SOURCE_DIR@"
set PYTHONPATH="@CMAKE_SOURCE_DIR@"/systemtest/test_support;@CMAKE_SOURCE_DIR@/python_modules/jupedsim;@CMAKE_LIBRARY_OUTPUT_DIRECTORY@"
set PYTHONPATH="@CMAKE_SOURCE_DIR@/performancetest;@CMAKE_SOURCE_DIR@"/systemtest/test_support;@CMAKE_SOURCE_DIR@/python_modules/jupedsim;@CMAKE_LIBRARY_OUTPUT_DIRECTORY@"

pytest %JPSCORE_SOURCE_PATH%/systemtest %*

7 changes: 7 additions & 0 deletions scripts/ci/gh_build_linux.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
set -e
echo Using ${CC} and ${CXX}
numcpus=$(nproc)
mkdir build && cd build
cmake .. -DBUILD_TESTS=ON -DWERROR=ON -DCMAKE_UNITY_BUILD=ON
cmake --build . -- -j ${numcpus} -- VERBOSE=1
cmake --build . -t tests -- -j ${numcpus} -- VERBOSE=1
Loading