Skip to content

Commit f12766d

Browse files
authored
Merge pull request #135 from stefanotorresi/fix-make-obs-workdir-target
Minor CI fixes
2 parents de9fae1 + 8e4544a commit f12766d

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.ci/gh_release_to_obs_changeset.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
temp.seek(0)
5656

5757
if args.file:
58-
with open(args.file, "r") as prev:
58+
with open(args.file, "a+") as prev:
5959
old = prev.read()
6060
with open(args.file, "w") as new:
6161
for line in temp:

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ jobs:
3636
docker run --rm -t -v "$(pwd):/package" -v "$GOPATH/pkg/mod:/root/go/pkg/mod" -w /package \
3737
-e OBS_USER -e OBS_PASS -e OBS_PROJECT -e OBS_PACKAGE -e VERSION -e REPOSITORY=$TRAVIS_REPO_SLUG \
3838
shap/continuous_deliver \
39-
bash -c "/scripts/init_osc_creds.sh && make obs-commit"
39+
bash -c "/scripts/init_osc_creds.sh && make obs-commit" || travis_terminate 1

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ clean-obs:
6565
obs-workdir: build/obs
6666
build/obs:
6767
osc checkout $(OBS_PROJECT)/$(OBS_PACKAGE) -o build/obs
68-
rm build/obs/*.tar.gz
68+
rm -f build/obs/*.tar.gz
6969
cp -rv .ci/obs/* build/obs/
7070
sed -i 's/%%VERSION%%/$(VERSION)/' build/obs/_service
7171
cd build/obs; osc service runall

0 commit comments

Comments
 (0)