fix: resolve merge conflicts in github app config PR#3
fix: resolve merge conflicts in github app config PR#3neverSettles wants to merge 2 commits intorefreshdotdev:mainfrom
Conversation
…rraform user-data
# Conflicts: # install.sh # skills/proactive-engineer/SKILL.md
WalkthroughThis PR refactors the installation and configuration architecture to centralize setup logic and improve GitHub App authentication support. The main change consolidates manual installation steps into a single external install script, reducing the Terraform user-data script from ~40 lines to a simple script invocation. Configuration file organization is improved by relocating the GitHub App private key to a dedicated config directory. Git identity configuration is modernized by replacing environment variable exports with global git config commands, with automatic handling by the refresh script. GitHub token precedence is updated to prioritize GH_TOKEN over GITHUB_TOKEN, and new environment variables support GitHub App authentication. Changes
Sequence DiagramThis diagram shows the interactions between components: sequenceDiagram
participant Script as Installation Script
participant FS as File System
participant Env as Environment
Script->>Script: Check USE_GITHUB_APP = "yes"
Script->>Script: Check GITHUB_APP_PEM_PATH is set
alt GitHub App authentication enabled
Note over Script,FS: New: Ensure config directory exists
Script->>FS: mkdir -p $CONFIG_DIR
FS-->>Script: Directory created/verified
Script->>Script: Set PEM_DEST=$CONFIG_DIR/github-app.pem
Script->>FS: Copy PEM file from GITHUB_APP_PEM_PATH to PEM_DEST
FS-->>Script: File copied
Script->>FS: chmod 600 on PEM_DEST
FS-->>Script: Permissions set
Script->>Env: Export GITHUB_APP_PEM_PATH=PEM_DEST
Env-->>Script: Variable exported
else GitHub App not used
Note over Script: Skip GitHub App setup
end
🔗 Cross-Repository Impact AnalysisEnable automatic detection of breaking changes across your dependent repositories. → Set up now Learn more about Cross-Repository AnalysisWhat It Does
How to Enable
Benefits
|
|
I attempted to resolve the merge conflicts locally but ran into auth issues when trying to push the resolved branch back up to origin/fix/github-app-config-and-docs. Could a maintainer pull this down, resolve the user-data.sh conflict, and force push? |
Resolves conflicts between PR #1 and recent changes on main. Applies the github-app.pem path fix to the correct block in install.sh and integrates the new token chaining requirements in SKILL.md.
EntelligenceAI PR Summary
This PR centralizes installation logic and enhances GitHub App authentication support by consolidating manual setup steps into a single external install script.
Confidence Score: 5/5 - Safe to Merge