Move /tmp to tmp/.

This commit is contained in:
Black Hat 2018-08-02 20:06:38 +00:00
parent adedcd5beb
commit dce1f5f48b
1 changed files with 12 additions and 14 deletions

View File

@ -3,22 +3,24 @@ stages:
- build - build
- deploy - deploy
preparation-flatpak: cache:
image: black0/flatpak paths:
stage: preparation - tmp/
script:
- cd ../
- git clone "https://$GIT_USERNAME:$GIT_PASSWORD@gitlab.com/b0/matrique-repo"
- cd matrique
artifacts: preparation-flatpak:
untracked: true image: alpine/git
paths: stage: preparation
- ../matrique-repo before_script:
- mkdir tmp
script:
- cd tmp
- git clone "https://$GIT_USERNAME:$GIT_PASSWORD@gitlab.com/b0/matrique-repo"
- cd ../
build-native: build-native:
image: rabits/qt:5.11-desktop image: rabits/qt:5.11-desktop
stage: build stage: build
cache: {}
before_script: before_script:
- git submodule update --init --recursive - git submodule update --init --recursive
script: script:
@ -38,12 +40,8 @@ build-flatpak:
script: script:
- gpg2 -v --import <(echo "$GPG_SECRET_KEY") - gpg2 -v --import <(echo "$GPG_SECRET_KEY")
- cd flatpak - cd flatpak
- flatpak-builder --repo=../../matrique-repo/public build-dir org.eu.encom.matrique.json --force-clean --gpg-sign=52986BF4D61350EC249F2E891B0DB3358FC5E4B2 - flatpak-builder --repo=../tmp/matrique-repo/public build-dir org.eu.encom.matrique.json --force-clean --gpg-sign=52986BF4D61350EC249F2E891B0DB3358FC5E4B2
- cd ../ - cd ../
artifacts:
untracked: true
paths:
- ../matrique-repo
deploy-flatpak: deploy-flatpak:
image: fedora:latest image: fedora:latest
@ -52,7 +50,7 @@ deploy-flatpak:
- git config --global user.name "$GIT_NAME" - git config --global user.name "$GIT_NAME"
- git config --global user.email "$GIT_EMAIL" - git config --global user.email "$GIT_EMAIL"
script: script:
- cd ../matrique-repo - cd tmp/matrique-repo
- git add -A - git add -A
- git commit -m "$CI_COMMIT_MESSAGE" - git commit -m "$CI_COMMIT_MESSAGE"
- git push origin master - git push origin master