home

commit 256c3c3771fbed6d06995f42535c0d9a00926210
parent 3fe32936f88ea65a6e091966e3500e72b219914d
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Sun, 26 Apr 2020 18:12:47 +0200

Add more mrconfig files

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

Diffstat:
M
modules/profiles/assets/lib.mr
 | 
9
++++++---
M
modules/profiles/assets/src.github.mr
 | 
5
+++++
A
modules/profiles/assets/src.github.openshift.mr
 | 
18
++++++++++++++++++
A
modules/profiles/assets/src.knative.dev.mr
 | 
20
++++++++++++++++++++
M
modules/profiles/assets/src.mr
 | 
4
++++
M
modules/profiles/dev.nix
 | 
2
++

6 files changed, 55 insertions(+), 3 deletions(-)
diff --git a/modules/profiles/assets/lib.mr b/modules/profiles/assets/lib.mr
@@ -5,7 +5,8 @@ lib =
     my_git_clone() {
         USERNAME=${GIT_USERNAME:-git}
         GIT_PREFIX=${GIT_PREFIX}
-        URL="${GIT_PREFIX}${USERNAME}@${BASE_HOST}${MR_REPO//${BASE}${BASE_HOST}/}.git"
+        GIT_BASE=${GIT_BASE:-${BASE_HOST}}
+        URL="${GIT_PREFIX}${USERNAME}@${GIT_BASE}${MR_REPO//${BASE_HOST}/}.git"
         git clone $URL $MR_REPO
     }
 checkout = my_git_clone
@@ -16,8 +17,10 @@ git_u =
     CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
     echo "On $CURRENT_BRANCH"
     git stash
-    REMOTE="upstream"
-    git config remote.upstream.url || REMOTE="origin"
+    REMOTE="origin"
+    if [[ -z "$NO_UPSTREAM_U" ]]; then
+        git config remote.upstream.url && REMOTE="upstream"
+    fi
     echo "Rebase ${REMOTE}/master on master"
     git rebase ${REMOTE}/master master
     git co $CURRENT_BRANCH
diff --git a/modules/profiles/assets/src.github.mr b/modules/profiles/assets/src.github.mr
@@ -3,6 +3,11 @@ include = cat ${HOME}/.config/mr
 [DEFAULT]
 lib =
     export BASE_HOST="github.com"
+    export GIT_BASE="github.com:"
+
+[openshift]
+chain = true
+skip = true
 
 [tektoncd/catalog]
 [tektoncd/cli]
diff --git a/modules/profiles/assets/src.github.openshift.mr b/modules/profiles/assets/src.github.openshift.mr
@@ -0,0 +1,18 @@
+include = cat ${HOME}/.config/mr
+
+[DEFAULT]
+lib =
+    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/modules/profiles/assets/src.knative.dev.mr b/modules/profiles/assets/src.knative.dev.mr
@@ -0,0 +1,19 @@
+include = cat ${HOME}/.config/mr
+
+[DEFAULT]
+lib =
+    export BASE_HOST="${HOME}/src/knative.dev/"
+    export GIT_BASE="github.com:knative/"
+
+[build]
+[build-template]
+[caching]
+[client]
+[client-contrib]
+[community]
+[eventing]
+[eventing-contrib]
+[net-kourier]
+[observability]
+[pkg]
+[serving]+
\ No newline at end of file
diff --git a/modules/profiles/assets/src.mr b/modules/profiles/assets/src.mr
@@ -12,6 +12,10 @@ skip = true
 chain = true
 skip = true
 
+[knative.dev]
+chain = true
+skip = true
+
 [pkgs.devel.redhat.com]
 chain = true
 skip = true
diff --git a/modules/profiles/dev.nix b/modules/profiles/dev.nix
@@ -22,7 +22,9 @@ in
         '';
         xdg.configFile."mr".source = ./assets/lib.mr;
         home.file."src/.mrconfig".source = ./assets/src.mr;
+        home.file."src/knative.dev/.mrconfig".source = ./assets/src.knative.dev.mr;
         home.file."src/github.com/.mrconfig".source = ./assets/src.github.mr;
+        home.file."src/github.com/openshift/.mrconfig".source = ./assets/src.github.openshift.mr;
         home.file."src/pkgs.devel.redhat.com/.mrconfig".source = ./assets/src.pkgs.devel.redhat.mr;
         home.packages = with pkgs;
           [