Skip to content

Commit aa12038

Browse files
authored
Merge pull request #12 from openalea/master
update from openalea
2 parents 3091aa9 + 78e1997 commit aa12038

4 files changed

Lines changed: 13 additions & 63 deletions

File tree

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,16 @@ on:
1515
release:
1616
types:
1717
- published
18+
workflow_dispatch:
19+
inputs:
20+
check_before_tag:
21+
description: "Run OpenAlea CI pre-tag build"
22+
required: false
23+
default: "true"
24+
type: boolean
25+
26+
run-name: >
27+
${{ github.event_name == 'workflow_dispatch' && 'OpenAlea CI pre-tag build' || 'OpenAlea CI' }}
1828
1929
jobs:
2030
build:

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# PyQGLViewer
2-
3-
[![Build Status](https://travis-ci.org/fredboudon/PyQGLViewer.svg?branch=master)](https://travis-ci.org/fredboudon/PyQGLViewer) [![Build status](https://ci.appveyor.com/api/projects/status/7jo1h7frejsot8uh/branch/master?svg=true)](https://ci.appveyor.com/project/fredboudon/pyqglviewer/branch/master)
2+
![ workflow](https://github.com/openalea/PyQGLViewer/actions/workflows/conda-package-build.yml/badge.svg)
43

54
## Presentation
65

conda/meta.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ build:
2222

2323
requirements:
2424
build:
25-
- {{ compiler('cxx')}}
25+
- {{ compiler('cxx')}}
2626
- make # [unix]
2727
- pkg-config # [linux]
2828
- {{ cdt('mesa-libgl-devel') }} # [linux]
@@ -62,4 +62,4 @@ test:
6262
source_files: # [unix]
6363
- test/*.py # [unix]
6464
commands: # [unix]
65-
- pytest -v # [unix]
65+
- pytest -v # [unix]

setup.py.old

Lines changed: 0 additions & 59 deletions
This file was deleted.

0 commit comments

Comments
 (0)