Merge pull request #31 from mittwald/task/add-restic-prune

add restic prune and up deps

Author: Lucaber

.github/workflows/build.yaml

@@ -1,6 +1,6 @@
 name: Build & Test
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
 
@@ -10,25 +10,25 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Set up Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v4
       with:
-        go-version: 1.15
+        go-version: "1.20"
 
     - name: Run GoReleaser
       uses: goreleaser/goreleaser-action@v2
       with:
         version: latest
-        args: release --rm-dist --snapshot --skip-publish -f build/ci/.goreleaser.yml
+        args: release --clean --snapshot --skip-publish -f build/ci/.goreleaser.yml
 
   test:
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
 
     - name: Set up Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v4
       with:
-        go-version: 1.15
+        go-version: "1.20"
 
     - name: Install restic
       run: |

.github/workflows/release.yaml

@@ -12,8 +12,13 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.20"
+
       - run: docker login -u "${{ secrets.QUAY_IO_USER }}" -p "${{ secrets.QUAY_IO_TOKEN }}" quay.io
 
-      - run: curl -sL https://git.io/goreleaser | bash -s -- --config build/ci/.goreleaser.yml --rm-dist
+      - run: curl -sL https://git.io/goreleaser | bash -s -- --config build/ci/.goreleaser.yml --clean
         env:
           GITHUB_TOKEN: ${{ secrets.RELEASE_USER_TOKEN }}

Makefile

@@ -1,7 +1,6 @@
 BINARY_NAME = brudi
 COMMIT_HASH = $(shell git rev-parse --verify HEAD)
 CURDIR = $(shell pwd)
-GOLANGCI_LINT_VER = v1.35.0
 
 .PHONY: build test
 
@@ -29,20 +28,20 @@ lintci:
 	docker run --rm \
     -v $(CURDIR):/app \
     -w /app \
-	-e GOLANGCI_ADDITIONAL_YML=/app/build/package/ci/.golangci.yml \
-	quay.io/mittwald/golangci-lint:0.0.8 \
+	-e GOLANGCI_ADDITIONAL_YML=/app/build/ci/.golangci.yml \
+	quay.io/mittwald/golangci-lint:0.0.29 \
 		golangci-lint run -v --fix  ./...
 
 lint:
 	docker run --rm \
 		-v $(shell go env GOPATH):/go \
 		-v ${CURDIR}:/app -w /app \
-		-e GOLANGCI_ADDITIONAL_YML=/app/build/package/ci/.golangci.yml \
-		quay.io/mittwald/golangci-lint:0.0.8 \
+		-e GOLANGCI_ADDITIONAL_YML=/app/build/ci/.golangci.yml \
+		quay.io/mittwald/golangci-lint:0.0.29 \
 			golangci-lint run -v --fix  ./...
 
 goreleaser:
-	curl -sL https://git.io/goreleaser | bash -s -- --snapshot --skip-publish --rm-dist
+	curl -sL https://git.io/goreleaser | bash -s -- --debug --snapshot --skip-publish --clean
 
 upTestMongo: downTestMongo
 	trap 'cd $(CURDIR) && make downTestMongo' 0 1 2 3 6 9 15

build/ci/.golangci.yml

@@ -5,3 +5,10 @@ run:
     - test/
   timeout: 10m
 
+linters:
+  disable:
+    - forcetypeassert
+
+linters-settings:
+  cyclop:
+    max-complexity: 15

build/ci/.goreleaser.yml

@@ -1,28 +1,19 @@
 before:
   hooks:
-    - go mod download
-    - make lintci
+    - go mod tidy
+
 builds:
 -
   env:
   - CGO_ENABLED=0
   binary: brudi
   ldflags:
-    - -s
-    - -w
-    - -X 'github.com/mittwald/brudi/cmd.tag={{ .Tag }}'
+    - -s -w -X 'github.com/mittwald/brudi/cmd.tag={{ .Version }}'
   goos:
     - darwin
     - linux
   goarch:
     - amd64
-archives:
-- replacements:
-    darwin: Darwin
-    linux: Linux
-    windows: Windows
-    386: i386
-    amd64: x86_64
 checksum:
   name_template: 'checksums.txt'
 snapshot:

build/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM        alpine:3.12
+FROM        alpine:3.18
 
 LABEL       maintainer="Mittwald CM Service <https://github.com/mittwald>"
 

cmd/mongodump.go

@@ -19,7 +19,7 @@ var (
 			ctx, cancel := context.WithCancel(context.Background())
 			defer cancel()
 
-			err := source.DoBackupForKind(ctx, mongodump.Kind, cleanup, useRestic, useResticForget)
+			err := source.DoBackupForKind(ctx, mongodump.Kind, cleanup, useRestic, useResticForget, useResticPrune)
 			if err != nil {
 				panic(err)
 			}

cmd/mongorestore.go

@@ -19,7 +19,7 @@ var (
 			ctx, cancel := context.WithCancel(context.Background())
 			defer cancel()
 
-			err := source.DoRestoreForKind(ctx, mongorestore.Kind, cleanup, useRestic, useResticForget)
+			err := source.DoRestoreForKind(ctx, mongorestore.Kind, cleanup, useRestic)
 			if err != nil {
 				panic(err)
 			}

cmd/mysqldump.go

@@ -18,7 +18,7 @@ var (
 			ctx, cancel := context.WithCancel(context.Background())
 			defer cancel()
 
-			err := source.DoBackupForKind(ctx, mysqldump.Kind, cleanup, useRestic, useResticForget)
+			err := source.DoBackupForKind(ctx, mysqldump.Kind, cleanup, useRestic, useResticForget, useResticPrune)
 			if err != nil {
 				panic(err)
 			}

cmd/mysqlrestore.go

@@ -18,7 +18,7 @@ var (
 			ctx, cancel := context.WithCancel(context.Background())
 			defer cancel()
 
-			err := source.DoRestoreForKind(ctx, mysqlrestore.Kind, cleanup, useRestic, useResticForget)
+			err := source.DoRestoreForKind(ctx, mysqlrestore.Kind, cleanup, useRestic)
 			if err != nil {
 				panic(err)
 			}