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 97b89be16e..0000000000 Binary files a/.git-crypt/keys/default/0/106E1EB7856273777A0C8BB4EF8EA444C1E7B69C.gpg and /dev/null differ diff --git a/.git-crypt/keys/default/0/91D8EDBE6BD70DFB803D59292470ADBDD426DEB5.gpg b/.git-crypt/keys/default/0/91D8EDBE6BD70DFB803D59292470ADBDD426DEB5.gpg deleted file mode 100644 index 3da4a7ec9c..0000000000 Binary files a/.git-crypt/keys/default/0/91D8EDBE6BD70DFB803D59292470ADBDD426DEB5.gpg and /dev/null differ diff --git a/.git-crypt/keys/default/0/E08F802F45946A6A3E16AD1B1609CD53B15C2462.gpg b/.git-crypt/keys/default/0/E08F802F45946A6A3E16AD1B1609CD53B15C2462.gpg deleted file mode 100644 index 787ec0578d..0000000000 Binary files a/.git-crypt/keys/default/0/E08F802F45946A6A3E16AD1B1609CD53B15C2462.gpg and /dev/null differ diff --git a/.git-crypt/provision.sh b/.git-crypt/provision.sh deleted file mode 100755 index 2fb9bc08d9..0000000000 --- a/.git-crypt/provision.sh +++ /dev/null @@ -1,110 +0,0 @@ -#!/bin/bash - -# Check if gpg is installed -if ! command -v gpg &> /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