Skip to content

Commit

Permalink
Try to fix workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
thejohnfreeman committed Oct 31, 2023
1 parent 0c6c2ce commit 37c665d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 16 deletions.
12 changes: 2 additions & 10 deletions .github/actions/install-nix/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,16 @@ inputs:
runs:
using: composite
steps:
- name: install Python
uses: actions/setup-python@v4
with:
# The `imp` module is removed in Python 3.12
# but required by Conan 1.x.
python-version: '3.11'
cache: pip
cache-dependency-path: .github/workflows/cache-python
- name: install Python packages
uses: ./.github/actions/install-python
with:
key: ${{ inputs.cache-key-python }}
- name: install Ninja on Linux
if: matrix.generator.name == 'Ninja' && startsWith(matrix.platform, 'ubuntu')
if: matrix.generator == 'Ninja' && startsWith(matrix.platform, 'ubuntu')
shell: bash
run: sudo apt install ninja-build
- name: install Ninja on OSX
if: matrix.generator.name == 'Ninja' && startsWith(matrix.platform, 'macos')
if: matrix.generator == 'Ninja' && startsWith(matrix.platform, 'macos')
shell: bash
run: brew install ninja
- name: check environment
Expand Down
11 changes: 8 additions & 3 deletions .github/actions/install-python/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,14 @@ inputs:
runs:
using: composite
steps:
- name: debug
shell: bash
run: echo shell = "${{ inputs.shell }}"
- name: install Python
uses: actions/setup-python@v4
with:
# The `imp` module is removed in Python 3.12
# but required by Conan 1.x.
python-version: '3.11'
cache: pip
cache-dependency-path: .github/workflows/cache-python
- name: learn Python cache directory
id: pip-cache
shell: bash
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@ jobs:
- Visual Studio 16 2019
shared:
- OFF
- ON
flavor:
- Debug
- Release
- release
- debug
runs-on: windows-2019
env:
GENERATOR: ${{ matrix.generator }}
Expand Down

0 comments on commit 37c665d

Please sign in to comment.