SilverLABS/littleshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Auto-detect Gitea SSH port instead of hardcoding 2223
Some checks failed
Build and Deploy LittleShop / Deploy to Production VPS (Manual Only) (push) Has been skipped
Details
Build and Deploy LittleShop / Deploy to Pre-Production (CT109) (push) Failing after 1s
Details

Browse Source
This commit is contained in:
SysAdmin 2025-11-17 14:02:21 +00:00
parent e7659a4615
commit 1a7fd96486
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.gitea/workflows/build-and-deploy.yml
View File

@ -200,8 +200,22 @@ jobs:
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
ssh-add ~/.ssh/git_deploy_key 2>/dev/null || true ssh-add ~/.ssh/git_deploy_key 2>/dev/null || true
# Try to determine Gitea SSH port (try common ports)
echo "Testing Gitea SSH connectivity..."
for port in 22 2222 2223 3000; do
if nc -z -w1 git.silverlabs.uk $port 2>/dev/null; then
echo "Found SSH service on port $port"
GITEA_SSH_PORT=$port
break
fi
done
# Default to 22 if not found
GITEA_SSH_PORT=${GITEA_SSH_PORT:-22}
echo "Using SSH port: $GITEA_SSH_PORT"
# Add git.silverlabs.uk to known hosts # Add git.silverlabs.uk to known hosts
ssh-keyscan -p 2223 git.silverlabs.uk >> ~/.ssh/known_hosts 2>/dev/null || true ssh-keyscan -p $GITEA_SSH_PORT git.silverlabs.uk >> ~/.ssh/known_hosts 2>/dev/null || true
# Use home directory for deployment # Use home directory for deployment
DEPLOY_DIR=~/littleshop DEPLOY_DIR=~/littleshop
@ -215,10 +229,10 @@ jobs:
if [ ! -d .git ]; then if [ ! -d .git ]; then
echo "Cloning repository via SSH..." echo "Cloning repository via SSH..."
rm -rf * # Clean any existing files rm -rf * # Clean any existing files
GIT_SSH_COMMAND="ssh -i ~/.ssh/git_deploy_key -p 2223" git clone ssh://git@git.silverlabs.uk:2223/Jamie/littleshop.git . GIT_SSH_COMMAND="ssh -i ~/.ssh/git_deploy_key -p $GITEA_SSH_PORT" git clone ssh://git@git.silverlabs.uk:$GITEA_SSH_PORT/Jamie/littleshop.git .
else else
echo "Repository already cloned, pulling latest..." echo "Repository already cloned, pulling latest..."
GIT_SSH_COMMAND="ssh -i ~/.ssh/git_deploy_key -p 2223" git fetch origin GIT_SSH_COMMAND="ssh -i ~/.ssh/git_deploy_key -p $GITEA_SSH_PORT" git fetch origin
fi fi
echo "Checking out version: $VERSION" echo "Checking out version: $VERSION"