Fix GHA (#10)

mdsol · Jul 17, 2024 · 013252b · 013252b
1 parent a1bfc8d
commit 013252b
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 18 deletions.
diff --git a/.github/workflows/build_artifact.yml b/.github/workflows/build_artifact.yml
@@ -21,11 +21,14 @@ jobs:
     env: {}
 
     steps:
-      - name: CI
-        uses: ./github/workflows/ci.yaml
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Go
+        uses: ./.github/workflows/composite/go
 
       - name: Build
-        run: make clean lint prepare build pack ß
+        run: make clean lint prepare build pack
 
       - name: Environment
         run: |

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,8 +3,8 @@ name: CI
 on:
   push:
     paths:
-      - .github/workflows/ci.yml
-      - pkg/**
+      - '.github/workflows/**.yml'
+      - 'pkg/**'
       - go.mod
       - go.sum
       - Makefile
@@ -25,18 +25,9 @@ jobs:
     env: {}
 
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v4
 
-      - name: Setup Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: '1.22'
+      - name: Go
+        uses: ./.github/workflows/composite/go
 
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
-        with:
-          version: v1.58.2
-          args: --verbose --concurrency=2 --timeout=600s
-
-      - name: Test with the Go CLI
-        run: go test -v ./...
diff --git a/.github/workflows/composite/go/action.yml b/.github/workflows/composite/go/action.yml
@@ -0,0 +1,19 @@
+name: Go
+
+runs:
+  using: composite
+  steps:
+    - name: Setup Go
+      uses: actions/setup-go@v5
+      with:
+        go-version: '1.22'
+
+    - name: golangci-lint
+      uses: golangci/golangci-lint-action@v6
+      with:
+        version: v1.58.2
+        args: --verbose --concurrency=2 --timeout=600s
+
+    - name: Test with the Go CLI
+      shell: bash
+      run: go test -v ./...