b4795733518be4ca1507e4221ee972e82171c28e

Author
Ayman Bagabas <ayman.bagabas@gmail.com>
Committer
Ayman Bagabas <ayman.bagabas@gmail.com>
Date

Message

Add separate goreleaser test workflow and add *bsd

also ignore windows arm64 and arm7 builds

needs: https://github.com/charmbracelet/bubbletea/pull/167

Diff

  1diff --git a/.github/workflows/goreleaser-publish.yml b/.github/workflows/goreleaser-publish.yml
  2new file mode 100644
  3index 0000000000000000000000000000000000000000..89f65fac600cc45230e79325ae7a39511831c324
  4--- /dev/null
  5+++ b/.github/workflows/goreleaser-publish.yml
  6@@ -0,0 +1,60 @@
  7+name: goreleaser-publish
  8+
  9+on:
 10+  push:
 11+    tags:
 12+      - v*.*.*
 13+
 14+concurrency:
 15+  group: goreleaser
 16+  cancel-in-progress: true
 17+
 18+permissions:
 19+  contents: write
 20+  packages: write
 21+
 22+jobs:
 23+  goreleaser:
 24+    runs-on: ubuntu-latest
 25+    env:
 26+      DOCKER_CLI_EXPERIMENTAL: enabled
 27+    steps:
 28+      - name: Checkout
 29+        uses: actions/checkout@v2
 30+        with:
 31+          fetch-depth: 0
 32+
 33+      - name: Set up Go
 34+        uses: actions/setup-go@v2
 35+        with:
 36+          go-version: 1.17
 37+
 38+      - name: Login to DockerHub
 39+        uses: docker/login-action@v1
 40+        with:
 41+          username: ${{ secrets.DOCKERHUB_USERNAME }}
 42+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 43+
 44+      - name: Login to GitHub Container Registry
 45+        uses: docker/login-action@v1
 46+        with:
 47+          registry: ghcr.io
 48+          username: ${{ github.repository_owner }}
 49+          password: ${{ secrets.GITHUB_TOKEN }}
 50+
 51+      - name: Set up QEMU
 52+        uses: docker/setup-qemu-action@v1
 53+
 54+      - name: Set up Docker Buildx
 55+        id: buildx
 56+        uses: docker/setup-buildx-action@v1
 57+
 58+      - name: Run GoReleaser
 59+        uses: goreleaser/goreleaser-action@v2
 60+        with:
 61+          distribution: goreleaser
 62+          version: latest
 63+          args: release --rm-dist --skip-sign
 64+        env:
 65+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 66+          HOMEBREW_TAP_GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
 67diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml
 68index e8aa2d10c6cc8786079e8749517ee99bccbfa4b1..54debb9899bc93cfdef04a422cf116155d21243d 100644
 69--- a/.github/workflows/goreleaser.yml
 70+++ b/.github/workflows/goreleaser.yml
 71@@ -1,15 +1,6 @@
 72 name: goreleaser
 73 
 74-on:
 75-  push:
 76-    tags:
 77-      - v*.*.*
 78-
 79-concurrency: goreleaser
 80-
 81-permissions:
 82-  contents: write
 83-  packages: write
 84+on: [push, pull_request]
 85 
 86 jobs:
 87   goreleaser:
 88@@ -27,19 +18,6 @@ jobs:
 89         with:
 90           go-version: 1.17
 91 
 92-      - name: Login to DockerHub
 93-        uses: docker/login-action@v1
 94-        with:
 95-          username: ${{ secrets.DOCKERHUB_USERNAME }}
 96-          password: ${{ secrets.DOCKERHUB_TOKEN }}
 97-
 98-      - name: Login to GitHub Container Registry
 99-        uses: docker/login-action@v1
100-        with:
101-          registry: ghcr.io
102-          username: ${{ github.repository_owner }}
103-          password: ${{ secrets.GITHUB_TOKEN }}
104-
105       - name: Set up QEMU
106         uses: docker/setup-qemu-action@v1
107 
108@@ -52,7 +30,7 @@ jobs:
109         with:
110           distribution: goreleaser
111           version: latest
112-          args: release --rm-dist --skip-sign
113+          args: release --snapshot --rm-dist --skip-sign
114         env:
115           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
116           HOMEBREW_TAP_GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
117diff --git a/.goreleaser.yml b/.goreleaser.yml
118index 2f93b937f2db02e3755386d1bcd7f2d3c2a02622..f4952badb71e8ac5654663dbae344bbee1c0e0a5 100644
119--- a/.goreleaser.yml
120+++ b/.goreleaser.yml
121@@ -16,6 +16,9 @@ builds:
122       - linux
123       - darwin
124       - windows
125+      - freebsd
126+      - openbsd
127+      - netbsd
128     goarch:
129       - amd64
130       - arm64
131@@ -26,6 +29,12 @@ builds:
132       - "7"
133     ignore:
134       - goos: windows
135+        goarch: arm64
136+      - goos: windows
137+        goarm: "6"
138+      - goos: windows
139+        goarm: "7"
140+      - goos: openbsd
141         goarm: "6"
142 
143 archives:
144diff --git a/go.mod b/go.mod
145index 5e897507b247113f2195903c0015a145989da140..22077c51f946a59396abb6faa3b5554563a9a15b 100644
146--- a/go.mod
147+++ b/go.mod
148@@ -4,7 +4,7 @@ go 1.17
149 
150 require (
151 	github.com/charmbracelet/bubbles v0.9.0
152-	github.com/charmbracelet/bubbletea v0.19.1
153+	github.com/charmbracelet/bubbletea v0.19.2
154 	github.com/charmbracelet/glamour v0.3.0
155 	github.com/charmbracelet/lipgloss v0.4.0
156 	github.com/charmbracelet/wish v0.1.1
157diff --git a/go.sum b/go.sum
158index b9c8cbac5d8878bb7999a61f7fc0c3a24200e393..07626067ab3fc364715d66a4f5ef2a94c5c5b3c1 100644
159--- a/go.sum
160+++ b/go.sum
161@@ -26,8 +26,8 @@ github.com/charmbracelet/bubbles v0.9.0 h1:lqJ8FXwoLceQF2J0A+dWo1Cuu1dNyjbW4Opgd
162 github.com/charmbracelet/bubbles v0.9.0/go.mod h1:NWT/c+0rYEnYChz5qCyX4Lj6fDw9gGToh9EFJPajghU=
163 github.com/charmbracelet/bubbletea v0.14.1/go.mod h1:b5lOf5mLjMg1tRn1HVla54guZB+jvsyV0yYAQja95zE=
164 github.com/charmbracelet/bubbletea v0.19.0/go.mod h1:VuXF2pToRxDUHcBUcPmCRUHRvFATM4Ckb/ql1rBl3KA=
165-github.com/charmbracelet/bubbletea v0.19.1 h1:VHuzkJbnTAkxhOfi9+Lb5PYfNM9+Oh+qhP8uDX5ReOU=
166-github.com/charmbracelet/bubbletea v0.19.1/go.mod h1:VuXF2pToRxDUHcBUcPmCRUHRvFATM4Ckb/ql1rBl3KA=
167+github.com/charmbracelet/bubbletea v0.19.2 h1:tUSaPH1EFT8b6BbwAGm7a+uuTB3uI7hwaCOKQ7Yithk=
168+github.com/charmbracelet/bubbletea v0.19.2/go.mod h1:VuXF2pToRxDUHcBUcPmCRUHRvFATM4Ckb/ql1rBl3KA=
169 github.com/charmbracelet/glamour v0.3.0 h1:3H+ZrKlSg8s+WU6V7eF2eRVYt8lCueffbi7r2+ffGkc=
170 github.com/charmbracelet/glamour v0.3.0/go.mod h1:TzF0koPZhqq0YVBNL100cPHznAAjVj7fksX2RInwjGw=
171 github.com/charmbracelet/harmonica v0.1.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=