Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ESCAPE2020
WP3
ZenodoCI
Commits
905e96bc
Commit
905e96bc
authored
Feb 23, 2021
by
Enrique Garcia
Browse files
Merge branch 'update_docker' into 'master'
Update docker env See merge request
!13
parents
25c1dbad
e0ebd30b
Pipeline
#106192
passed with stages
in 2 minutes and 43 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
18 deletions
+25
-18
.gitlab-ci.yml
.gitlab-ci.yml
+18
-6
Docker/Dockerfile
Docker/Dockerfile
+2
-6
README.md
README.md
+5
-6
No files found.
.gitlab-ci.yml
View file @
905e96bc
...
...
@@ -66,16 +66,29 @@ deploy_zenodo:
only
:
### Ideally this stage should be run only when a new release / tag of the source code is created, i.e., (- tags).
# The script is changed to check that the both `upload_new_deposit` and `upload_new_version_deposit` works nicely.
-
tags
-
branches
# For testing
#deploy_from_container:
# stage: deploy
# image: gitlab-registry.in2p3.fr/escape2020/wp3/zenodoci:v1.1
# before_script:
# - test_connection_zenodo --token $ZENODO_TOKEN --sandbox False -p $CI_PROJECT_DIR
# script:
# - mkdir -p build
# - parse_last_release_git.sh $CI_PROJECT_NAME $CI_PROJECT_URL
# - ls ./build
#
# - upload_new_deposit --token $ZENODO_TOKEN --sandbox False --input-dir ./build
# only:
# - tags
test_deploy_from_container
:
stage
:
test_container
image
:
gitlab-registry.in2p3.fr/escape2020/wp3/zenodoci
image
:
gitlab-registry.in2p3.fr/escape2020/wp3/zenodoci
:v1.1
before_script
:
-
wget -q https://gitlab.in2p3.fr/escape2020/wp3/zenodoci/-/raw/master/zenodoci/parse_last_release.sh
-
pwd parse_last_release.sh
# testing/debugging
-
which parse_last_release_git.sh
-
test_connection_zenodo --token $SANDBOX_ZENODO_TOKEN --sandbox True -p $CI_PROJECT_DIR
script
:
-
pwd
# testing/debugging
...
...
@@ -87,11 +100,10 @@ test_deploy_from_container:
-
codemeta2zenodo -h
-
mkdir -p build
-
/bin/bash
parse_last_release.sh $CI_PROJECT_NAME $CI_PROJECT_URL
-
parse_last_release
_git
.sh $CI_PROJECT_NAME $CI_PROJECT_URL
-
ls ./build
-
upload_new_deposit --token $SANDBOX_ZENODO_TOKEN --sandbox True --input-dir ./build
-
upload_new_version_deposit -t $SANDBOX_ZENODO_TOKEN -s True -i ./build -id $ZENODO_PROJECT_ID
only
:
-
tags
-
branches
# testing/debugging
Docker/Dockerfile
View file @
905e96bc
...
...
@@ -3,9 +3,5 @@ FROM continuumio/miniconda3
ENV
PATH=/opt/conda/bin/:${PATH}
SHELL
[ "/bin/bash", "-c"]
RUN
conda
install
git pip wget
&&
\
# pip install git+https://gitlab.in2p3.fr/escape2020/wp3/zenodoci
git clone https://gitlab.in2p3.fr/escape2020/wp3/zenodoci.git
WORKDIR
zenodoci
RUN
pip
install
.
WORKDIR
..
RUN
conda
install
git pip
&&
\
pip
--no-cache-dir
install
git+https://gitlab.in2p3.fr/escape2020/wp3/zenodoci
README.md
View file @
905e96bc
...
...
@@ -48,19 +48,18 @@ The code to be added to the `.gitlab-ci.yml` file is the following (**COMMON FOR
```
stages:
- `(...) all your CI stages (...)`
- deploy
_to_zenodo
- deploy
`(...) All the code to be run in your CI pipeline (...)`
deploy:
stage: deploy
_to_zenodo
image: gitlab-registry.in2p3.fr/escape2020/wp3/zenodoci
deploy
_to_zenodo
:
stage: deploy
image: gitlab-registry.in2p3.fr/escape2020/wp3/zenodoci
:v1.1
before_script:
- wget -q https://gitlab.in2p3.fr/escape2020/wp3/zenodoci/-/raw/master/zenodoci/parse_last_release.sh
- test_connection_zenodo --token $ZENODO_TOKEN --sandbox False -p $CI_PROJECT_DIR
script:
- mkdir -p build
-
/bin/bash
parse_last_release.sh $CI_PROJECT_NAME $CI_PROJECT_URL
- parse_last_release
_git
.sh $CI_PROJECT_NAME $CI_PROJECT_URL
- ls ./build
- upload_new_deposit --token $SANDBOX_ZENODO_TOKEN --sandbox True --input-dir ./build
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment