Procházet zdrojové kódy

remove darwin arm64 from build

Matthew R. Kasun před 3 roky
rodič
revize
29195a9daa
1 změnil soubory, kde provedl 49 přidání a 344 odebrání
  1. 49 344
      .github/workflows/buildandrelease.yml

+ 49 - 344
.github/workflows/buildandrelease.yml

@@ -104,20 +104,14 @@ jobs:
 #          prerelease: true
 #          asset_name: netclient
 
-<<<<<<< HEAD
       - 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
@@ -129,7 +123,6 @@ jobs:
           overwrite: true
           prerelease: true
           asset_name: netclient-gui
-=======
 #      - name: build gui
 #        run: |
 #          cd netclient
@@ -146,9 +139,7 @@ jobs:
 #          overwrite: true
 #          prerelease: true
 #          asset_name: netclient-gui
->>>>>>> a0796818 (remove linux/windows for testing)
 
-<<<<<<< HEAD
       - name: Package x86 deb
         continue-on-error: true
         uses: gravitl/github-action-fpm@master
@@ -409,268 +400,6 @@ jobs:
           overwrite: true
           prerelease: true
           asset_name: netclient-freebsd-arm64
-=======
-#      - name: Package x86 deb
-#        continue-on-error: true
-#        uses: gravitl/github-action-fpm@master
-#        with:
-#          fpm_args: './netclient/build/netclient=/sbin/netclient ./netclient/build/netclient.service=/lib/systemd/system/netclient.service'
-#          fpm_opts: '-s dir -t deb --architecture amd64 --version ${{ env.PACKAGE_VERSION }}'
-#
-#      - name: Upload x86 deb to Release
-#        continue-on-error: true
-#        uses: svenstaro/upload-release-action@v2
-#        with:
-#          repo_token: ${{ secrets.GITHUB_TOKEN }}
-#          file: netclient_${{ env.PACKAGE_VERSION }}_amd64.deb
-#          tag: ${{ env.NETMAKER_VERSION }}
-#          overwrite: true
-#          prerelease: true
-#          asset_name: netclient_${{ env.PACKAGE_VERSION }}_amd64.deb
-#
-#      - name: Package x86 rpm
-#        continue-on-error: true
-#        uses: gravitl/github-action-fpm@master
-#        with:
-#          fpm_args: './netclient/build/netclient=/sbin/netclient ./netclient/build/netclient.service=/lib/systemd/system/netclient.service'
-#          fpm_opts: '-s dir -t rpm --architecture amd64 --version ${{ env.PACKAGE_VERSION }}'
-#
-#      - name: Upload x86 rpm to Release
-#        continue-on-error: true
-#        uses: svenstaro/upload-release-action@v2
-#        with:
-#          repo_token: ${{ secrets.GITHUB_TOKEN }}
-#          file: netclient-${{ env.PACKAGE_VERSION }}-1.x86_64.rpm
-#          tag: ${{ env.NETMAKER_VERSION }}
-#          overwrite: true
-#          prerelease: true
-#          asset_name: netclient-${{ env.PACKAGE_VERSION }}-1.x86_64.rpm
-#
-#      - name: Package x86 pacman
-#        continue-on-error: true
-#        uses: gravitl/github-action-fpm@master
-#        with:
-#          # arch has particular path requirements --- cannot write to a symbolic link e.g. /sbin and /lib
-#          fpm_args: './netclient/build/netclient=/usr/bin/netclient ./netclient/build/netclient.service=/usr/lib/systemd/system/netclient.service'
-#          fpm_opts: '-s dir -t pacman --architecture amd64 --version ${{ env.PACKAGE_VERSION }}'
-#
-#      - name: Upload x86 pacman to Release
-#        continue-on-error: true
-#        uses: svenstaro/upload-release-action@v2
-#        with:
-#          repo_token: ${{ secrets.GITHUB_TOKEN }}
-#          file: netclient-${{ env.PACKAGE_VERSION }}-1-x86_64.pkg.tar.zst
-#          tag: ${{ env.NETMAKER_VERSION }}
-#          overwrite: true
-#          prerelease: true
-#          asset_name: netclient-${{ env.PACKAGE_VERSION }}-1-x86_64.pkg.tar.zst
-#
-#  netclient-arm:
-#    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
-#        run: |
-#          cd netclient
-#          env CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=5 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-arm5/netclient main.go
-#          env CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=6 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-arm6/netclient main.go
-#          env CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=7 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-arm7/netclient main.go
-#          env CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-arm64/netclient main.go
-#
-#      - name: Upload arm5 to Release
-#        uses: svenstaro/upload-release-action@v2
-#        with:
-#          repo_token: ${{ secrets.GITHUB_TOKEN }}
-#          file: netclient/build/netclient-arm5/netclient
-#          tag: ${{ env.NETMAKER_VERSION }}
-#          overwrite: true
-#          prerelease: true
-#          asset_name: netclient-arm5
-#
-#      - name: Upload arm6 to Release
-#        uses: svenstaro/upload-release-action@v2
-#        with:
-#          repo_token: ${{ secrets.GITHUB_TOKEN }}
-#          file: netclient/build/netclient-arm6/netclient
-#          tag: ${{ env.NETMAKER_VERSION }}
-#          overwrite: true
-#          prerelease: true
-#          asset_name: netclient-arm6
-#
-#      - name: Upload arm7 to Release
-#        uses: svenstaro/upload-release-action@v2
-#        with:
-#          repo_token: ${{ secrets.GITHUB_TOKEN }}
-#          file: netclient/build/netclient-arm7/netclient
-#          tag: ${{ env.NETMAKER_VERSION }}
-#          overwrite: true
-#          prerelease: true
-#          asset_name: netclient-arm7
-#
-#      - name: Upload arm64 to Release
-#        continue-on-error: true
-#        uses: svenstaro/upload-release-action@v2
-#        with:
-#          repo_token: ${{ secrets.GITHUB_TOKEN }}
-#          file: netclient/build/netclient-arm64/netclient
-#          tag: ${{ env.NETMAKER_VERSION }}
-#          overwrite: true
-#          prerelease: true
-#          asset_name: netclient-arm64
-#
-#      - name: Package arm64 deb
-#        continue-on-error: true
-#        uses: gravitl/github-action-fpm@master
-#        with:
-#          fpm_args: './netclient/build/netclient-arm64/netclient=/sbin/netclient ./netclient/build/netclient.service=/lib/systemd/netclient.service'
-#          fpm_opts: '-s dir -t deb --architecture arm64 --version ${{ env.PACKAGE_VERSION }}'
-#      - name: Upload arm deb to Release
-#        continue-on-error: true
-#        uses: svenstaro/upload-release-action@v2
-#        with:
-#          repo_token: ${{ secrets.GITHUB_TOKEN }}
-#          file: netclient_${{ env.PACKAGE_VERSION }}_arm64.deb
-#          tag: ${{ env.NETMAKER_VERSION }}
-#          overwrite: true
-#          prerelease: true
-#          asset_name: netclient_${{ env.PACKAGE_VERSION }}_arm64.deb
-#
-#      - name: Package arm64 rpm
-#        continue-on-error: true
-#        uses: gravitl/github-action-fpm@master
-#        with:
-#          fpm_args: './netclient/build/netclient-arm64/netclient=/sbin/netclient ./netclient/build/netclient.service=/lib/systemd/netclient.service'
-#          fpm_opts: '-s dir -t rpm --architecture arm64 --version ${{ env.PACKAGE_VERSION }}'
-#
-#      - name: Upload arm64 rpm to Release
-#        continue-on-error: true
-#        uses: svenstaro/upload-release-action@v2
-#        with:
-#          repo_token: ${{ secrets.GITHUB_TOKEN }}
-#          file: netclient-${{ env.PACKAGE_VERSION }}-1.aarch64.rpm
-#          tag: ${{ env.NETMAKER_VERSION }}
-#          overwrite: true
-#          prerelease: true
-#          asset_name: netclient-${{ env.PACKAGE_VERSION }}-1.aarch4.rpm
-#
-#  netclient-mipsle:
-#    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
-#        run: |
-#          cd netclient
-#          env CGO_ENABLED=0 GOOS=linux GOARCH=mipsle go build -ldflags "-s -w -X 'main.version=$NETMAKER_VERSION'" -o build/netclient-mipsle/netclient main.go && upx build/netclient-mipsle/netclient
-#
-#      - name: Upload mipsle to Release
-#        uses: svenstaro/upload-release-action@v2
-#        with:
-#          repo_token: ${{ secrets.GITHUB_TOKEN }}
-#          file: netclient/build/netclient-mipsle/netclient
-#          tag: ${{ env.NETMAKER_VERSION }}
-#          overwrite: true
-#          prerelease: true
-#          asset_name: netclient-mipsle
-#
-#  netclient-freebsd:
-#    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
-#        run: |
-#          cd netclient
-#          env CGO_ENABLED=0 GOOS=freebsd GOARCH=amd64 go build -ldflags="-X 'main.Version=${NETMAKER_VERSION}'" -o build/netclient-freebsd/netclient main.go
-#          env CGO_ENABLED=0 GOOS=freebsd GOARCH=arm GOARM=5 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-freebsd-arm5/netclient main.go
-#          env CGO_ENABLED=0 GOOS=freebsd GOARCH=arm GOARM=6 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-freebsd-arm6/netclient main.go
-#          env CGO_ENABLED=0 GOOS=freebsd GOARCH=arm GOARM=7 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-freebsd-arm7/netclient main.go
-#          env CGO_ENABLED=0 GOOS=freebsd GOARCH=arm64 go build -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-freebsd-arm64/netclient main.go
-#
-#      - name: Upload freebsd to Release
-#        uses: svenstaro/upload-release-action@v2
-#        with:
-#          repo_token: ${{ secrets.GITHUB_TOKEN }}
-#          file: netclient/build/netclient-freebsd/netclient
-#          tag: ${{ env.NETMAKER_VERSION }}
-#          overwrite: true
-#          prerelease: true
-#          asset_name: netclient-freebsd
-#
-#      - name: Upload freebsd-arm5 to Release
-#        uses: svenstaro/upload-release-action@v2
-#        with:
-#          repo_token: ${{ secrets.GITHUB_TOKEN }}
-#          file: netclient/build/netclient-freebsd-arm5/netclient
-#          tag: ${{ env.NETMAKER_VERSION }}
-#          overwrite: true
-#          prerelease: true
-#          asset_name: netclient-freebsd-arm5
-#
-#      - name: Upload freebsd-arm6 to Release
-#        uses: svenstaro/upload-release-action@v2
-#        with:
-#          repo_token: ${{ secrets.GITHUB_TOKEN }}
-#          file: netclient/build/netclient-freebsd-arm6/netclient
-#          tag: ${{ env.NETMAKER_VERSION }}
-#          overwrite: true
-#          prerelease: true
-#          asset_name: netclient-freebsd-arm6
-#
-#      - name: Upload freebsd-arm7 to Release
-#        uses: svenstaro/upload-release-action@v2
-#        with:
-#          repo_token: ${{ secrets.GITHUB_TOKEN }}
-#          file: netclient/build/netclient-freebsd-arm7/netclient
-#          tag: ${{ env.NETMAKER_VERSION }}
-#          overwrite: true
-#          prerelease: true
-#          asset_name: netclient-freebsd-arm7
-#
-#      - name: Upload freebsd-arm64 to Release
-#        uses: svenstaro/upload-release-action@v2
-#        with:
-#          repo_token: ${{ secrets.GITHUB_TOKEN }}
-#          file: netclient/build/netclient-freebsd-arm64/netclient
-#          tag: ${{ env.NETMAKER_VERSION }}
-#          overwrite: true
-#          prerelease: true
-#          asset_name: netclient-freebsd-arm64
->>>>>>> 1dbb1535 (test gui builds)
 
   netclient-darwin:
     runs-on: macos-latest
@@ -691,18 +420,11 @@ 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
-=======
-          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)
+#          env GOOS=darwin GOARCH=arm64 go build -tags=gui -ldflags="-X 'main.version=${NETMAKER_VERSION}'" -o build/netclient-darwin-arm64/netclient .
       - name: Upload darwin-amd64 to Release
         uses: svenstaro/upload-release-action@v2
         with:
@@ -713,60 +435,59 @@ jobs:
           prerelease: true
           asset_name: netclient-darwin
 
-      - name: Upload darwin-arm64 to Release
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: netclient/build/netclient-darwin-arm64/netclient
-          tag: ${{ env.NETMAKER_VERSION }}
-          overwrite: true
-          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
+#      - name: Upload darwin-arm64 to Release
 #        uses: svenstaro/upload-release-action@v2
 #        with:
 #          repo_token: ${{ secrets.GITHUB_TOKEN }}
-#          file: netclient/build/netclient.exe
+#          file: netclient/build/netclient-darwin-arm64/netclient
 #          tag: ${{ env.NETMAKER_VERSION }}
 #          overwrite: true
 #          prerelease: true
-#          asset_name: netclient.exe
+#          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
 
-<<<<<<< HEAD
   linux-packages:
     runs-on: ubuntu-latest
     needs: [version, netclient-x86, netclient-arm]
@@ -778,19 +499,3 @@ jobs:
           repository: gravitl/netmaker-devops
           event-type: build-packages
           client-payload: '{"VERSION": "${{ env.PACKAGE_VERSION }}"}'
-=======
-#  linux-packages:
-#    runs-on: ubuntu-latest
-#    needs: |
-#      version
-#      netclient-x86
-#      netclien-arm
-#    steps:
-#      - name: Repository Dispatch
-#        uses: peter-evans/[email protected]
-#        with:
-#          token: ${{ secrets.PERS_TOKEN_FOR_NETMAKER_DEVOPS}}
-#          repository: gravitl/netmaker-devops
-#          event-type: build-packages
-#          client-payload: '{"VERSION": "${{ env.PACKAGE_VERSION }}"}'
->>>>>>> 1dbb1535 (test gui builds)