Skip to content

Commit e42c536

Browse files
Merge branch 'master' into scheduling-improvements
2 parents 240601a + e2297a6 commit e42c536

File tree

16 files changed

+116
-114
lines changed

16 files changed

+116
-114
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ jobs:
4444
- name: golangci-lint
4545
uses: golangci/golangci-lint-action@v6
4646
with:
47-
version: v1.61
48-
args: --timeout=5m
47+
version: v1.63.4
48+
args: --timeout=30m
4949

5050
- name: Test
5151
run: make test-ci

.github/workflows/docker.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Rebuild docker image
22

33
on:
4+
workflow_dispatch:
45
schedule:
56
- cron: '32 6 * * 0'
67

.goreleaser-docker-only.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ archives:
2525
- id: targz
2626
builds:
2727
- resticprofile_targz
28-
format: tar.gz
28+
formats: tar.gz
2929

3030
dockers:
3131
- image_templates:

.goreleaser-snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ archives:
2525
- id: targz
2626
builds:
2727
- resticprofile_targz
28-
format: tar.gz
28+
formats: tar.gz
2929

3030
dockers:
3131
- image_templates:

.goreleaser.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,19 +107,19 @@ archives:
107107
builds:
108108
- resticprofile_targz
109109
name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}'
110-
format: tar.gz
110+
formats: tar.gz
111111

112112
- id: targz_no_self_update
113113
builds:
114114
- resticprofile_no_self_update
115115
name_template: '{{ .ProjectName }}_no_self_update_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}'
116-
format: tar.gz
116+
formats: tar.gz
117117

118118
- id: zip
119119
builds:
120120
- resticprofile_zip
121121
name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}'
122-
format: zip
122+
formats: zip
123123

124124
checksum:
125125
name_template: 'checksums.txt'

build/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ COPY build/restic-${ARCH} /usr/bin/restic
1111
COPY build/rclone-${ARCH} /usr/bin/rclone
1212
COPY resticprofile /usr/bin/resticprofile
1313

14-
RUN apk add --no-cache ca-certificates curl openssh-client-default tzdata
14+
RUN apk add --no-cache ca-certificates curl logrotate openssh-client-default tzdata
1515

1616
VOLUME /resticprofile
1717
WORKDIR /resticprofile

build/Dockerfile_non-root

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ COPY build/restic-${ARCH} /usr/bin/restic
1111
COPY build/rclone-${ARCH} /usr/bin/rclone
1212
COPY resticprofile /usr/bin/resticprofile
1313

14-
RUN apk add --no-cache openssh-client-default curl tzdata ca-certificates supercronic && \
14+
RUN apk add --no-cache ca-certificates curl logrotate openssh-client-default tzdata supercronic && \
1515
chmod +x /usr/bin/restic /usr/bin/rclone /usr/bin/resticprofile && \
1616
adduser -D -h /resticprofile resticprofile && \
1717
mkdir -p /resticprofile && \

config/mocks/NamedPropertySet.go

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/mocks/ProfileInfo.go

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)