update

Author: The-DevBlog

.github/workflows/staging.yml

@@ -53,36 +53,11 @@ jobs:
                 scp -i ${{ secrets.SSH_PRIVATE_KEY_PATH }}/${{ secrets.SSH_PRIVATE_KEY_NAME }} -r client/dist ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.DEVBLOG_ROOT_PATH }}/client
                 scp -i ${{ secrets.SSH_PRIVATE_KEY_PATH }}/${{ secrets.SSH_PRIVATE_KEY_NAME }} client/Dockerfile ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.DEVBLOG_ROOT_PATH }}/client
 
-                
-
     deploy-server:
         name: Deploy Server
         runs-on: ubuntu-latest
         environment: staging
         steps:
-            # - name: Cache Trunk
-            #   uses: actions/cache@v3
-            #   with:
-            #     path: ~/.cargo
-            #     key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-            #     restore-keys: |
-            #       ${{ runner.os }}-cargo-
-
-            # - uses: actions/checkout@v3
-            # - name: Set up Rust
-            #   uses: dtolnay/rust-toolchain@stable
-            #   with:
-            #     targets: wasm32-unknown-unknown
-            #     toolchain: stable
-                
-            # - name: Install Trunk
-            #   run: cargo install trunk
-            # #   if: steps.cache.outputs.cache-hit != 'true'
-                
-            # - name: Build with Trunk
-            #   run: trunk build --release  
-            #   working-directory: client
-
             - name: Set up .NET
               uses: actions/setup-dotnet@v1
               with:
@@ -97,30 +72,22 @@ jobs:
             - name: Publish application
               run: dotnet publish ./server/devblog.csproj -c Release -o ./app/publish /p:UseAppHost=false
 
-            # - name: Create SSH Key
-            #   run: |
-            #     mkdir -p ${{ secrets.SSH_PRIVATE_KEY_PATH }}
-            #     echo "${{ secrets.SSH_PRIVATE_KEY_CONTENT }}" > ${{ secrets.SSH_PRIVATE_KEY_PATH }}/${{ secrets.SSH_PRIVATE_KEY_NAME }}
-            #     sudo chmod 600 ${{ secrets.SSH_PRIVATE_KEY_PATH }}/${{ secrets.SSH_PRIVATE_KEY_NAME }}
-            #   shell: bash
+            - name: Create SSH Key
+              run: |
+                mkdir -p ${{ secrets.SSH_PRIVATE_KEY_PATH }}
+                echo "${{ secrets.SSH_PRIVATE_KEY_CONTENT }}" > ${{ secrets.SSH_PRIVATE_KEY_PATH }}/${{ secrets.SSH_PRIVATE_KEY_NAME }}
+                sudo chmod 600 ${{ secrets.SSH_PRIVATE_KEY_PATH }}/${{ secrets.SSH_PRIVATE_KEY_NAME }}
+              shell: bash
 
-            # - name: Add Host Key to known_hosts
-            #   run: ssh-keyscan -H ${{ secrets.SSH_HOST }} >> ${{ secrets.SSH_PRIVATE_KEY_PATH }}/known_hosts
+            - name: Add Host Key to known_hosts
+              run: ssh-keyscan -H ${{ secrets.SSH_HOST }} >> ${{ secrets.SSH_PRIVATE_KEY_PATH }}/known_hosts
 
             - name: Copy Files to Server
               run: |
                 scp -i ${{ secrets.SSH_PRIVATE_KEY_PATH }}/${{ secrets.SSH_PRIVATE_KEY_NAME }} docker-compose.yml ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.DEVBLOG_ROOT_PATH }}
                 scp -i ${{ secrets.SSH_PRIVATE_KEY_PATH }}/${{ secrets.SSH_PRIVATE_KEY_NAME }} server/Dockerfile ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.DEVBLOG_ROOT_PATH }}/server
                 scp -i ${{ secrets.SSH_PRIVATE_KEY_PATH }}/${{ secrets.SSH_PRIVATE_KEY_NAME }} -r ./app/publish ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.DEVBLOG_ROOT_PATH }}/server/publish
 
-            # - name: Restart Container
-            #   run: |
-            #     ssh -i ${{ secrets.SSH_PRIVATE_KEY_PATH }}/${{ secrets.SSH_PRIVATE_KEY_NAME }} ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} "\
-            #     cd ${{ secrets.DEVBLOG_ROOT_PATH }} && \
-            #     docker container rm -f ${{ secrets.DEVBLOG_CLIENT_CONTAINER }} || true && \
-            #     docker container rm -f ${{ secrets.DEVBLOG_SERVER_CONTAINER }}
-            #     docker compose up -d"
-          
     restart-containers:
         name: Restart Containers
         needs: [deploy-server, deploy-client]