update release error (labring#3132)

* refactor(main): fix release error Signed-off-by: cuisongliu <[email protected]> * refactor(main): fix release error Signed-off-by: cuisongliu <[email protected]> --------- Signed-off-by: cuisongliu <[email protected]>
sealos-ci-robot · May 25, 2023 · ac62c85 · ac62c85
1 parent f010bc2
commit ac62c85
Show file tree

Hide file tree

Showing 6 changed files with 94 additions and 72 deletions.
diff --git a/.github/workflows/cloud.yml b/.github/workflows/cloud.yml
@@ -1,21 +1,17 @@
 name: Build Cloud Cluster image
 
 on:
- workflow_call:
- inputs:
- release:
- required: false
- type: boolean
- default: false
+ release:
+ types: [ published ]
  workflow_dispatch:
  inputs:
  push_image:
- description: 'Push images'
+ description: 'Push image'
  required: false
  type: boolean
  default: false
- release_tag:
- description: 'Release images'
+ push_image_tag:
+ description: 'Push image tag'
  default: 'dev'
  required: false
  type: string
@@ -44,7 +40,7 @@ jobs:
  uses: ./.github/workflows/import-save-sealos.yml
 
  build-cluster-image:
- if: ${{ (github.event_name == 'push') || (inputs.push_image == true) || (inputs.release == true) }}
+ if: ${{ (github.event_name == 'release') ||(github.event_name == 'push') || (inputs.push_image == true) }}
  needs:
  - save-sealos
  runs-on: ubuntu-latest
@@ -55,10 +51,18 @@ jobs:
  fetch-depth: 0
  - name: Expose git commit data
  uses: rlespinasse/git-commit-data-action@v1
+ - name: Check if tag
+ id: check_tag
+ run: |
+ if [[ "${{ github.ref }}" == refs/tags/* ]]; then
+ echo "isTag=true" >> "$GITHUB_OUTPUT"
+ else
+ echo "isTag=false" >> "$GITHUB_OUTPUT"
+ fi
  - name: Prepare
  id: prepare
  run: |
- bash ./scripts/resolve-tag-image.sh "${{ inputs.push_image }}" "${{ inputs.release }}" "${{ inputs.release_tag }}" 
+ bash ./scripts/resolve-tag-image.sh "${{ inputs.push_image }}" "${{ steps.check_tag.outputs.isTag }}" "${{ inputs.push_image_tag }}" 
  echo repo=ghcr.io/${{ github.repository_owner }}/sealos-cloud >> $GITHUB_OUTPUT
  - name: Download sealos
  uses: actions/download-artifact@v3

diff --git a/.github/workflows/controllers.yml b/.github/workflows/controllers.yml
@@ -1,21 +1,17 @@
 name: Build Controllers image
 
 on:
- workflow_call:
- inputs:
- release:
- required: false
- type: boolean
- default: false
+ create:
+ tags:
  workflow_dispatch:
  inputs:
  push_image:
- description: "Push images"
+ description: "Push image"
  required: false
  type: boolean
  default: false
- release_tag:
- description: "Release images"
+ push_image_tag:
+ description: "Push image tag"
  default: "dev"
  required: false
  type: string
@@ -119,11 +115,18 @@ jobs:
 
  - name: Expose git commit data
  uses: rlespinasse/git-commit-data-action@v1
-
+ - name: Check if tag
+ id: check_tag
+ run: |
+ if [[ "${{ github.ref }}" == refs/tags/* ]]; then
+ echo "isTag=true" >> "$GITHUB_OUTPUT"
+ else
+ echo "isTag=false" >> "$GITHUB_OUTPUT"
+ fi
  - name: Prepare
  id: prepare
  run: |
- bash ./scripts/resolve-tag-image.sh "${{ inputs.push_image }}" "${{ inputs.release }}" "${{ inputs.release_tag }}"
+ bash ./scripts/resolve-tag-image.sh "${{ inputs.push_image }}" "${{ steps.check_tag.outputs.isTag }}" "${{ inputs.push_image_tag }}"
  echo docker_repo=ghcr.io/${{ github.repository_owner }}/sealos-${{ matrix.module.name }}-controller >> $GITHUB_OUTPUT
 
  - # Add support for more platforms with QEMU (optional)
@@ -137,7 +140,7 @@ jobs:
 
  - name: Login to Docker Hub
  uses: docker/login-action@v2
- if: ${{ (github.event_name == 'push') || (inputs.push_image == true) || (inputs.release == true) }}
+ if: ${{ (github.event_name == 'push') ||(github.event_name == 'create') || (inputs.push_image == true)  }}
  with:
  registry: ghcr.io
  username: ${{ github.repository_owner }}
@@ -159,14 +162,14 @@ jobs:
  context: ./controllers/${{ matrix.module.path }}
  file: ./controllers/${{ matrix.module.path }}/Dockerfile
  # Push if it's a push event or if push_image is true
- push: ${{ (github.event_name == 'push') || (inputs.push_image == true) || (inputs.release == true) }}
+ push: ${{ (github.event_name == 'push')||(github.event_name == 'create') || (inputs.push_image == true) }}
  tags: ${{ steps.meta.outputs.tags }}
  labels: ${{ steps.meta.outputs.labels }}
  platforms: linux/amd64,linux/arm64
  save-sealos:
  uses: ./.github/workflows/import-save-sealos.yml
  build-cluster-image:
- if: ${{ (github.event_name == 'push') || (inputs.push_image == true) || (inputs.release == true) }}
+ if: ${{ (github.event_name == 'push') ||(github.event_name == 'create') || (inputs.push_image == true)  }}
  needs:
  - image-build
  - save-sealos
@@ -193,11 +196,18 @@ jobs:
 
  - name: Expose git commit data
  uses: rlespinasse/git-commit-data-action@v1
-
+ - name: Check if tag
+ id: check_tag
+ run: |
+ if [[ "${{ github.ref }}" == refs/tags/* ]]; then
+ echo "isTag=true" >> "$GITHUB_OUTPUT"
+ else
+ echo "isTag=false" >> "$GITHUB_OUTPUT"
+ fi
  - name: Prepare
  id: prepare
  run: |
- bash ./scripts/resolve-tag-image.sh "${{ inputs.push_image }}" "${{ inputs.release }}" "${{ inputs.release_tag }}"
+ bash ./scripts/resolve-tag-image.sh "${{ inputs.push_image }}" "${{ steps.check_tag.outputs.isTag }}" "${{ inputs.push_image_tag }}"
  echo old_docker_repo=ghcr.io/labring/sealos-${{ matrix.module.name }}-controller >> $GITHUB_OUTPUT
  echo new_docker_repo=ghcr.io/${{ github.repository_owner }}/sealos-${{ matrix.module.name }}-controller >> $GITHUB_OUTPUT
  echo cluster_repo=ghcr.io/${{ github.repository_owner }}/sealos-cloud-${{ matrix.module.name }}-controller >> $GITHUB_OUTPUT

diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
@@ -1,21 +1,17 @@
 name: Build Frontend Image
 
 on:
- workflow_call:
- inputs:
- release:
- required: false
- type: boolean
- default: false
+ create:
+ tags:
  workflow_dispatch:
  inputs:
  push_image:
- description: 'Push images'
+ description: 'Push image'
  required: false
  type: boolean
  default: false
- release_tag:
- description: 'Release images'
+ push_image_tag:
+ description: 'Push image tag'
  default: 'dev'
  required: false
  type: string
@@ -63,11 +59,18 @@ jobs:
 
  - name: Expose git commit data
  uses: rlespinasse/git-commit-data-action@v1
-
+ - name: Check if tag
+ id: check_tag
+ run: |
+ if [[ "${{ github.ref }}" == refs/tags/* ]]; then
+ echo "isTag=true" >> "$GITHUB_OUTPUT"
+ else
+ echo "isTag=false" >> "$GITHUB_OUTPUT"
+ fi
  - name: Prepare
  id: prepare
  run: |
- bash ./scripts/resolve-tag-image.sh "${{ inputs.push_image }}" "${{ inputs.release }}" "${{ inputs.release_tag }}"
+ bash ./scripts/resolve-tag-image.sh "${{ inputs.push_image }}" "${{ steps.check_tag.outputs.isTag }}" "${{ inputs.push_image_tag }}"
  - name: Extract module name
  id: module_name
  run: |
@@ -92,7 +95,7 @@ jobs:
  uses: docker/setup-buildx-action@v2
 
  - name: Login to Github Container Hub
- if: ${{ (github.event_name == 'push') || (inputs.push_image == true) || (inputs.release == true) }}
+ if: ${{ (github.event_name == 'push') ||(github.event_name == 'create') || (inputs.push_image == true) }}
  uses: docker/login-action@v2
  with:
  registry: ghcr.io
@@ -105,13 +108,13 @@ jobs:
  context: ./frontend/${{ matrix.module }}
  file: ./frontend/${{ matrix.module }}/Dockerfile
  # Push if it's a push event or if push_image is true
- push: ${{ (github.event_name == 'push') || (inputs.push_image == true) || (inputs.release == true) }}
+ push: ${{ (github.event_name == 'push') ||(github.event_name == 'create') || (inputs.push_image == true)  }}
  tags: ${{ steps.meta.outputs.tags }}
  labels: ${{ steps.meta.outputs.labels }}
  save-sealos:
  uses: ./.github/workflows/import-save-sealos.yml
  cluster-image-build:
- if: ${{ (github.event_name == 'push') || (inputs.push_image == true) || (inputs.release == true) }}
+ if: ${{ (github.event_name == 'push') ||(github.event_name == 'create') || (inputs.push_image == true)  }}
  needs:
  - image-build
  - save-sealos
@@ -140,11 +143,18 @@ jobs:
 
  - name: Expose git commit data
  uses: rlespinasse/git-commit-data-action@v1
-
+ - name: Check if tag
+ id: check_tag
+ run: |
+ if [[ "${{ github.ref }}" == refs/tags/* ]]; then
+ echo "isTag=true" >> "$GITHUB_OUTPUT"
+ else
+ echo "isTag=false" >> "$GITHUB_OUTPUT"
+ fi
  - name: Prepare
  id: prepare
  run: |
- tag_name=$(bash ./scripts/resolve-tag-image.sh "${{ inputs.push_image }}" "${{ inputs.release }}" "${{ inputs.release_tag }}")
+ tag_name=$(bash ./scripts/resolve-tag-image.sh "${{ inputs.push_image }}" "${{ steps.check_tag.outputs.isTag }}" "${{ inputs.push_image_tag }}")
  echo old_docker_repo=ghcr.io/labring/sealos-${{ env.MODULE_NAME }}-frontend >> $GITHUB_OUTPUT
  echo old_docker_image=ghcr.io/labring/sealos-${{ env.MODULE_NAME }}-frontend:dev >> $GITHUB_OUTPUT
  echo new_docker_repo=ghcr.io/${{ github.repository_owner }}/sealos-${{ env.MODULE_NAME }}-frontend >> $GITHUB_OUTPUT

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,18 +13,6 @@ on:
  - "*"
 
 jobs:
- workflow-frontend:
- uses: ./.github/workflows/frontend.yml
- with:
- release: true
- workflow-services:
- uses: ./.github/workflows/services.yml
- with:
- release: true
- workflow-controllers:
- uses: ./.github/workflows/controllers.yml
- with:
- release: true
  goreleaser:
  runs-on: ubuntu-20.04
  steps:

diff --git a/.github/workflows/services.yml b/.github/workflows/services.yml
@@ -2,21 +2,17 @@ name: Build Services image
 
 
 on:
- workflow_call:
- inputs:
- release:
- required: false
- type: boolean
- default: false
+ create:
+ tags:
  workflow_dispatch:
  inputs:
  push_image:
- description: 'Push images'
+ description: 'Push image'
  required: false
  type: boolean
  default: false
- release_tag:
- description: 'Release images'
+ push_image_tag:
+ description: 'Push image tag'
  default: 'dev'
  required: false
  type: string
@@ -109,11 +105,18 @@ jobs:
 
  - name: Expose git commit data
  uses: rlespinasse/git-commit-data-action@v1
-
+ - name: Check if tag
+ id: check_tag
+ run: |
+ if [[ "${{ github.ref }}" == refs/tags/* ]]; then
+ echo "isTag=true" >> "$GITHUB_OUTPUT"
+ else
+ echo "isTag=false" >> "$GITHUB_OUTPUT"
+ fi
  - name: Prepare
  id: prepare
  run: |
- bash ./scripts/resolve-tag-image.sh "${{ inputs.push_image }}" "${{ inputs.release }}" "${{ inputs.release_tag }}"
+ bash ./scripts/resolve-tag-image.sh "${{ inputs.push_image }}" "${{ steps.check_tag.outputs.isTag }}" "${{ inputs.push_image_tag }}"
  echo docker_repo=ghcr.io/${{ github.repository_owner }}/sealos-${{ matrix.module }}-service >> $GITHUB_OUTPUT
 
  - # Add support for more platforms with QEMU (optional)
@@ -127,7 +130,7 @@ jobs:
 
  - name: Login to Docker Hub
  uses: docker/login-action@v2
- if: ${{ (github.event_name == 'push') || (inputs.push_image == true) || (inputs.release == true) }}
+ if: ${{ (github.event_name == 'push') ||(github.event_name == 'create') || (inputs.push_image == true)  }}
  with:
  registry: ghcr.io
  username: ${{ github.repository_owner }}
@@ -150,15 +153,15 @@ jobs:
  context: ./service/${{ matrix.module }}
  file: ./service/${{ matrix.module }}/Dockerfile
  # Push if it's a push event or if push_image is true
- push: ${{ (github.event_name == 'push') || (inputs.push_image == true) || (inputs.release == true) }}
+ push: ${{ (github.event_name == 'push') ||(github.event_name == 'create') || (inputs.push_image == true)  }}
  tags: ${{ steps.meta.outputs.tags }}
  labels: ${{ steps.meta.outputs.labels }}
  platforms: linux/amd64,linux/arm64
 
  save-sealos:
  uses: ./.github/workflows/import-save-sealos.yml
  build-cluster-image:
- if: ${{ (github.event_name == 'push') || (inputs.push_image == true) || (inputs.release == true) }}
+ if: ${{ (github.event_name == 'push') ||(github.event_name == 'create') || (inputs.push_image == true) }}
  needs:
  - image-build
  - save-sealos
@@ -174,11 +177,18 @@ jobs:
 
  - name: Expose git commit data
  uses: rlespinasse/git-commit-data-action@v1
-
+ - name: Check if tag
+ id: check_tag
+ run: |
+ if [[ "${{ github.ref }}" == refs/tags/* ]]; then
+ echo "isTag=true" >> "$GITHUB_OUTPUT"
+ else
+ echo "isTag=false" >> "$GITHUB_OUTPUT"
+ fi
  - name: Prepare
  id: prepare
  run: |
- bash ./scripts/resolve-tag-image.sh "${{ inputs.push_image }}" "${{ inputs.release }}" "${{ inputs.release_tag }}"
+ bash ./scripts/resolve-tag-image.sh "${{ inputs.push_image }}" "${{ steps.check_tag.outputs.isTag }}" "${{ inputs.push_image_tag }}"
  echo old_docker_repo=ghcr.io/labring/sealos-${{ matrix.module }}-service >> $GITHUB_OUTPUT
  echo new_docker_repo=ghcr.io/${{ github.repository_owner }}/sealos-${{ matrix.module }}-service >> $GITHUB_OUTPUT
  echo cluster_repo=ghcr.io/${{ github.repository_owner }}/sealos-cloud-${{ matrix.module }}-service >> $GITHUB_OUTPUT

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -13,7 +13,7 @@ It is warmly welcomed if you have interest to hack on sealos. First, we encourag
 
 ## Reporting security issues
 
-Security issues are always treated seriously. As our usual principle, we discourage anyone to spread security issues. If you find a security issue of sealos, please do not discuss it in public and even do not open a public issue. Instead we encourage you to send us a private email to [admin@sealyun.com](mailto:admin@sealyun.com) to report this.
+Security issues are always treated seriously. As our usual principle, we discourage anyone to spread security issues. If you find a security issue of sealos, please do not discuss it in public and even do not open a public issue. Instead we encourage you to send us a private email to [admin@sealos.io](mailto:admin@sealos.io) to report this.
 
 ## Reporting general issues