Skip to content

Commit 543b9a0

Browse files
committed
Merge remote-tracking branch 'upstream/master' into patch2
2 parents 0b85929 + da6d8fa commit 543b9a0

File tree

3 files changed

+22
-50
lines changed

3 files changed

+22
-50
lines changed

.github/workflows/build.yml

+4-32
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,11 @@
11
name: build
22
on: [push, pull_request]
3+
34
jobs:
45
build:
5-
strategy:
6-
matrix:
7-
os: [ubuntu-latest, macos-latest, windows-latest]
8-
runs-on: ${{ matrix.os }}
9-
env:
10-
GO111MODULE: "on"
11-
COLORTERM: "truecolor"
12-
COLORFGBG: "7;0"
13-
TERM: "xterm-256color"
14-
steps:
15-
- name: Checkout code
16-
uses: actions/checkout@v4
17-
18-
- name: Install Go
19-
uses: actions/setup-go@v5
20-
with:
21-
go-version: stable
22-
23-
- name: Download Go modules
24-
run: go mod download
25-
26-
- name: Build
27-
run: go build -v ./...
28-
29-
- name: Test
30-
run: go test ./...
31-
if: matrix.os != 'windows-latest'
32-
33-
govulncheck:
34-
uses: charmbracelet/meta/.github/workflows/govulncheck.yml@main
35-
with:
36-
go-version: stable
6+
uses: charmbracelet/meta/.github/workflows/build.yml@main
7+
secrets:
8+
gh_pat: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
379

3810
semgrep:
3911
uses: charmbracelet/meta/.github/workflows/semgrep.yml@main

go.mod

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ go 1.21
44

55
require (
66
github.com/alecthomas/chroma/v2 v2.14.0
7-
github.com/charmbracelet/lipgloss v0.13.0
8-
github.com/charmbracelet/x/ansi v0.3.2
7+
github.com/charmbracelet/lipgloss v1.0.0
8+
github.com/charmbracelet/x/ansi v0.6.0
99
github.com/charmbracelet/x/exp/golden v0.0.0-20240806155701-69247e0abc2a
1010
github.com/microcosm-cc/bluemonday v1.0.27
1111
github.com/muesli/reflow v0.3.0
1212
github.com/muesli/termenv v0.15.3-0.20240618155329-98d742f6907a
13-
github.com/yuin/goldmark v1.7.4
14-
github.com/yuin/goldmark-emoji v1.0.3
15-
golang.org/x/term v0.24.0
13+
github.com/yuin/goldmark v1.7.8
14+
github.com/yuin/goldmark-emoji v1.0.4
15+
golang.org/x/term v0.27.0
1616
)
1717

1818
require (
@@ -26,5 +26,5 @@ require (
2626
github.com/mattn/go-runewidth v0.0.15 // indirect
2727
github.com/rivo/uniseg v0.4.7 // indirect
2828
golang.org/x/net v0.27.0 // indirect
29-
golang.org/x/sys v0.25.0 // indirect
29+
golang.org/x/sys v0.28.0 // indirect
3030
)

go.sum

+12-12
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ github.com/aymanbagabas/go-udiff v0.2.0 h1:TK0fH4MteXUDspT88n8CKzvK0X9O2xu9yQjWp
1010
github.com/aymanbagabas/go-udiff v0.2.0/go.mod h1:RE4Ex0qsGkTAJoQdQQCA0uG+nAzJO/pI/QwceO5fgrA=
1111
github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
1212
github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
13-
github.com/charmbracelet/lipgloss v0.13.0 h1:4X3PPeoWEDCMvzDvGmTajSyYPcZM4+y8sCA/SsA3cjw=
14-
github.com/charmbracelet/lipgloss v0.13.0/go.mod h1:nw4zy0SBX/F/eAO1cWdcvy6qnkDUxr8Lw7dvFrAIbbY=
15-
github.com/charmbracelet/x/ansi v0.3.2 h1:wsEwgAN+C9U06l9dCVMX0/L3x7ptvY1qmjMwyfE6USY=
16-
github.com/charmbracelet/x/ansi v0.3.2/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw=
13+
github.com/charmbracelet/lipgloss v1.0.0 h1:O7VkGDvqEdGi93X+DeqsQ7PKHDgtQfF8j8/O2qFMQNg=
14+
github.com/charmbracelet/lipgloss v1.0.0/go.mod h1:U5fy9Z+C38obMs+T+tJqst9VGzlOYGj4ri9reL3qUlo=
15+
github.com/charmbracelet/x/ansi v0.6.0 h1:qOznutrb93gx9oMiGf7caF7bqqubh6YIM0SWKyA08pA=
16+
github.com/charmbracelet/x/ansi v0.6.0/go.mod h1:KBUFw1la39nl0dLl10l5ORDAqGXaeurTQmwyyVKse/Q=
1717
github.com/charmbracelet/x/exp/golden v0.0.0-20240806155701-69247e0abc2a h1:G99klV19u0QnhiizODirwVksQB91TJKV/UaTnACcG30=
1818
github.com/charmbracelet/x/exp/golden v0.0.0-20240806155701-69247e0abc2a/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=
1919
github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
@@ -40,14 +40,14 @@ github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJ
4040
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
4141
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
4242
github.com/yuin/goldmark v1.7.1/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
43-
github.com/yuin/goldmark v1.7.4 h1:BDXOHExt+A7gwPCJgPIIq7ENvceR7we7rOS9TNoLZeg=
44-
github.com/yuin/goldmark v1.7.4/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
45-
github.com/yuin/goldmark-emoji v1.0.3 h1:aLRkLHOuBR2czCY4R8olwMjID+tENfhyFDMCRhbIQY4=
46-
github.com/yuin/goldmark-emoji v1.0.3/go.mod h1:tTkZEbwu5wkPmgTcitqddVxY9osFZiavD+r4AzQrh1U=
43+
github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic=
44+
github.com/yuin/goldmark v1.7.8/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
45+
github.com/yuin/goldmark-emoji v1.0.4 h1:vCwMkPZSNefSUnOW2ZKRUjBSD5Ok3W78IXhGxxAEF90=
46+
github.com/yuin/goldmark-emoji v1.0.4/go.mod h1:tTkZEbwu5wkPmgTcitqddVxY9osFZiavD+r4AzQrh1U=
4747
golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
4848
golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
4949
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
50-
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
51-
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
52-
golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
53-
golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
50+
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
51+
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
52+
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
53+
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=

0 commit comments

Comments
 (0)