summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Whitwell2020-09-29 11:53:11 +0100
committerTom Whitwell2020-09-29 11:53:11 +0100
commitfa30f6bba11b39dc0e43773cb2f20a1088ecb6d4 (patch)
tree18422c06f43e150911e191d700b0d00e6eeb32fa
parent23e3ca77268a18314e8d5d3f846c9d6473c83b36 (diff)
downloadaur-gds-cli-git.tar.gz
Hardcode branch name to main
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
-rw-r--r--release-pipeline.yml71
3 files changed, 5 insertions, 76 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 05b69af91432..0b39926e47ab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = gds-cli-git
pkgdesc = CLI for GDS Staff
- pkgver = 2.5.0.r4.g0d39742
+ pkgver = 3.0.0.r11.g52ceac3
pkgrel = 1
url = https://github.com/alphagov/gds-cli
arch = i686
@@ -12,9 +12,9 @@ pkgbase = gds-cli-git
optdepends = aws-vault: Manager for AWS Credentials
optdepends = yubikey-manager: Manager for yubikey
optdepends = govuk-guix: CLI tool for managing GOV.UK services
- provides = gds-cli=2.5.0.r4.g0d39742
+ provides = gds-cli=3.0.0.r11.g52ceac3
conflicts = gds-cli
- source = gds-cli-git::git+https://github.com/alphagov/gds-cli
+ source = gds-cli-git::git+https://github.com/alphagov/gds-cli#branch=main
sha512sums = SKIP
pkgname = gds-cli-git
diff --git a/PKGBUILD b/PKGBUILD
index 7e1e19e6e098..7c8f9b961a01 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Tom Whitwell <tom.whitwell@digital.cabinet-office.gov.uk>
pkgname=gds-cli-git
-pkgver=2.5.0.r4.g0d39742
+pkgver=3.0.0.r11.g52ceac3
pkgrel=1
pkgdesc="CLI for GDS Staff"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ optdepends=("aws-cli: CLI for Amazon AWS"
makedepends=('git' 'go-pie')
provides=("gds-cli=${pkgver}")
conflicts=('gds-cli')
-source=("${pkgname}"::"git+https://github.com/alphagov/gds-cli")
+source=("${pkgname}"::"git+https://github.com/alphagov/gds-cli#branch=main")
sha512sums=('SKIP')
pkgver() {
diff --git a/release-pipeline.yml b/release-pipeline.yml
deleted file mode 100644
index bf73508a550f..000000000000
--- a/release-pipeline.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-meta:
- containers:
- ruby: &makepkg-image-resource
- type: docker-image
- source:
- repository: whynothugo/makepkg
- tag: latest
-jobs:
- - name: Trigger
- plan:
- - in_parallel:
- - get: gds-cli-src
- trigger: true
-
- - name: Build
- plan:
- - in_parallel:
- - get: gds-cli-src
- passed: [Trigger]
- trigger: true
- - get: gds-cli-aur
- - task: Run Make job
- config:
- platform: linux
- image_resource: *makepkg-image-resource
- inputs:
- - name: gds-cli-aur
- outputs:
- - name: gds-cli-aur_updated
- run:
- path: sh
- args:
- - -exc
- - |
- sudo chown -R notroot.notroot .
- git clone gds-cli-aur gds-cli-aur_updated
- cd gds-cli-aur_updated
- sed -i 's/pkgrel\=.*$/pkgrel\=1/' PKGBUILD
- set +x
- git config --global credential.helper store
- git config --global push.default simple
- git config --global user.email "concourse@whitwell.dev"
- git config --global user.name "Concourse"
- git config --global credential.https://github.com.username ((concourse-github-username))
- echo "https://((concourse-github-username)):((concourse-github-token))@github.com" > ${HOME}/.git-credentials
- set -x
- make all
- VERSION=$(sed -n 's/pkgver\=\(.*\)/\1/p' PKGBUILD)
- git add PKGBUILD .SRCINFO
- git commit -m "Update gds-cli to ${VERSION}"
- on_success:
- put: gds-cli-aur
- params:
- repository: gds-cli-aur_updated
-
-resources:
- - name: gds-cli-aur
- type: git
- source:
- uri: ssh://aur@aur.archlinux.org/gds-cli-git.git
- branch: master
- private_key: |
- ((concourse-ssh-key.id_rsa))
-
- - name: gds-cli-src
- type: git
- source:
- uri: git@github.com:alphagov/gds-cli.git
- branch: master
- private_key: |
- ((concourse-ssh-key.id_rsa))