Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
ewoksdata
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
workflow
ewoksapps
ewoksdata
Commits
e60a8242
Commit
e60a8242
authored
8 months ago
by
Wout De Nolf
Browse files
Options
Downloads
Plain Diff
Merge branch 'fix_ci' into 'main'
fix CI See merge request
!85
parents
4a5e49b7
42f5b536
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!85
fix CI
Pipeline
#182660
passed
8 months ago
Stage: test
Stage: style
Stage: build
Stage: test_build
Stage: deploy
Changes
2
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+9
-1
9 additions, 1 deletion
.gitlab-ci.yml
pyproject.toml
+1
-2
1 addition, 2 deletions
pyproject.toml
with
10 additions
and
3 deletions
.gitlab-ci.yml
+
9
−
1
View file @
e60a8242
...
...
@@ -26,7 +26,7 @@ test-3.9-id31_2.0:
extends
:
.test-3.9
before_script
:
-
git clone https://gitlab.esrf.fr/bliss/bliss.git --branch id31_2.0 blissrepo
-
pip install blissrepo/blissdata
-
pip install blissrepo/blissdata
"numpy<2"
-
rm -rf blissrepo
-
!reference
[
.test-3.9
,
before_script
]
variables
:
...
...
@@ -40,6 +40,14 @@ test-3.9-1.11.x:
-
rm -rf blissrepo
-
!reference
[
.test-3.9
,
before_script
]
test-3.9-2.0.x
:
extends
:
.test-3.9
before_script
:
-
git clone https://gitlab.esrf.fr/bliss/bliss.git --branch 2.0.x blissrepo
-
pip install blissrepo/blissdata "numpy<2"
-
rm -rf blissrepo
-
!reference
[
.test-3.9
,
before_script
]
test-3.10
:
extends
:
.test-3.10
before_script
:
...
...
This diff is collapsed.
Click to expand it.
pyproject.toml
+
1
−
2
View file @
e60a8242
[build-system]
requires
=
[
"setuptools>
=
46.4
,
<
63
",
"wheel"
,
"setuptools>
=
46.4
"
]
build-backend
=
"setuptools.build_meta"
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment