home

commit bdcc7c377bfb5113499309347f5fce17995399b4
parent 9beef75ab3672735128ccd0baf464854cbec7f04
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Wed, 15 Sep 2021 17:30:27 +0200

users/vincent: update dev mrconfig(s)

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

Diffstat:
M
users/vincent/dev/mr.nix
 | 
1
+
M
users/vincent/dev/mr/lib.mr
 | 
3
+--
M
users/vincent/dev/mr/src.github.mr
 | 
8
--------
A
users/vincent/dev/mr/src.osp.forks.mr
 | 
28
++++++++++++++++++++++++++++
M
users/vincent/dev/mr/src.osp.mr
 | 
44
++++++++++++++++++++++++++++++++++++++++++++

5 files changed, 74 insertions(+), 10 deletions(-)
diff --git a/users/vincent/dev/mr.nix b/users/vincent/dev/mr.nix
@@ -7,6 +7,7 @@
   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/osp/forks/.mrconfig".source = ./mr/src.osp.forks.mr;
   home.file."src/osp/.mrconfig".source = ./mr/src.osp.mr;
   # Old setup, migrate this slowly
   home.file."src/github.com/.mrconfig".source = ./mr/src.github.mr;
diff --git a/users/vincent/dev/mr/lib.mr b/users/vincent/dev/mr/lib.mr
@@ -1,7 +1,6 @@
 # -*- mode: sh -*-
 [DEFAULT]
 lib =
-    BASE="${HOME}/src/"
     my_git_clone() {
         USERNAME=${GIT_USERNAME:-git}
         GIT_PREFIX=${GIT_PREFIX}
@@ -34,7 +33,7 @@ git_u =
     if [[ -z "$NO_UPSTREAM_U" ]]; then
         git config remote.upstream.url && REMOTE="upstream"
     fi
-    echo "Rebase ${REMOTE}/${DEFAULT_BRANCH} on master"
+    echo "Rebase ${REMOTE}/${DEFAULT_BRANCH} on ${DEFAULT_BRANCH}"
     git rebase ${REMOTE}/${DEFAULT_BRANCH} ${DEFAULT_BRANCH}
     git co $CURRENT_BRANCH
 skip = [ $1 != "checkout" ] && lazy
diff --git a/users/vincent/dev/mr/src.github.mr b/users/vincent/dev/mr/src.github.mr
@@ -13,11 +13,3 @@ checkout =
     cd NixOS/nixpkgs
     git remote add upstream https://github.com/NixOS/nixpkgs.git
     git fetch -p --all
-
-[openshift]
-chain = true
-skip = true
-
-[tektoncd]
-chain = true
-skip = true
diff --git a/users/vincent/dev/mr/src.osp.forks.mr b/users/vincent/dev/mr/src.osp.forks.mr
@@ -0,0 +1,28 @@
+# -*- mode: sh -*-
+include = cat ${HOME}/.config/mr
+
+[DEFAULT]
+lib =
+    git_fork_clone() {
+        REPO_NAME=${MR_REPO//$(dirname ${MR_CONFIG})\/}
+        URL=git@github.com:vdemeester/tektoncd-${REPO_NAME}.git
+        UPSTREAM_URL=https://github.com/tektoncd/${REPO_NAME}.git
+        # FIXME(vdemeester) should probably be https
+        OPENSHIFT_URL=git@github.com:openshift/tektoncd-${REPO_NAME}.git
+        echo "URL         : $URL"
+        echo "UPSTREAM_URL: $UPSTREAM_URL"
+        echo "OPENSHIFT_URL: $OPENSHIFT_URL"
+        git clone $URL $MR_REPO
+        cd $MR_REPO
+        git remote add upstream $UPSTREAM_URL
+        git remote add openshift $OPENSHIFT_URL
+        git fetch -p --all
+    }
+checkout = git_fork_clone
+# Do not try to rebase, …
+git_u = git fetch -p --all
+
+[catalog]
+[operator]
+[pipeline]
+[triggers]
diff --git a/users/vincent/dev/mr/src.osp.mr b/users/vincent/dev/mr/src.osp.mr
@@ -1,2 +1,46 @@
 # -*- mode: sh -*-
 include = cat ${HOME}/.config/mr
+
+[DEFAULT]
+lib =
+    export BASE_USER=vdemeester
+    export BASE_HOST="github.com"
+
+# tektoncd openshift forks (for carrying patches, …)
+[forks]
+chain = true
+skip = true
+
+# downstream (RH internal)
+
+# github.com/openshift
+[openshift-ci]
+lib =
+    export DEFAULT_BRANCH=master
+checkout =
+    git clone git@github.com:vdemeester/release.git openshift-ci
+    cd openshift-ci
+    git remote add upstream https://github.com/openshift/release.git
+    git fetch -p --all
+
+[pipelines-docs]
+lib =
+    export BASE_PATH=openshift
+    export DEFAULT_BRANCH=master
+[pipelines-tutorial]
+lib =
+    export BASE_PATH=openshift
+    export DEFAULT_BRANCH=master
+
+# github.com/openshift-pipelines
+[enhancements]
+lib =
+    export BASE_PATH=openshift-pipelines
+[knowledge-base]
+lib =
+    export DEFAULT_BRANCH=master
+checkout =
+    git clone git@github.com:vdemeester/knowledge-base.git
+    cd knowledge-base
+    git remote add upstream git@github.com:openshift-pipelines/knowledge-base.git
+    git fetch -p --all