diff --git a/.drone.yml b/.drone.yml index fe187a6..5f172ed 100644 --- a/.drone.yml +++ b/.drone.yml @@ -85,7 +85,7 @@ steps: commands: - curl -sL https://git.io/goreleaser > goreleaser - chmod +x goreleaser - - ./scripts/version.sh ./goreleaser --snapshot --skip-publish --rm-dist + - ./scripts/version.sh ./goreleaser --snapshot --skip-publish --clean - wget https://builds.hrfee.pw/upload.py - pip3 install requests - bash -c 'sftp -i /id_rsa2 -o StrictHostKeyChecking=no root@161.97.102.153:/mnt/redoc <<< $"put docs/swagger.json jfa-go.json"' @@ -163,7 +163,7 @@ steps: commands: - curl -sL https://git.io/goreleaser > goreleaser - chmod +x goreleaser - - ./scripts/version.sh ./goreleaser --snapshot --skip-publish --rm-dist + - ./scripts/version.sh ./goreleaser --snapshot --skip-publish --clean trigger: event: diff --git a/.goreleaser.yml b/.goreleaser.yml index b15cb59..b4df4c6 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -8,11 +8,10 @@ before: hooks: - go mod download - rm -rf data/web - - mkdir -p data - - cp -r static data/web + - mkdir -p data/web/css + - bash -c 'cp -r static/* data/web/' - npm install - npm install esbuild - - mkdir -p data/web/css - cp node_modules/remixicon/fonts/remixicon.css node_modules/remixicon/fonts/remixicon.woff2 data/web/css/ - cp -r html data/ - node scripts/missing-colors.js html data/html @@ -26,11 +25,13 @@ before: - cp -r ts tempts - scripts/dark-variant.sh tempts - scripts/dark-variant.sh tempts/modules - - npx esbuild --target=es6 --format=esm --bundle tempts/admin.ts --outfile=./data/web/js/admin.js --minify - - npx esbuild --target=es6 --format=esm --bundle tempts/pwr.ts --outfile=./data/web/js/pwr.js --minify - - npx esbuild --target=es6 --format=esm --bundle tempts/form.ts --outfile=./data/web/js/form.js --minify - - npx esbuild --target=es6 --format=esm --bundle tempts/setup.ts --outfile=./data/web/js/setup.js --minify - - npx esbuild --target=es6 --format=esm --bundle tempts/crash.ts --outfile=./data/crash.js --minify + - mkdir -p data/web/js + - npx esbuild --target=es6 --bundle tempts/admin.ts --outfile=./data/web/js/admin.js --minify + - npx esbuild --target=es6 --bundle tempts/user.ts --outfile=./data/web/js/user.js --minify + - npx esbuild --target=es6 --bundle tempts/pwr.ts --outfile=./data/web/js/pwr.js --minify + - npx esbuild --target=es6 --bundle tempts/form.ts --outfile=./data/web/js/form.js --minify + - npx esbuild --target=es6 --bundle tempts/setup.ts --outfile=./data/web/js/setup.js --minify + - npx esbuild --target=es6 --bundle tempts/crash.ts --outfile=./data/crash.js --minify - rm -r tempts - npx esbuild --bundle css/base.css --outfile=./data/web/css/bundle.css --external:remixicon.css --minify - cp html/crash.html data/ @@ -87,32 +88,32 @@ archives: builds: - windows-tray format: zip - name_template: "{{ .ProjectName }}_{{ .Version }}_TrayIcon_{{ .Os }}_{{ .Arch }}" - replacements: - darwin: macOS - linux: Linux - windows: Windows - amd64: x86_64 + name_template: >- + {{ .ProjectName }}_{{ .Version }}_TrayIcon_ + {{- if eq .Os "darwin" }}macOS + {{- else }}{{- title .Os }}{{ end }}_ + {{- if eq .Arch "amd64" }}x86_64 + {{- else }}{{ .Arch }}{{ end }} - id: linux-tray builds: - linux-tray format: zip - name_template: "{{ .ProjectName }}_{{ .Version }}_TrayIcon_{{ .Os }}_{{ .Arch }}" - replacements: - darwin: macOS - linux: Linux - windows: Windows - amd64: x86_64 + name_template: >- + {{ .ProjectName }}_{{ .Version }}_TrayIcon_ + {{- if eq .Os "darwin" }}macOS + {{- else }}{{- title .Os }}{{ end }}_ + {{- if eq .Arch "amd64" }}x86_64 + {{- else }}{{ .Arch }}{{ end }} - id: notray builds: - notray format: zip - name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}" - replacements: - darwin: macOS - linux: Linux - windows: Windows - amd64: x86_64 + name_template: >- + {{ .ProjectName }}_{{ .Version }}_ + {{- if eq .Os "darwin" }}macOS + {{- else }}{{- title .Os }}{{ end }}_ + {{- if eq .Arch "amd64" }}x86_64 + {{- else }}{{ .Arch }}{{ end }} checksum: name_template: 'checksums.txt' snapshot: @@ -167,10 +168,10 @@ nfpms: replaces: - jfa-go dependencies: - - libappindicator3-1 + - libayatana-appindicator rpm: dependencies: - libappindicator-gtk3 apk: dependencies: - - libappindicator + - libayatana-appindicator