diff --git a/.drone.yml b/.drone.yml index f18be0d..a6f9be7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,7 +14,7 @@ steps: - go mod download - curl -sL https://git.io/goreleaser > goreleaser.sh - chmod +x goreleaser.sh - - ./goreleaser.sh --snapshot --skip-publish --rm-dist + - ./version.sh ./goreleaser.sh --snapshot --skip-publish --rm-dist - wget https://builds.hrfee.pw/upload.py - pip3 install requests - bash -c 'sftp -P 2022 -i /id_rsa -o StrictHostKeyChecking=no root@161.97.102.153:/repo/incoming <<< $"put dist/*.deb"' diff --git a/.gitignore b/.gitignore index a1ce752..a75617d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ ./main waybar-mpris +dist/* diff --git a/.goreleaser.yml b/.goreleaser.yml index 86afd5f..82721d4 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -28,7 +28,7 @@ archives: checksum: name_template: 'checksums.txt' snapshot: - name_template: "0.0.0-{{.ShortCommit}}" + name_template: "0.0.0-{{.Env.NFPM_EPOCH}}" changelog: sort: asc filters: diff --git a/dist/checksums.txt b/dist/checksums.txt deleted file mode 100644 index 9af7977..0000000 --- a/dist/checksums.txt +++ /dev/null @@ -1,3 +0,0 @@ -57ca953082ee67820539a128d6c285b1bc1e4e917e1376c86cbbc2436880330a waybar-mpris_git-750317a_Linux_x86_64.tar.gz -6e638c4c4e7b1aa324abbbbedda193600390988001c9d4c8d5ed4700f1f6ca0a waybar-mpris_git-750317a_Linux_armv6.tar.gz -c710c2cd4e4a3ed3c4d5e2b8f2a86077904c26365102496ea9b429e5ad2204a6 waybar-mpris_git-750317a_Linux_arm64.tar.gz diff --git a/dist/config.yaml b/dist/config.yaml deleted file mode 100644 index 9e90b5b..0000000 --- a/dist/config.yaml +++ /dev/null @@ -1,88 +0,0 @@ -project_name: waybar-mpris -release: - github: - owner: hrfee - name: waybar-mpris - gitea: - owner: hrfee - name: waybar-mpris - name_template: v{{.Version}} -milestones: -- repo: - owner: hrfee - name: waybar-mpris - name_template: '{{ .Tag }}' -scoop: - name: waybar-mpris - commit_author: - name: goreleaserbot - email: goreleaser@carlosbecker.com - commit_msg_template: Scoop update for {{ .ProjectName }} version {{ .Tag }} -builds: -- id: waybar-mpris - goos: - - linux - goarch: - - amd64 - - arm - - arm64 - goarm: - - "6" - targets: - - linux_amd64 - - linux_arm_6 - - linux_arm64 - dir: ./ - main: . - ldflags: - - -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}} -X main.builtBy=goreleaser - binary: waybar-mpris - env: - - CGO_ENABLED=0 - lang: go - gobinary: go -archives: -- id: default - builds: - - waybar-mpris - name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}' - replacements: - amd64: x86_64 - linux: Linux - format: tar.gz - files: - - licence* - - LICENCE* - - license* - - LICENSE* - - readme* - - README* - - changelog* - - CHANGELOG* - allow_different_binary_count: false -snapshot: - name_template: git-{{.ShortCommit}} -checksum: - name_template: checksums.txt - algorithm: sha256 -changelog: - filters: - exclude: - - '^docs:' - - '^test:' - sort: asc -dist: dist -env_files: - github_token: ~/.config/goreleaser/github_token - gitlab_token: ~/.config/goreleaser/gitlab_token - gitea_token: ~/.config/goreleaser/gitea_token -before: - hooks: - - go mod download -source: - name_template: '{{ .ProjectName }}-{{ .Version }}' - format: tar.gz -github_urls: - download: https://github.com -gitlab_urls: - download: https://gitlab.com diff --git a/dist/waybar-mpris_git-750317a_Linux_arm64.tar.gz b/dist/waybar-mpris_git-750317a_Linux_arm64.tar.gz deleted file mode 100644 index a92e6d8..0000000 Binary files a/dist/waybar-mpris_git-750317a_Linux_arm64.tar.gz and /dev/null differ diff --git a/dist/waybar-mpris_git-750317a_Linux_armv6.tar.gz b/dist/waybar-mpris_git-750317a_Linux_armv6.tar.gz deleted file mode 100644 index 52d2d27..0000000 Binary files a/dist/waybar-mpris_git-750317a_Linux_armv6.tar.gz and /dev/null differ diff --git a/dist/waybar-mpris_git-750317a_Linux_x86_64.tar.gz b/dist/waybar-mpris_git-750317a_Linux_x86_64.tar.gz deleted file mode 100644 index ed38cab..0000000 Binary files a/dist/waybar-mpris_git-750317a_Linux_x86_64.tar.gz and /dev/null differ diff --git a/dist/waybar-mpris_linux_amd64/waybar-mpris b/dist/waybar-mpris_linux_amd64/waybar-mpris deleted file mode 100755 index 16d1e69..0000000 Binary files a/dist/waybar-mpris_linux_amd64/waybar-mpris and /dev/null differ diff --git a/dist/waybar-mpris_linux_arm64/waybar-mpris b/dist/waybar-mpris_linux_arm64/waybar-mpris deleted file mode 100755 index 35f129c..0000000 Binary files a/dist/waybar-mpris_linux_arm64/waybar-mpris and /dev/null differ diff --git a/dist/waybar-mpris_linux_arm_6/waybar-mpris b/dist/waybar-mpris_linux_arm_6/waybar-mpris deleted file mode 100755 index 3029a1a..0000000 Binary files a/dist/waybar-mpris_linux_arm_6/waybar-mpris and /dev/null differ diff --git a/version.sh b/version.sh new file mode 100755 index 0000000..7b6f2d2 --- /dev/null +++ b/version.sh @@ -0,0 +1,2 @@ +#!/bin/bash +NFPM_EPOCH=$(git rev-list --all --count) $@