From 7a66a9c90d5f706f51cc40cedc335d3f85f75210 Mon Sep 17 00:00:00 2001 From: lufia Date: Mon, 30 Nov 2020 11:49:40 +0900 Subject: [PATCH 1/8] use actions/cache@v2 --- .github/workflows/test.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 772dd7b5..6366c74f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,6 +20,12 @@ jobs: with: go-version: ${{ matrix.go }} - uses: actions/checkout@v2 + - uses: actions/cache@v2 + with: + path: ~/go/pkg/mod + key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} + restore-keys: | + ${{ runner.os }}-go- - run: | make lint make cover @@ -34,6 +40,12 @@ jobs: with: go-version: ${{ matrix.go }} - uses: actions/checkout@v2 + - uses: actions/cache@v2 + with: + path: ~/go/pkg/mod + key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} + restore-keys: | + ${{ runner.os }}-go- - run: | go build -o check-log/check-log.exe ./check-log go build -o check-procs/check-procs.exe ./check-procs From eb0a2d591a3cc5172288f3d484a2ec784c775cc5 Mon Sep 17 00:00:00 2001 From: lufia Date: Mon, 30 Nov 2020 11:49:52 +0900 Subject: [PATCH 2/8] drop 'go vet' 'go vet' run automatically during 'go test'. --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6366c74f..42f0b36a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -50,5 +50,4 @@ jobs: go build -o check-log/check-log.exe ./check-log go build -o check-procs/check-procs.exe ./check-procs go build -o check-windows-eventlog/check-windows-evenglog.exe ./check-windows-eventlog - go vet -all ./check-log/... ./check-procs/... ./check-ntservice/... ./check-windows-eventlog/... go test ./check-log/... ./check-procs/... ./check-ntservice/... ./check-windows-eventlog/... From 0217edf4c05c3ceb67e1e0fc61ffd0f2d3b3dcc2 Mon Sep 17 00:00:00 2001 From: lufia Date: Mon, 30 Nov 2020 11:53:27 +0900 Subject: [PATCH 3/8] release check-plugins packages by GitHub Actions --- .github/workflows/test.yml | 43 ++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 42f0b36a..b822106f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,7 +6,9 @@ on: branches: - master pull_request: - +env: + GO111MODULE: on + DEBIAN_FRONTEND: noninteractive jobs: test: strategy: @@ -27,9 +29,7 @@ jobs: restore-keys: | ${{ runner.os }}-go- - run: | - make lint - make cover - + make lint cover all test-windows: strategy: matrix: @@ -51,3 +51,38 @@ jobs: go build -o check-procs/check-procs.exe ./check-procs go build -o check-windows-eventlog/check-windows-evenglog.exe ./check-windows-eventlog go test ./check-log/... ./check-procs/... ./check-ntservice/... ./check-windows-eventlog/... + release: + needs: [test, test-windows] + runs-on: ubuntu-latest + if: github.ref == 'refs/heads/master' + steps: + - run: | + sudo apt-get update + sudo apt-get install -y rpm devscripts debhelper fakeroot crossbuild-essential-arm64 + mkdir -p ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS} + - uses: actions/cache@v2 + with: + path: ~/go/pkg/mod + key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} + restore-keys: | + ${{ runner.os }}-go- + - uses: actions/setup-go@v2 + with: + go-version: 1.14.x + - uses: actions/checkout@v2 + - run: | + go get github.com/x-motemen/gobump/cmd/gobump + go get github.com/mackerelio/golib/cmd/mackerel-github-release + make build rpm deb + # TODO: uncomment + #mackerel-github-release && mackerel-github-release -staging + mackerel-github-release -dry-run && mackerel-github-release -staging -dry-run + env: + GITHUB_TOKEN: ${{ secrets.MACKERELBOT_GITHUB_TOKEN }} + - uses: 8398a7/action-slack@v3 + with: + status: ${{ job.status }} + fields: repo,message,commit,action,eventName,ref,workflow,job,took + username: mkr-release + env: + SLACK_WEBHOOK_URL: ${{ secrets.MACKEREL_SLACK_WEBHOOK_URL }} From bad9987982a8b4fce0a94a431e9b831611c143eb Mon Sep 17 00:00:00 2001 From: lufia Date: Mon, 30 Nov 2020 11:54:47 +0900 Subject: [PATCH 4/8] drop Travis CI / AppVeyor configs --- .travis.yml | 38 -------------------------------------- appveyor.yml | 19 ------------------- 2 files changed, 57 deletions(-) delete mode 100644 .travis.yml delete mode 100644 appveyor.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 99526f94..00000000 --- a/.travis.yml +++ /dev/null @@ -1,38 +0,0 @@ -language: go -go: -- 1.14.x -env: - global: - - GO111MODULE=on - - PATH=~/gopath/bin:$PATH - - DEBIAN_FRONTEND=noninteractive - - secure: "HB9I+UY4i/WGNuWu+tBCqYAGUj5eDDRGiHU46TEqyKIaaNiyaa7VCwN8ncWN+1MOsY/tQlz+S+PdAwnUWaehvTdhhDVXleGjgtNtZPYFOiziT0+WhcfiWQf73aj1nz0r8gNIEVqIt2m7+FQjCfNNzOFG5DmgP5odiRf2qe5Gm50zsUZUWTPoEbb1nI2eG+juqzijaa17WJbLuVoIkV4/3oywzAJ8Oe8b8SZoilwKFM3e8s12fUI6AMkHGCjGul/Ch4y37xC8lYCShlGJgaOuvgS3DY/cfgt4BzUt9LDmqeJd49S2LfxAHbbjX7gtjvrZelapOZ9lQbEGbAOEUc2yMbYQThDnaaUOeCgBCOeXdM0HdgQJxKLA8smxhorzOna+8Oey77JuuqzmYPvICPt42cKO673dZxnHdy+qDUrgcHIIhEIPanCOAgs939gpRkNlKOkCrLG8jI2nuWQng60MQw5dCxWYDImkmcFY2UUeMKKC9oEBELOMa41mfWJPtsAWEKUSfoaqV91Zw8kD9ubgO6TwqXXbGK8SJiq+nJImEBjiMFdouU5SBEdvE0rbBspC20oqsum+e1UgrCkLAUsA7D1XRhRxFQ/5JgLZ/ZooI10qBAAMppkWC6WSRDIo/9DcL8QmJYelNIjHfT9z6wBzC8rUnaYekp4+RZ+Z8VlhHAk=" -sudo: false -addons: - apt: - packages: - - rpm - - devscripts - - debhelper - - fakeroot - - crossbuild-essential-arm64 -install: -- mkdir -p ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS} -script: -- make lint -- make cover -- make all -after_script: -- goveralls -coverprofile=.profile.cov -before_deploy: -- go get github.com/x-motemen/gobump/cmd/gobump -- go get github.com/mackerelio/golib/cmd/mackerel-github-release -deploy: -- provider: script - script: mackerel-github-release && mackerel-github-release -staging - skip_cleanup: true - on: - branch: master -notifications: - slack: - secure: W4637ZIl5Gbwm93btsfysyvZpVw3GVMni1y7ea8lj4XFEyNV9aoW0OIkCjWIL9MrkxnkCcnhTKfOAPuFoqFYXXRJFkYCU9GYRsENqwvk9ev2xNyQ9OPIdNqVFcgzA4qiX97JwiuvkaDauRLsWKpdZUtMugrMEsnt1hH6E6uJ5CyVtuun9O5SyICet9tzyLyFpefrhKT8LJiwYDzT9PX6vaL2FCxDgservpPon4YkIkbaZcfURbkd0Gkm3IW5HSVAzAesEspDPAAbMp0ZKF6YPXk1kCuAttNcXoNfRyxIWD02qYTVvVLMVI9DbcDGzAeBPYaZ0vLFtCTwPWx342GqAVDy1sZ5xqYwwqpeVwPA7GdCARl3PgP1q04j4Dd6ZUMn5vM+HdMGtbKcT2vks/t9D8ozrX2F/SyTAVCVqt4xEBSVus4U8a7oK+JQXphnV++8ltDfyXoSdv4oQjHDmpZurcbEgmzWBFuenQK8CKM71voEZZSxhu4/7TksoXuo0zzxhopR9u9B/Y+/74azGBv3VW/JfzJ5gzi08Y56YA80pLHjbxJeykKzv4lR+c+WAWGxVhBD9xN4OKcer3ohDbTfhs0rDf270DOSYx3bstnvQ87NcNbJ1sPRwRhK8rbzvwtLnGUjMNK1kNRcr2rQmmJYlR3DH/hfHHEvAQPeseN90Ek= diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 638bbc54..00000000 --- a/appveyor.yml +++ /dev/null @@ -1,19 +0,0 @@ -version: 0.9.4-{build} -image: Previous Visual Studio 2019 -clone_folder: c:\gopath\src\github.com\mackerelio\go-check-plugins -environment: - GOPATH: c:\gopath - GOROOT: c:\go114 -install: - - set PATH=%GOROOT%\bin;%GOPATH%\bin;%PATH%;C:\MinGW\bin - - echo %Path% - - go version - - go env -build_script: -- go get -d -v -t ./... -- go build -o check-log/check-log.exe ./check-log -- go build -o check-procs/check-procs.exe ./check-procs -- go build -o check-windows-eventlog/check-windows-evenglog.exe ./check-windows-eventlog -test_script: -- go vet -all ./check-log/... ./check-procs/... ./check-ntservice/... ./check-windows-eventlog/... -- go test ./check-log/... ./check-procs/... ./check-ntservice/... ./check-windows-eventlog/... From 0b1fd9706568ec3bf3dab17dd730daf6d9024e51 Mon Sep 17 00:00:00 2001 From: lufia Date: Mon, 30 Nov 2020 12:07:59 +0900 Subject: [PATCH 5/8] fix tasks --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b822106f..e7c1b872 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,7 +29,7 @@ jobs: restore-keys: | ${{ runner.os }}-go- - run: | - make lint cover all + make lint cover testconvention test test-windows: strategy: matrix: @@ -73,7 +73,7 @@ jobs: - run: | go get github.com/x-motemen/gobump/cmd/gobump go get github.com/mackerelio/golib/cmd/mackerel-github-release - make build rpm deb + make clean build rpm deb # TODO: uncomment #mackerel-github-release && mackerel-github-release -staging mackerel-github-release -dry-run && mackerel-github-release -staging -dry-run From e679d5fe58b7c056ba32d7abce0038ffbe1c4f8c Mon Sep 17 00:00:00 2001 From: lufia Date: Mon, 30 Nov 2020 12:22:57 +0900 Subject: [PATCH 6/8] test the workflow temporarily --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e7c1b872..51c362aa 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -54,7 +54,8 @@ jobs: release: needs: [test, test-windows] runs-on: ubuntu-latest - if: github.ref == 'refs/heads/master' + # TODO: uncomment + #if: github.ref == 'refs/heads/master' steps: - run: | sudo apt-get update From a2fddc7143552a40ab1a5a3a66316deba396c0b4 Mon Sep 17 00:00:00 2001 From: lufia Date: Mon, 30 Nov 2020 12:47:14 +0900 Subject: [PATCH 7/8] uncomment TODOs --- .github/workflows/test.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 51c362aa..e96a8480 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -54,8 +54,7 @@ jobs: release: needs: [test, test-windows] runs-on: ubuntu-latest - # TODO: uncomment - #if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/master' steps: - run: | sudo apt-get update @@ -75,9 +74,7 @@ jobs: go get github.com/x-motemen/gobump/cmd/gobump go get github.com/mackerelio/golib/cmd/mackerel-github-release make clean build rpm deb - # TODO: uncomment - #mackerel-github-release && mackerel-github-release -staging - mackerel-github-release -dry-run && mackerel-github-release -staging -dry-run + mackerel-github-release && mackerel-github-release -staging env: GITHUB_TOKEN: ${{ secrets.MACKERELBOT_GITHUB_TOKEN }} - uses: 8398a7/action-slack@v3 From d1576ec0a4a2efaeb8623635889d84da295ea263 Mon Sep 17 00:00:00 2001 From: lufia Date: Mon, 30 Nov 2020 17:23:17 +0900 Subject: [PATCH 8/8] fix notification username --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e96a8480..5f7b0805 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -81,6 +81,6 @@ jobs: with: status: ${{ job.status }} fields: repo,message,commit,action,eventName,ref,workflow,job,took - username: mkr-release + username: go-check-plugins-release env: SLACK_WEBHOOK_URL: ${{ secrets.MACKEREL_SLACK_WEBHOOK_URL }}