change go build -- remove main.go

.github/workflows/buildandrelease.yml

@@ -38,7 +38,6 @@ jobs:
           fi
           echo "::set-output name=tag::${{ env.NETMAKER_VERSION }}"
           echo "::set-output name=version::${{ env.PACKAGE_VERSION }}"
-<<<<<<< HEAD
   netmaker:
     runs-on: ubuntu-latest
     needs: version
@@ -71,40 +70,6 @@ jobs:
           overwrite: true
           prerelease: true
           asset_name: netmaker
-=======
-#  netmaker:        
-#    runs-on: ubuntu-latest
-#    needs: version
-#    steps:
-#      - name: set variables
-#        run: |
-#          echo ${{ needs.version.outputs.tag }} ${{ needs.version.outputs.version }}
-#          TAG=${{needs.version.outputs.tag}}
-#          VERSION=${{needs.version.outputs.version}}
-#          if [[ -z ${VERSION} || -z ${TAG} ]]; then
-#            exit 1
-#          fi
-#          echo "NETMAKER_VERSION=${TAG}"  >> $GITHUB_ENV
-#          echo "PACKAGE_VERSION=${VERSION}" >> $GITHUB_ENV
-#      - name: Checkout
-#        uses: actions/checkout@v2
-#      - name: Setup go
-#        uses: actions/setup-go@v2
-#        with:
-#          go-version: 1.18
-#      - name: Build
-#        run: |
-#          env CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netmaker main.go
-#      - name: Upload netmaker x86 to Release
-#        uses: svenstaro/upload-release-action@v2
-#        with:
-#          repo_token: ${{ secrets.GITHUB_TOKEN }}
-#          file: build/netmaker
-#          tag: ${{ env.NETMAKER_VERSION }}
-#          overwrite: true
-#          prerelease: true
-#          asset_name: netmaker
->>>>>>> 1dbb1535 (test gui builds)
 
   netclient-x86:
     runs-on: ubuntu-latest
@@ -141,12 +106,17 @@ jobs:
 
       - name: build gui
         run: |
+          cd netclient
           sudo apt-get install -y gcc libgl1-mesa-dev xorg-dev
+<<<<<<< HEAD
 <<<<<<< HEAD
           go build -tags=gui -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-gui .
 =======
           go build -tags=gui -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient main.go
 >>>>>>> 1dbb1535 (test gui builds)
+=======
+          go build -tags=gui -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient .
+>>>>>>> f37b8247 (change go build -- remove main.go)
 
       - name: Upload netclient x86 gui to Release
         continue-on-error: true
@@ -702,8 +672,13 @@ jobs:
       - name: Build
         run: |
           cd netclient
+<<<<<<< HEAD
           env GOOS=darwin GOARCH=amd64 go build -tags=gui -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-darwin/netclient .
           env CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 go build -tags=gui -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-darwin-arm64/netclient main.go
+=======
+          env GOARCH=amd64 go build -tags=gui -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-darwin/netclient .
+          env GOARCH=arm64 go build -tags=gui -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-darwin-arm64/netclient .
+>>>>>>> f37b8247 (change go build -- remove main.go)
       - name: Upload darwin-amd64 to Release
         uses: svenstaro/upload-release-action@v2
         with: