Skip to content

Commit

Permalink
switch to correct linux deps, cleanup cmake, disable gitchangelog
Browse files Browse the repository at this point in the history
Signed-off-by: Stephen L Arnold <[email protected]>
  • Loading branch information
sarnold committed Jan 2, 2021
1 parent a4937cb commit 322dde7
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:
strategy:
fail-fast: false
matrix:
platform: [macos-latest, ubuntu-latest]
python-version: ["2.7", "3.6", "3.7", "3.8", "3.9"]
platform: [macos-latest, ubuntu-20.04]
python-version: ["3.6", "3.7", "3.8", "3.9"]

runs-on: ${{ matrix.platform }}

Expand Down Expand Up @@ -49,12 +49,15 @@ jobs:
if: runner.os == 'macOS'
run: |
brew install re2
brew install ninja
- name: Install Ubuntu build deps
if: runner.os == 'Linux'
run: |
sudo apt-get -qq update
sudo apt-get install -y libre2-dev
sudo apt-get install -y software-properties-common
sudo add-apt-repository -y -s ppa:nerdboy/embedded
sudo apt-get install -y libre2-dev ninja-build
- name: Install dependencies
run: |
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ find_package(re2 CONFIG REQUIRED NAMES re2)
get_target_property(include_dirs re2::re2 INTERFACE_INCLUDE_DIRECTORIES)
message("re2_include_dirs=${include_dirs}")

get_target_property(link_libraries re2::re2 INTERFACE_LINK_LIBRARIES)
message("re2_extra_objects=${link_libraries}")
#get_target_property(link_libraries re2::re2 INTERFACE_LINK_LIBRARIES)
#message("re2_extra_objects=${link_libraries}")
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,11 @@ deps =
twine
build
-rrequirements.txt
git+https://github.com/freepn/[email protected]
#git+https://github.com/freepn/[email protected]

commands =
python -m pip install --upgrade pip wheel setuptools
python -m build -s
python setup.py bdist_wheel
twine check dist/*
bash -c 'gitchangelog $(git tag --sort=taggerdate | tail -n2 | head -n1)..'
#bash -c 'gitchangelog $(git tag --sort=taggerdate | tail -n2 | head -n1)..'

0 comments on commit 322dde7

Please sign in to comment.