Skip to content

Commit

Permalink
Deploy fixes + skip uploading for now (already done)
Browse files Browse the repository at this point in the history
  • Loading branch information
friday committed Aug 24, 2021
1 parent ef013ba commit dc1afa0
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ deploy:
provider: releases
draft: true
name: $TRAVIS_TAG
body: $(git tag -l --format='%(contents)' $TRAVIS_TAG)
body: "$(git tag -l --format='%(contents)' $TRAVIS_TAG)"
api_key:
secure: EG0AuBGirBDu5XYKFZwITcXq/0U50f2PR5UVhbspr6D8LLcLbuxItMVnNjSuT1BQNpt7ijJ3gQfkh0QXZdv02d/H0l0+U2YCCyytvypMeqSfVawIGxYvYK2i5DH+0k7rVC9WoimpB+4lNx+VZILwzjudCzzefH8+ZSPPoeFOPYC8SU/VYPx2K31jgz7LlTWiEsijPF8XErXmHdQ3IDnDFnNZpNVnWPlArozQkqsJF9tosBPO72ZLFKLpAH+Eg+WVnPmqQlzH6MIzE9bsyxDD98mRvhkBNUI8EJI/qPqLczA9wJVt33VJrnQhJP5QEhNZ4IwyHuK61oUqM6/Q80LJhFpxeNebnkGIYWrkmY8pKJAV/BnIU8ejiVrMxqLzq+plb1Bzz08NLSyD9xp0o4KHDuMC/e6dohuNFaSlOCHv41Z9bQrGBXnQRjG4b4vN1cAK8ozVVLO2hosWf1vj0ItUPzZG4X1psjspbEcWlDyPak6ZUYoVsT9/xsGojN7N6MPqXxnrkzn+ffHL/gzdE6nIxwQNeg42xrRfepvO+96G4c53gF/YEMLYccKarfriLmrpRd+OzYx2Dbc8K2AMhXE5gseswQmHeSJj0ln0Kd1XKBEGqYlwtha3ZzRvOR00I9ONhAZL2fasX/H19nL9odH5NsdVjzxv9vuA2Q2KiA/meZc=
file:
Expand Down
19 changes: 10 additions & 9 deletions scripts/aur-update.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@ def push_update(source):
ssh_key = os.sep.join((project_path, 'scripts', 'aur_key'))
git_ssh_command = 'ssh -oStrictHostKeyChecking=no -i %s' % ssh_key
ssh_enabled_env = dict(os.environ, GIT_SSH_COMMAND=git_ssh_command)
run_shell('git config user.email ulauncher.app@gmail.com')
run_shell('git config user.name "Aleksandr Gornostal"')
cwd = os.getcwd()
temp_dir = mkdtemp()
print("Temp dir: %s" % temp_dir)
print("Cloning AUR repo: %s" % aur_repo)
Expand All @@ -61,12 +58,16 @@ def push_update(source):
set_pkg_key('pkgver', version)
set_pkg_key('pkgrel', '1')
set_pkg_key('source', source)
print("Making a git commit")
run_shell(f'git commit PKGBUILD .SRCINFO -m "Version update {version}"')
print("Pushing changes to master branch")
run_shell('git push origin master', env=ssh_enabled_env)
os.chdir(cwd)
os.rmdir(temp_dir)
run_shell('git config user.email ulauncher.app@gmail.com')
run_shell('git config user.name "Aleksandr Gornostal"')
run_shell('git add PKGBUILD .SRCINFO')
if os.system('git diff --cached --quiet'):
print("Making a git commit")
run_shell(f'git commit -m "Version update {version}"')
print("Pushing changes to master branch")
run_shell('git push origin master', env=ssh_enabled_env)
else:
print("No changes to commit (you probably already updated this version)")


def run_shell(command, **kw):
Expand Down
6 changes: 0 additions & 6 deletions scripts/build-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,6 @@ build-release() {

# RPMs deactivated for now
# create_rpms

# Upload if tag doesn't contain "test"
if [[ $(echo "$VERSION" | tr '[:upper:]' '[:lower:]') != *test* ]]; then
launchpad_upload
aur_update
fi
}

create_deb() {
Expand Down

0 comments on commit dc1afa0

Please sign in to comment.