From 0b35f60c7c9bfcda712bc0c04a035711f4878250 Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong(cubxxw-openim)" <3293172751nss@gmail.com> Date: Wed, 26 Jul 2023 16:26:40 +0800 Subject: [PATCH] feat: set pull request Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> --- .github/workflows/build-docker-image.yml | 107 ++++++++++++++++++----- .github/workflows/pull-request.yml | 30 +++++-- 2 files changed, 108 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml index 31e0a5b65..ff58d8d8f 100644 --- a/.github/workflows/build-docker-image.yml +++ b/.github/workflows/build-docker-image.yml @@ -12,38 +12,99 @@ # See the License for the specific language governing permissions and # limitations under the License. -name: OpenIM Build Docker Images +name: Publish Docker image + on: push: + branches: + - main tags: - v* + workflow_dispatch: + jobs: build: runs-on: ubuntu-latest - strategy: - matrix: - bin: - - openim-server steps: - - name: Checkout + - name: Check out the repo uses: actions/checkout@v3 - - name: Setup Docker Buildx - uses: docker/setup-buildx-action@v2 - - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + + - name: Log in to Docker Hub + uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Docker metadata - id: metadata - uses: docker/metadata-action@v4 + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 with: - images: ghcr.io/${{ github.repository_owner }}/openim-${{ matrix.bin }} - - name: Build and release Docker images - uses: docker/build-push-action@v3 + images: openim/openim-server + tags: latest + + - name: Build and push Docker image + uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc with: - platforms: linux/386,linux/amd64,linux/arm64/v8 - target: ${{ matrix.bin }} - tags: ${{ steps.metadata.outputs.tags }} - push: true \ No newline at end of file + context: . + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + + + - name: Log in to AliYun Docker Hub + uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 + with: + registry: registry.cn-hangzhou.aliyuncs.com + username: ${{ secrets.ALIREGISTRY_USERNAME }} + password: ${{ secrets.ALIREGISTRY_TOKEN }} + + - name: Extract metadata (tags, labels) for Docker + id: meta2 + uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 + with: + images: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server + tags: latest + + - name: Build and push Docker image + uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc + with: + context: . + push: true + tags: ${{ steps.meta2.outputs.tags }} + labels: ${{ steps.meta2.outputs.labels }} + +# name: OpenIM Build Docker Images +# on: +# push: +# tags: +# - v* +# jobs: +# build: +# runs-on: ubuntu-latest +# strategy: +# matrix: +# bin: +# - openim-server +# steps: +# - name: Checkout +# uses: actions/checkout@v3 +# - name: Setup Docker Buildx +# uses: docker/setup-buildx-action@v2 +# - name: Login to GitHub Container Registry +# uses: docker/login-action@v2 +# with: +# registry: ghcr.io +# username: ${{ github.repository_owner }} +# password: ${{ secrets.GITHUB_TOKEN }} +# - name: Docker metadata +# id: metadata +# uses: docker/metadata-action@v4 +# with: +# images: ghcr.io/${{ github.repository_owner }}/openim-${{ matrix.bin }} +# - name: Build and release Docker images +# uses: docker/build-push-action@v3 +# with: +# platforms: linux/386,linux/amd64,linux/arm64/v8 +# target: ${{ matrix.bin }} +# tags: ${{ steps.metadata.outputs.tags }} +# push: true \ No newline at end of file diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index c6c577817..5c42877c0 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -35,7 +35,18 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - name: checkout + uses: actions/checkout@v3 + with: + token: ${{ secrets.BOT_GITHUB_TOKEN }} + + - name: Get League branch Patch + run: | + git config user.name 'openimbot' + git config user.email 'openimsdk@qq.com' + git checkout -b cicd/patch-${{ steps.patch.outputs.patch }} + git commit -am "docs: modify tracked file during workflow" + - uses: actions/setup-node@v3 - name: Setup Go uses: actions/setup-go@v2 @@ -82,12 +93,17 @@ jobs: sudo make add-copyright echo "OpenIM verify successfully" continue-on-error: true - + + - name: Commit code + run: | + git add . + git commit -a -s -m "cicd: bump League Patch to cicd/patch-${{ steps.patch.outputs.patch }}" + - name: Create Pull Request - uses: peter-evans/create-pull-request@v5.0.0 + uses: peter-evans/create-pull-request@v5 with: - commit-message: Bump League Patch to ${{ steps.patch.outputs.patch }} - title: Bump League Patch to ${{ steps.patch.outputs.patch }} + commit-message: "cicd: bump League Patch to cicd/patch-${{ steps.patch.outputs.patch }}" + title: Bump League Patch to cicd/patch-${{ steps.patch.outputs.patch }} body: | Review criteria: @@ -95,5 +111,7 @@ jobs: This is an automated PR. [workflow](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/.github/workflows/pull-request.yml). + base: main branch: cicd/patch-${{ steps.patch.outputs.patch }} - labels: kind/documentation, area/test, ok-to-test \ No newline at end of file + labels: kind/documentation, area/test, ok-to-test + token: ${{ secrets.BOT_GITHUB_TOKEN }} \ No newline at end of file