diff options
| -rw-r--r-- | .editorconfig | 2 | ||||
| -rw-r--r-- | .github/workflows/ci.yaml | 8 | ||||
| -rw-r--r-- | .github/workflows/deploy.yaml | 34 | ||||
| -rw-r--r-- | .github/workflows/update-flake.yaml | 2 |
4 files changed, 2 insertions, 44 deletions
diff --git a/.editorconfig b/.editorconfig index cba1b92..7618759 100644 --- a/.editorconfig +++ b/.editorconfig @@ -4,7 +4,7 @@ root = true [*] indent_style = tab tab_width = 2 -indent_size = "tab" +indent_size = 2 end_of_line = lf charset = utf-8 trim_trailing_whitespace = true diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1d57123..26c7aaa 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -3,11 +3,9 @@ name: CI on: pull_request: workflow_dispatch: - workflow_call: jobs: build: - needs: [lint, format] runs-on: ubuntu-latest steps: @@ -31,12 +29,6 @@ jobs: - name: run build run: pnpm build - - name: upload ./dist - uses: actions/upload-artifact@v3 - with: - name: dist - path: dist - lint: runs-on: ubuntu-latest diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml deleted file mode 100644 index 23ba2c8..0000000 --- a/.github/workflows/deploy.yaml +++ /dev/null @@ -1,34 +0,0 @@ -name: deploy - -on: - push: - workflow_dispatch: - -jobs: - ci: - uses: ./.github/workflows/ci.yaml - permissions: - security-events: write - - deploy: - needs: ci - runs-on: ubuntu-latest - - permissions: - deployments: write - - steps: - - name: download dist - uses: actions/download-artifact@v3 - with: - name: dist - path: dist - - - name: deploy to cloudflare pages - uses: cloudflare/pages-action@v1 - with: - apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} - accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - projectName: teawieapi - directory: dist - gitHubToken: ${{ github.token }} diff --git a/.github/workflows/update-flake.yaml b/.github/workflows/update-flake.yaml index 3cdc03d..0ff5bb9 100644 --- a/.github/workflows/update-flake.yaml +++ b/.github/workflows/update-flake.yaml @@ -23,7 +23,7 @@ jobs: with: token: ${{ github.token }} - - name: enable auto-merge + - name: merge pr shell: bash run: gh pr merge --rebase "$PR_ID" env: |