replace centos7 with rockylinux9 in integration tests

goss-org · Jul 9, 2024 · f1f2cc9 · f1f2cc9
1 parent 61d1445
commit f1f2cc9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/.github/workflows/golangci.yaml b/.github/workflows/golangci.yaml
@@ -51,11 +51,5 @@ jobs:
         with:
           go-version-file: go.mod
 
-      #- name: Integration tests
-      #  run: make test-int-all
-
-      # GHA does not work with centos7
-      - name: Integration tests-64
-        run: make wheezy trusty alpine3 arch test-int-serve-linux-amd64
-      - name: Integration tests-32
-        run: make wheezy-32 trusty-32 alpine3-32 arch-32
+      - name: Integration tests
+        run: make test-int-all
diff --git a/Makefile b/Makefile
@@ -96,8 +96,8 @@ test-darwin-all: test-short-all test-int-darwin-all
 test-linux-all: test-short-all test-int-64 test-int-32
 test-windows-all: test-short-all test-int-windows-all
 
-test-int-64: centos7 rockylinux9 wheezy trusty alpine3 arch test-int-serve-linux-amd64
-test-int-32: centos7-32 rockylinux9-32 wheezy-32 trusty-32 alpine3-32 arch-32
+test-int-64: rockylinux9 wheezy trusty alpine3 arch test-int-serve-linux-amd64
+test-int-32: rockylinux9-32 wheezy-32 trusty-32 alpine3-32 arch-32
 test-int-darwin-all: test-int-validate-darwin-amd64 test-int-serve-darwin-amd64
 test-int-windows-all: test-int-validate-windows-amd64 test-int-serve-windows-amd64
 test-int-all: test-int-32 test-int-64