Merge pull request #2 from bilalcaliskan/devel

feat: ci/cd setup
bilalcaliskan · Jan 20, 2024 · 186951c · 186951c
2 parents 6ecdeb1 + 5f3d9f2
commit 186951c
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 48 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -45,23 +45,28 @@ jobs:
         with:
           version: "2022.1.3"
 
-  codeql:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'go' ]
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
-        with:
-          languages: ${{ matrix.language }}
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v3
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+#  codeql:
+#    runs-on: ubuntu-latest
+#    strategy:
+#      fail-fast: false
+#      matrix:
+#        language: [ 'go' ]
+#    steps:
+#      - name: Checkout code
+#        uses: actions/checkout@v4
+#      - name: Install Go
+#        uses: actions/setup-go@v5
+#        with:
+#          go-version-file: "go.mod"
+#          cache: true
+#      - name: Initialize CodeQL
+#        uses: github/codeql-action/init@v3
+#        with:
+#          languages: ${{ matrix.language }}
+#      - name: Autobuild
+#        uses: github/codeql-action/autobuild@v3
+#      - name: Perform CodeQL Analysis
+#        uses: github/codeql-action/analyze@v3
 
   sonarcloud:
     runs-on: ubuntu-latest
@@ -100,5 +105,7 @@ jobs:
         with:
           go-version-file: "go.mod"
           cache: true
-      - name: Build
-        run: make -s build
+      - name: Build daemon
+        run: make -s build-daemon
+      - name: Build CLI
+        run: make -s build-cli
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -42,23 +42,23 @@ jobs:
         with:
           version: "2022.1.3"
 
-  codeql:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'go' ]
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
-        with:
-          languages: ${{ matrix.language }}
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v3
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+#  codeql:
+#    runs-on: ubuntu-latest
+#    strategy:
+#      fail-fast: false
+#      matrix:
+#        language: [ 'go' ]
+#    steps:
+#      - name: Checkout code
+#        uses: actions/checkout@v4
+#      - name: Initialize CodeQL
+#        uses: github/codeql-action/init@v3
+#        with:
+#          languages: ${{ matrix.language }}
+#      - name: Autobuild
+#        uses: github/codeql-action/autobuild@v3
+#      - name: Perform CodeQL Analysis
+#        uses: github/codeql-action/analyze@v3
 
   sonarcloud:
     runs-on: ubuntu-latest
@@ -97,15 +97,17 @@ jobs:
         with:
           go-version-file: "go.mod"
           cache: true
-      - name: Build
-        run: make -s build
+      - name: Build daemon
+        run: make -s build-daemon
+      - name: Build CLi
+        run: make -s build-cli
 
   tag:
     runs-on: ubuntu-latest
     needs:
       - lint
       - test
-      - codeql
+#      - codeql
       - staticcheck
       - sonarcloud
       - build

diff --git a/Makefile b/Makefile
@@ -95,10 +95,15 @@ test-coverage: test
 	go tool cover -html=coverage.txt -o cover.html
 	open cover.html
 
-.PHONY: build
+.PHONY: build-daemon
 build: vendor
-	$(info building binary...)
-	go build -o bin/main main.go || (echo an error while building binary, exiting!; sh -c 'exit 1';)
+	$(info building daemon binary...)
+	go build -o bin/split-the-tunnel cmd/daemon/daemon.go || (echo an error while building daemon binary, exiting!; sh -c 'exit 1';)
+
+.PHONY: build-cli
+build: vendor
+	$(info building cli binary...)
+	go build -o bin/stt-cli cmd/cli/cli.go || (echo an error while building cli binary, exiting!; sh -c 'exit 1';)
 
 .PHONY: run
 run: vendor

diff --git a/build/package/.goreleaser.yaml b/build/package/.goreleaser.yaml
@@ -14,10 +14,9 @@ before:
     - go mod download
 
 builds:
-  - id: binary
+  - id: daemon
     goos:
       - linux
-      - darwin
     goarch:
       - amd64
     binary: "{{ .ProjectName }}"
@@ -26,6 +25,17 @@ builds:
       - -s -w -X {{ .Env.MODULE }}/{{ .Env.VERSION_DIR }}.gitCommit={{ .ShortCommit }}
       - -s -w -X {{ .Env.MODULE }}/{{ .Env.VERSION_DIR }}.buildDate={{ .CommitDate }}
     main: ./main.go
+  - id: cli
+    goos:
+      - linux
+    goarch:
+      - amd64
+    binary: stt-cli
+    ldflags:
+      - -s -w -X {{ .Env.MODULE }}/{{ .Env.VERSION_DIR }}.gitVersion={{ .Version }}
+      - -s -w -X {{ .Env.MODULE }}/{{ .Env.VERSION_DIR }}.gitCommit={{ .ShortCommit }}
+      - -s -w -X {{ .Env.MODULE }}/{{ .Env.VERSION_DIR }}.buildDate={{ .CommitDate }}
+    main: ./main.go
 
 archives:
   - files:

diff --git a/internal/ipc/ipc.go b/internal/ipc/ipc.go
@@ -165,9 +165,6 @@ func handleListCommand(conn net.Conn) error {
 
 func Cleanup(path string) error {
 	// Perform any cleanup and shutdown tasks here
-	if err := os.Remove(path); err != nil {
-		return err
-	}
 
-	return nil
+	return os.Remove(path)
 }