Skip to content

Commit 2b11aa8

Browse files
committed
Travis: Prepare code for auto-test and -deployment
1 parent 029b85f commit 2b11aa8

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

Diff for: .travis.yml

+8-6
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ services:
1111
install:
1212
- COMMIT=${TRAVIS_COMMIT::8} ;
1313
- REPO=drtrigon/file-metadata-wikibot ;
14-
- docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS ;
14+
# - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS ;
1515
- docker build -f $DOCKERFILE -t $REPO:$COMMIT . ;
1616
- docker tag $REPO:$COMMIT $REPO:$DOCKERTAG ;
1717
# - docker tag $REPO:$COMMIT $REPO:travis-$TRAVIS_BUILD_NUMBER ;
@@ -22,7 +22,9 @@ install:
2222
script:
2323
- docker images ; docker ps -a ;
2424
- export DOCKERCONTAINER=`sudo docker run -d $REPO:$COMMIT` ;
25-
# - docker exec wikibot-create-config ;
25+
- docker exec $DOCKERCONTAINER wikibot-filemeta-log -help || true ;
26+
- docker exec $DOCKERCONTAINER wikibot-filemeta-simple -help || true ;
27+
# - docker exec $DOCKERCONTAINER wikibot-create-config ;
2628
- docker cp user-config.py $DOCKERCONTAINER:/user-config.py ;
2729
- docker cp pywikibot.lwp.hack $DOCKERCONTAINER:/pywikibot.lwp.hack ;
2830
- docker cp login-hack.py $DOCKERCONTAINER:/login-hack.py ;
@@ -31,7 +33,7 @@ script:
3133
- docker exec $DOCKERCONTAINER wikibot-filemeta-simple -cat:SVG_files -limit:5 ;
3234
- docker rmi $REPO:$COMMIT ;
3335
- docker images ; docker ps -a ;
34-
# Upload to docker if it's on the master branch
35-
- if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then
36-
docker push $REPO ;
37-
fi
36+
# # Upload to docker if it's on the master branch
37+
# - if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then
38+
# docker push $REPO ;
39+
# fi

Diff for: Dockerfile

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
FROM pywikibotcatfiles/file-metadata
22
MAINTAINER DrTrigon <[email protected]>
33

4-
# Installation of most recent (nightly) pywikibot
54
#RUN git clone --branch 2.0 --recursive https://gerrit.wikimedia.org/r/pywikibot/core.git
6-
RUN wikibot-filemeta-log || true
7-
RUN pip install git+https://gerrit.wikimedia.org/r/pywikibot/core.git#egg=pywikibot
85

9-
# Show some info about usage of wikibot commands
10-
RUN wikibot-filemeta-log -help || true
11-
RUN wikibot-filemeta-simple -help || true
6+
# Installation of most recent (nightly) pywikibot
7+
RUN wikibot-filemeta-log || \
8+
pip install git+https://gerrit.wikimedia.org/r/pywikibot/core.git#egg=pywikibot

0 commit comments

Comments
 (0)