diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-11-18 08:37:05 -0500 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2018-11-18 08:37:05 -0500 |
| commit | c46c0f501dea5275b66dda6bb0f96c45a79e7734 (patch) | |
| tree | f745ac20560988a1ec6727b117302e0210a2785c /.builds | |
| parent | 901358e5f335468b6f3ac1d7d022da15d355cf2d (diff) | |
Update deploy builds
Diffstat (limited to '.builds')
| -rw-r--r-- | .builds/alpine.yml | 4 | ||||
| -rw-r--r-- | .builds/archlinux.yml | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/.builds/alpine.yml b/.builds/alpine.yml index 7d6ca5c..25dc830 100644 --- a/.builds/alpine.yml +++ b/.builds/alpine.yml @@ -14,6 +14,7 @@ environment: project: git.sr.ht repo_server: deploy@mirror.sr.ht repo_path: /var/www/mirror.sr.ht/alpine/sr.ht/x86_64 + master: git.sr.ht secrets: - fa00a8d3-7b63-42d5-8060-3bb31c3e3018 # ssh deploy key - d0adc1d4-af78-4852-920f-1134392f5d10 # package signing key @@ -69,3 +70,6 @@ tasks: abuild-sign -k ~/.abuild/alpine@sr.ht.rsa APKINDEX.tar.gz rsync --blocking-io -rPe "ssh $sshopts" \ APKINDEX.tar.gz $repo_server:$repo_path/ + - deploy: | + sshopts="-o StrictHostKeyChecking=no" + ssh deploy@$master doas apk upgrade -U diff --git a/.builds/archlinux.yml b/.builds/archlinux.yml index 6fb30cc..a04d4c1 100644 --- a/.builds/archlinux.yml +++ b/.builds/archlinux.yml @@ -18,7 +18,6 @@ sources: environment: repo_server: deploy@mirror.sr.ht repo_path: /var/www/mirror.sr.ht/archlinux/sr.ht - master: deploy@git.sr.ht secrets: - fa00a8d3-7b63-42d5-8060-3bb31c3e3018 # ssh deploy key - 3e65a1a8-a20f-4f6b-a452-df2ac398bc1e # package signing key @@ -45,7 +44,7 @@ tasks: git describe --exact-match HEAD || complete-build - deploy: | cd sr.ht-pkgbuilds/git.sr.ht - sshopts="-o StrictHostKeyChecking=no" # TODO: remove this when builds run on a tty + sshopts="-o StrictHostKeyChecking=no" rsync --blocking-io \ --rsh="ssh $sshopts" -rP *.pkg.tar.xz{,.sig} $repo_server:$repo_path/ ssh $sshopts $repo_server repo-add -n -R \ @@ -54,4 +53,3 @@ tasks: ssh $sshopts $repo_server repo-add -n -R \ $repo_path/sr.ht.db.tar.gz \ $repo_path/git.sr.ht-images-$pkgver-$pkgrel-any.pkg.tar.xz - ssh $sshopts $master sudo /usr/local/bin/update-srht git.sr.ht |