diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 037d3259e..ee2edfbe4 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -97,7 +97,7 @@ jobs: uses: goreleaser/goreleaser-action@v2 with: version: latest - args: release -f .goreleaser-nightly.yml --rm-dist + args: --snapshot -f .goreleaser-nightly.yml --rm-dist env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -105,7 +105,7 @@ jobs: env: CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }} run: | - for filename in dist/*.deb; do + for filename in release/*.deb; do echo "Pushing $filename to 'unstable'" cloudsmith push deb evcc/unstable/any-distro/any-version $filename done \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7573e68b5..1fd321cf1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -98,7 +98,7 @@ jobs: env: CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }} run: | - for filename in dist/*.deb; do + for filename in release/*.deb; do echo "Pushing $filename to 'stable'" cloudsmith push deb evcc/stable/any-distro/any-version $filename done \ No newline at end of file diff --git a/.goreleaser-nightly.yml b/.goreleaser-nightly.yml index ef87f25a4..69a3194a6 100644 --- a/.goreleaser-nightly.yml +++ b/.goreleaser-nightly.yml @@ -7,7 +7,7 @@ builds: flags: - -tags=release ldflags: - - -X github.com/evcc-io/evcc/server.Version={{.Version}}.0-nightly.{{.Date}} -X github.com/evcc-io/evcc/server.Commit={{.ShortCommit}} -s -w + - -X github.com/evcc-io/evcc/server.Version={{.Version}}.{{.Timestamp}} -X github.com/evcc-io/evcc/server.Commit={{.ShortCommit}} -s -w env: - CGO_ENABLED=0 goos: @@ -31,15 +31,15 @@ archives: format: zip files: - evcc.dist.yaml - name_template: "{{.ProjectName}}_{{ .Version }}.0-nightly.{{.Date}}_{{.Os}}-{{.Arch}}" + name_template: "{{.ProjectName}}_{{ .Version }}.{{.Timestamp}}_{{.Os}}-{{.Arch}}" checksum: name_template: 'checksums.txt' snapshot: - name_template: "nightly" + name_template: "{{ .Version }}.{{.Timestamp}}" nfpms: - id: default package_name: evcc - file_name_template: "{{.ProjectName}}_{{ .Version }}.0-nightly.{{.Date}}_{{.Os}}-{{.Arch}}" + file_name_template: "{{.ProjectName}}_{{ .Version }}.{{.Timestamp}}_{{.Os}}-{{.Arch}}" homepage: https://evcc.io description: EV Charge Controller diff --git a/packaging/scripts/postinstall.sh b/packaging/scripts/postinstall.sh index c10f87964..fec119f6f 100644 --- a/packaging/scripts/postinstall.sh +++ b/packaging/scripts/postinstall.sh @@ -21,6 +21,8 @@ if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-decon systemctl --system daemon-reload >/dev/null || true if [ -n "$2" ]; then deb-systemd-invoke try-restart evcc.service >/dev/null || true + else + deb-systemd-invoke start evcc.service >/dev/null || true fi fi fi \ No newline at end of file