diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index d948b801..ce9716dc 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -4,11 +4,10 @@ name: Build & Deploy on: push: branches: - - 'dev' - - 'main' - - 'master' + - "main" + - "master" tags: - - 'v*.*.*' + - "v*.*.*" env: IMAGE_NAME: rss3/xlog @@ -22,8 +21,7 @@ jobs: outputs: version: ${{ steps.meta.outputs.version }} steps: - - - name: Checkout + - name: Checkout uses: actions/checkout@v2 - name: docker meta id: meta @@ -32,11 +30,9 @@ jobs: images: ${{ env.IMAGE_NAME }} tags: | type=sha - - - name: Set up Docker Buildx + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - - name: Login to DockerHub + - name: Login to DockerHub if: github.event_name != 'pull_request' uses: docker/login-action@v1 with: @@ -51,28 +47,28 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} -# deploy-dev: -# runs-on: ubuntu-latest -# needs: build -# steps: -# - name: Checkout -# uses: actions/checkout@v2 -# - name: Set K8s context -# uses: aliyun/ack-set-context@v1 -# with: -# access-key-id: "${{ secrets.ACCESS_KEY_ID }}" -# access-key-secret: "${{ secrets.ACCESS_KEY_SECRET }}" -# cluster-id: "${{ env.DEV_ACK_CLUSTER_ID }}" -# - run: | -# wget https://github.com/mikefarah/yq/releases/download/v4.25.1/yq_linux_amd64.tar.gz -O - | tar xz && mv yq_linux_amd64 /usr/local/bin/yq -# curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.22.10/bin/linux/amd64/kubectl && chmod +x kubectl && mv kubectl /usr/local/bin/kubectl -# - uses: sljeff/secrets2env@main -# with: -# secrets-json: ${{ toJson(secrets) }} -# - env: -# IMAGE_TAG_RELEASE: ${{ env.IMAGE_NAME }}:${{ needs.build.outputs.version }} -# run: | -# sh apply.sh deploy/dev/* + # deploy-dev: + # runs-on: ubuntu-latest + # needs: build + # steps: + # - name: Checkout + # uses: actions/checkout@v2 + # - name: Set K8s context + # uses: aliyun/ack-set-context@v1 + # with: + # access-key-id: "${{ secrets.ACCESS_KEY_ID }}" + # access-key-secret: "${{ secrets.ACCESS_KEY_SECRET }}" + # cluster-id: "${{ env.DEV_ACK_CLUSTER_ID }}" + # - run: | + # wget https://github.com/mikefarah/yq/releases/download/v4.25.1/yq_linux_amd64.tar.gz -O - | tar xz && mv yq_linux_amd64 /usr/local/bin/yq + # curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.22.10/bin/linux/amd64/kubectl && chmod +x kubectl && mv kubectl /usr/local/bin/kubectl + # - uses: sljeff/secrets2env@main + # with: + # secrets-json: ${{ toJson(secrets) }} + # - env: + # IMAGE_TAG_RELEASE: ${{ env.IMAGE_NAME }}:${{ needs.build.outputs.version }} + # run: | + # sh apply.sh deploy/dev/* deploy-prod: # if: startsWith(github.ref, 'refs/tags/v')