Skip to content
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
22 changes: 12 additions & 10 deletions .github/workflows/build_dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ on:
default: false
testing:
required: false
type: boolean
default: false
type: string
default: 'False'
workflow_dispatch:
inputs:
branch:
Expand Down Expand Up @@ -50,9 +50,11 @@ on:
default: false
testing:
description: 'Run Tests'
required: false
type: boolean
default: false
required: true
type: choice
- True
- False
default: 'false'

jobs:
BuildSislDeps:
Expand All @@ -72,13 +74,13 @@ jobs:
repository: ebay/sisl
path: deps/sisl
ref: ${{ inputs.branch }}
if: ${{ inputs.testing == 'true' || steps.restore-cache-sisl.outputs.cache-hit != 'true' }}
if: ${{ inputs.testing == 'True' || steps.restore-cache-sisl.outputs.cache-hit != 'true' }}

- name: Setup Python
uses: actions/setup-python@v3
with:
python-version: "3.8"
if: ${{ inputs.testing == 'true' || steps.restore-cache-sisl.outputs.cache-hit != 'true' }}
if: ${{ inputs.testing == 'True' || steps.restore-cache-sisl.outputs.cache-hit != 'true' }}

- name: Setup Conan and Export Recipes
run: |
Expand All @@ -92,7 +94,7 @@ jobs:
conan export deps/sisl/3rd_party/jemalloc
conan export deps/sisl/3rd_party/prerelease_dummy
conan export deps/sisl/3rd_party/pistache pistache/cci.20201127@
if: ${{ inputs.testing == 'true' || steps.restore-cache-sisl.outputs.cache-hit != 'true' }}
if: ${{ inputs.testing == 'True' || steps.restore-cache-sisl.outputs.cache-hit != 'true' }}

- name: Build Cache
run: |
Expand All @@ -102,7 +104,7 @@ jobs:
-s build_type=${{ inputs.build-type }} \
--build missing \
deps/sisl
if: ${{ inputs.testing != 'true' && steps.restore-cache-sisl.outputs.cache-hit != 'true' }}
if: ${{ inputs.testing != 'True' && steps.restore-cache-sisl.outputs.cache-hit != 'true' }}

- name: Test Package
run: |
Expand All @@ -112,7 +114,7 @@ jobs:
-s build_type=${{ inputs.build-type }} \
--build missing \
deps/sisl
if: ${{ inputs.testing == 'true' }}
if: ${{ inputs.testing == 'True' }}

- name: Cleanup
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/merge_conan_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ jobs:
build-type: ${{ matrix.build-type }}
malloc-impl: ${{ matrix.malloc-impl }}
prerelease: ${{ matrix.prerelease }}
testing: true
testing: 'True'
2 changes: 1 addition & 1 deletion .github/workflows/pr_conan_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ jobs:
build-type: ${{ matrix.build-type }}
malloc-impl: ${{ matrix.malloc-impl }}
prerelease: ${{ matrix.prerelease }}
testing: true
testing: 'True'