fixes

Signed-off-by: Grzegorz Choiński <[email protected]>
Wallted · Jan 27, 2024 · 155b8a9 · 155b8a9
1 parent 22373b8
commit 155b8a9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -33,11 +33,11 @@ jobs:
     needs: [publish-dotnet]
 
     steps:
-    - name: clone and docker compose up
+    - name: setup env and docker compose up
       uses: appleboy/ssh-action@master
       env:
-        CERT_PATH: ${{ secrets.CERT_PATH }}
         CERT_KEY_PATH: ${{ secrets.CERT_KEY_PATH }}
+        CERT_PATH: ${{ secrets.CERT_PATH }}
         PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
         CERTIFICATE: ${{ secrets.CERTIFICATE }}
         NGINX_CONF: ${{ secrets.NGINX_CONF }}
@@ -49,8 +49,8 @@ jobs:
         script: |
           rm -rf repo
           git clone https://github.com/${{github.repository}} repo && cd repo
-          git fetch origin refs/pull/49/head
-          git checkout FETCH_HEAD
+          git fetch origin $TAG
+          git checkout $TAG
           chmod +x ./setup_env.sh
           ./setup_env.sh
           docker-compose -f docker-compose.prod.yml down

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -30,7 +30,7 @@ jobs:
           git clone https://github.com/${{github.repository}} repo && cd repo
           git fetch origin refs/pull/49/head
           git checkout FETCH_HEAD
-          chmod +x ./deploy.sh
-          ./deploy.sh
+          chmod +x ./setup_env.sh
+          ./setup_env.sh
           docker-compose -f docker-compose.prod.yml down
           docker-compose -f docker-compose.prod.yml up -d