diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ccb01a1d3c..30aabb81ba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,7 +61,7 @@ jobs: go generate - name: golangci-lint - uses: golangci/golangci-lint-action@v2 + uses: golangci/golangci-lint-action@v3 with: version: v1.45.0 diff --git a/api/publish.go b/api/publish.go index d2287dbd84..665cebed68 100644 --- a/api/publish.go +++ b/api/publish.go @@ -211,7 +211,7 @@ func apiPublishRepoOrSnapshot(c *gin.Context) { } published.SkipBz2 = context.Config().SkipBz2Publishing - if b.SkipContents != nil { + if b.SkipBz2 != nil { published.SkipBz2 = *b.SkipBz2 } diff --git a/system/t04_mirror/ShowMirror8Test_gold b/system/t04_mirror/ShowMirror8Test_gold index 2b8ae8fec8..dedfcd1932 100644 --- a/system/t04_mirror/ShowMirror8Test_gold +++ b/system/t04_mirror/ShowMirror8Test_gold @@ -23,7 +23,6 @@ "Label": "Debian-Security", "Origin": "Debian", "Suite": "oldoldstable", - "Valid-Until": "Sat, 05 Feb 2022 10:02:07 UTC", "Version": "9" }, "LastDownloadDate": "0001-01-01T00:00:00Z", diff --git a/system/t04_mirror/show.py b/system/t04_mirror/show.py index ce1d25d4f0..9323a68cc1 100644 --- a/system/t04_mirror/show.py +++ b/system/t04_mirror/show.py @@ -39,7 +39,7 @@ class ShowMirror4Test(BaseTest): runCmd = "aptly mirror show mirror4" def outputMatchPrepare(self, s): - return re.sub(r"(Date|Valid-Until): [,0-9:+A-Za-z -]+\n", "", s) + return re.sub(r"(Date): [,0-9:+A-Za-z -]+\n", "", s) class ShowMirror5Test(BaseTest):