From be6b71dec7cd00108096da496c352a73dee40b61 Mon Sep 17 00:00:00 2001 From: Timmy Welch Date: Sat, 10 Sep 2022 21:10:47 -0700 Subject: [PATCH] Put unix specific commands in OS specific blocks --- .github/workflows/build.yaml | 11 ++++++----- .github/workflows/package.yaml | 14 +++++++------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 3551d4d..4249ab9 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -83,20 +83,21 @@ jobs: - name: Install macos dependencies run: | brew install icu4c pkg-config - shell: bash + export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig"; + export PATH="/usr/local/opt/icu4c/bin:/usr/local/opt/icu4c/sbin:$PATH" + python -m pip install --no-binary=:pyicu: pyicu if: runner.os == 'macOS' - name: Install linux dependencies run: | sudo apt-get install pkg-config libicu-dev - shell: bash + export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig"; + export PATH="/usr/local/opt/icu4c/bin:/usr/local/opt/icu4c/sbin:$PATH" + python -m pip install --no-binary=:pyicu: pyicu if: runner.os == 'Linux' - name: Build and install PyPi packages run: | make clean pydist - export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig"; - export PATH="/usr/local/opt/icu4c/bin:/usr/local/opt/icu4c/sbin:$PATH" - python3 -m pip install --no-binary=:pyicu: pyicu python -m pip install "dist/$(python setup.py --fullname)-py3-none-any.whl[all]" - name: build diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml index 59d34c8..ca88919 100644 --- a/.github/workflows/package.yaml +++ b/.github/workflows/package.yaml @@ -44,22 +44,22 @@ jobs: - name: Install macos dependencies run: | brew install icu4c pkg-config - shell: bash + export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig"; + export PATH="/usr/local/opt/icu4c/bin:/usr/local/opt/icu4c/sbin:$PATH" + python -m pip install --no-binary=:pyicu: pyicu if: runner.os == 'macOS' - name: Install linux dependencies run: | sudo apt-get install pkg-config libicu-dev - shell: bash + export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig"; + export PATH="/usr/local/opt/icu4c/bin:/usr/local/opt/icu4c/sbin:$PATH" + python -m pip install --no-binary=:pyicu: pyicu if: runner.os == 'Linux' - name: Build, Install and Test PyPi packages run: | make clean pydist - export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig"; - export PATH="/usr/local/opt/icu4c/bin:/usr/local/opt/icu4c/sbin:$PATH" - python3 -m pip install --no-binary=:pyicu: pyicu python -m pip install "dist/$(python setup.py --fullname)-py3-none-any.whl[all]" - echo "CT_FULL_NAME=$(python setup.py --fullname)" >> $GITHUB_ENV python -m flake8 python -m pytest @@ -82,4 +82,4 @@ jobs: draft: false files: | dist/!(*Linux).zip - dist/*.whl + dist/*${{ fromJSON('["never", ""]')[runner.os == 'Linux'] }}.whl