Skip to content

Commit

Permalink
Merge pull request #194 from chenrui333/go-1.14
Browse files Browse the repository at this point in the history
chore(deps): bump go to v1.14
  • Loading branch information
bojand authored Jun 1, 2020
2 parents 66cbda8 + fe8a8e6 commit cc19f0b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@ on:
jobs:
build:
runs-on: ubuntu-latest
env:
env:
GO111MODULE: on
GOLANGCI_LINT_VERSION: v1.22.0

steps:
- name: Set up Go
uses: actions/setup-go@v1
with:
go-version: 1.13
go-version: 1.14
id: go
- name: Check out code
uses: actions/checkout@v1
uses: actions/checkout@v2
- name: Cache Go modules
uses: actions/cache@v1
id: cache-go-mod
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,28 +28,28 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Set up Go
uses: actions/setup-go@v1
with:
go-version: 1.13.x
go-version: 1.14

- name: Get current time
uses: gerred/actions/current-time@master
id: current-time

- name: Set version
# run: echo "::set-env name=RELEASE_VERSION::${GITHUB_REF/refs\/tags\//}"
run: echo "::set-env name=RELEASE_VERSION::$(git describe --tags $(git rev-list --tags --max-count=1))"

- name: Build ghz
run: |
mkdir ./dist/
mkdir ./dist/${{ matrix.target }}/
go build -ldflags='-s -w -X main.version=${{ env.RELEASE_VERSION }} -X main.commit=${{ github.sha }} -X main.date=${{ steps.current-time.outputs.time }}' -o ./dist/${{ matrix.target }}/ ./cmd/ghz/...
- name: Build ghz-web
env:
env:
CGO_ENABLED: 1
run: |
go build -ldflags='-s -w -X main.version=${{ env.RELEASE_VERSION }} -X main.commit=${{ github.sha }} -X main.date=${{ steps.current-time.outputs.time }}' -o ./dist/${{ matrix.target }}/ ./cmd/ghz-web/...
Expand All @@ -60,7 +60,7 @@ jobs:
cp ./LICENSE ./dist/${{ matrix.target }}/LICENSE
cd ./dist/${{ matrix.target }}
7z a ../../${{ matrix.name }} ghz.exe ghz-web.exe ./LICENSE
- name: Prepare build artifacts [-nix]
if: matrix.os != 'windows-latest'
run: |
Expand Down Expand Up @@ -150,9 +150,9 @@ jobs:
git config --global credential.helper store
git config --global user.name "bojand"
git config --global user.email "[email protected]"
cd $(brew --repo homebrew/core)
cd $(brew --repo homebrew/core)
git fetch origin
sudo git reset --hard origin/master
sudo git reset --hard origin/master
cd -
brew bump-formula-pr --url=https://github.com/bojand/ghz/archive/${{ env.RELEASE_VERSION }}.tar.gz --message="Automated release pull request using continuous integration." --no-browse -v ghz --force
brew bump-formula-pr --url=https://github.com/bojand/ghz/archive/${{ env.RELEASE_VERSION }}.tar.gz --message="Automated release pull request using continuous integration." --no-browse -v ghz-web --force
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/bojand/ghz

go 1.13
go 1.14

require (
cloud.google.com/go v0.46.3 // indirect
Expand Down

0 comments on commit cc19f0b

Please sign in to comment.