From 4c3b928cebd714f582c994fcb030b146c99d87ac Mon Sep 17 00:00:00 2001 From: DVKunion Date: Tue, 2 Apr 2024 11:50:19 +0800 Subject: [PATCH] fix: ci --- .github/conf/.goreleaser.yml | 5 ++-- .github/workflows/build.yml | 9 ++------ .../workflows/{package.yaml => package.yml} | 19 +++++++++++---- .github/workflows/pages.yml | 7 +++--- .github/workflows/release.yml | 18 ++++++++++----- .github/workflows/seamoon.yml | 23 +++++++++++++++++++ 6 files changed, 57 insertions(+), 24 deletions(-) rename .github/workflows/{package.yaml => package.yml} (89%) create mode 100644 .github/workflows/seamoon.yml diff --git a/.github/conf/.goreleaser.yml b/.github/conf/.goreleaser.yml index de5b2c1..2297630 100644 --- a/.github/conf/.goreleaser.yml +++ b/.github/conf/.goreleaser.yml @@ -1,7 +1,6 @@ before: hooks: - go mod tidy - - builds: - binary: seamoon env: @@ -15,14 +14,14 @@ builds: - 6 - 7 ldflags: - - -s -w -X github.com/DVKunion/SeaMoon/system/xlog.Version={{.Version}} -X github.com/DVKunion/SeaMoon/system/xlog.Commit={{.Sha}} + - -s -w -X github.com/DVKunion/SeaMoon/system/xlog.Version={{.Version}} -X github.com/DVKunion/SeaMoon/system/xlog.Commit={{.ShortCommit}} checksum: name_template: 'checksums.txt' snapshot: name_template: "{{ .Tag }}-next" upx: - enabled: true - goos: [linux, darwin] + goos: [ linux, darwin ] compress: best changelog: sort: asc diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7233dcc..01859a7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,11 +1,6 @@ -name: SeaMoon - +name: seamoon-build on: - push: - tags: - - "*" - pull_request: - branches: [ "main" ] + workflow_call: jobs: build: diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yml similarity index 89% rename from .github/workflows/package.yaml rename to .github/workflows/package.yml index 20aab63..b05ad1f 100644 --- a/.github/workflows/package.yaml +++ b/.github/workflows/package.yml @@ -1,8 +1,19 @@ -name: Package +name: seamoon-package on: - push: - tags: - - "*" + workflow_call: + secrets: + DOCKERHUB_USERNAME: + required: true + DOCKERHUB_TOKEN: + required: true + ALIYUN_USERNAME: + required: true + ALIYUN_PASSWORD: + required: true + TENCENT_USERNAME: + required: true + TENCENT_PASSWORD: + required: true jobs: package-docker: diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index a0924f5..b8e1db1 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -1,9 +1,8 @@ # Simple workflow for deploying static content to GitHub Pages -name: Deploy - +name: seamoon-package on: - push: - branches: [ "main", "feat/docs" ] + workflow_call: + jobs: # Single deploy job since we're just deploying deploy: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cf61bde..7ac721b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,10 +1,9 @@ -name: goreleaser - +name: seamoon-goreleaser on: - push: - tags: - - "*" - + workflow_call: + secrets: + GO_RELEASER_GITHUB_TOKEN: + required: true jobs: build: name: GoReleaser build @@ -14,6 +13,13 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 + - name: Set up Node.js + uses: actions/setup-node@v4 + with: + node-version: '20' + - name: Build Front + run: | + cd web && npm install | true && npm run build && cp -r dist ../cmd/client/static - name: Set up Go uses: actions/setup-go@v5 with: diff --git a/.github/workflows/seamoon.yml b/.github/workflows/seamoon.yml new file mode 100644 index 0000000..95e1bd8 --- /dev/null +++ b/.github/workflows/seamoon.yml @@ -0,0 +1,23 @@ +name: seamoon +on: [ push, pull_request ] +jobs: + build: + uses: ./.github/workflows/build.yml + docs: + if: ${{ github.ref == 'refs/heads/main' || ${{ github.ref == 'refs/heads/feat/docs' }} + uses: ./.github/workflows/pages.yml + release: + if: startsWith(github.ref, 'refs/tags/') + uses: ./.github/workflows/release.yml + package: + if: startsWith(github.ref, 'refs/tags/') + uses: ./.github/workflows/package.yml + with: + secrets: + DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} + ALIYUN_USERNAME: ${{ secrets.ALIYUN_USERNAME }} + ALIYUN_PASSWORD: ${{ secrets.ALIYUN_PASSWORD }} + TENCENT_USERNAME: ${{ secrets.TENCENT_USERNAME }} + TENCENT_PASSWORD: ${{ secrets.TENCENT_PASSWORD }} +