From 7327ee3ff87306f47e142d313a1269cedc9b2730 Mon Sep 17 00:00:00 2001 From: wanghe-fit2cloud Date: Fri, 29 Nov 2024 15:11:13 +0800 Subject: [PATCH] feat: Optimize the CI script --- .gitignore | 3 --- .goreleaser.yaml | 5 +++-- .idea/icon.png | Bin 9330 -> 3374 bytes CODE_OF_CONDUCT.md | 2 +- Makefile | 2 +- SECURITY.md | 8 -------- script.sh => ci/script.sh | 6 +++++- 7 files changed, 10 insertions(+), 16 deletions(-) rename script.sh => ci/script.sh (79%) diff --git a/.gitignore b/.gitignore index a49bfc19f..5e6f2189d 100644 --- a/.gitignore +++ b/.gitignore @@ -22,14 +22,12 @@ build/1panel *.iml *.ipr - # Test binary, built with `go test -c` *.test # Output of the go coverage tool, specifically when used with LiteIDE *.out - # Dependency directories /pkg/ backend/__debug_bin @@ -42,7 +40,6 @@ frontend/components.d.ts frontend/src/xpack backend/xpack *_xpack.go - .history/ dist/ 1pctl diff --git a/.goreleaser.yaml b/.goreleaser.yaml index ca4ecfe12..e3c781fa1 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -6,8 +6,8 @@ before: hooks: # - export NODE_OPTIONS="--max-old-space-size=8192" # - make build_web - - chmod +x ./script.sh - - ./script.sh + - chmod +x ./ci/script.sh + - ./ci/script.sh - sed -i 's@ORIGINAL_VERSION=.*@ORIGINAL_VERSION=v{{ .Version }}@g' 1pctl - go mod tidy @@ -42,6 +42,7 @@ archives: - install.sh - README.md - LICENSE + - GeoIP.mmdb checksum: name_template: 'checksums.txt' diff --git a/.idea/icon.png b/.idea/icon.png index 6f82a12d56b666914ee686321551411e970d4db5..4e2448e0b6b5c6a04a8a438354c5e0226b17a5a8 100644 GIT binary patch literal 3374 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 literal 9330 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