Date: Wednesday, April 27, 2022 @ 14:14:09 Author: jelle Revision: 1191140
archrelease: copy trunk to community-x86_64 Added: argocd/repos/community-x86_64/PKGBUILD (from rev 1191139, argocd/trunk/PKGBUILD) argocd/repos/community-x86_64/argo-ui.patch (from rev 1191139, argocd/trunk/argo-ui.patch) Deleted: argocd/repos/community-x86_64/PKGBUILD argocd/repos/community-x86_64/argo-ui.patch ---------------+ PKGBUILD | 152 ++++++++++++++++++++++++++++---------------------------- argo-ui.patch | 22 ++++---- 2 files changed, 87 insertions(+), 87 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-04-27 14:14:02 UTC (rev 1191139) +++ PKGBUILD 2022-04-27 14:14:09 UTC (rev 1191140) @@ -1,76 +0,0 @@ -# Maintainer: Daurnimator <daurnima...@archlinux.org> - -pkgname=argocd -pkgver=2.3.3 -# find matching argo-ui commit via ui/yarn.lock -# commit id also needs to be updated in argo-ui.patch -_argoui_commit=4336822c14164f36eb9d0a6b6c3c40560df4c4d7 -pkgrel=1 -pkgdesc="Declarative continuous deployment for Kubernetes" -arch=('x86_64') -url='https://argo-cd.readthedocs.io/en/stable/' -license=('Apache') -makedepends=('go' 'python' 'yarn') -depends=('glibc') -provides=('argocd-cli') -replaces=('argocd-cli') -source=("argo-cd-${pkgver}.tar.gz::https://github.com/argoproj/argo-cd/archive/v${pkgver}.tar.gz" - "argo-ui-${_argoui_commit}.tar.gz::https://github.com/argoproj/argo-ui/archive/${_argoui_commit}.tar.gz" - "argo-ui.patch") -sha512sums=('91f0af50c4b18fba9e4c2962e543ab27e6709b53923ac09c8a073c69c247336b445cd20134d73e3ef4fc0b007849c22b63e71c44762d0266f3f5caf5c4549d8d' - '9a085b664064cc973e62e5699404ecf28600efe48c632313c3229ff3d84365bd9a6b073044e5ec492aed145781ddd3e6ab667d48ba4ae25ef5b301f242399159' - '8c6e3b284aed3ee92965601a2958d8eaf0e018005317d948e45ea01a3bce75a53bac904c373b69c926d607c44db6105da8e2b1d1cecfce3a1ce1545d58132097') - -prepare() { - cd "argo-cd-$pkgver" - - patch -p0 -i ../argo-ui.patch - - go mod download -} - -build() { - cd "argo-cd-$pkgver" - - ( - cd ui - yarn install --cache-folder "${srcdir}/yarn-cache" - ARGO_VERSION="$pkgver" NODE_ENV='production' NODE_ONLINE_ENV='online' yarn build - ) - - export CGO_CPPFLAGS="${CPPFLAGS}" - export CGO_CFLAGS="${CFLAGS}" - export CGO_CXXFLAGS="${CXXFLAGS}" - export CGO_LDFLAGS="${LDFLAGS}" - export GOPROXY=off - go build -o argocd \ - -trimpath \ - -buildmode=pie \ - -mod=readonly \ - -modcacherw \ - -ldflags "-X github.com/argoproj/argo-cd/v2/common.version=${pkgver} \ - -X github.com/argoproj/argo-cd/v2/common.buildDate=$(date -u +'%Y-%m-%dT%H:%M:%SZ' --date=@${SOURCE_DATE_EPOCH}) \ - -X github.com/argoproj/argo-cd/v2/common.gitTag=${pkgver} \ - -linkmode=external \ - -extldflags \"${LDFLAGS}\"" \ - ./cmd - - ./argocd completion bash > argocd.bash - ./argocd completion zsh > argocd.zsh -} - -package() { - cd "argo-cd-$pkgver" - - install -D argocd "$pkgdir/usr/bin/argocd" - ln -s argocd "$pkgdir/usr/bin/argocd-server" - ln -s argocd "$pkgdir/usr/bin/argocd-application-controller" - ln -s argocd "$pkgdir/usr/bin/argocd-repo-server" - ln -s argocd "$pkgdir/usr/bin/argocd-cmp-server" - ln -s argocd "$pkgdir/usr/bin/argocd-dex" - ln -s argocd "$pkgdir/usr/bin/argocd-notifications" - ln -s argocd "$pkgdir/usr/bin/argocd-git-ask-pass" - - install -Dm644 argocd.bash "$pkgdir/usr/share/bash-completion/completions/argocd" - install -Dm644 argocd.zsh "$pkgdir/usr/share/zsh/site-functions/_argocd" -} Copied: argocd/repos/community-x86_64/PKGBUILD (from rev 1191139, argocd/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-04-27 14:14:09 UTC (rev 1191140) @@ -0,0 +1,76 @@ +# Maintainer: Daurnimator <daurnima...@archlinux.org> + +pkgname=argocd +pkgver=2.3.3 +# find matching argo-ui commit via ui/yarn.lock +# commit id also needs to be updated in argo-ui.patch +_argoui_commit=4336822c14164f36eb9d0a6b6c3c40560df4c4d7 +pkgrel=2 +pkgdesc="Declarative continuous deployment for Kubernetes" +arch=('x86_64') +url='https://argo-cd.readthedocs.io/en/stable/' +license=('Apache') +makedepends=('go' 'python' 'yarn') +depends=('glibc') +provides=('argocd-cli') +replaces=('argocd-cli') +source=("argo-cd-${pkgver}.tar.gz::https://github.com/argoproj/argo-cd/archive/v${pkgver}.tar.gz" + "argo-ui-${_argoui_commit}.tar.gz::https://github.com/argoproj/argo-ui/archive/${_argoui_commit}.tar.gz" + "argo-ui.patch") +sha512sums=('91f0af50c4b18fba9e4c2962e543ab27e6709b53923ac09c8a073c69c247336b445cd20134d73e3ef4fc0b007849c22b63e71c44762d0266f3f5caf5c4549d8d' + '9a085b664064cc973e62e5699404ecf28600efe48c632313c3229ff3d84365bd9a6b073044e5ec492aed145781ddd3e6ab667d48ba4ae25ef5b301f242399159' + '8c6e3b284aed3ee92965601a2958d8eaf0e018005317d948e45ea01a3bce75a53bac904c373b69c926d607c44db6105da8e2b1d1cecfce3a1ce1545d58132097') + +prepare() { + cd "argo-cd-$pkgver" + + patch -p0 -i ../argo-ui.patch + + go mod download +} + +build() { + cd "argo-cd-$pkgver" + + ( + cd ui + yarn install --cache-folder "${srcdir}/yarn-cache" + ARGO_VERSION="$pkgver" NODE_ENV='production' NODE_ONLINE_ENV='online' yarn build + ) + + export CGO_CPPFLAGS="${CPPFLAGS}" + export CGO_CFLAGS="${CFLAGS}" + export CGO_CXXFLAGS="${CXXFLAGS}" + export CGO_LDFLAGS="${LDFLAGS}" + export GOPROXY=off + go build -o argocd \ + -trimpath \ + -buildmode=pie \ + -mod=readonly \ + -modcacherw \ + -ldflags "-X github.com/argoproj/argo-cd/v2/common.version=${pkgver} \ + -X github.com/argoproj/argo-cd/v2/common.buildDate=$(date -u +'%Y-%m-%dT%H:%M:%SZ' --date=@${SOURCE_DATE_EPOCH}) \ + -X github.com/argoproj/argo-cd/v2/common.gitTag=${pkgver} \ + -linkmode=external \ + -extldflags \"${LDFLAGS}\"" \ + ./cmd + + ./argocd completion bash > argocd.bash + ./argocd completion zsh > argocd.zsh +} + +package() { + cd "argo-cd-$pkgver" + + install -D argocd "$pkgdir/usr/bin/argocd" + ln -s argocd "$pkgdir/usr/bin/argocd-server" + ln -s argocd "$pkgdir/usr/bin/argocd-application-controller" + ln -s argocd "$pkgdir/usr/bin/argocd-repo-server" + ln -s argocd "$pkgdir/usr/bin/argocd-cmp-server" + ln -s argocd "$pkgdir/usr/bin/argocd-dex" + ln -s argocd "$pkgdir/usr/bin/argocd-notifications" + ln -s argocd "$pkgdir/usr/bin/argocd-git-ask-pass" + + install -Dm644 argocd.bash "$pkgdir/usr/share/bash-completion/completions/argocd" + install -Dm644 argocd.zsh "$pkgdir/usr/share/zsh/site-functions/_argocd" +} Deleted: argo-ui.patch =================================================================== --- argo-ui.patch 2022-04-27 14:14:02 UTC (rev 1191139) +++ argo-ui.patch 2022-04-27 14:14:09 UTC (rev 1191140) @@ -1,11 +0,0 @@ ---- ui/package.json 2021-12-16 00:00:00.000000000 +1100 -+++ ui/package.json 2021-12-16 00:00:00.000000000 +1100 -@@ -28,7 +28,7 @@ - "@types/react-router-dom": "^4.2.3", - "@types/superagent": "^3.5.7", - "ansi-to-react": "^6.1.6", -- "argo-ui": "git+https://github.com/argoproj/argo-ui.git", -+ "argo-ui": "file:../../argo-ui-4336822c14164f36eb9d0a6b6c3c40560df4c4d7", - "classnames": "^2.2.5", - "color": "^3.1.0", - "cookie": "^0.3.1", Copied: argocd/repos/community-x86_64/argo-ui.patch (from rev 1191139, argocd/trunk/argo-ui.patch) =================================================================== --- argo-ui.patch (rev 0) +++ argo-ui.patch 2022-04-27 14:14:09 UTC (rev 1191140) @@ -0,0 +1,11 @@ +--- ui/package.json 2021-12-16 00:00:00.000000000 +1100 ++++ ui/package.json 2021-12-16 00:00:00.000000000 +1100 +@@ -28,7 +28,7 @@ + "@types/react-router-dom": "^4.2.3", + "@types/superagent": "^3.5.7", + "ansi-to-react": "^6.1.6", +- "argo-ui": "git+https://github.com/argoproj/argo-ui.git", ++ "argo-ui": "file:../../argo-ui-4336822c14164f36eb9d0a6b6c3c40560df4c4d7", + "classnames": "^2.2.5", + "color": "^3.1.0", + "cookie": "^0.3.1",