diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..33bc481 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,22 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file + +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "monthly" + groups: + "GitHub Actions updates": + patterns: + - "*" + - package-ecosystem: "gomod" + directory: "/" + schedule: + interval: "monthly" + groups: + "Go modules updates": + dependency-type: "production" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 70d4593..1dcca8f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,6 @@ jobs: cat $GITHUB_WORKSPACE/profile.cov_tmp | grep -v "mocks" | grep -v "_mock" > $GITHUB_WORKSPACE/profile.cov working-directory: app env: - GO111MODULE: on TZ: "America/Chicago" - name: golangci-lint diff --git a/Dockerfile b/Dockerfile index 9523107..4cb1d85 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,6 @@ ARG GIT_BRANCH ARG GITHUB_SHA ARG CI -ENV GOFLAGS="-mod=vendor" - ADD . /build WORKDIR /build @@ -18,6 +16,10 @@ RUN \ FROM umputun/baseimage:app-latest + +# enables automatic changelog generation by tools like Dependabot +LABEL org.opencontainers.image.source="https://github.com/radio-t/super-bot" + COPY --from=build /build/telegram-rt-bot /srv/telegram-rt-bot COPY data/*.data /srv/data/ COPY data/logs.html /srv/logs.html diff --git a/Makefile b/Makefile index d210367..6524722 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ generate: .PHONY: build ## build: builds server build: - @cd app && go build -v -mod=vendor + @cd app && go build -v .PHONY: vendor ## vendor: runs `go mod vendor` @@ -22,7 +22,7 @@ vendor: .PHONY: test ## test: runs `go test` test: - @go test -mod=vendor ./app/... -coverprofile cover.out + @go test ./app/... -coverprofile cover.out .PHONY: lint ## lint: runs `golangci-lint` @@ -35,5 +35,5 @@ lint: # make run ARGS="--super=umputun" # make run ARGS="--super=umputun --broadcast=umputun --export-num=684 --export-path=logs --export-day=20200104 --export-template=data/logs.html" run: - @go run -v -mod=vendor app/main.go --dbg ${ARGS} + @go run -v app/main.go --dbg ${ARGS}