squash pipeline fixing

mittwald · Feb 22, 2021 · fda7a16 · fda7a16
1 parent 5576685
commit fda7a16
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 7 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -14,6 +14,9 @@ jobs:
       with:
         go-version: 1.15
 
+    - name: Lint
+      run: make lintci
+
     - name: Run GoReleaser
       uses: goreleaser/goreleaser-action@v2
       with:
@@ -24,7 +27,7 @@ jobs:
       uses: goreleaser/goreleaser-action@v2
       with:
         version: latest
-        args: release --rm-dist --snapshot --skip-publish -f build/ci/.goreleaser_root.yml
+        args: release --rm-dist --snapshot --skip-publish -f build/ci/.goreleaser_privileged.yml
 
   test:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -17,3 +17,7 @@ jobs:
       - run: curl -sL https://git.io/goreleaser | bash -s -- --config build/ci/.goreleaser.yml --rm-dist
         env:
           GITHUB_TOKEN: ${{ secrets.RELEASE_USER_TOKEN }}
+
+      - run: curl -sL https://git.io/goreleaser | bash -s -- --config build/ci/.goreleaser_privileged.yml --rm-dist
+        env:
+          GITHUB_TOKEN: ${{ secrets.RELEASE_USER_TOKEN }}
diff --git a/Makefile b/Makefile
@@ -29,15 +29,15 @@ lintci:
 	docker run --rm \
     -v $(CURDIR):/app \
     -w /app \
-	-e GOLANGCI_ADDITIONAL_YML=/app/build/package/ci/.golangci.yml \
+	-e GOLANGCI_ADDITIONAL_YML=/app/build/ci/.golangci.yml \
 	quay.io/mittwald/golangci-lint:0.0.8 \
 		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 \
+		-e GOLANGCI_ADDITIONAL_YML=/app/build/ci/.golangci.yml \
 		quay.io/mittwald/golangci-lint:0.0.8 \
 			golangci-lint run -v --fix  ./...
 

diff --git a/build/ci/.golangci.yml b/build/ci/.golangci.yml
@@ -3,5 +3,6 @@
 run:
   skip-dirs:
     - test/
+    - dist/
   timeout: 10m
 
diff --git a/build/ci/.goreleaser.yml b/build/ci/.goreleaser.yml
@@ -1,7 +1,7 @@
 before:
   hooks:
     - go mod download
-    - make lintci
+
 builds:
 -
   env:

diff --git a/build/ci/.goreleaser_root.yml → build/ci/.goreleaser_privileged.yml b/build/ci/.goreleaser_root.yml → build/ci/.goreleaser_privileged.yml
@@ -1,7 +1,7 @@
 before:
   hooks:
     - go mod download
-    - make lintci
+
 builds:
   -
     env:
@@ -43,7 +43,7 @@ dockers:
       - quay.io/mittwald/brudi_root:stable
     binaries:
       - brudi
-    dockerfile: build/docker/Dockerfile_root
+    dockerfile: build/docker/Dockerfile_privileged
     goos: linux
     goarch: amd64
     goarm: ''
diff --git a/build/docker/Dockerfile_root → build/docker/Dockerfile_privileged b/build/docker/Dockerfile_root → build/docker/Dockerfile_privileged
diff --git a/test/pkg/source/xfstest/xfs_test.go b/test/pkg/source/xfstest/xfs_test.go
@@ -58,6 +58,9 @@ func (xfsTestSuite *XFSTestSuite) TestBasicXFSDump() {
 
 	err = os.Remove(dumpName)
 	xfsTestSuite.Require().NoError(err)
+
+	err = os.Remove(dirName)
+	xfsTestSuite.Require().NoError(err)
 }
 
 func (xfsTestSuite *XFSTestSuite) TestXFSDumpRestic() {
@@ -79,7 +82,7 @@ func (xfsTestSuite *XFSTestSuite) TestXFSDumpRestic() {
 
 	dirName := fmt.Sprintf("%s/testdir", mountPoint)
 
-	os.Mkdir(dirName, 744)
+	err = os.Mkdir(dirName, 744)
 	xfsTestSuite.Require().NoError(err)
 
 	err = source.DoBackupForKind(ctx, "xfsdump", false, true, false)
@@ -95,6 +98,8 @@ func (xfsTestSuite *XFSTestSuite) TestXFSDumpRestic() {
 	xfsTestSuite.Require().NoError(err)
 	err = os.Remove(dumpName)
 	xfsTestSuite.Require().NoError(err)
+	err = os.Remove(dirName)
+	xfsTestSuite.Require().NoError(err)
 }
 
 func TestXFSTestSuite(t *testing.T) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,5 +3,6 @@ @@
     run:
       skip-dirs:
         - test/
+        - dist/
       timeout: 10m