Skip to content

Commit 2a252cd

Browse files
authored
Merge pull request #44 from tbrittain/feat/tb/update-deps
Update Go runtime version, many packages
2 parents 96897a1 + 28f7d8a commit 2a252cd

14 files changed

Lines changed: 1547 additions & 695 deletions

File tree

.gitattributes

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Default: auto-detect text files and normalize to LF in the repo
2+
* text=auto eol=lf
3+
4+
# Source code
5+
*.go text eol=lf
6+
*.ts text eol=lf
7+
*.js text eol=lf
8+
*.vue text eol=lf
9+
*.html text eol=lf
10+
*.css text eol=lf
11+
12+
# Config / data
13+
*.json text eol=lf
14+
*.yml text eol=lf
15+
*.yaml text eol=lf
16+
*.mod text eol=lf
17+
*.sum text eol=lf
18+
*.toml text eol=lf
19+
20+
# Docs / text
21+
*.md text eol=lf
22+
*.txt text eol=lf
23+
24+
# Windows build assets (keep CRLF on Windows checkout for tooling compatibility)
25+
*.nsi text eol=crlf
26+
*.nsh text eol=crlf
27+
*.manifest text eol=crlf
28+
*.plist text eol=lf
29+
30+
# Binary files — no line ending conversion
31+
*.png binary
32+
*.ico binary
33+
*.icns binary
34+
*.woff2 binary
35+
*.woff binary
36+
*.ttf binary
37+
*.otf binary
38+
*.md5 binary

.github/workflows/pr.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ jobs:
88
test:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v4
11+
- uses: actions/checkout@v6
1212

1313
- name: Setup Go
14-
uses: actions/setup-go@v5
14+
uses: actions/setup-go@v6
1515
with:
1616
go-version-file: go.mod
1717

1818
- name: Setup Node
19-
uses: actions/setup-node@v4
19+
uses: actions/setup-node@v6
2020
with:
2121
node-version: 24
2222
cache: npm
@@ -35,28 +35,28 @@ jobs:
3535
run: cd frontend && npm run build
3636

3737
- name: Run Go tests
38-
run: go test ./...
38+
run: go test -tags webkit2_41 ./...
3939

4040
build:
4141
needs: test
4242
runs-on: ubuntu-latest
4343
steps:
44-
- uses: actions/checkout@v4
44+
- uses: actions/checkout@v6
4545

4646
- name: Setup Go
47-
uses: actions/setup-go@v5
47+
uses: actions/setup-go@v6
4848
with:
4949
go-version-file: go.mod
5050

5151
- name: Setup Node
52-
uses: actions/setup-node@v4
52+
uses: actions/setup-node@v6
5353
with:
54-
node-version: 22
54+
node-version: 24
5555
cache: npm
5656
cache-dependency-path: frontend/package-lock.json
5757

5858
- name: Install Wails CLI
59-
run: go install github.com/wailsapp/wails/v2/cmd/wails@latest
59+
run: go install github.com/wailsapp/wails/v2/cmd/wails@v2.11.0
6060

6161
- name: Install Linux dependencies
6262
run: sudo apt-get update && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.1-dev

.github/workflows/release.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ jobs:
1111
test:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v6
1515

1616
- name: Setup Go
17-
uses: actions/setup-go@v5
17+
uses: actions/setup-go@v6
1818
with:
1919
go-version-file: go.mod
2020

2121
- name: Setup Node
22-
uses: actions/setup-node@v4
22+
uses: actions/setup-node@v6
2323
with:
2424
node-version: 24
2525
cache: npm
@@ -32,7 +32,7 @@ jobs:
3232
run: cd frontend && npm ci && npm run build
3333

3434
- name: Run Go tests
35-
run: go test ./...
35+
run: go test -tags webkit2_41 ./...
3636

3737
build:
3838
needs: test
@@ -51,22 +51,22 @@ jobs:
5151
artifact: git-analytics-macos-universal
5252
runs-on: ${{ matrix.os }}
5353
steps:
54-
- uses: actions/checkout@v4
54+
- uses: actions/checkout@v6
5555

5656
- name: Setup Go
57-
uses: actions/setup-go@v5
57+
uses: actions/setup-go@v6
5858
with:
5959
go-version-file: go.mod
6060

6161
- name: Setup Node
62-
uses: actions/setup-node@v4
62+
uses: actions/setup-node@v6
6363
with:
6464
node-version: 24
6565
cache: npm
6666
cache-dependency-path: frontend/package-lock.json
6767

6868
- name: Install Wails CLI
69-
run: go install github.com/wailsapp/wails/v2/cmd/wails@latest
69+
run: go install github.com/wailsapp/wails/v2/cmd/wails@v2.11.0
7070

7171
- name: Install Linux dependencies
7272
if: runner.os == 'Linux'
@@ -95,7 +95,7 @@ jobs:
9595
run: cd build/bin && zip -r ../../${{ matrix.artifact }}.zip git-analytics.app
9696

9797
- name: Upload artifact
98-
uses: actions/upload-artifact@v4
98+
uses: actions/upload-artifact@v6
9999
with:
100100
name: ${{ matrix.artifact }}
101101
path: ${{ matrix.artifact }}.zip
@@ -105,7 +105,7 @@ jobs:
105105
runs-on: ubuntu-latest
106106
steps:
107107
- name: Download all artifacts
108-
uses: actions/download-artifact@v4
108+
uses: actions/download-artifact@v7
109109
with:
110110
merge-multiple: true
111111

CLAUDE.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,14 @@ Primary dependencies for core functionality:
1818
## Development
1919

2020
```sh
21-
wails dev # Run in dev mode with hot reload
22-
wails build # Build for current platform
21+
make dev # Run in dev mode with hot reload
22+
make build # Build for current platform
2323
```
2424

25+
> The Makefile checks `pkg-config` at build time and automatically applies `-tags webkit2_41`
26+
> if `webkit2gtk-4.0` is not available (e.g. Ubuntu 24.04+). On other platforms or Linux
27+
> distros that still ship 4.0, no tag is applied.
28+
2529
Frontend dependencies:
2630
```sh
2731
cd frontend && npm install

Makefile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
.PHONY: dev build
2+
3+
# On Linux, fall back to webkit2gtk-4.1 if 4.0 is not available (e.g. Ubuntu 24.04+)
4+
UNAME_S := $(shell uname -s)
5+
ifeq ($(UNAME_S),Linux)
6+
ifeq ($(shell pkg-config --exists webkit2gtk-4.0 && echo yes || echo no),no)
7+
TAGS := -tags webkit2_41
8+
endif
9+
endif
10+
11+
dev:
12+
wails dev $(TAGS)
13+
14+
build:
15+
wails build $(TAGS)

0 commit comments

Comments
 (0)