Diff
1diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
2new file mode 100644
3index 0000000000000000000000000000000000000000..3901f38d57cfbe6ca4d21ccda4ec15ada612276c
4--- /dev/null
5+++ b/.github/workflows/build.yml
6@@ -0,0 +1,28 @@
7+name: build
8+on: [push, pull_request]
9+jobs:
10+ test:
11+ strategy:
12+ matrix:
13+ go-version: [~1.17, ^1]
14+ os: [ubuntu-latest, macos-latest, windows-latest]
15+ runs-on: ${{ matrix.os }}
16+ env:
17+ GO111MODULE: "on"
18+ steps:
19+ - name: Install Go
20+ uses: actions/setup-go@v2
21+ with:
22+ go-version: ${{ matrix.go-version }}
23+
24+ - name: Checkout code
25+ uses: actions/checkout@v2
26+
27+ - name: Download Go modules
28+ run: go mod download
29+
30+ - name: Build
31+ run: go build -v ./...
32+
33+ - name: Test
34+ run: go test ./...
35diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
36deleted file mode 100644
37index 9000bd8ccbcb641f32a79320fa20dd97d354f9b7..0000000000000000000000000000000000000000
38--- a/.github/workflows/ci.yml
39+++ /dev/null
40@@ -1,35 +0,0 @@
41-name: CI
42-
43-on:
44- push:
45- branches: [ main ]
46- pull_request:
47-
48-jobs:
49-
50- build:
51- strategy:
52- matrix:
53- go-version: [~1.17]
54- runs-on: ubuntu-latest
55- steps:
56- - uses: actions/checkout@v2
57- with:
58- fetch-depth: 0
59-
60- - name: Clone internal repositories
61- run: |
62- git clone -b release https://${{ secrets.ACCESS_TOKEN }}@github.com/charmbracelet/charm-internal ../charm
63- git clone -b master https://${{ secrets.ACCESS_TOKEN }}@github.com/charmbracelet/bubbletea-internal ../bubbletea
64- git clone -b main https://${{ secrets.ACCESS_TOKEN }}@github.com/charmbracelet/wish ../wish
65-
66- - name: Set up Go
67- uses: actions/setup-go@v2
68- with:
69- go-version: ${{ matrix.go-version }}
70-
71- - name: Build
72- run: go build -v .
73-
74- - name: Test
75- run: go test -v .
76diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml
77index 213b01a1dfa9299dd0426c13c05f9e72cfbc623d..effc1fdc352df9e1e8f5e9589d98941d068e3b47 100644
78--- a/.github/workflows/goreleaser.yml
79+++ b/.github/workflows/goreleaser.yml
80@@ -3,7 +3,7 @@ name: goreleaser
81 on:
82 push:
83 tags:
84- - 'v*.*.*'
85+ - "v*.*.*"
86
87 permissions:
88 contents: write
89@@ -20,12 +20,6 @@ jobs:
90 with:
91 fetch-depth: 0
92
93- - name: Clone internal repositories
94- run: |
95- git clone -b release https://${{ secrets.ACCESS_TOKEN }}@github.com/charmbracelet/charm-internal ../charm
96- git clone -b master https://${{ secrets.ACCESS_TOKEN }}@github.com/charmbracelet/bubbletea-internal ../bubbletea
97- git clone -b main https://${{ secrets.ACCESS_TOKEN }}@github.com/charmbracelet/wish ../wish
98-
99 - name: Set up Go
100 uses: actions/setup-go@v2
101 with:
102@@ -59,14 +53,3 @@ jobs:
103 args: release --rm-dist
104 env:
105 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
106-
107- # - name: Update Docker Hub Readme
108- # uses: christian-korneck/update-container-description-action@v1
109- # env:
110- # DOCKER_USER: ${{ secrets.DOCKERHUB_USERNAME }}
111- # DOCKER_PASS: ${{ secrets.DOCKERHUB_TOKEN }}
112- # with:
113- # destination_container_repo: charmcli/soft-serve
114- # provider: dockerhub
115- # short_description: "A tasty Git server 🍦"
116- # readme_file: "README.md"
117diff --git a/.github/workflows/soft-serve.yml b/.github/workflows/soft-serve.yml
118index a6054e29a9b4559cf75e30a168c00b6903b0ed48..601e75e964201ffc815196f6adce55978a48a569 100644
119--- a/.github/workflows/soft-serve.yml
120+++ b/.github/workflows/soft-serve.yml
121@@ -14,27 +14,9 @@ jobs:
122 with:
123 fetch-depth: 0
124
125- - name: Clone internal repositories
126- run: |
127- git clone -b release https://${{ secrets.ACCESS_TOKEN }}@github.com/charmbracelet/charm-internal ../charm
128- git clone -b master https://${{ secrets.ACCESS_TOKEN }}@github.com/charmbracelet/bubbletea-internal ../bubbletea
129- git clone -b main https://${{ secrets.ACCESS_TOKEN }}@github.com/charmbracelet/wish ../wish
130-
131 - name: Push to Soft-Serve
132 uses: charmbracelet/soft-serve-action@v1
133 with:
134 server: "git.charm.sh"
135 ssh-key: "${{ secrets.CHARM_SOFT_SERVE_KEY }}"
136 name: "soft-serve"
137-
138- - name: Push vendor to Soft-Serve
139- env:
140- SSH_AUTH_SOCK: /tmp/ssh_agent.sock
141- run: |
142- git config --global user.email "actions@github.com"
143- git config --global user.name "Charmbracelet[bot]"
144- git checkout -b vendor
145- go mod vendor
146- git add vendor
147- git commit -m 'vendor'
148- git push -f soft-serve vendor