Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into front
Browse files Browse the repository at this point in the history
# Conflicts:
#	web/auto-imports.d.ts
#	web/src/components/Video/Comments.vue
#	web/src/components/Video/VideoPlay.vue
#	web/src/utils/request.ts
  • Loading branch information
liuxianloveqiqi committed Nov 7, 2023
2 parents 34eee83 + f8f7ec3 commit fa002f8
Show file tree
Hide file tree
Showing 355 changed files with 27,265 additions and 8,202 deletions.
88 changes: 88 additions & 0 deletions .github/workflows/chat-docker-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
name: Docker Build and Push Chat
on:
workflow_dispatch:
inputs:
parameter_name:
description: 'go'
required: true
jobs:
# chat-rpc
build-and-push-chat-rpc:
runs-on: ubuntu-latest
steps:
- name: Checkout the repository
uses: actions/checkout@v2

- name: Login to Docker Hub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Set up QEMU
uses: docker/setup-qemu-action@v1

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Create and push chat-rpc Docker image
uses: docker/build-push-action@v2
with:
context: .
file: ./server/chat/rpc/Dockerfile
push: true
tags: ${{ secrets.DOCKERHUB_IMAGE }}chat-rpc:latest
platforms: linux/amd64,linux/arm64 # 构建多个架构的镜像
- name: executing remote ssh commands using password
uses: appleboy/[email protected]
with:
host: ${{ secrets.HOST }}
username: ${{ secrets.USERNAME }}
password: ${{ secrets.PASSWORD }}
port: ${{ secrets.PORT }}
script: |
cd /home/douniu
docker-compose stop chat-rpc
docker-compose rm -f chat-rpc
docker image rm ${{ secrets.DOCKERHUB_IMAGE }}chat-rpc:latest
docker-compose -f docker-compose.yaml up -d chat-rpc
# chat-api
build-and-push-chat-api:
runs-on: ubuntu-latest
steps:
- name: Checkout the repository
uses: actions/checkout@v2

- name: Login to Docker Hub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Set up QEMU
uses: docker/setup-qemu-action@v1

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Create and push chat-api Docker image
uses: docker/build-push-action@v2
with:
context: .
file: ./server/chat/api/Dockerfile
push: true
tags: ${{ secrets.DOCKERHUB_IMAGE }}chat-api:latest
platforms: linux/amd64,linux/arm64 # 构建多个架构的镜像
- name: executing remote ssh commands using password
uses: appleboy/[email protected]
with:
host: ${{ secrets.HOST }}
username: ${{ secrets.USERNAME }}
password: ${{ secrets.PASSWORD }}
port: ${{ secrets.PORT }}
script: |
cd /home/douniu
docker-compose stop chat-api
docker-compose rm -f chat-api
docker image rm ${{ secrets.DOCKERHUB_IMAGE }}chat-api:latest
docker-compose -f docker-compose.yaml up -d chat-api
89 changes: 89 additions & 0 deletions .github/workflows/comment-docker-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
name: Docker Build and Push Comment
on:
workflow_dispatch:
inputs:
parameter_name:
description: 'go'
required: true
jobs:

# comment-rpc
build-and-push-comment-rpc:
runs-on: ubuntu-latest
steps:
- name: Checkout the repository
uses: actions/checkout@v2

- name: Login to Docker Hub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Set up QEMU
uses: docker/setup-qemu-action@v1

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Create and push comment-rpc Docker image
uses: docker/build-push-action@v2
with:
context: .
file: ./server/comment/rpc/Dockerfile
push: true
tags: ${{ secrets.DOCKERHUB_IMAGE }}comment-rpc:latest
platforms: linux/amd64,linux/arm64 # 构建多个架构的镜像
- name: executing remote ssh commands using password
uses: appleboy/[email protected]
with:
host: ${{ secrets.HOST }}
username: ${{ secrets.USERNAME }}
password: ${{ secrets.PASSWORD }}
port: ${{ secrets.PORT }}
script: |
cd /home/douniu
docker-compose stop comment-rpc
docker-compose rm -f comment-rpc
docker image rm ${{ secrets.DOCKERHUB_IMAGE }}comment-rpc:latest
docker-compose -f docker-compose.yaml up -d comment-rpc
# comment-api
build-and-push-comment-api:
runs-on: ubuntu-latest
steps:
- name: Checkout the repository
uses: actions/checkout@v2

- name: Login to Docker Hub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Set up QEMU
uses: docker/setup-qemu-action@v1

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Create and push comment-api Docker image
uses: docker/build-push-action@v2
with:
context: .
file: ./server/comment/api/Dockerfile
push: true
tags: ${{ secrets.DOCKERHUB_IMAGE }}comment-api:latest
platforms: linux/amd64,linux/arm64 # 构建多个架构的镜像
- name: executing remote ssh commands using password
uses: appleboy/[email protected]
with:
host: ${{ secrets.HOST }}
username: ${{ secrets.USERNAME }}
password: ${{ secrets.PASSWORD }}
port: ${{ secrets.PORT }}
script: |
cd /home/douniu
docker-compose stop comment-api
docker-compose rm -f comment-api
docker image rm ${{ secrets.DOCKERHUB_IMAGE }}comment-api:latest
docker-compose -f docker-compose.yaml up -d comment-api
21 changes: 21 additions & 0 deletions .github/workflows/dev-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: dev-check

on:
push:
branches: [ "dev" ]


jobs:

build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: '1.20'

- name: Build
run: go build -v ./...
134 changes: 134 additions & 0 deletions .github/workflows/favorite-docker-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
name: Docker Build and Push Favorite
on:
workflow_dispatch:
inputs:
parameter_name:
description: 'go'
required: true
#on:
# push:
# branches:
# - dev
jobs:
# favorite-api
build-and-push-favorite-api:
runs-on: ubuntu-latest
steps:
- name: Checkout the repository
uses: actions/checkout@v2

- name: Login to Docker Hub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Set up QEMU
uses: docker/setup-qemu-action@v1

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Create and push favorite-api Docker image
uses: docker/build-push-action@v2
with:
context: .
file: ./server/favorite/api/Dockerfile
push: true
tags: ${{ secrets.DOCKERHUB_IMAGE }}favorite-api:latest
platforms: linux/amd64,linux/arm64 # 构建多个架构的镜像
- name: executing remote ssh commands using password
uses: appleboy/[email protected]
with:
host: ${{ secrets.HOST }}
username: ${{ secrets.USERNAME }}
password: ${{ secrets.PASSWORD }}
port: ${{ secrets.PORT }}
script: |
cd /home/douniu
docker-compose stop favorite-api
docker-compose rm -f favorite-api
docker image rm ${{ secrets.DOCKERHUB_IMAGE }}favorite-api:latest
docker-compose -f docker-compose.yaml up -d favorite-api
# favorite-rpc
build-and-push-favorite-rpc:
runs-on: ubuntu-latest
steps:
- name: Checkout the repository
uses: actions/checkout@v2

- name: Login to Docker Hub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Set up QEMU
uses: docker/setup-qemu-action@v1

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Create and push favorite-rpc Docker image
uses: docker/build-push-action@v2
with:
context: .
file: ./server/favorite/rpc/Dockerfile
push: true
tags: ${{ secrets.DOCKERHUB_IMAGE }}favorite-rpc:latest
platforms: linux/amd64,linux/arm64 # 构建多个架构的镜像
- name: executing remote ssh commands using password
uses: appleboy/[email protected]
with:
host: ${{ secrets.HOST }}
username: ${{ secrets.USERNAME }}
password: ${{ secrets.PASSWORD }}
port: ${{ secrets.PORT }}
script: |
cd /home/douniu
docker-compose stop favorite-rpc
docker-compose rm -f favorite-rpc
docker image rm ${{ secrets.DOCKERHUB_IMAGE }}favorite-rpc:latest
docker-compose -f docker-compose.yaml up -d favorite-rpc
# favorite-mq
build-and-push-favorite-mq:
runs-on: ubuntu-latest
steps:
- name: Checkout the repository
uses: actions/checkout@v2

- name: Login to Docker Hub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Set up QEMU
uses: docker/setup-qemu-action@v1

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Create and push favorite-rpc Docker image
uses: docker/build-push-action@v2
with:
context: .
file: ./server/favorite/mq/Dockerfile
push: true
tags: ${{ secrets.DOCKERHUB_IMAGE }}favorite-mq:latest
platforms: linux/amd64,linux/arm64 # 构建多个架构的镜像
- name: executing remote ssh commands using password
uses: appleboy/[email protected]
with:
host: ${{ secrets.HOST }}
username: ${{ secrets.USERNAME }}
password: ${{ secrets.PASSWORD }}
port: ${{ secrets.PORT }}
script: |
cd /home/douniu
docker-compose stop favorite-mq
docker-compose rm -f favorite-mq
docker image rm ${{ secrets.DOCKERHUB_IMAGE }}favorite-mq:latest
docker-compose -f docker-compose.yaml up -d favorite-mq
25 changes: 25 additions & 0 deletions .github/workflows/go-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# This workflow will build a golang project
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-go

name: Go-Test

on:
push:
branches: [ "dev" ]
pull_request:
branches: [ "dev" ]

jobs:

build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: '1.20'

- name: Test
run: go test -v ./test
Loading

0 comments on commit fa002f8

Please sign in to comment.