Compare commits
3 Commits
master
...
test-issue
Author | SHA1 | Date | |
---|---|---|---|
|
741f854e18 | ||
|
049add8dd8 | ||
|
490e3a3bdb |
@ -337,7 +337,8 @@ fdroid build:
|
||||
- printf "keystore\x3a $keystore\n" >> config.yml
|
||||
- chown vagrant $keystore
|
||||
|
||||
- for build in `./tools/find-changed-builds.py`; do
|
||||
- APPS="$(./tools/find-changed-builds.py)"
|
||||
- for build in $APPS; do
|
||||
set -x;
|
||||
apt-get install sudo;
|
||||
chown -R vagrant $home_vagrant;
|
||||
@ -395,8 +396,8 @@ pages:
|
||||
- curl --silent https://gitlab.com/fdroid/gradle-plugins/-/archive/master/gradle-plugins-master.tar.gz
|
||||
| tar -xz --directory=$GRADLE_USER_HOME/fdroid --strip-components=1
|
||||
|
||||
- git ls-remote https://gitlab.com/fdroid/issuebot.git master
|
||||
- curl --silent https://gitlab.com/fdroid/issuebot/-/archive/master/issuebot-master.tar.gz
|
||||
- git ls-remote https://gitlab.com/eighthave/issuebot.git master
|
||||
- curl --silent https://gitlab.com/eighthave/issuebot/-/archive/master/issuebot-master.tar.gz
|
||||
| tar -xz --strip-components=1
|
||||
- pyvenv --system-site-packages --clear issuebot-env
|
||||
- . issuebot-env/bin/activate
|
||||
|
@ -14,11 +14,10 @@ target_ref = os.getenv('TARGET_REF')
|
||||
source_ref = os.getenv('SOURCE_REF')
|
||||
|
||||
for appid in sorted(changed):
|
||||
metadata_file = 'metadata/' + appid +'.yml'
|
||||
metadata_file = 'metadata/{appid}.yml'.format(**locals())
|
||||
diff = subprocess.check_output(
|
||||
(
|
||||
'git diff --no-color --diff-filter=d ' + target_ref +
|
||||
'...' + source_ref + ' -- ' + metadata_file
|
||||
'git diff --no-color --diff-filter=d {target_ref}...{source_ref} -- {metadata_file}' .format(**locals())
|
||||
).split(' ')
|
||||
)
|
||||
|
||||
@ -83,8 +82,7 @@ for appid in sorted(changed):
|
||||
signatures_dir = 'metadata/%s/signatures/' % appid
|
||||
diff = subprocess.check_output(
|
||||
(
|
||||
'git diff --no-color --diff-filter=d ' + target_ref +
|
||||
'...' + source_ref + ' -- ' + signatures_dir
|
||||
'git diff --name-only --no-color --diff-filter=d {target_ref}...{source_ref} -- {signatures_dir}'.format(**locals())
|
||||
).split(' ')
|
||||
)
|
||||
for f in diff.split():
|
||||
|
@ -36,7 +36,7 @@ fi
|
||||
|
||||
curl --silent --request POST \
|
||||
--form token="$issuebot" \
|
||||
--form ref=master \
|
||||
--form ref=test-issuebot-2 \
|
||||
--form "variables[FROM_CI_COMMIT_REF_NAME]=$CI_COMMIT_REF_NAME" \
|
||||
--form "variables[FROM_CI_COMMIT_REF_SLUG]=$CI_COMMIT_REF_SLUG" \
|
||||
--form "variables[FROM_CI_COMMIT_SHA]=$CI_COMMIT_SHA" \
|
||||
|
Loading…
x
Reference in New Issue
Block a user