|
@@ -71,22 +71,22 @@ jobs:
|
|
|
prerelease: true
|
|
|
asset_name: netmaker
|
|
|
|
|
|
- netclient-x86:
|
|
|
- runs-on: ubuntu-latest
|
|
|
- needs: version
|
|
|
- steps:
|
|
|
- - name: Checkout
|
|
|
- uses: actions/checkout@v2
|
|
|
- - name: Set Variables
|
|
|
- run: |
|
|
|
- TAG=${{needs.version.outputs.tag}}
|
|
|
- VERSION=${{needs.version.outputs.version}}
|
|
|
- echo "NETMAKER_VERSION=${TAG}" >> $GITHUB_ENV
|
|
|
- echo "PACKAGE_VERSION=${VERSION}" >> $GITHUB_ENV
|
|
|
- - name: Setup go
|
|
|
- uses: actions/setup-go@v2
|
|
|
- with:
|
|
|
- go-version: 1.18
|
|
|
+# netclient-x86:
|
|
|
+# runs-on: ubuntu-latest
|
|
|
+# needs: version
|
|
|
+# steps:
|
|
|
+# - name: Checkout
|
|
|
+# uses: actions/checkout@v2
|
|
|
+# - name: Set Variables
|
|
|
+# run: |
|
|
|
+# TAG=${{needs.version.outputs.tag}}
|
|
|
+# VERSION=${{needs.version.outputs.version}}
|
|
|
+# echo "NETMAKER_VERSION=${TAG}" >> $GITHUB_ENV
|
|
|
+# echo "PACKAGE_VERSION=${VERSION}" >> $GITHUB_ENV
|
|
|
+# - name: Setup go
|
|
|
+# uses: actions/setup-go@v2
|
|
|
+# with:
|
|
|
+# go-version: 1.18
|
|
|
|
|
|
# - name: Build cli
|
|
|
# run: |
|
|
@@ -104,6 +104,7 @@ jobs:
|
|
|
# prerelease: true
|
|
|
# asset_name: netclient
|
|
|
|
|
|
+<<<<<<< HEAD
|
|
|
- name: build gui
|
|
|
run: |
|
|
|
cd netclient
|
|
@@ -128,6 +129,24 @@ jobs:
|
|
|
overwrite: true
|
|
|
prerelease: true
|
|
|
asset_name: netclient-gui
|
|
|
+=======
|
|
|
+# - name: build gui
|
|
|
+# run: |
|
|
|
+# cd netclient
|
|
|
+# sudo apt-get install -y gcc libgl1-mesa-dev xorg-dev
|
|
|
+# go build -tags=gui -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient .
|
|
|
+#
|
|
|
+# - name: Upload netclient x86 gui to Release
|
|
|
+# continue-on-error: true
|
|
|
+# uses: svenstaro/upload-release-action@v2
|
|
|
+# with:
|
|
|
+# repo_token: ${{ secrets.GITHUB_TOKEN }}
|
|
|
+# file: netclient/build/netclient
|
|
|
+# tag: ${{ env.NETMAKER_VERSION }}
|
|
|
+# overwrite: true
|
|
|
+# prerelease: true
|
|
|
+# asset_name: netclient-gui
|
|
|
+>>>>>>> a0796818 (remove linux/windows for testing)
|
|
|
|
|
|
<<<<<<< HEAD
|
|
|
- name: Package x86 deb
|
|
@@ -672,6 +691,7 @@ jobs:
|
|
|
- name: Build
|
|
|
run: |
|
|
|
cd netclient
|
|
|
+<<<<<<< HEAD
|
|
|
<<<<<<< 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
|
|
@@ -679,6 +699,10 @@ jobs:
|
|
|
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)
|
|
|
+=======
|
|
|
+ env GOOS=darwin GOARCH=amd64 go build -tags=gui -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-darwin/netclient .
|
|
|
+ env GOOS=darwin GOARCH=arm64 go build -tags=gui -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-darwin-arm64/netclient .
|
|
|
+>>>>>>> a0796818 (remove linux/windows for testing)
|
|
|
- name: Upload darwin-amd64 to Release
|
|
|
uses: svenstaro/upload-release-action@v2
|
|
|
with:
|
|
@@ -699,48 +723,48 @@ jobs:
|
|
|
prerelease: true
|
|
|
asset_name: netclient-darwin-arm64
|
|
|
|
|
|
- netclient-windows:
|
|
|
- runs-on: windows-latest
|
|
|
- needs: version
|
|
|
- steps:
|
|
|
- - name: Checkout
|
|
|
- uses: actions/checkout@v2
|
|
|
- - name: Set Variables
|
|
|
- run: |
|
|
|
- TAG=${{needs.version.outputs.tag}}
|
|
|
- VERSION=${{needs.version.outputs.version}}
|
|
|
- echo "NETMAKER_VERSION=${TAG}" >> $GITHUB_ENV
|
|
|
- echo "PACKAGE_VERSION=${VERSION}" >> $GITHUB_ENV
|
|
|
- shell: bash
|
|
|
- - name: Setup go
|
|
|
- uses: actions/setup-go@v3
|
|
|
- with:
|
|
|
- go-version: 1.18
|
|
|
- - name: Mysys2 setup
|
|
|
- uses: msys2/setup-msys2@v2
|
|
|
- with:
|
|
|
- install: >-
|
|
|
- git
|
|
|
- mingw-w64-x86_64-toolchain
|
|
|
- - name: Build
|
|
|
- run: |
|
|
|
- echo $(go env GOPATH)/bin >> $GITHUB_PATH
|
|
|
- cd netclient
|
|
|
- go get -v github.com/josephspurrier/goversioninfo
|
|
|
- go install -v github.com/josephspurrier/goversioninfo/cmd/goversioninfo
|
|
|
- go generate
|
|
|
- go build -tags=gui -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient.exe .
|
|
|
-
|
|
|
- - name: Upload netclient windows to Release
|
|
|
- continue-on-error: true
|
|
|
- uses: svenstaro/upload-release-action@v2
|
|
|
- with:
|
|
|
- repo_token: ${{ secrets.GITHUB_TOKEN }}
|
|
|
- file: netclient/build/netclient.exe
|
|
|
- tag: ${{ env.NETMAKER_VERSION }}
|
|
|
- overwrite: true
|
|
|
- prerelease: true
|
|
|
- asset_name: netclient.exe
|
|
|
+# netclient-windows:
|
|
|
+# runs-on: windows-latest
|
|
|
+# needs: version
|
|
|
+# steps:
|
|
|
+# - name: Checkout
|
|
|
+# uses: actions/checkout@v2
|
|
|
+# - name: Set Variables
|
|
|
+# run: |
|
|
|
+# TAG=${{needs.version.outputs.tag}}
|
|
|
+# VERSION=${{needs.version.outputs.version}}
|
|
|
+# echo "NETMAKER_VERSION=${TAG}" >> $GITHUB_ENV
|
|
|
+# echo "PACKAGE_VERSION=${VERSION}" >> $GITHUB_ENV
|
|
|
+# shell: bash
|
|
|
+# - name: Setup go
|
|
|
+# uses: actions/setup-go@v3
|
|
|
+# with:
|
|
|
+# go-version: 1.18
|
|
|
+# - name: Mysys2 setup
|
|
|
+# uses: msys2/setup-msys2@v2
|
|
|
+# with:
|
|
|
+# install: >-
|
|
|
+# git
|
|
|
+# mingw-w64-x86_64-toolchain
|
|
|
+# - name: Build
|
|
|
+# run: |
|
|
|
+# echo $(go env GOPATH)/bin >> $GITHUB_PATH
|
|
|
+# cd netclient
|
|
|
+# go get -v github.com/josephspurrier/goversioninfo
|
|
|
+# go install -v github.com/josephspurrier/goversioninfo/cmd/goversioninfo
|
|
|
+# go generate
|
|
|
+# go build -tags=gui -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient.exe .
|
|
|
+#
|
|
|
+# - name: Upload netclient windows to Release
|
|
|
+# continue-on-error: true
|
|
|
+# uses: svenstaro/upload-release-action@v2
|
|
|
+# with:
|
|
|
+# repo_token: ${{ secrets.GITHUB_TOKEN }}
|
|
|
+# file: netclient/build/netclient.exe
|
|
|
+# tag: ${{ env.NETMAKER_VERSION }}
|
|
|
+# overwrite: true
|
|
|
+# prerelease: true
|
|
|
+# asset_name: netclient.exe
|
|
|
|
|
|
<<<<<<< HEAD
|
|
|
linux-packages:
|