From bdcb8e6f73186fa2d0eed81010d995b454475067 Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Thu, 19 Feb 2026 12:30:21 +1100 Subject: [PATCH] Refactor import paths to use the full repository URL and remove obsolete GitHub Actions workflow file --- .drone.yml | 86 ++++++++++++++++++++++++++++++ .github/workflows/docker-build.yml | 65 ---------------------- cmd/invertergui/main.go | 16 +++--- mk2core/core.go | 2 +- plugins/cli/cli.go | 2 +- plugins/mqttclient/mqtt.go | 2 +- plugins/mqttclient/mqtt_test.go | 2 +- plugins/munin/munin.go | 2 +- plugins/munin/munin_test.go | 2 +- plugins/prometheus/prometheus.go | 2 +- plugins/webui/webgui.go | 4 +- plugins/webui/webgui_test.go | 2 +- 12 files changed, 104 insertions(+), 83 deletions(-) create mode 100644 .drone.yml delete mode 100644 .github/workflows/docker-build.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..b328a15 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,86 @@ +kind: pipeline +type: docker +name: ci + +trigger: + event: + - pull_request + - push + - tag + +steps: + - name: lint + image: golangci/golangci-lint:v1.64.8-alpine + environment: + GOFLAGS: -mod=mod + commands: + - golangci-lint run --timeout=5m + + - name: test + image: golang:1.26 + environment: + GOFLAGS: -mod=mod + commands: + - go test -v -race -coverprofile=coverage.txt -covermode=atomic ./... + + - name: build + image: golang:1.26 + environment: + GOFLAGS: -mod=mod + commands: + - CGO_ENABLED=0 go build -v ./cmd/invertergui + + - name: docker-build-validate + image: gcr.io/kaniko-project/executor:v1.23.2-debug + commands: + - /kaniko/executor --context "${DRONE_WORKSPACE}" --dockerfile "${DRONE_WORKSPACE}/Dockerfile" --no-push --destination registry.coadcorp.com/nathan/invertergui:pr-${DRONE_BUILD_NUMBER} + when: + event: + - pull_request + + - name: docker-publish-commit + image: plugins/docker + settings: + registry: registry.coadcorp.com + repo: registry.coadcorp.com/nathan/invertergui + dockerfile: Dockerfile + username: nathan + password: + from_secret: registry_password + tags: + - ${DRONE_COMMIT_SHA} + when: + event: + - push + + - name: docker-publish-latest + image: plugins/docker + settings: + registry: registry.coadcorp.com + repo: registry.coadcorp.com/nathan/invertergui + dockerfile: Dockerfile + username: nathan + password: + from_secret: registry_password + tags: + - latest + when: + event: + - push + branch: + - main + - master + + - name: docker-publish-release + image: plugins/docker + settings: + registry: registry.coadcorp.com + repo: registry.coadcorp.com/nathan/invertergui + dockerfile: Dockerfile + username: nathan + password: + from_secret: registry_password + auto_tag: true + when: + event: + - tag diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml deleted file mode 100644 index 08c6ddf..0000000 --- a/.github/workflows/docker-build.yml +++ /dev/null @@ -1,65 +0,0 @@ -# Tagging based on: https://docs.docker.com/build/ci/github-actions/manage-tags-labels/ -# Multi platform based on: https://docs.docker.com/build/ci/github-actions/multi-platform/ -name: build -on: - push: - branches: - - "**" - tags: - - "v*" - pull_request: - -jobs: - inverter_gui_pipeline: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: "Setup" - uses: actions/setup-go@v3 - with: - go-version: '1.22' - - - name: Lint - uses: golangci/golangci-lint-action@v3 - with: - version: latest - - - name: Test - run: go test -v -race -coverprofile=coverage.txt -covermode=atomic ./... - - - name: Upload code coverage - uses: codecov/codecov-action@v3 - - - name: Generate docker image labels and tags - id: docker_meta - uses: docker/metadata-action@v4 - with: - images: ghcr.io/diebietse/invertergui - tags: | - type=ref,event=branch - type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to GitHub Container Registry - if: github.event_name != 'pull_request' - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push to GitHub Container Registry - uses: docker/build-push-action@v4 - with: - platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 - push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.docker_meta.outputs.tags }} - labels: ${{ steps.docker_meta.outputs.labels }} diff --git a/cmd/invertergui/main.go b/cmd/invertergui/main.go index 9509dcf..96da5e5 100644 --- a/cmd/invertergui/main.go +++ b/cmd/invertergui/main.go @@ -37,14 +37,14 @@ import ( "net/http" "os" - "invertergui/mk2core" - "invertergui/mk2driver" - "invertergui/plugins/cli" - "invertergui/plugins/mqttclient" - "invertergui/plugins/munin" - "invertergui/plugins/prometheus" - "invertergui/plugins/webui" - "invertergui/plugins/webui/static" + "git.coadcorp.com/nathan/invertergui/mk2core" + "git.coadcorp.com/nathan/invertergui/mk2driver" + "git.coadcorp.com/nathan/invertergui/plugins/cli" + "git.coadcorp.com/nathan/invertergui/plugins/mqttclient" + "git.coadcorp.com/nathan/invertergui/plugins/munin" + "git.coadcorp.com/nathan/invertergui/plugins/prometheus" + "git.coadcorp.com/nathan/invertergui/plugins/webui" + "git.coadcorp.com/nathan/invertergui/plugins/webui/static" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/sirupsen/logrus" "github.com/tarm/serial" diff --git a/mk2core/core.go b/mk2core/core.go index be3753c..e126455 100644 --- a/mk2core/core.go +++ b/mk2core/core.go @@ -1,7 +1,7 @@ package mk2core import ( - "invertergui/mk2driver" + "git.coadcorp.com/nathan/invertergui/mk2driver" ) type Core struct { diff --git a/plugins/cli/cli.go b/plugins/cli/cli.go index 8988d41..80bab3a 100644 --- a/plugins/cli/cli.go +++ b/plugins/cli/cli.go @@ -1,7 +1,7 @@ package cli import ( - "invertergui/mk2driver" + "git.coadcorp.com/nathan/invertergui/mk2driver" "github.com/sirupsen/logrus" ) diff --git a/plugins/mqttclient/mqtt.go b/plugins/mqttclient/mqtt.go index 05f88fa..63d6561 100644 --- a/plugins/mqttclient/mqtt.go +++ b/plugins/mqttclient/mqtt.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "invertergui/mk2driver" + "git.coadcorp.com/nathan/invertergui/mk2driver" mqtt "github.com/eclipse/paho.mqtt.golang" "github.com/sirupsen/logrus" ) diff --git a/plugins/mqttclient/mqtt_test.go b/plugins/mqttclient/mqtt_test.go index aefb722..4d25b5c 100644 --- a/plugins/mqttclient/mqtt_test.go +++ b/plugins/mqttclient/mqtt_test.go @@ -3,7 +3,7 @@ package mqttclient import ( "testing" - "invertergui/mk2driver" + "git.coadcorp.com/nathan/invertergui/mk2driver" "github.com/stretchr/testify/assert" ) diff --git a/plugins/munin/munin.go b/plugins/munin/munin.go index 11fc0ae..ed86101 100644 --- a/plugins/munin/munin.go +++ b/plugins/munin/munin.go @@ -36,7 +36,7 @@ import ( "net/http" "time" - "invertergui/mk2driver" + "git.coadcorp.com/nathan/invertergui/mk2driver" "github.com/sirupsen/logrus" ) diff --git a/plugins/munin/munin_test.go b/plugins/munin/munin_test.go index 16a5ddc..1a756b8 100644 --- a/plugins/munin/munin_test.go +++ b/plugins/munin/munin_test.go @@ -6,7 +6,7 @@ import ( "net/http/httptest" "testing" - "invertergui/mk2driver" + "git.coadcorp.com/nathan/invertergui/mk2driver" ) func TestServer(_ *testing.T) { diff --git a/plugins/prometheus/prometheus.go b/plugins/prometheus/prometheus.go index 9c03ccb..a673dda 100644 --- a/plugins/prometheus/prometheus.go +++ b/plugins/prometheus/prometheus.go @@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package prometheus import ( - "invertergui/mk2driver" + "git.coadcorp.com/nathan/invertergui/mk2driver" "github.com/prometheus/client_golang/prometheus" ) diff --git a/plugins/webui/webgui.go b/plugins/webui/webgui.go index 5a74f06..0377d6b 100644 --- a/plugins/webui/webgui.go +++ b/plugins/webui/webgui.go @@ -38,8 +38,8 @@ import ( "sync" "time" - "invertergui/mk2driver" - "invertergui/websocket" + "git.coadcorp.com/nathan/invertergui/mk2driver" + "git.coadcorp.com/nathan/invertergui/websocket" "github.com/sirupsen/logrus" ) diff --git a/plugins/webui/webgui_test.go b/plugins/webui/webgui_test.go index 7ffc426..c24e046 100644 --- a/plugins/webui/webgui_test.go +++ b/plugins/webui/webgui_test.go @@ -36,7 +36,7 @@ import ( "testing" "time" - "invertergui/mk2driver" + "git.coadcorp.com/nathan/invertergui/mk2driver" ) type templateTest struct {