From 28e28aa8738656e3fcee26a1149406695c9135c8 Mon Sep 17 00:00:00 2001 From: Gaurav Kumar Date: Mon, 11 Jul 2022 10:45:18 +0530 Subject: [PATCH 1/5] fix: remove windows_arm64 as goos/goarch pair --- .github/workflows/build.yml | 1 + .goreleaser.yml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 12253e4bf..8c2ef72cc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,6 +5,7 @@ on: branches: - master - main + - fix-build-worflow jobs: build: diff --git a/.goreleaser.yml b/.goreleaser.yml index 5356fa139..bde3c398b 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -43,7 +43,7 @@ builds: - -X github.com/odpf/meteor/cmd.BuildCommit={{.FullCommit}} - -X github.com/odpf/meteor/cmd.BuildDate={{.Date}} goos: [windows] - goarch: [amd64, arm64] # skip goarch 386 and arm due to conflicts with "github.com/blastrain/vitess-sqlparser" library + goarch: [amd64] # skip goarch 386 and arm due to conflicts with "github.com/blastrain/vitess-sqlparser" library env: - CGO_ENABLED=0 @@ -90,7 +90,7 @@ brews: description: "Metadata collection tool." tap: owner: odpf - name: homebrew-taps + name: homebrew-tap license: "Apache 2.0" folder: Formula From 0da3f7a98002a183b8e228634f95ea7df7282147 Mon Sep 17 00:00:00 2001 From: Gaurav Kumar Date: Mon, 11 Jul 2022 11:03:55 +0530 Subject: [PATCH 2/5] feat: update golang version to 1.18 --- .github/workflows/build.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/plugin_test.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 2 +- .goreleaser.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8c2ef72cc..cd188c4ac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: '1.16' + go-version: '1.18' - name: Run GoReleaser uses: goreleaser/goreleaser-action@v2.6.1 with: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 770acb288..2e8cc1256 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.16' + go-version: '1.18' - uses: actions/checkout@v2 with: fetch-depth: 0 diff --git a/.github/workflows/plugin_test.yml b/.github/workflows/plugin_test.yml index 2981e2789..1a82608b3 100644 --- a/.github/workflows/plugin_test.yml +++ b/.github/workflows/plugin_test.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.18 - name: Install dependencies run: sudo apt-get install build-essential - name: Install packages diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 04a1e4954..22ae94e0e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: '^1.16' + go-version: '^1.18' - name: Checkout uses: actions/checkout@v2 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 153348248..0936a42e2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.18 - name: Install dependencies run: sudo apt-get install build-essential - name: Install packages diff --git a/.goreleaser.yml b/.goreleaser.yml index bde3c398b..e29415e44 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -43,7 +43,7 @@ builds: - -X github.com/odpf/meteor/cmd.BuildCommit={{.FullCommit}} - -X github.com/odpf/meteor/cmd.BuildDate={{.Date}} goos: [windows] - goarch: [amd64] # skip goarch 386 and arm due to conflicts with "github.com/blastrain/vitess-sqlparser" library + goarch: [amd64, arm64] # skip goarch 386 and arm due to conflicts with "github.com/blastrain/vitess-sqlparser" library env: - CGO_ENABLED=0 From 334cc569172e803ac16789609ae7aec28281c6b0 Mon Sep 17 00:00:00 2001 From: Gaurav Kumar Date: Mon, 11 Jul 2022 11:21:36 +0530 Subject: [PATCH 3/5] feat: move to golang version to 1.17 --- .github/workflows/build.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/plugin_test.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cd188c4ac..37a561f95 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: '1.18' + go-version: '1.17' - name: Run GoReleaser uses: goreleaser/goreleaser-action@v2.6.1 with: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 2e8cc1256..96dcfc4f9 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.18' + go-version: '1.17' - uses: actions/checkout@v2 with: fetch-depth: 0 diff --git a/.github/workflows/plugin_test.yml b/.github/workflows/plugin_test.yml index 1a82608b3..e0a35c706 100644 --- a/.github/workflows/plugin_test.yml +++ b/.github/workflows/plugin_test.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.18 + go-version: 1.17 - name: Install dependencies run: sudo apt-get install build-essential - name: Install packages diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 22ae94e0e..8a90bd4ff 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: '^1.18' + go-version: '^1.17' - name: Checkout uses: actions/checkout@v2 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0936a42e2..38f50dde7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.18 + go-version: 1.17 - name: Install dependencies run: sudo apt-get install build-essential - name: Install packages From 63faef64c12f579026f32610846d9f696e1e8b35 Mon Sep 17 00:00:00 2001 From: Gaurav Kumar Date: Mon, 11 Jul 2022 11:38:40 +0530 Subject: [PATCH 4/5] fix: remove current branch name from build ci --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 37a561f95..077b87802 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,6 @@ on: branches: - master - main - - fix-build-worflow jobs: build: From 5b1997bc4bbd258c8a948e6c19c1659e6a0a034b Mon Sep 17 00:00:00 2001 From: Gaurav Kumar Date: Mon, 11 Jul 2022 11:45:10 +0530 Subject: [PATCH 5/5] docs: update installation command for homebrew-tap --- README.md | 2 +- docs/docs/guides/0_installation.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 063e6fb2b..7377888f6 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ Ideally, you should install it somewhere in your PATH for easy use. `/usr/local/ ```sh # Install meteor (requires homebrew installed) -$ brew install odpf/taps/meteor +$ brew install odpf/tap/meteor # Upgrade meteor (requires homebrew installed) $ brew upgrade meteor diff --git a/docs/docs/guides/0_installation.md b/docs/docs/guides/0_installation.md index a9a0449e0..71dea46f1 100644 --- a/docs/docs/guides/0_installation.md +++ b/docs/docs/guides/0_installation.md @@ -6,7 +6,7 @@ Meteor can be installed currently by one of the following ways: ```sh # install meteor (requires homebrew installed) -$ brew install odpf/taps/meteor +$ brew install odpf/tap/meteor # Get info about meteor $ meteor