From 116ccd6b3b290d2001be46656319989071c61e03 Mon Sep 17 00:00:00 2001
From: Aurel Canciu <aurelcanciu@gmail.com>
Date: Thu, 3 Dec 2020 12:22:21 +0200
Subject: [PATCH] Rename flux-git to flux-scm to prevent collision
A flux-git package already exists in AUR
Signed-off-by: Aurel Canciu <aurelcanciu@gmail.com>
---
.github/aur/{flux-git => flux-scm}/.SRCINFO.template | 4 ++--
.github/aur/{flux-git => flux-scm}/.gitignore | 0
.github/aur/{flux-git => flux-scm}/PKGBUILD.template | 2 +-
.github/aur/{flux-git => flux-scm}/publish.sh | 0
.goreleaser.yml | 4 ++--
5 files changed, 5 insertions(+), 5 deletions(-)
rename .github/aur/{flux-git => flux-scm}/.SRCINFO.template (91%)
rename .github/aur/{flux-git => flux-scm}/.gitignore (100%)
rename .github/aur/{flux-git => flux-scm}/PKGBUILD.template (98%)
rename .github/aur/{flux-git => flux-scm}/publish.sh (100%)
diff --git a/.github/aur/flux-git/.SRCINFO.template b/.github/aur/flux-scm/.SRCINFO.template
similarity index 91%
rename from .github/aur/flux-git/.SRCINFO.template
rename to .github/aur/flux-scm/.SRCINFO.template
index 54ce3ad2..e7f3288a 100644
--- a/.github/aur/flux-git/.SRCINFO.template
+++ b/.github/aur/flux-scm/.SRCINFO.template
@@ -1,4 +1,4 @@
-pkgbase = flux-git
+pkgbase = flux-scm
pkgdesc = Open and extensible continuous delivery solution for Kubernetes
pkgver = ${PKGVER}
pkgrel = ${PKGREL}
@@ -16,4 +16,4 @@ pkgbase = flux-git
source = git+https://github.com/fluxcd/flux2.git
md5sums = SKIP
-pkgname = flux-git
+pkgname = flux-scm
diff --git a/.github/aur/flux-git/.gitignore b/.github/aur/flux-scm/.gitignore
similarity index 100%
rename from .github/aur/flux-git/.gitignore
rename to .github/aur/flux-scm/.gitignore
diff --git a/.github/aur/flux-git/PKGBUILD.template b/.github/aur/flux-scm/PKGBUILD.template
similarity index 98%
rename from .github/aur/flux-git/PKGBUILD.template
rename to .github/aur/flux-scm/PKGBUILD.template
index 4d3a233d..09c0537b 100644
--- a/.github/aur/flux-git/PKGBUILD.template
+++ b/.github/aur/flux-scm/PKGBUILD.template
@@ -1,7 +1,7 @@
# Maintainer: Aurel Canciu <aurelcanciu@gmail.com>
# Maintainer: Hidde Beydals <hello@hidde.co>
-pkgname=flux-git
+pkgname=flux-scm
pkgver=${PKGVER}
pkgrel=${PKGREL}
pkgdesc="Open and extensible continuous delivery solution for Kubernetes"
diff --git a/.github/aur/flux-git/publish.sh b/.github/aur/flux-scm/publish.sh
similarity index 100%
rename from .github/aur/flux-git/publish.sh
rename to .github/aur/flux-scm/publish.sh
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 0eee4c18..1df84b11 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -58,11 +58,11 @@ publishers:
eval $(ssh-agent -s)
ssh-add <(echo "{{ .Env.AUR_BOT_SSH_PRIVATE_KEY }}")
.github/aur/flux-bin/publish.sh {{ .Version }}
- - name: aur-pkg-git
+ - name: aur-pkg-scm
cmd: |
eval $(ssh-agent -s)
ssh-add <(echo "{{ .Env.AUR_BOT_SSH_PRIVATE_KEY }}")
- .github/aur/flux-git/publish.sh {{ .Version }}
+ .github/aur/flux-scm/publish.sh {{ .Version }}
- name: aur-pkg-go
cmd: |
eval $(ssh-agent -s)
--
GitLab