diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index ad1bc0e1dff..44646d54a0d 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -57,84 +57,12 @@ jobs: REDIS_HOST_PASSWORD: ${{secrets.REDIS_HOST_PASSWORD}} PRIVATE_API_ADDR: ${{secrets.PRIVATE_API_ADDR}} PRIVATE_API_AUTH: ${{secrets.PRIVATE_API_AUTH}} - HIVESIGNER_CLIENT_SECRET: ${{secrets.HIVESIGNER_CLIENT_SECRET}} + HIVESIGNER_CLIENT_SECRET: ${{secrets.HIVESIGNER_SECRET}} SEARCH_API_ADDR: ${{secrets.SEARCH_API_ADDR}} SEARCH_API_SECRET: ${{secrets.SEARCH_API_SECRET}} API_PORT: ${{secrets.API_PORT}} with: - host: ${{ secrets.SSH_HOST_EU }} - username: ${{ secrets.SSH_USERNAME }} - key: ${{ secrets.SSH_KEY }} - port: ${{ secrets.SSH_PORT }} - envs: USE_PRIVATE,REDIS_HOST_PASSWORD,PRIVATE_API_ADDR,PRIVATE_API_AUTH,HIVESIGNER_CLIENT_SECRET,SEARCH_API_ADDR,SEARCH_API_SECRET,API_PORT - script: | - export USE_PRIVATE=$USE_PRIVATE - export REDIS_HOST_PASSWORD=$REDIS_HOST_PASSWORD - export PRIVATE_API_ADDR=$PRIVATE_API_ADDR - export PRIVATE_API_AUTH=$PRIVATE_API_AUTH - export HIVESIGNER_CLIENT_SECRET=$HIVESIGNER_CLIENT_SECRET - export SEARCH_API_ADDR=$SEARCH_API_ADDR - export SEARCH_API_SECRET=$SEARCH_API_SECRET - export API_PORT=$API_PORT - cd ~/vision-production - git pull origin master - docker pull ecency/vision:latest - docker pull ecency/api:latest - docker-compose -f docker-compose.production.yml up -d - - deploy-US: - needs: build - runs-on: ubuntu-latest - steps: - - name: SSH and deploy node app - uses: appleboy/ssh-action@master - env: - USE_PRIVATE: ${{secrets.USE_PRIVATE}} - REDIS_HOST_PASSWORD: ${{secrets.REDIS_HOST_PASSWORD}} - PRIVATE_API_ADDR: ${{secrets.PRIVATE_API_ADDR}} - PRIVATE_API_AUTH: ${{secrets.PRIVATE_API_AUTH}} - HIVESIGNER_CLIENT_SECRET: ${{secrets.HIVESIGNER_CLIENT_SECRET}} - SEARCH_API_ADDR: ${{secrets.SEARCH_API_ADDR}} - SEARCH_API_SECRET: ${{secrets.SEARCH_API_SECRET}} - API_PORT: ${{secrets.API_PORT}} - with: - host: ${{ secrets.SSH_HOST_US }} - username: ${{ secrets.SSH_USERNAME }} - key: ${{ secrets.SSH_KEY }} - port: ${{ secrets.SSH_PORT }} - envs: USE_PRIVATE,REDIS_HOST_PASSWORD,PRIVATE_API_ADDR,PRIVATE_API_AUTH,HIVESIGNER_CLIENT_SECRET,SEARCH_API_ADDR,SEARCH_API_SECRET,API_PORT - script: | - export USE_PRIVATE=$USE_PRIVATE - export REDIS_HOST_PASSWORD=$REDIS_HOST_PASSWORD - export PRIVATE_API_ADDR=$PRIVATE_API_ADDR - export PRIVATE_API_AUTH=$PRIVATE_API_AUTH - export HIVESIGNER_CLIENT_SECRET=$HIVESIGNER_CLIENT_SECRET - export SEARCH_API_ADDR=$SEARCH_API_ADDR - export SEARCH_API_SECRET=$SEARCH_API_SECRET - export API_PORT=$API_PORT - cd ~/vision-production - git pull origin master - docker pull ecency/vision:latest - docker pull ecency/api:latest - docker-compose -f docker-compose.production.yml up -d - - deploy-SG: - needs: build - runs-on: ubuntu-latest - steps: - - name: SSH and deploy node app - uses: appleboy/ssh-action@master - env: - USE_PRIVATE: ${{secrets.USE_PRIVATE}} - REDIS_HOST_PASSWORD: ${{secrets.REDIS_HOST_PASSWORD}} - PRIVATE_API_ADDR: ${{secrets.PRIVATE_API_ADDR}} - PRIVATE_API_AUTH: ${{secrets.PRIVATE_API_AUTH}} - HIVESIGNER_CLIENT_SECRET: ${{secrets.HIVESIGNER_CLIENT_SECRET}} - SEARCH_API_ADDR: ${{secrets.SEARCH_API_ADDR}} - SEARCH_API_SECRET: ${{secrets.SEARCH_API_SECRET}} - API_PORT: ${{secrets.API_PORT}} - with: - host: ${{ secrets.SSH_HOST_SG }} + host: ${{ secrets.SSH_HOST_EU_OLD }} username: ${{ secrets.SSH_USERNAME }} key: ${{ secrets.SSH_KEY }} port: ${{ secrets.SSH_PORT }} diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 960f745b375..98c6daca845 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -45,38 +45,3 @@ jobs: - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} - - deploy: - needs: build - runs-on: ubuntu-latest - steps: - - name: SSH and deploy node app - uses: appleboy/ssh-action@master - env: - USE_PRIVATE: ${{secrets.USE_PRIVATE}} - REDIS_HOST_PASSWORD: ${{secrets.REDIS_HOST_PASSWORD}} - PRIVATE_API_ADDR: ${{secrets.PRIVATE_API_ADDR}} - PRIVATE_API_AUTH: ${{secrets.PRIVATE_API_AUTH}} - HIVESIGNER_CLIENT_SECRET: ${{secrets.HIVESIGNER_CLIENT_SECRET}} - SEARCH_API_ADDR: ${{secrets.SEARCH_API_ADDR}} - SEARCH_API_SECRET: ${{secrets.SEARCH_API_SECRET}} - API_PORT: ${{secrets.API_PORT}} - with: - host: ${{ secrets.SSH_STAGING_HOST }} - username: ${{ secrets.SSH_USERNAME }} - key: ${{ secrets.SSH_KEY }} - port: ${{ secrets.SSH_PORT }} - envs: USE_PRIVATE,REDIS_HOST_PASSWORD,PRIVATE_API_ADDR,PRIVATE_API_AUTH,HIVESIGNER_CLIENT_SECRET,SEARCH_API_ADDR,SEARCH_API_SECRET,API_PORT - script: | - export USE_PRIVATE=$USE_PRIVATE - export REDIS_HOST_PASSWORD=$REDIS_HOST_PASSWORD - export PRIVATE_API_ADDR=$PRIVATE_API_ADDR - export PRIVATE_API_AUTH=$PRIVATE_API_AUTH - export HIVESIGNER_CLIENT_SECRET=$HIVESIGNER_CLIENT_SECRET - export SEARCH_API_ADDR=$SEARCH_API_ADDR - export SEARCH_API_SECRET=$SEARCH_API_SECRET - export API_PORT=$API_PORT - cd ~/vision-staging - git pull origin development - docker pull ecency/vision:development - docker-compose up -d