From ea7a280daae2075bf161796fb32b04ac43ef9f62 Mon Sep 17 00:00:00 2001 From: DevTekVE Date: Fri, 2 Aug 2024 14:01:30 +0200 Subject: [PATCH] Revert "Add .git-crypt and .venv to the blacklist" This reverts commit f51a6f54 Revert "Add git-crypt unlock attempt in provision script" This reverts commit f4dac4b4 Revert "ci: git-crypt: Decrypt prior to building" This reverts commit faf52492b67dd995b1643c49de602d82929c1e5d. Revert "git-crypt: add collaborators" This reverts commit bc1aad6f6a66fbeb490997ee7f8a282feb5f6dfd. --- .git-crypt/.gitattributes | 4 - ...6E1EB7856273777A0C8BB4EF8EA444C1E7B69C.gpg | Bin 725 -> 0 bytes ...D8EDBE6BD70DFB803D59292470ADBDD426DEB5.gpg | Bin 725 -> 0 bytes ...8F802F45946A6A3E16AD1B1609CD53B15C2462.gpg | Bin 735 -> 0 bytes .git-crypt/provision.sh | 110 ------------------ .gitlab-ci.yml | 2 +- release/release_files.py | 2 - 7 files changed, 1 insertion(+), 117 deletions(-) delete mode 100644 .git-crypt/.gitattributes delete mode 100644 .git-crypt/keys/default/0/106E1EB7856273777A0C8BB4EF8EA444C1E7B69C.gpg delete mode 100644 .git-crypt/keys/default/0/91D8EDBE6BD70DFB803D59292470ADBDD426DEB5.gpg delete mode 100644 .git-crypt/keys/default/0/E08F802F45946A6A3E16AD1B1609CD53B15C2462.gpg delete mode 100755 .git-crypt/provision.sh diff --git a/.git-crypt/.gitattributes b/.git-crypt/.gitattributes deleted file mode 100644 index 665b10e8f0..0000000000 --- a/.git-crypt/.gitattributes +++ /dev/null @@ -1,4 +0,0 @@ -# Do not edit this file. To specify the files to encrypt, create your own -# .gitattributes file in the directory where your files are. -* !filter !diff -*.gpg binary diff --git a/.git-crypt/keys/default/0/106E1EB7856273777A0C8BB4EF8EA444C1E7B69C.gpg b/.git-crypt/keys/default/0/106E1EB7856273777A0C8BB4EF8EA444C1E7B69C.gpg deleted file mode 100644 index 97b89be16eef468dea1688448132cd49bc1a9205..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 725 zcmV;`0xJE50t^Eiti!r3*)-+>5CEM;BTRKyWmz_3gO6PMXMbPN8+OdA6CadusYg9^ zWEg3Hz?fKrSv+uXx{Tssm0G=WQZdR4NKEO3c+2^|&X>&>$KG$#mLSy6=!V~-Blgi< z4rbWQe~-g;X9ORi=kxVsUp%TuJzT8$KfwLD=!;G22C0wERyD)W8*Cqx$nwrUQ}{`SO70zzskdift(^gjR0vt;&(*}}_sKQrIoG1GHILGca1FFrY23uBQ6ca*) zN2ZBxDgh+>4NJ=^wpG%=0|AIJdW$G(>Cj!#x{XK+oplLEf2E9Ui6cd(9*v zH2SrDh492MO=i<_&_X5mlVw}px}?7bLxm!ItMLI`Vl-3GhjO*>3*S^}x#3+R_LqTs z0@tS3baUe2=5JPH*zgRlaWq~6WGGaggBmy;;TaC7@~U7}3DrU33Z9lF@?;bC*_7)rtkjg8j6|?1VHGyK^v9fhF$}jmr$w}(@|UW zCDSs`cxVBK0OX@n!pU+=3s>=PP<`7I*TgwzlW}bCJCxAdJ=4{%NGkuX2|Y$;ev}{L z5K_5bU1AU%jBP?KVo4zu5kLdZ>i=eEjD7&CVB(9&Se)dt^i%Wd@R;T2ZC?d*n7`AV zWZI}=|MbRfHX7&T2=1TyZJAdaN5iQH?*Z3{`z4N5Y6=`NNKGrYI!f*$v1R`6NzE=$ zQaUW|sFgpJ$pX0W)o~=x)WCHO?{R4=qJRk7)Z}YSJT&nYoyuc;14=$octKO1;nyrH zh?nA@kC?#@x0f28qYC*srv67oHzn+DI^+(3ps`LSlfzcJ@he*!Hn*PEW{;&fCcx4B zqTYwap!a3@OfA*S>CD|^9VJ2)+7+0f&_EVya;dcq=`$JeyO{H!VN6!XkO@SR1MjPX z9LQDJ3%q65Zt!N@N3znu0|6YI82ww*3PRzyAIJeTfu$`dI#tndf?i0VwJCCjU#Zeg z4-(gUMpGm7v8X7c9iP9JD(my5N%*Q2yv0j`6r9vf!p4S`EmHT5gs5-@0>f-CT&9}f z`AuXtw#?1kk{ghL1gqZYO&3}31ZbTi23N5N1fdQh2YSxD{`dF-fEt2;y1)6ri0-mj zn!xr}jV&Qmo;v${hx}{D(h9&5Ra}+i#}apkZbKLQI=iu;U@^hnFk;ij8&U+bgn?l6xnAgEx#Dza?w=UzyMmxvM+Qe+SWlz+UQ?Q5m53(MN8h>Y>D@RZ-j5M)P(Kq>$`lN{RFr{12*0F2 znlSADOAt%tK)Tu_aX3x5P=wumS{_Dv-_i20k{~-J6SYQl>~UN0JXnmf;WYQ+ zl=rpmLzyLjcWaVY!<;pOvWuLA(=M<#_tbnAXLS)ki|#8FaJ)whiG&coR=Z_ikWR>? zFBgrx0Tgi?(Q}^(EIoM>nkS(~sCSo~1hPsEAML=nFNbsqHIK9R^QNoeBBF7c`X>Pv z2tZj&5Q(v;8Tl^wn9uy`m|qfw_BRewH3nw`$fLi)1Zji~Pel2nzBJymh@fGl!s)#%;n5V(c*u;yCs?@dDe?5QF{V6*~;eqdI%ym|q}v^cIxfgJah zqPTravGaxq?yS&u?A~3E+J@@>Am<`ioGZhA`B?4FL%P5Ju*TZc+T%>mQZjHZ3PF!AeqNfQ7bGbH`6kQ_jEj zxk`Gih-)5$|KoWu-$MlpAwwb|lTjPXCnRW-KEjg+vFbb8bf`&zYCkC94P{ekg-Euy zRaURgwANGWf>8S~<}tx-0%z3@hQAg0*mp#WlH>^*hKrdC1X+)1(5^$P0q!#8j`fGP zk8f_lbc5xFGx{2PXsOrdN6YR9AJA=?S=57 RnAcT|%MwwGhU?B@M#$H9W /dev/null; then - echo "gpg could not be found. Please install gpg to continue." - exit 1 -fi - -# Check if git-crypt is installed -if ! command -v git-crypt &> /dev/null; then - # Check if /TICI file exists - if [ -f "/TICI" ]; then - echo "/TICI file detected. Attempting to install git-crypt..." - sudo apt update && sudo apt install git-crypt -y - else - echo "git-crypt could not be found. Please install git-crypt to continue." - exit 1 - fi -fi - -# Attempt to unlock with git-crypt -if git-crypt unlock &> /dev/null; then - echo "git-crypt unlock successful. You already have access." - exit 0 -fi - -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)" -no_prompt=0 -# Attempt to retrieve name and email from git config, default to "undefined" -name=$(git config --get user.name) -email=$(git config --get user.email) -name=${name:-"undefined"} -email=${email:-"undefined"} -passphrase="" - -# Function to display help message -show_help() { - echo "Usage: $0 [options]" - echo "" - echo "Options:" - echo " --name Set the user's name. Default is git config user.name or 'undefined'." - echo " --email Set the user's email. Default is git config user.email or 'undefined'." - echo " --passphrase Set the passphrase for the GPG key." - echo " --no-prompt Run without interactive prompts, using defaults or provided values." - echo " -h, --help Display this help message and exit." - echo "" - exit 0 -} - -# Check for help flag before parsing other arguments -for arg in "$@"; do - case $arg in - -h|--help) - show_help - ;; - esac -done - -# Parse named arguments -while [[ "$#" -gt 0 ]]; do - case $1 in - --name) name="$2"; shift ;; - --email) email="$2"; shift ;; - --passphrase) passphrase="$2"; shift ;; - --no-prompt) no_prompt=1 ;; - *) echo "Unknown parameter passed: $1"; exit 1 ;; - esac - shift -done - -# No need to prompt for missing information if no-prompt is enabled or defaults are used - -# Set protection line based on passphrase -if [[ -z "$passphrase" ]]; then - protection_line="%no-protection" -else - protection_line="Passphrase: $passphrase" -fi - -# Generate and process GPG key -GPG_OUTPUT=$(echo " -%echo Generating a basic OpenPGP key -Key-Type: RSA -Key-Length: 4096 -Subkey-Type: RSA -Subkey-Length: 4096 -Name-Real: $name -Name-Comment: Generated from git config or default -Name-Email: $email -Expire-Date: 0 -$protection_line -%commit -%echo done -" | gpg --batch --generate-key - 2>&1) - -# Extract and export the key ID -KEY_ID=$(echo "$GPG_OUTPUT" | grep -o '[0-9A-F]\{40\}' | head -n 1) -if [ -z "$KEY_ID" ]; then - echo "Failed to generate GPG key or extract key ID." - exit 1 -fi - -INSTALL_KEY_PATH=${DIR}/keys/install_new_key_sp -mkdir -p ${INSTALL_KEY_PATH} -gpg --export $KEY_ID > ${INSTALL_KEY_PATH}/$KEY_ID.gpg -git add ${INSTALL_KEY_PATH}/$KEY_ID.gpg -git commit -m "Add new public key to install." -git push - -echo "Public key exported to ${INSTALL_KEY_PATH}/${KEY_ID}.gpg" \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 33d6289f63..f8324710f5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -147,7 +147,7 @@ build: when: manual - if: $NEW_BRANCH when: always - + check no source code sent: image: alpine stage: sanity diff --git a/release/release_files.py b/release/release_files.py index 4ae0aad1ed..31d1518d74 100755 --- a/release/release_files.py +++ b/release/release_files.py @@ -88,8 +88,6 @@ sunnypilot_blacklist = [ "codecov.yml", "conftest.py", "poetry.lock", - ".git-crypt/", - ".venv", ] # Merge the blacklists