diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f49d581..1f646ca 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -3,47 +3,21 @@ on: branches: - main - -#jobs: -# build-and-push: -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v2 -# - name: Build amd64 image -# run: | -# docker build --platform linux/amd64 -t registry.hub.docker.com/xiaomoinfo/wechatgpt-amd64:latest . -# - name: Push amd64 image -# run: | -# docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD" -# docker images -# docker push registry.hub.docker.com/xiaomoinfo/wechatgpt-amd64:latest -# - name: Build apple silicon image -# run: | -# docker build -t registry.hub.docker.com/xiaomoinfo/wechatgpt:latest . -# - name: Push apple silicon image -# run: | -# docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD" -# docker images -# docker push registry.hub.docker.com/xiaomoinfo/wechatgpt:latest - - jobs: build-and-push: runs-on: ubuntu-latest steps: -# - name: Set up QEMU -# uses: docker/setup-qemu-action@v2 -# - name: Set up Docker Buildx -# uses: docker/setup-buildx-action@v2 -# - name: Login to Docker Hub -# uses: docker/login-action@v2 -# with: -# username: ${{ secrets.DOCKER_USERNAME }} -# password: ${{ secrets.DOCKER_PASSWORD }} + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - name: Login to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} - name: Build and push uses: docker/build-push-action@v3 with: - manifest: ./manifest.yml + push: true platforms: linux/amd64,linux/arm64 - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} diff --git a/.github/workflows/manifest.yml b/.github/workflows/manifest.yml deleted file mode 100644 index 60029ba..0000000 --- a/.github/workflows/manifest.yml +++ /dev/null @@ -1,9 +0,0 @@ -image: wechatgpt -architectures: - - amd64 - - arm64 - - arm -tags: - - latest - - amd64-latest - - arm64-latest \ No newline at end of file