diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fd30c5fa..9f994391 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ jobs: build: strategy: matrix: - platform: [macos-latest] + platform: [ubuntu-latest] go-version: [1.17] name: Build runs-on: ${{ matrix.platform }} @@ -25,8 +25,8 @@ jobs: with: node-version: '16' - - name: Setup docker - uses: docker-practice/actions-setup-docker@master +# - name: Setup docker +# uses: docker-practice/actions-setup-docker@master - name: Checkout uses: actions/checkout@v2 @@ -45,7 +45,7 @@ jobs: run: | docker pull techknowlogick/xgo:latest go install src.techknowlogick.com/xgo@latest - brew install upx + sudo apt install upx - name: Build web run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 265d7498..02fa517f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ jobs: release: strategy: matrix: - platform: [macos-latest] + platform: [ubuntu-latest] go-version: [1.17] name: Release runs-on: ${{ matrix.platform }} @@ -19,8 +19,8 @@ jobs: with: go-version: ${{ matrix.go-version }} - - name: Setup docker - uses: docker-practice/actions-setup-docker@master +# - name: Setup docker +# uses: docker-practice/actions-setup-docker@master - name: Setup Node uses: actions/setup-node@v2 @@ -44,7 +44,7 @@ jobs: run: | docker pull techknowlogick/xgo:latest go install src.techknowlogick.com/xgo@latest - brew install upx + sudo apt install upx - name: Build web run: | diff --git a/build.sh b/build.sh index 8066e71d..84180179 100644 --- a/build.sh +++ b/build.sh @@ -9,7 +9,7 @@ gitCommit=$(git log --pretty=format:"%h" -1) if [ "$1" == "release" ]; then gitTag=$(git describe --abbrev=0 --tags) else - gitTag=$(git describe --abbrev=0 --tags)-next + gitTag=build-next fi echo "build version: $gitTag"