diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index e69de29..ff7065a 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -0,0 +1,36 @@
+name: golangci-lint
+
+on:
+  push:
+    branches:
+      - 21-cicd
+  pull_request:
+    branches:
+      - main
+      - develop
+
+permissions:
+  # Optional: allow write access to checks to allow the action to annotate code in the PR.
+  checks: write
+
+jobs:
+
+  golangci:
+
+    strategy:
+      matrix:
+        go: [ 'stable' ]
+        os: [ ubuntu-latest ]
+
+    name: lint
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-go@v5
+        with:
+          go-version: ${{ matrix.go }}
+
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v6
\ No newline at end of file