diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9dedc41b5e..bfe6b5e985 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -170,7 +170,7 @@ jobs: - name: Prepare Image run: | make prepare-image - sed -i -e 's#-ld.*$#& -X github.com/andig/evcc/server/updater.Password=${{ secrets.IMAGE_PASS }}#' buildflags/github.com/andig/evcc/buildflags.txt + sed -i -e 's#-ld.*$#& -X github.com/evcc-io/evcc/server/updater.Password=${{ secrets.IMAGE_PASS }}#' buildflags/github.com/evcc-io/evcc/buildflags.txt mkdir /home/runner/.config/gokrazy echo ${{ secrets.IMAGE_PASS }}> /home/runner/.config/gokrazy/http-password.txt diff --git a/.goreleaser.yml b/.goreleaser.yml index e1b7b1ed7a..896ae3fe64 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -12,7 +12,7 @@ builds: flags: - -tags=release ldflags: - - -X github.com/andig/evcc/server.Version={{.Version}} -X github.com/andig/evcc/server.Commit={{.ShortCommit}} -s -w + - -X github.com/evcc-io/evcc/server.Version={{.Version}} -X github.com/evcc-io/evcc/server.Commit={{.ShortCommit}} -s -w env: - CGO_ENABLED=0 goos: diff --git a/Makefile b/Makefile index b6d421b725..91219c5f87 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ SHA := $(shell test -d .git && git rev-parse --short HEAD) VERSION := $(if $(TAG_NAME),$(TAG_NAME),$(SHA)) BUILD_DATE := $(shell date -u '+%Y-%m-%d_%H:%M:%S') BUILD_TAGS := -tags=release -LD_FLAGS := -X github.com/andig/evcc/server.Version=$(VERSION) -X github.com/andig/evcc/server.Commit=$(SHA) -s -w +LD_FLAGS := -X github.com/evcc-io/evcc/server.Version=$(VERSION) -X github.com/evcc-io/evcc/server.Commit=$(SHA) -s -w BUILD_ARGS := -ldflags='$(LD_FLAGS)' # docker @@ -20,7 +20,7 @@ TARGETS := arm.v6,arm.v8,amd64 # image IMAGE_FILE := evcc_$(TAG_NAME).image IMAGE_ROOTFS := evcc_$(TAG_NAME).rootfs -IMAGE_OPTIONS := -hostname evcc -http_port 8080 github.com/gokrazy/serial-busybox github.com/gokrazy/breakglass github.com/andig/evcc +IMAGE_OPTIONS := -hostname evcc -http_port 8080 github.com/gokrazy/serial-busybox github.com/gokrazy/breakglass github.com/evcc-io/evcc default: build @@ -87,9 +87,9 @@ prepare-image: go get github.com/gokrazy/tools/cmd/gokr-packer@latest mkdir -p flags/github.com/gokrazy/breakglass echo "-forward=private-network" > flags/github.com/gokrazy/breakglass/flags.txt - mkdir -p buildflags/github.com/andig/evcc - echo "$(BUILD_TAGS),gokrazy" > buildflags/github.com/andig/evcc/buildflags.txt - echo "-ldflags=$(LD_FLAGS)" >> buildflags/github.com/andig/evcc/buildflags.txt + mkdir -p buildflags/github.com/evcc-io/evcc + echo "$(BUILD_TAGS),gokrazy" > buildflags/github.com/evcc-io/evcc/buildflags.txt + echo "-ldflags=$(LD_FLAGS)" >> buildflags/github.com/evcc-io/evcc/buildflags.txt image: gokr-packer -overwrite=$(IMAGE_FILE) -target_storage_bytes=1258299392 $(IMAGE_OPTIONS) @@ -105,7 +105,7 @@ image-update: soc: @echo Version: $(VERSION) $(BUILD_DATE) - go build -o evcc-soc $(BUILD_TAGS) $(BUILD_ARGS) github.com/andig/evcc/cmd/soc + go build -o evcc-soc $(BUILD_TAGS) $(BUILD_ARGS) github.com/evcc-io/evcc/cmd/soc stamps: docker pull hacksore/hks diff --git a/README.md b/README.md index cf379519e2..2d29a8227b 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # evcc [![Open in Visual Studio Code](https://open.vscode.dev/badges/open-in-vscode.svg)](https://open.vscode.dev/andig/evcc) -[![Build Status](https://github.com/andig/evcc/workflows/Build/badge.svg)](https://github.com/andig/evcc/actions?query=workflow%3ABuild) -[![Code Quality](https://goreportcard.com/badge/github.com/andig/evcc)](https://goreportcard.com/report/github.com/andig/evcc) -[![Latest Version](https://img.shields.io/github/release/andig/evcc.svg)](https://github.com/andig/evcc/releases) +[![Build Status](https://github.com/evcc-io/evcc/workflows/Build/badge.svg)](https://github.com/evcc-io/evcc/actions?query=workflow%3ABuild) +[![Code Quality](https://goreportcard.com/badge/github.com/evcc-io/evcc)](https://goreportcard.com/report/github.com/evcc-io/evcc) +[![Latest Version](https://img.shields.io/github/release/andig/evcc.svg)](https://github.com/evcc-io/evcc/releases) [![Pulls from Docker Hub](https://img.shields.io/docker/pulls/andig/evcc.svg)](https://hub.docker.com/r/andig/evcc) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=48YVXXA7BDNC2) @@ -23,7 +23,7 @@ EVCC is an extensible EV Charge Controller with PV integration implemented in [G - status notifications using [Telegram](https://telegram.org), [PushOver](https://pushover.net) and [many more](https://containrrr.dev/shoutrrr/) - logging using [InfluxDB](https://www.influxdata.com) and [Grafana](https://grafana.com/grafana/) - granular charge power control down to mA steps with supported chargers (labeled by e.g. smartWB als [OLC](https://board.evse-wifi.de/viewtopic.php?f=16&t=187)) -- REST and MQTT [APIs](#api) for integration with home automation systems (e.g. [HomeAssistant](https://github.com/andig/evcc-hassio-addon)) +- REST and MQTT [APIs](#api) for integration with home automation systems (e.g. [HomeAssistant](https://github.com/evcc-io/evcc-hassio-addon)) ![Screenshot](docs/screenshot.png) diff --git a/api/api.go b/api/api.go index 8222644275..a7f749ff8f 100644 --- a/api/api.go +++ b/api/api.go @@ -2,7 +2,7 @@ package api import "time" -//go:generate mockgen -package mock -destination ../mock/mock_api.go github.com/andig/evcc/api Charger,ChargeState,ChargePhases,Identifier,Meter,MeterEnergy,Vehicle,ChargeRater,Battery +//go:generate mockgen -package mock -destination ../mock/mock_api.go github.com/evcc-io/evcc/api Charger,ChargeState,ChargePhases,Identifier,Meter,MeterEnergy,Vehicle,ChargeRater,Battery // ChargeMode are charge modes modeled after OpenWB type ChargeMode string diff --git a/api/error.go b/api/error.go index 97c17f81a8..58ba7670ea 100644 --- a/api/error.go +++ b/api/error.go @@ -9,7 +9,7 @@ var ErrNotAvailable = errors.New("not available") var ErrMustRetry = errors.New("must retry") // ErrSponsorRequired indicates that a sponsor token is required -var ErrSponsorRequired = errors.New("sponsorship required, see https://github.com/andig/evcc#sponsorship") +var ErrSponsorRequired = errors.New("sponsorship required, see https://github.com/evcc-io/evcc#sponsorship") // ErrTimeout is the error returned when a timeout happened. // Modeled after context.DeadlineError diff --git a/assets/js/components/Version.stories.js b/assets/js/components/Version.stories.js index 9df09ed1c2..e16e208bfd 100644 --- a/assets/js/components/Version.stories.js +++ b/assets/js/components/Version.stories.js @@ -15,7 +15,7 @@ const Template = (args, { argTypes }) => ({ }); const releaseNotes = - '

0.48

Bug fixes:

Enhancements:

'; + '

0.48

Bug fixes:

Enhancements:

'; export const AktuelleVersion = Template.bind({}); AktuelleVersion.args = { diff --git a/assets/js/components/Version.vue b/assets/js/components/Version.vue index 44f5721b7e..16b73757fa 100644 --- a/assets/js/components/Version.vue +++ b/assets/js/components/Version.vue @@ -129,7 +129,7 @@ export default { } }, releaseNotesUrl: function (version) { - return `https://github.com/andig/evcc/releases/tag/${version}`; + return `https://github.com/evcc-io/evcc/releases/tag/${version}`; }, }, computed: { diff --git a/assets/js/views/App.vue b/assets/js/views/App.vue index bf817efe23..fba1dcab39 100644 --- a/assets/js/views/App.vue +++ b/assets/js/views/App.vue @@ -3,7 +3,7 @@