Skip to content

Commit c7aee87

Browse files
akiyosiakiyosi
committed
update for akiyosi/qt
1 parent 25efc26 commit c7aee87

36 files changed

+204
-167
lines changed

‎.github/workflows/ci.yaml

Lines changed: 52 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: CI
33
on: [push, pull_request]
44

55
env:
6-
cache-version: v11
6+
cache-version: v12
77

88
jobs:
99

@@ -14,7 +14,7 @@ jobs:
1414
test-and-build-linux:
1515
strategy:
1616
matrix:
17-
go-version: [1.18.x]
17+
go-version: [1.20.x]
1818
platform: [ubuntu-20.04]
1919
qtversion: [5.15.6]
2020
runs-on: ${{ matrix.platform }}
@@ -130,7 +130,7 @@ jobs:
130130
test-and-build-macos-11:
131131
strategy:
132132
matrix:
133-
go-version: [1.18.x]
133+
go-version: [1.20.x]
134134
platform: [macos-11]
135135
qtversion: [5.15.2]
136136
runs-on: ${{ matrix.platform }}
@@ -206,7 +206,7 @@ jobs:
206206
test-windows-mingw:
207207
strategy:
208208
matrix:
209-
go-version: [1.18.10]
209+
go-version: [1.20.5]
210210
platform: [windows-latest]
211211
runs-on: ${{ matrix.platform }}
212212
env:
@@ -251,22 +251,22 @@ jobs:
251251
run: |
252252
export PATH=/c/hostedtoolcache/windows/go/${{ matrix.go-version }}/x64/bin/:$PATH
253253
cd /d/a/goneovim/goneovim/src/github.com/${{ github.repository }}
254-
go get -v github.com/therecipe/qt
255-
go get github.com/therecipe/qt/internal/[email protected]20200904063919-c0c124a5770d
256-
go get github.com/therecipe/qt/internal/binding/files/docs/5.12.0
257-
go get github.com/therecipe/qt/internal/binding/files/docs/5.13.0
258-
go get github.com/therecipe/qt/internal/cmd/[email protected]20200904063919-c0c124a5770d
259-
go install -v -tags=no_env github.com/therecipe/qt/cmd/...
254+
go get -v github.com/akiyosi/qt
255+
go get github.com/akiyosi/qt/internal/[email protected]20230718095223-7e4e923f23fa
256+
go get github.com/akiyosi/qt/internal/binding/files/docs/5.12.0
257+
go get github.com/akiyosi/qt/internal/binding/files/docs/5.13.0
258+
go get github.com/akiyosi/qt/internal/cmd/[email protected]20230718095223-7e4e923f23fa
259+
go install -v -tags=no_env github.com/akiyosi/qt/cmd/...
260260
go mod vendor
261-
git clone https://github.com/therecipe/env_windows_amd64_513.git vendor/github.com/therecipe/env_windows_amd64_513
261+
git clone https://github.com/akiyosi/env_windows_amd64_513.git vendor/github.com/akiyosi/env_windows_amd64_513
262262
263263
- uses: actions/cache@v2
264264
id: cache-qt-bindings-windows-test
265265
with:
266266
path: |
267-
${{ github.workspace }}\src\github.com\${{ github.repository }}\vendor\github.com\therecipe\qt\*
268-
!${{ github.workspace }}\src\github.com\${{ github.repository }}\vendor\github.com\therecipe\qt\.git
269-
key: test-qtbindings-windows-test-${{ env.cache-version }}
267+
${{ github.workspace }}\src\github.com\${{ github.repository }}\vendor\github.com\akiyosi\qt\*
268+
!${{ github.workspace }}\src\github.com\${{ github.repository }}\vendor\github.com\akiyosi\qt\.git
269+
key: cache-qtbindings-windows-test-${{ env.cache-version }}
270270

271271
- name: Generate Qt bindings
272272
if: ${{ steps.cache-qt-bindings-windows-test.outputs.cache-hit != 'true' }}
@@ -296,7 +296,7 @@ jobs:
296296
build-windows-mingw:
297297
strategy:
298298
matrix:
299-
go-version: [1.18.10]
299+
go-version: [1.20.5]
300300
platform: [windows-latest]
301301
runs-on: ${{ matrix.platform }}
302302
env:
@@ -347,30 +347,48 @@ jobs:
347347
with:
348348
fetch-depth: 0
349349
path: ${{ github.workspace }}\${{ github.repository }}
350-
350+
351351
- name: Copy checkout repogitory
352352
shell: msys2 {0}
353353
run: |
354354
mkdir -p /c/${{ github.repository }}
355355
ls -l /d/a/goneovim/goneovim/${{ github.repository }}
356356
cp -pR /d/a/goneovim/goneovim/${{ github.repository }}/* /c/${{ github.repository }}/
357357
cp -pR /d/a/goneovim/goneovim/${{ github.repository }}/.* /c/${{ github.repository }}/
358+
mkdir -p /c/src/github.com/${{ github.repository }}
359+
cp -pR /d/a/goneovim/goneovim/${{ github.repository }}/* /c/src/github.com/${{ github.repository }}/
358360
ls -l /c/${{ github.repository }}
361+
ls -l /c/src/github.com/${{ github.repository }}
359362
360363
- name: Get Qt binding for Go
361364
shell: msys2 {0}
362365
run: |
363366
export PATH=/c/hostedtoolcache/windows/go/${{ matrix.go-version }}/x64/bin/:$PATH
364367
cd /c/${{ github.repository }}
365-
go get -v github.com/therecipe/qt
366-
go get github.com/therecipe/qt/internal/[email protected]20200904063919-c0c124a5770d
367-
go get github.com/therecipe/qt/internal/binding/files/docs/5.12.0
368-
go get github.com/therecipe/qt/internal/binding/files/docs/5.13.0
369-
go get github.com/therecipe/qt/internal/cmd/[email protected]20200904063919-c0c124a5770d
370-
go install -v -tags=no_env github.com/therecipe/qt/cmd/...
368+
go get -v github.com/akiyosi/qt
369+
go get github.com/akiyosi/qt/internal/[email protected]20230718095223-7e4e923f23fa
370+
go get github.com/akiyosi/qt/internal/binding/files/docs/5.12.0
371+
go get github.com/akiyosi/qt/internal/binding/files/docs/5.13.0
372+
go get github.com/akiyosi/qt/internal/cmd/[email protected]20230718095223-7e4e923f23fa
373+
go install -v -tags=no_env github.com/akiyosi/qt/cmd/...
371374
go mod vendor
372-
git clone https://github.com/therecipe/env_windows_amd64_513.git vendor/github.com/therecipe/env_windows_amd64_513
375+
git clone https://github.com/akiyosi/env_windows_amd64_513.git vendor/github.com/akiyosi/env_windows_amd64_513
376+
377+
- uses: actions/cache@v2
378+
id: cache-qt-bindings-windows-build
379+
with:
380+
path: |
381+
/c/${{ github.repository }}\vendor\github.com\akiyosi\qt\*
382+
!/c/${{ github.repository }}\vendor\github.com\akiyosi\qt\.git
383+
key: cache-qtbindings-windows-build-${{ env.cache-version }}
373384

385+
- name: Generate Qt bindings
386+
if: ${{ steps.cache-qt-bindings-windows-build.outputs.cache-hit != 'true' }}
387+
shell: msys2 {0}
388+
run: |
389+
export PATH=/c/hostedtoolcache/windows/go/${{ matrix.go-version }}/x64/bin/:$PATH
390+
cd /c/${{ github.repository }}
391+
$(go env GOPATH)/bin/qtsetup -test=false
374392
375393
- name: Get dependencies
376394
shell: msys2 {0}
@@ -379,7 +397,7 @@ jobs:
379397
cd /c/${{ github.repository }}
380398
make deps
381399
382-
### https://github.com/therecipe/qt/issues/657
400+
### https://github.com/akiyosi/qt/issues/657
383401
#- name: Test
384402
# shell: msys2 {0}
385403
# run: |
@@ -503,7 +521,7 @@ jobs:
503521
env:
504522
GOROOT: ${{ github.workspace }}\go-1.18
505523
run: |
506-
${{ github.workspace }}\go-1.18\bin\go.exe get -v -tags=no_env github.com/therecipe/qt/cmd/...
524+
${{ github.workspace }}\go-1.18\bin\go.exe get -v -tags=no_env github.com/akiyosi/qt/cmd/...
507525
508526
- name: Install Go 1.13
509527
run: |
@@ -558,8 +576,8 @@ jobs:
558576
# id: cache-qt-bindings-windows
559577
# with:
560578
# path: |
561-
# ${{ github.workspace }}\src\github.com\therecipe\qt\*
562-
# !${{ github.workspace }}\src\github.com\therecipe\qt\.git
579+
# ${{ github.workspace }}\src\github.com\akiyosi\qt\*
580+
# !${{ github.workspace }}\src\github.com\akiyosi\qt\.git
563581
# key: ${{ matrix.qtversion }}-qtbindings-windows-${{ env.cache-version }}
564582

565583
- name: Generate Qt bindings
@@ -571,15 +589,15 @@ jobs:
571589
${{ github.workspace }}\bin\qtsetup.exe prep windows
572590
${{ github.workspace }}\bin\qtsetup.exe check windows
573591
${{ github.workspace }}\bin\qtsetup.exe generate windows
574-
sed -i '9,14d' ${{ github.workspace }}\src\github.com\therecipe\qt\core\core.cpp
575-
sed -i '661,666d' ${{ github.workspace }}\src\github.com\therecipe\qt\internal\binding\templater\template_cpp.go
592+
sed -i '9,14d' ${{ github.workspace }}\src\github.com\akiyosi\qt\core\core.cpp
593+
sed -i '661,666d' ${{ github.workspace }}\src\github.com\akiyosi\qt\internal\binding\templater\template_cpp.go
576594
${{ github.workspace }}\bin\qtsetup.exe install windows
577595
578596
- name: Get dependencies
579597
run: |
580598
go get -v -d github.com/${{ github.repository }}/...
581-
cd ${{ github.workspace }}\src\github.com\${{ github.repository }}\cmd\goneovim
582-
${{ github.workspace }}\bin\qtmoc.exe
599+
cd ${{ github.workspace }}\src\github.com\${{ github.repository }}
600+
${{ github.workspace }}\bin\qtmoc.exe desktop ./cmd/goneovim
583601
584602
# - name: Convert to compatible sources on Qt5.12
585603
# if: ${{ matrix.qtversion == '5.12.6' }}
@@ -625,8 +643,9 @@ jobs:
625643
env:
626644
QT_API: 5.13.0
627645
run: |
628-
cd ${{ github.workspace }}\src\github.com\${{ github.repository }}\cmd\goneovim
629-
${{ github.workspace }}\bin\qtdeploy -ldflags "-X github.com/akiyosi/goneovim/editor.Version=${{ steps.version-windows.outputs.GONEOVIM_VERSION }}" build desktop
646+
cd ${{ github.workspace }}\src\github.com\${{ github.repository }}
647+
go generate
648+
${{ github.workspace }}\bin\qtdeploy build desktop ./cmd/goneovim
630649
Copy-Item -Force -Recurse -Path ../../runtime -Destination ./deploy/windows/
631650
632651
- name: Upload for windows

‎.github/workflows/release.yaml

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
needs: [check-new-commit]
3434
strategy:
3535
matrix:
36-
go-version: [1.18.x]
36+
go-version: [1.20.x]
3737
platform: [ubuntu-20.04]
3838
qtversion: [5.15.6]
3939
runs-on: ${{ matrix.platform }}
@@ -103,7 +103,7 @@ jobs:
103103
104104
- name: Get Qt binding for Go
105105
run: |
106-
go get -v github.com/therecipe/qt/cmd/...
106+
go get -v github.com/akiyosi/qt/cmd/...
107107
108108
- name: Checkout code
109109
uses: actions/checkout@v2
@@ -120,7 +120,7 @@ jobs:
120120
- uses: actions/cache@v2
121121
id: cache-qt-bindings-linux
122122
with:
123-
path: ${{ github.workspace }}/src/github.com/therecipe
123+
path: ${{ github.workspace }}/src/github.com/akiyosi
124124
key: ${{ matrix.qtversion }}-qtbindings-linux-${{ env.cache-version }}
125125

126126
- name: Generate Qt bindings
@@ -143,8 +143,9 @@ jobs:
143143
144144
- name: Build
145145
run: |
146-
cd ${{ github.workspace }}/src/github.com/${{ github.repository }}/cmd/goneovim
147-
$(go env GOPATH)/bin/qtdeploy -ldflags "-X github.com/akiyosi/goneovim/editor.Version=${{ steps.version-linux.outputs.GONEOVIM_VERSION }}" build desktop
146+
cd ${{ github.workspace }}/src/github.com/${{ github.repository }}/
147+
go generate
148+
$(go env GOPATH)/bin/qtdeploy build desktop ./cmd/goneovim
148149
cp -pR ../../runtime ./deploy/linux/
149150
150151
- if: github.event_name == 'workflow_dispatch'
@@ -170,7 +171,7 @@ jobs:
170171
needs: [check-new-commit]
171172
strategy:
172173
matrix:
173-
go-version: [1.18.x]
174+
go-version: [1.20.x]
174175
platform: [windows-latest]
175176
qtversion: [5.14.1]
176177
runs-on: ${{ matrix.platform }}
@@ -198,7 +199,7 @@ jobs:
198199
continue-on-error: true
199200
run: |
200201
curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/go1.18.5.windows-amd64.zip
201-
expand-archive -path go1.18.5.windows-amd64.zip -destinationpath .
202+
expand-archive -path go1.20.6.windows-amd64.zip -destinationpath .
202203
Move-Item -Path go -Destination C:\go-root
203204
204205
- name: Setup MSYS2 and install Qt5
@@ -224,7 +225,7 @@ jobs:
224225
225226
- name: Get Qt binding for Go
226227
run: |
227-
C:\go-root\bin\go.exe get -v -tags=no_env github.com/therecipe/qt/cmd/...
228+
C:\go-root\bin\go.exe get -v -tags=no_env github.com/akiyosi/qt/cmd/...
228229
229230
- name: Checkout code
230231
uses: actions/checkout@v2
@@ -252,8 +253,8 @@ jobs:
252253
id: cache-qt-bindings-windows
253254
with:
254255
path: |
255-
C:\src\github.com\therecipe\qt\*
256-
!C:\src\github.com\therecipe\qt\.git
256+
C:\src\github.com\akiyosi\qt\*
257+
!C:\src\github.com\akiyosi\qt\.git
257258
key: ${{ matrix.qtversion }}-qtbindings-windows-${{ env.cache-version }}
258259

259260
- name: Generate Qt bindings
@@ -275,15 +276,16 @@ jobs:
275276
run: |
276277
export PATH=$PATH:/c/bin:/c/go-root/bin:/d/a/_temp/msys64/usr/bin
277278
cd /c/src/github.com/akiyosi/goneovim/
278-
cd ./cmd/goneovim
279-
/c/bin/qtmoc
279+
cd
280+
/c/bin/qtmoc desktop ./cmd/goneovim
280281
281282
- name: Build for windows
282283
shell: msys2 {0}
283284
run: |
284285
export PATH=$PATH:/c/bin:/c/go-root/bin:/d/a/_temp/msys64/usr/bin
285-
cd /c/src/github.com/akiyosi/goneovim/cmd/goneovim
286-
/c/bin/qtdeploy -ldflags "-X github.com/akiyosi/goneovim/editor.Version=${{ steps.version-windows.outputs.GONEOVIM_VERSION }}" build desktop
286+
cd /c/src/github.com/akiyosi/goneovim/
287+
go generate
288+
/c/bin/qtdeploy build desktop ./cmd/goneovim
287289
cp -pR ../../runtime ./deploy/windows/
288290
289291
- if: github.event_name == 'workflow_dispatch'
@@ -310,7 +312,7 @@ jobs:
310312
needs: [check-new-commit]
311313
strategy:
312314
matrix:
313-
go-version: [1.18.x]
315+
go-version: [1.20.x]
314316
platform: [macos-11]
315317
qtversion: [5.15.2]
316318
runs-on: ${{ matrix.platform }}
@@ -343,7 +345,7 @@ jobs:
343345

344346
- name: Get Qt binding for Go
345347
run: |
346-
go get -v github.com/therecipe/qt/cmd/...
348+
go get -v github.com/akiyosi/qt/cmd/...
347349
348350
- name: Checkout code
349351
uses: actions/checkout@v2
@@ -365,7 +367,7 @@ jobs:
365367
# - uses: actions/cache@v2
366368
# id: cache-qt-bindings-macos-11
367369
# with:
368-
# path: ${{ github.workspace }}/src/github.com/therecipe
370+
# path: ${{ github.workspace }}/src/github.com/akiyosi
369371
# key: ${{ matrix.qtversion }}-qtbindings-macos-11-${{ env.cache-version }}
370372

371373
#if: ${{ steps.cache-qt-bindings-macos-11.outputs.cache-hit != 'true' }}
@@ -377,13 +379,14 @@ jobs:
377379
- name: Get dependencies
378380
run: |
379381
go get -v -t -d github.com/${{ github.repository }}/...
380-
cd ${{ github.workspace }}/src/github.com/${{ github.repository }}/cmd/goneovim
381-
$(go env GOPATH)/bin/qtmoc
382+
cd ${{ github.workspace }}/src/github.com/${{ github.repository }}
383+
$(go env GOPATH)/bin/qtmoc desktop ./cmd/goneovim
382384
383385
- name: Build
384386
run: |
385-
cd ${{ github.workspace }}/src/github.com/${{ github.repository }}/cmd/goneovim
386-
$(go env GOPATH)/bin/qtdeploy -ldflags "-X github.com/akiyosi/goneovim/editor.Version=${{ steps.version-macos-11.outputs.GONEOVIM_VERSION }}" build desktop
387+
cd ${{ github.workspace }}/src/github.com/${{ github.repository }}/
388+
go generate
389+
$(go env GOPATH)/bin/qtdeploy build desktop ./cmd/goneovim
387390
cp -pR ../../runtime ./deploy/darwin/goneovim.app/Contents/Resources/
388391
cd ${{ github.workspace }}/src/github.com/${{ github.repository }}/
389392
/usr/libexec/PlistBuddy -c "Add :CFBundleVersion string ${{ steps.version-macos-11.outputs.GONEOVIM_VERSION_HASH }}" "./cmd/goneovim/deploy/darwin/goneovim.app/Contents/Info.plist"

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
debug.log
55
tags*
66
moc*
7+
editor/version.txt
78
cmd/goneovim/goneovim
89
cmd/goneovim/debug
910
cmd/goneovim/deploy/*

0 commit comments

Comments
 (0)