update actions

Lifailon · Oct 5, 2024 · c6ca440 · c6ca440
1 parent cb8dc56
commit c6ca440
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 73 deletions.
diff --git a/.github/workflows/ci-docker.yml → .github/workflows/cd-docker-hub.yml b/.github/workflows/ci-docker.yml → .github/workflows/cd-docker-hub.yml
@@ -1,4 +1,4 @@
-name: Docker Build and Push
+name: Deploy to Docker Hub
 
 on:
   workflow_dispatch:

diff --git a/.github/workflows/cd-vercel.yml b/.github/workflows/cd-vercel.yml
@@ -19,7 +19,8 @@ jobs:
     - name: Install dependencies
       run: npm install
 
-    - uses: amondnet/vercel-action@v25
+    - name: Deploy to Vercel
+      uses: amondnet/vercel-action@v25
       with:
         vercel-token: ${{ secrets.VERCEL_TOKEN }}
         vercel-org-id: ${{ secrets.VERCEL_ORG_ID }}

diff --git a/.github/workflows/ci-curl-tests.yml b/.github/workflows/ci-curl-tests.yml
@@ -13,16 +13,6 @@ on:
         required: false
         default: false
         type: boolean
-      Vercel:
-        description: 'Deploy to Vercel'
-        required: false
-        default: false
-        type: boolean
-  # push:
-  #   branches:
-  #     - main
-  # schedule:
-  # - cron: '0 12 * * *'
 
 jobs:
   build:
@@ -563,19 +553,4 @@ jobs:
           docker push lifailon/torapi:latest
         else
           echo Skip
-        fi
-
-    - name: Deploy to Vercel
-      run: |
-        if [ "${{ github.event.inputs.Vercel }}" = "true" ]; then
-          npm install
-          echo
-          npm install --global vercel@latest
-          echo
-          echo Vercel version:
-          vercel --version
-          echo
-          vercel deploy --prod --token=${{ secrets.VERCEL_TOKEN }} --yes
-        else
-          echo Skip
         fi
diff --git a/.github/workflows/ci-postman-tests.yml b/.github/workflows/ci-postman-tests.yml
@@ -37,11 +37,16 @@ on:
           - 'not'
           - 'GitHub'
           - 'DockerHub'
-      # Docker:
-      #   description: 'Build docker image from GitHub'
-      #   required: false
-      #   default: false
-      #   type: boolean
+      DeployDocker:
+        description: 'Deploy to Docker Hub'
+        required: false
+        default: false
+        type: boolean
+      DeployVercel:
+        description: 'Deploy to Vercel'
+        required: false
+        default: false
+        type: boolean
 
 jobs:
   build:
@@ -137,4 +142,30 @@ jobs:
       uses: mikepenz/action-junit-report@v4
       if: success() || failure()
       with:
-        report_paths: '**/postman-results.xml'
+        report_paths: '**/postman-results.xml'
+
+    - name: Login to Docker Hub
+      if: ${{ github.event.inputs.DeployDocker == 'true' && success() }}
+      uses: docker/login-action@v3
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+
+    - name: Deploy to Docker Hub
+      if: ${{ github.event.inputs.DeployDocker == 'true' && success() }}
+      run: |
+        docker build -t lifailon/torapi:latest .
+        docker push lifailon/torapi:latest
+
+    - name: Install dependencies for deploy to Vercel
+      if: ${{ github.event.inputs.DeployVercel == 'true' && success() }}
+      run: npm install
+
+    - name: Deploy to Vercel
+      if: ${{ github.event.inputs.DeployVercel == 'true' && success() }}
+      uses: amondnet/vercel-action@v25
+      with:
+        vercel-token: ${{ secrets.VERCEL_TOKEN }}
+        vercel-org-id: ${{ secrets.VERCEL_ORG_ID }}
+        vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID }}
+        vercel-args: '--prod'
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@
     <a href="https://github.com/Lifailon/TorAPI/actions"><img title="Actions" src="https://img.shields.io/badge/Actions-%230075A8.svg?style=for-the-badge&logo=githubactions&logoColor=white"></a>
     <br>
     <br>
-    <a href="https://github.com/Lifailon/TorAPI/actions"><img title="Actions"src="https://img.shields.io/github/actions/workflow/status/Lifailon/TorAPI/ci-docker.yml?logo=GitHub-Actions&label=CI+Docker"></a>
+    <a href="https://github.com/Lifailon/TorAPI/actions"><img title="Actions"src="https://img.shields.io/github/actions/workflow/status/Lifailon/TorAPI/cd-docker-hub.yml?logo=GitHub-Actions&label=CI+Docker+Hub"></a>
     <a href="https://github.com/Lifailon/TorAPI/actions"><img title="Actions"src="https://img.shields.io/github/actions/workflow/status/Lifailon/TorAPI/cd-vercel.yml?logo=Vercel&label=CD+Vercel"></a>
     <a href="https://github.com/Lifailon/TorAPI/actions"><img title="Actions"src="https://img.shields.io/github/actions/workflow/status/Lifailon/TorAPI/ci-postman-tests.yml?logo=Postman&label=Postman+Tests"></a>
     <a href="https://app.swaggerhub.com/apis-docs/Lifailon/TorAPI"><img title="Swagger"src="https://img.shields.io/swagger/valid/3.0?specUrl=https%3A%2F%2Fraw.githubusercontent.com%2FLifailon%2FTorAPI%2Fmain%2Fswagger%2Fswagger.yaml&logo=Swagger&label=Swagger"></a>
@@ -241,25 +241,25 @@ newman run postman-tests.json \
     --env-var "queryAllPage=test" \
     --env-var "baseUrl=http://localhost:8443"
 ...
-┌─────────────────────────┬────────────────────┬───────────────────┐
-│                         │           executed │            failed │
-├─────────────────────────┼────────────────────┼───────────────────┤
-│              iterations │                  1 │                 0 │
-├─────────────────────────┼────────────────────┼───────────────────┤
-│                requests │                 29 │                 0 │
-├─────────────────────────┼────────────────────┼───────────────────┤
-│            test-scripts │                 75 │                 0 │
-├─────────────────────────┼────────────────────┼───────────────────┤
-│      prerequest-scripts │                 62 │                 0 │
-├─────────────────────────┼────────────────────┼───────────────────┤
-│              assertions │                133 │                 0 │
-├─────────────────────────┴────────────────────┴───────────────────┤
-│ total run duration: 29.4s                                        │
-├──────────────────────────────────────────────────────────────────┤
-│ total data received: 1.6MB (approx)                              │
-├──────────────────────────────────────────────────────────────────┤
-│ average response time: 969ms [min: 3ms, max: 5.8s, s.d.: 1372ms] │
-└──────────────────────────────────────────────────────────────────┘
+┌─────────────────────────┬────────────────────┬────────────────────┐
+│                         │           executed │             failed │
+├─────────────────────────┼────────────────────┼────────────────────┤
+│              iterations │                  1 │                  0 │
+├─────────────────────────┼────────────────────┼────────────────────┤
+│                requests │                 29 │                  0 │
+├─────────────────────────┼────────────────────┼────────────────────┤
+│            test-scripts │                 75 │                  0 │
+├─────────────────────────┼────────────────────┼────────────────────┤
+│      prerequest-scripts │                 62 │                  0 │
+├─────────────────────────┼────────────────────┼────────────────────┤
+│              assertions │                135 │                  0 │
+├─────────────────────────┴────────────────────┴────────────────────┤
+│ total run duration: 30.6s                                         │
+├───────────────────────────────────────────────────────────────────┤
+│ total data received: 1.58MB (approx)                              │
+├───────────────────────────────────────────────────────────────────┤
+│ average response time: 1012ms [min: 2ms, max: 6.5s, s.d.: 1507ms] │
+└───────────────────────────────────────────────────────────────────┘
 ```
 
 ---

diff --git a/README_RU.md b/README_RU.md
@@ -13,7 +13,7 @@
     <a href="https://github.com/Lifailon/TorAPI/actions"><img title="Actions" src="https://img.shields.io/badge/Actions-%230075A8.svg?style=for-the-badge&logo=githubactions&logoColor=white"></a>
     <br>
     <br>
-    <a href="https://github.com/Lifailon/TorAPI/actions"><img title="Actions"src="https://img.shields.io/github/actions/workflow/status/Lifailon/TorAPI/ci-docker.yml?logo=GitHub-Actions&label=CI+Docker"></a>
+    <a href="https://github.com/Lifailon/TorAPI/actions"><img title="Actions"src="https://img.shields.io/github/actions/workflow/status/Lifailon/TorAPI/cd-docker-hub.yml?logo=GitHub-Actions&label=CI+Docker+Hub"></a>
     <a href="https://github.com/Lifailon/TorAPI/actions"><img title="Actions"src="https://img.shields.io/github/actions/workflow/status/Lifailon/TorAPI/cd-vercel.yml?logo=Vercel&label=CD+Vercel"></a>
     <a href="https://github.com/Lifailon/TorAPI/actions"><img title="Actions"src="https://img.shields.io/github/actions/workflow/status/Lifailon/TorAPI/ci-postman-tests.yml?logo=Postman&label=Postman+Tests"></a>
     <a href="https://app.swaggerhub.com/apis-docs/Lifailon/TorAPI"><img title="Swagger"src="https://img.shields.io/swagger/valid/3.0?specUrl=https%3A%2F%2Fraw.githubusercontent.com%2FLifailon%2FTorAPI%2Fmain%2Fswagger%2Fswagger.yaml&logo=Swagger&label=Swagger"></a>
@@ -241,25 +241,25 @@ newman run postman-tests.json \
     --env-var "queryAllPage=test" \
     --env-var "baseUrl=http://localhost:8443"
 ...
-┌─────────────────────────┬────────────────────┬───────────────────┐
-│                         │           executed │            failed │
-├─────────────────────────┼────────────────────┼───────────────────┤
-│              iterations │                  1 │                 0 │
-├─────────────────────────┼────────────────────┼───────────────────┤
-│                requests │                 29 │                 0 │
-├─────────────────────────┼────────────────────┼───────────────────┤
-│            test-scripts │                 75 │                 0 │
-├─────────────────────────┼────────────────────┼───────────────────┤
-│      prerequest-scripts │                 62 │                 0 │
-├─────────────────────────┼────────────────────┼───────────────────┤
-│              assertions │                133 │                 0 │
-├─────────────────────────┴────────────────────┴───────────────────┤
-│ total run duration: 29.4s                                        │
-├──────────────────────────────────────────────────────────────────┤
-│ total data received: 1.6MB (approx)                              │
-├──────────────────────────────────────────────────────────────────┤
-│ average response time: 969ms [min: 3ms, max: 5.8s, s.d.: 1372ms] │
-└──────────────────────────────────────────────────────────────────┘
+┌─────────────────────────┬────────────────────┬────────────────────┐
+│                         │           executed │             failed │
+├─────────────────────────┼────────────────────┼────────────────────┤
+│              iterations │                  1 │                  0 │
+├─────────────────────────┼────────────────────┼────────────────────┤
+│                requests │                 29 │                  0 │
+├─────────────────────────┼────────────────────┼────────────────────┤
+│            test-scripts │                 75 │                  0 │
+├─────────────────────────┼────────────────────┼────────────────────┤
+│      prerequest-scripts │                 62 │                  0 │
+├─────────────────────────┼────────────────────┼────────────────────┤
+│              assertions │                135 │                  0 │
+├─────────────────────────┴────────────────────┴────────────────────┤
+│ total run duration: 30.6s                                         │
+├───────────────────────────────────────────────────────────────────┤
+│ total data received: 1.58MB (approx)                              │
+├───────────────────────────────────────────────────────────────────┤
+│ average response time: 1012ms [min: 2ms, max: 6.5s, s.d.: 1507ms] │
+└───────────────────────────────────────────────────────────────────┘
 ```
 
 ---