Merge branch 'main' into Profile-system

This commit is contained in:
2025-12-14 10:51:18 -06:00

View File

@@ -48,12 +48,12 @@ jobs:
cd /var/www/html/milsim-site-v4 cd /var/www/html/milsim-site-v4
version=`git log -1 --format=%H` version=`git log -1 --format=%H`
echo "Current Revision: $version" echo "Current Revision: $version"
echo "Updating to: ${{ github.sha }} echo "Updating to: ${{ github.sha }}"
sudo -u nginx git reset --hard sudo -u nginx git reset --hard
sudo -u nginx git pull origin main sudo -u nginx git fetch --tags
sudo -u nginx git pull origin main sudo -u nginx git pull origin main
new_version=`git log -1 --format=%H` new_version=`git log -1 --format=%H`
echo "Sucessfully updated to: $new_version echo "Successfully updated to: $new_version"
- name: Update Shared Dependencies and Fix Permissions - name: Update Shared Dependencies and Fix Permissions
run: | run: |