loading up the forgejo repo on tangled to test page performance
test_env: hardcode major go version in use (#23464)
hardcode the version of test_env we use in docker, so that we can use
different major versions of golang between versions of Gitea
---------
Co-authored-by: Lauris BH <lauris@nix.lv>
authored by
techknowlogick
Lauris BH
and committed by
GitHub
32204fcf
6e75739c
+25
-23
+20
-20
.drone.yml
+20
-20
.drone.yml
···
44
44
depends_on: [deps-frontend]
45
45
46
46
- name: lint-backend
47
-
image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env
47
+
image: gitea/test_env:linux-1.20-amd64 # https://gitea.com/gitea/test-env
48
48
pull: always
49
49
commands:
50
50
- make lint-backend
···
58
58
path: /go
59
59
60
60
- name: lint-backend-windows
61
-
image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env
61
+
image: gitea/test_env:linux-1.20-amd64 # https://gitea.com/gitea/test-env
62
62
commands:
63
63
- make golangci-lint-windows vet
64
64
environment:
···
73
73
path: /go
74
74
75
75
- name: lint-backend-gogit
76
-
image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env
76
+
image: gitea/test_env:linux-1.20-amd64 # https://gitea.com/gitea/test-env
77
77
commands:
78
78
- make lint-backend
79
79
environment:
···
234
234
path: /go
235
235
236
236
- name: prepare-test-env
237
-
image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env
237
+
image: gitea/test_env:linux-1.20-amd64 # https://gitea.com/gitea/test-env
238
238
pull: always
239
239
commands:
240
240
- ./build/test-env-prepare.sh
241
241
242
242
- name: build
243
-
image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env
243
+
image: gitea/test_env:linux-1.20-amd64 # https://gitea.com/gitea/test-env
244
244
user: gitea
245
245
commands:
246
246
- ./build/test-env-check.sh
···
255
255
path: /go
256
256
257
257
- name: test-pgsql
258
-
image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env
258
+
image: gitea/test_env:linux-1.20-amd64 # https://gitea.com/gitea/test-env
259
259
user: gitea
260
260
commands:
261
261
- timeout -s ABRT 50m make test-pgsql-migration test-pgsql
···
336
336
path: /go
337
337
338
338
- name: prepare-test-env
339
-
image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env
339
+
image: gitea/test_env:linux-1.20-amd64 # https://gitea.com/gitea/test-env
340
340
pull: always
341
341
commands:
342
342
- ./build/test-env-prepare.sh
343
343
344
344
- name: build
345
-
image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env
345
+
image: gitea/test_env:linux-1.20-amd64 # https://gitea.com/gitea/test-env
346
346
user: gitea
347
347
commands:
348
348
- ./build/test-env-check.sh
···
357
357
path: /go
358
358
359
359
- name: unit-test
360
-
image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env
360
+
image: gitea/test_env:linux-1.20-amd64 # https://gitea.com/gitea/test-env
361
361
user: gitea
362
362
commands:
363
363
- make unit-test-coverage test-check
···
373
373
path: /go
374
374
375
375
- name: unit-test-gogit
376
-
image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env
376
+
image: gitea/test_env:linux-1.20-amd64 # https://gitea.com/gitea/test-env
377
377
user: gitea
378
378
commands:
379
379
- make unit-test-coverage test-check
···
389
389
path: /go
390
390
391
391
- name: test-mysql
392
-
image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env
392
+
image: gitea/test_env:linux-1.20-amd64 # https://gitea.com/gitea/test-env
393
393
user: gitea
394
394
commands:
395
395
- make test-mysql-migration integration-test-coverage
···
490
490
path: /go
491
491
492
492
- name: prepare-test-env
493
-
image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env
493
+
image: gitea/test_env:linux-1.20-amd64 # https://gitea.com/gitea/test-env
494
494
pull: always
495
495
commands:
496
496
- ./build/test-env-prepare.sh
497
497
498
498
- name: build
499
-
image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env
499
+
image: gitea/test_env:linux-1.20-amd64 # https://gitea.com/gitea/test-env
500
500
user: gitea
501
501
commands:
502
502
- ./build/test-env-check.sh
···
511
511
path: /go
512
512
513
513
- name: test-mysql8
514
-
image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env
514
+
image: gitea/test_env:linux-1.20-amd64 # https://gitea.com/gitea/test-env
515
515
user: gitea
516
516
commands:
517
517
- timeout -s ABRT 50m make test-mysql8-migration test-mysql8
···
580
580
path: /go
581
581
582
582
- name: prepare-test-env
583
-
image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env
583
+
image: gitea/test_env:linux-1.20-amd64 # https://gitea.com/gitea/test-env
584
584
pull: always
585
585
commands:
586
586
- ./build/test-env-prepare.sh
587
587
588
588
- name: build
589
-
image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env
589
+
image: gitea/test_env:linux-1.20-amd64 # https://gitea.com/gitea/test-env
590
590
user: gitea
591
591
commands:
592
592
- ./build/test-env-check.sh
···
601
601
path: /go
602
602
603
603
- name: test-mssql
604
-
image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env
604
+
image: gitea/test_env:linux-1.20-amd64 # https://gitea.com/gitea/test-env
605
605
user: gitea
606
606
commands:
607
607
- make test-mssql-migration test-mssql
···
660
660
path: /go
661
661
662
662
- name: prepare-test-env
663
-
image: gitea/test_env:linux-arm64 # https://gitea.com/gitea/test-env
663
+
image: gitea/test_env:linux-1.20-arm64 # https://gitea.com/gitea/test-env
664
664
pull: always
665
665
commands:
666
666
- ./build/test-env-prepare.sh
667
667
668
668
- name: build
669
-
image: gitea/test_env:linux-arm64 # https://gitea.com/gitea/test-env
669
+
image: gitea/test_env:linux-1.20-arm64 # https://gitea.com/gitea/test-env
670
670
user: gitea
671
671
commands:
672
672
- ./build/test-env-check.sh
···
681
681
path: /go
682
682
683
683
- name: test-sqlite
684
-
image: gitea/test_env:linux-arm64 # https://gitea.com/gitea/test-env
684
+
image: gitea/test_env:linux-1.20-arm64 # https://gitea.com/gitea/test-env
685
685
user: gitea
686
686
commands:
687
687
- timeout -s ABRT 50m make test-sqlite-migration test-sqlite
+1
-1
Makefile
+1
-1
Makefile
···
29
29
EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/cmd/editorconfig-checker@2.6.0
30
30
ERRCHECK_PACKAGE ?= github.com/kisielk/errcheck@v1.6.2
31
31
GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.4.0
32
-
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.51.0
32
+
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.51.2
33
33
GXZ_PAGAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.10
34
34
MISSPELL_PACKAGE ?= github.com/client9/misspell/cmd/misspell@v0.3.4
35
35
SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.30.4
+4
-2
modules/highlight/highlight.go
+4
-2
modules/highlight/highlight.go
···
36
36
once sync.Once
37
37
38
38
cache *lru.TwoQueueCache
39
+
40
+
githubStyles = styles.Get("github")
39
41
)
40
42
41
43
// NewContext loads custom highlight map from local config
···
121
123
return code
122
124
}
123
125
// style not used for live site but need to pass something
124
-
err = formatter.Format(htmlw, styles.GitHub, iterator)
126
+
err = formatter.Format(htmlw, githubStyles, iterator)
125
127
if err != nil {
126
128
log.Error("Can't format code: %v", err)
127
129
return code
···
184
186
lines := make([]string, 0, len(tokensLines))
185
187
for _, tokens := range tokensLines {
186
188
iterator = chroma.Literator(tokens...)
187
-
err = formatter.Format(htmlBuf, styles.GitHub, iterator)
189
+
err = formatter.Format(htmlBuf, githubStyles, iterator)
188
190
if err != nil {
189
191
return nil, "", fmt.Errorf("can't format code: %w", err)
190
192
}