home

commit 5012e871a3885a12f6f5c5f741f30b76c9274259
parent e89802b5c4c9fbdc1af993e23506c62c8d7c6c86
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Mon, 19 Oct 2020 16:23:47 +0200

users/vincent: update mrconfig(s)

- Fix lib
- Add go.sbr.pm, tektoncd, k8s.io
- Fix openshift
- clean knative

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
users/vincent/dev/mr.nix
 | 
3
+++
M
users/vincent/dev/mr/lib.mr
 | 
14
+++++++++++++-
M
users/vincent/dev/mr/src.github.mr
 | 
21
++++++++++-----------
M
users/vincent/dev/mr/src.github.openshift.mr
 | 
12
+++---------
A
users/vincent/dev/mr/src.github.tektoncd.mr
 | 
20
++++++++++++++++++++
A
users/vincent/dev/mr/src.go.sbr.pm.mr
 | 
8
++++++++
A
users/vincent/dev/mr/src.k8s.io.mr
 | 
8
++++++++
M
users/vincent/dev/mr/src.knative.dev.mr
 | 
15
+++------------

8 files changed, 68 insertions(+), 33 deletions(-)
diff --git a/users/vincent/dev/mr.nix b/users/vincent/dev/mr.nix
@@ -3,8 +3,11 @@
 {
   xdg.configFile."mr".source = ./mr/lib.mr;
   home.file."src/.mrconfig".source = ./mr/src.mr;
+  home.file."src/go.sbr.pm/.mrconfig".source = ./mr/src.go.sbr.pm.mr;
+  home.file."src/k8s.io/.mrconfig".source = ./mr/src.k8s.io.mr;
   home.file."src/knative.dev/.mrconfig".source = ./mr/src.knative.dev.mr;
   home.file."src/github.com/.mrconfig".source = ./mr/src.github.mr;
   home.file."src/github.com/openshift/.mrconfig".source = ./mr/src.github.openshift.mr;
+  home.file."src/github.com/tektoncd/.mrconfig".source = ./mr/src.github.tektoncd.mr;
   home.file."src/pkgs.devel.redhat.com/.mrconfig".source = ./mr/src.pkgs.devel.redhat.mr;
 }
diff --git a/users/vincent/dev/mr/lib.mr b/users/vincent/dev/mr/lib.mr
@@ -6,8 +6,20 @@ lib =
         USERNAME=${GIT_USERNAME:-git}
         GIT_PREFIX=${GIT_PREFIX}
         GIT_BASE=${GIT_BASE:-${BASE_HOST}}
-        URL="${GIT_PREFIX}${USERNAME}@${GIT_BASE}${MR_REPO//${BASE_HOST}/}.git"
+        URL="${GIT_PREFIX}${USERNAME}@${GIT_BASE}${MR_REPO//$(dirname ${MR_CONFIG})}.git"
+        UPSTREAM_URL=""
+        if [[ -z "$NO_UPSTREAM_U" ]]; then
+            URL="${GIT_PREFIX}${USERNAME}@${GIT_BASE}:${BASE_USER}/${BASE_PATH}-${MR_REPO//$(dirname ${MR_CONFIG})\/}.git"
+            UPSTREAM_URL="https://${GIT_BASE}/${BASE_PATH}${MR_REPO//$(dirname ${MR_CONFIG}\/)}.git"
+        fi
+        echo "URL         : $URL"
+        echo "UPSTREAM_URL: $UPSTREAM_URL"
         git clone $URL $MR_REPO
+        if [[ -n "$UPSTREAM_URL" ]]; then
+            cd $MR_REPO
+            git remote add upstream $UPSTREAM_URL
+            git fetch -p --all
+        fi
     }
 checkout = my_git_clone
 git_gc = git gc "$@"
diff --git a/users/vincent/dev/mr/src.github.mr b/users/vincent/dev/mr/src.github.mr
@@ -1,24 +1,23 @@
+# -*- mode: sh -*-
 include = cat ${HOME}/.config/mr
 
 [DEFAULT]
 lib =
     export BASE_HOST="github.com"
+    export BASE_USER=vdemeester
     export GIT_BASE="github.com:"
 
 [NixOS/nixpkgs]
+checkout =
+    git clone git@github.com:vdemeester/nixpkgs.git
+    cd NixOS/nixpkgs
+    git remote add upstream https://github.com/NixOS/nixpkgs.git
+    git fetch -p --all
 
 [openshift]
 chain = true
 skip = true
 
-[tektoncd/catalog]
-[tektoncd/cli]
-[tektoncd/community]
-[tektoncd/dashboard]
-[tektoncd/experimental]
-[tektoncd/friends]
-[tektoncd/homebrew-tools]
-[tektoncd/pipeline]
-[tektoncd/plumbing]
-[tektoncd/triggers]
-[tektoncd/website]
+[tektoncd]
+chain = true
+skip = true
diff --git a/users/vincent/dev/mr/src.github.openshift.mr b/users/vincent/dev/mr/src.github.openshift.mr
@@ -1,19 +1,13 @@
+# -*- mode: sh -*-
 include = cat ${HOME}/.config/mr
 
 [DEFAULT]
-skip = true
 lib =
+    export BASE_PATH=openshift
+    export BASE_USER=vdemeester
     export BASE_HOST="github.com"
-    export GIT_BASE="github.com:"
-    export NO_UPSTREAM_U=1
 
 [pipelines-catalog]
 [pipelines-docs]
 [pipelines-tutorial]
 [release]
-[tektoncd-catalog]
-[tektoncd-cli]
-[tektoncd-pipeline]
-[tektoncd-pipeline-operator]
-[tektoncd-operator]
-[tektoncd-triggers]
diff --git a/users/vincent/dev/mr/src.github.tektoncd.mr b/users/vincent/dev/mr/src.github.tektoncd.mr
@@ -0,0 +1,20 @@
+# -*- mode: sh -*-
+include = cat ${HOME}/.config/mr
+
+[DEFAULT]
+lib =
+    export BASE_PATH=tektoncd
+    export BASE_USER=vdemeester
+    export BASE_HOST="github.com"
+
+[catalog]
+[cli]
+[community]
+[dashboard]
+[experimental]
+[friends]
+[homebrew-tools]
+[pipeline]
+[plumbing]
+[triggers]
+[website]
diff --git a/users/vincent/dev/mr/src.go.sbr.pm.mr b/users/vincent/dev/mr/src.go.sbr.pm.mr
@@ -0,0 +1,8 @@
+include = cat ${HOME}/.config/mr
+
+[ape]
+checkout = git clone git@git.sr.ht:~vdemeester/ape
+[nr]
+checkout = git clone git@git.sr.ht:~vdemeester/nr
+[ram]
+checkout = git clone git@git.sr.ht:~vdemeester/ram
diff --git a/users/vincent/dev/mr/src.k8s.io.mr b/users/vincent/dev/mr/src.k8s.io.mr
@@ -0,0 +1,8 @@
+include = cat ${HOME}/.config/mr
+
+[DEFAULT]
+lib =
+    export BASE_HOST="${HOME}/src/k8s.io/"
+    export GIT_BASE="github.com:kubernetes/"
+
+[test-infra]
diff --git a/users/vincent/dev/mr/src.knative.dev.mr b/users/vincent/dev/mr/src.knative.dev.mr
@@ -2,18 +2,9 @@ include = cat ${HOME}/.config/mr
 
 [DEFAULT]
 lib =
-    export BASE_HOST="${HOME}/src/knative.dev/"
-    export GIT_BASE="github.com:knative/"
+    export BASE_PATH=knative
+    export BASE_USER=vdemeester
+    export BASE_HOST="github.com"
 
-[build]
-[build-template]
-[caching]
-[client]
-[client-contrib]
-[community]
-[eventing]
-[eventing-contrib]
-[net-kourier]
-[observability]
 [pkg]
 [serving] 
\ No newline at end of file