From ff57da68bf92dbaa732d505dfa38936712d4dfba Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Thu, 1 Feb 2024 23:05:56 +0100 Subject: [PATCH 1/4] [gtk3] fix system pkg --- gtk3/install.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk3/install.yaml b/gtk3/install.yaml index 31bdac421..a9b7ef469 100644 --- a/gtk3/install.yaml +++ b/gtk3/install.yaml @@ -1,2 +1,2 @@ - type: system - name: libgtk3-dev + name: libgtk-3-dev From 499b5d2c030fb876c403d3121260d6ad15f3da75 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Mon, 5 Feb 2024 15:05:36 +0100 Subject: [PATCH 2/4] [matthijs] global blame ignore file --- matthijs/install.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matthijs/install.bash b/matthijs/install.bash index f496140aa..f5c4b230f 100644 --- a/matthijs/install.bash +++ b/matthijs/install.bash @@ -1,7 +1,7 @@ #! /usr/bin/env bash # Git Settings -git_config_items="advice.skippedCherryPicks=false color.ui=always merge.tool=meld pull.ff=true url.ssh://git@github.com/.insteadOf=https://github.com/" +git_config_items="advice.skippedCherryPicks=false rebase.autoStash=true color.ui=always merge.tool=meld pull.ff=true url.ssh://git@github.com/.insteadOf=https://github.com/ blame.ignoreRevsFile=.git-blame-ignore-revs" for item in $git_config_items do option=${item%=*} From 95f210afb69857d96d2984f51b8490bfba134970 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Tue, 6 Feb 2024 09:22:38 +0100 Subject: [PATCH 3/4] [git-lfs] also install lfs automatically --- git-lfs/install.bash | 8 ++++++++ git-lfs/install.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 git-lfs/install.bash diff --git a/git-lfs/install.bash b/git-lfs/install.bash new file mode 100644 index 000000000..44a729e30 --- /dev/null +++ b/git-lfs/install.bash @@ -0,0 +1,8 @@ +#! /usr/bin/env bash + +if ! git config --glob --get-regex "filter.lfs.*" &>/dev/null +then + tue-install-pipe git lfs install +else + tue-install-debug "git-lfs is already installed" +fi diff --git a/git-lfs/install.yaml b/git-lfs/install.yaml index 270cf635d..8dd95b634 100644 --- a/git-lfs/install.yaml +++ b/git-lfs/install.yaml @@ -1,2 +1,2 @@ -- type: system +- type: system-now name: git-lfs From f026119f0807e81ee65ae1ae3143c4f620868f73 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Fri, 9 Feb 2024 16:19:14 +0100 Subject: [PATCH 4/4] [networking] no control master with bitbucket See https://jira.atlassian.com/browse/BCLOUD-13465 --- networking/ssh_persistent_connection_lines | 2 ++ 1 file changed, 2 insertions(+) diff --git a/networking/ssh_persistent_connection_lines b/networking/ssh_persistent_connection_lines index c53165838..d653815ec 100644 --- a/networking/ssh_persistent_connection_lines +++ b/networking/ssh_persistent_connection_lines @@ -1,4 +1,6 @@ # BEGIN TUE PERSISTENT CONNECTION +Host bitbucket.??? # .org and .com + ControlMaster no Host * # Enable persistent connection multiplexing ControlMaster auto