refactoring

opentelekomcloud · Jun 5, 2024 · 2fb81ec · 2fb81ec
1 parent 3b4c23a
commit 2fb81ec
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 71 deletions.
diff --git a/.github/actions/code-quality/action.yaml b/.github/actions/code-quality/action.yaml
diff --git a/.github/workflows/otc-golangci-lint.yaml b/.github/workflows/otc-golangci-lint.yaml
@@ -6,42 +6,43 @@ on:
       - opened
       - edited
       - synchronize
+  workflow_call:
+    inputs:
+      config-path:
+        required: true
+        type: string
+    secrets:
+      envPAT:
+        required: true
 
 jobs:
   lint:
+    name: run golangci-lint
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: run checks
-        uses: ./.github/actions/code-quality
-
-#  lint:
-#    name: run golangci-lint
-#    runs-on: ubuntu-latest
-#    steps:
-#      - uses: actions/checkout@v4
-#      - uses: actions/setup-go@v5
-#        with:
-#          go-version: "1.20"
-#      - name: golangci-lint
-#        uses: golangci/golangci-lint-action@v6
-#        with:
-#          version: v1.53.3
-#  vet:
-#    name: run go vet
-#    runs-on: ubuntu-22.04
-#    steps:
-#      - uses: actions/checkout@v4
-#      - uses: actions/setup-go@v5
-#        with:
-#          go-version: "1.20"
-#      - run: make vet
-#  unit_tests:
-#    name: run unit tests
-#    runs-on: ubuntu-22.04
-#    steps:
-#      - uses: actions/checkout@v4
-#      - uses: actions/setup-go@v5
-#        with:
-#          go-version: "1.20"
-#      - run: make test
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.20"
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v6
+        with:
+          version: v1.53.3
+  vet:
+    name: run go vet
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.20"
+      - run: make vet
+  unit_tests:
+    name: run unit tests
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.20"
+      - run: make test
diff --git a/.github/workflows/otc-run-acc-tests.yaml b/.github/workflows/otc-run-acc-tests.yaml
@@ -4,6 +4,15 @@ on:
   pull_request:
     types:
       - labeled
+  workflow_call:
+    inputs:
+      config-path:
+        required: true
+        type: string
+    secrets:
+      envPAT:
+        required: true
+
 
 jobs:
   acc_tests:
@@ -16,6 +25,7 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           go-version: "1.20"
+      - uses: .github/workflows/reusable-workflow.yml
       - run: make acceptance
         env:
           OS_AUTH_URL: ${{ secrets.AUTH_URL }}