From 026318ccc44683285bba9fba8b443ff304578442 Mon Sep 17 00:00:00 2001
From: octeep <octeep@pm.me>
Date: Tue, 29 Mar 2022 18:09:18 +0100
Subject: [PATCH] update ci

---
 .github/workflows/build.yml     | 15 ++++++++++-----
 .github/workflows/ci-ubuntu.yml | 23 -----------------------
 2 files changed, 10 insertions(+), 28 deletions(-)
 delete mode 100644 .github/workflows/ci-ubuntu.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 40d8b80..d4f3e1c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,6 +1,11 @@
 name: Build
 on:
-  workflow_dispatch:
+  push:
+    branches:
+      - '**'
+  pull_request:
+    branches:
+      - '**'
 
 jobs:
   windowsAmd64Build:
@@ -14,7 +19,7 @@ jobs:
           go-version: 1.17
       - name: Building Windows amd64 Version
         run: |
-          CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o WireProxy_amd64.exe -v main.go
+          CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o WireProxy_amd64.exe -v ./cmd/wireproxy
           mkdir release_windows_amd64
           mv WireProxy_amd64.exe wireproxy.exe
           cp wireproxy.exe release_windows_amd64/wireproxy.exe
@@ -34,7 +39,7 @@ jobs:
           go-version: 1.17
       - name: Building Linux amd64 Version
         run: |
-          CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o WireProxy_amd64 -v main.go
+          CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o WireProxy_amd64 -v ./cmd/wireproxy
           mkdir release_linux_amd64
           mv WireProxy_amd64 wireproxy
           cp wireproxy release_linux_amd64/wireproxy
@@ -54,7 +59,7 @@ jobs:
           go-version: 1.17
       - name: Building Linux arm64 Version
         run: |
-          CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -o WireProxy_arm64 -v main.go
+          CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -o WireProxy_arm64 -v ./cmd/wireproxy
           mkdir release_linux_arm64
           mv WireProxy_arm64 wireproxy
           cp wireproxy release_linux_arm64/wireproxy
@@ -74,7 +79,7 @@ jobs:
           go-version: 1.17
       - name: Building Linux s390x Version
         run: |
-          CGO_ENABLED=0 GOOS=linux GOARCH=s390x go build -o WireProxy_s390x -v main.go
+          CGO_ENABLED=0 GOOS=linux GOARCH=s390x go build -o WireProxy_s390x -v ./cmd/wireproxy
           mkdir release_linux_s390x
           mv WireProxy_s390x wireproxy
           cp wireproxy release_linux_s390x/wireproxy
diff --git a/.github/workflows/ci-ubuntu.yml b/.github/workflows/ci-ubuntu.yml
deleted file mode 100644
index 40f8fee..0000000
--- a/.github/workflows/ci-ubuntu.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Build
-on:
-  push:
-    branches:
-      - '**'
-  pull_request:
-    branches:
-      - '**'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.17
-    - name: Checkout wireproxy
-      uses: actions/checkout@v2
-    - name: Build wireproxy
-      run: go build ./cmd/wireproxy
-