Skip to content

Commit 095b323

Browse files
cshumcshum
authored
build: libvips v8.15.1, go v1.22.1 (#412)
* build: libvips v8.15.1, go v1.22.1 * test: reset golden * test: update golden files
1 parent 6d17897 commit 095b323

File tree

103 files changed

+136
-91
lines changed
  • .github/workflows
  • Dockerfile
  • go.mod
  • go.sum
  • testdata/golden
    • 0.006120x0.008993%3A1.0x1.0/stretch/100x200/filters%3Abrightness%28-20%29%3Acontrast%2850%29%3Argb%2810%2C-50%2C30%29%3Afill%28black%29
    • 0x0/40x50/filters%3Afill%28white%29
    • 0x100%3A9999x9999/300x100/filters%3Afill%28white%29%3Aformat%28jpeg%29%3Afocal%28589x401%3A1000x814%29
    • 100x100
    • 100x200
    • 100x30
    • 100x300/filters%3Afill%28white%29%3Aformat%28jpeg%29%3Afocal%28589x401%3A1000x814%29
    • 10x20%3A3000x5000/stretch/100x200/filters%3Abrightness%28-20%29%3Acontrast%2850%29%3Argb%2810%2C-50%2C30%29%3Afill%28black%29
    • 200x-210/top
      • filters%3Ablur%281%2C2%29%3Asharpen%281%2C2%29%3Abackground_color%28ff0%29%3Aformat%28jpeg%29%3Aquality%2870%29
      • filters%3Ablur%285%29%3Asharpen%285%29%3Abackground_color%28ffff00%29%3Aformat%28jpeg%29%3Aquality%2870%29
    • 200x0/20x20%3A100x20/filters%3Afill%28yellow%29%3Awatermark%28dancing-banana.gif%2C-10%2C-10%2C0%2C50%2C50%29%3Awatermark%28dancing-banana.gif%2C-30%2C10%2C0%2C50%2C50%29
    • 200x100
    • 200x200/filters%3Aformat%28png%29%3Apalette%28%29%3Abitdepth%284%29%3Acompression%288%29
    • 300x100
      • filters%3Afill%28white%29%3Aformat%28jpeg%29%3Afocal%280.35x0.25%3A0.6x0.3%29
      • filters%3Afill%28white%29%3Aformat%28jpeg%29%3Afocal%28589x401%29%3Afocal%281000x814%29
      • filters%3Afill%28white%29%3Aformat%28jpeg%29%3Afocal%28589x401%3A1000x814%29
      • filters%3Afill%28white%29%3Aformat%28jpeg%29%3Afocal%289999x9999%29
    • 300x300/filters%3Aformat%28jpeg%29%3Afocal%28150%3A150%29
    • 50x50%3A0x0/filters%3Atrim%2850%2Cbottom-right%29
    • filters%3Abackground_color%28%29%3Aset_frames%28%29%3Aset_frames%280%29%3Around_corner%28%29%3Apadding%28%29%3Arotate%28%29%3Aproportion%28%29%3Aproportion%289999%29%3Aproportion%280.0000000001%29%3Aproportion%28-10%29
    • filters%3Afill%28cyan%29%3Around_corner%2860%29
    • filters%3Aformat%28tiff%29%3Aquality%2870%29
    • filters%3Aproportion%28%29%3Aproportion%289999%29%3Aproportion%280.0000000001%29%3Aproportion%28-10%29%3Asharpen%28-1%29
    • filters%3Aproportion%280.1%29
    • filters%3Aproportion%2810%29
    • filters%3Awatermark%282bands.png%2Crepeat%2Cbottom%2C40%2C25%2C50%29
    • fit-in
      • -180x180/10x10/filters%3Afill%28yellow%29%3Apadding%28white%2C10%2C20%2C30%2C40%29%3Aformat%28jpeg%29
      • -200x0/filters%3Ahue%28290%29%3Asaturation%28100%29%3Afill%28FFO%29%3Aupscale%28%29
      • 0x210/filters%3Afill%28yellow%29%3Around_corner%2840%2C60%2Cgreen%29
      • 100x100
      • 100x150/filters%3Arotate%2890%29%3Afill%28yellow%29
      • 100x210/10x20%3A15x3/filters%3Arotate%2890%29%3Afill%28yellow%29
      • 150x200/10x00%3A10x50
        • filters%3Afill%28cyan%29%3Alabel%28IMAGOR%2Ccenter%2C-30%2C25%2Cwhite%2C0%2Cmonospace%29
        • filters%3Afill%28yellow%29%3Alabel%28IMAGOR%2Ccenter%2C-30%2C25%2Cblack%29
      • 200x150
        • filters%3Afill%28cyan%29%3Awatermark%28dancing-banana.gif%2Crepeat%2Cbottom%2C0%2C50%2C50%29
        • filters%3Afill%28yellow%29%3Awatermark%28dancing-banana.gif%2C-20%2C-10%2C0%2C30%2C30%29%3Awatermark%28nyan-cat.gif%2C0%2C10%2C0%2C40%2C30%29
        • filters%3Afill%28yellow%29%3Awatermark%28dancing-banana.gif%2C30%2C-10%2C0%2C40%2C40%29%3Awatermark%28dancing-banana.gif%2C0%2C10%2C0%2C40%2C40%29
        • filters%3Afill%28yellow%29%3Awatermark%28gopher-front.png%2C-20%2C-10%2C0%2C30%2C30%29
        • filters%3Afill%28yellow%29%3Awatermark%28gopher-front.png%2Crepeat%2Cbottom%2C0%2C30%2C30%29
      • 200x200
        • filters%3Afill%28white%29%3Aset_frames%283%29%3Awatermark%28dancing-banana.gif%29%3Aformat%28jpeg%29
        • filters%3Afill%28white%29%3Aset_frames%283%2C200%29%3Awatermark%28dancing-banana.gif%29%3Aformat%28gif%29
        • filters%3Afill%28white%29%3Aset_frames%283%2C200%29%3Awatermark%28dancing-banana.gif%2Crepeat%2Crepeat%2C0%2C33%2C33%29%3Aformat%28gif%29
      • 200x210/20x20/filters%3Arotate%2890%29%3Arotate%28270%29%3Arotate%28180%29%3Afill%28blur%29%3Agrayscale%28%29
      • 300x200/10x10
        • filters%3Afill%28yellow%29%3Alabel%28IMAGOR%2C-0.15%2C0.1%2C30%2Cred%2C30%29
        • filters%3Afill%28yellow%29%3Alabel%28IMAGOR%2C-15%2C-10%2C30%2Cred%2C30%29
        • filters%3Afill%28yellow%29%3Alabel%28IMAGOR%2C-15p%2C10p%2C30%2Cred%2C30%29
        • filters%3Afill%28yellow%29%3Alabel%28IMAGOR%2C15%2C10%2C30%2Cblue%2C30%29
        • filters%3Afill%28yellow%29%3Alabel%28IMAGOR%2Ccenter%2Cbottom%2C30%2Cred%2C30%29
        • filters%3Afill%28yellow%29%3Alabel%28IMAGOR%2Cleft%2Ctop%2C30%2Cred%2C30%29
        • filters%3Afill%28yellow%29%3Alabel%28IMAGOR%2Cright%2Ccenter%2C30%2Cred%2C30%29
      • 400x400
      • 500x500
        • filters%3Afill%28white%29%3Awatermark%28gopher.png%2C0.1%2Crepeat%2C30%2C20%2C20%29%3Awatermark%28gopher.png%2Crepeat%2Cbottom%2C30%2C30%2C30%29%3Awatermark%28gopher-front.png%2Ccenter%2C-0.1%29
        • filters%3Afill%28white%29%3Awatermark%28gopher.png%2C10p%2Crepeat%2C30%2C20%2C20%29%3Awatermark%28gopher.png%2Crepeat%2Cbottom%2C30%2C30%2C30%29%3Awatermark%28gopher-front.png%2Ccenter%2C-10p%29
        • filters%3Afill%28white%29%3Awatermark%28gopher.png%2Cleft%2Ctop%2C30%2C20%2C20%29%3Awatermark%28gopher.png%2Cright%2Ccenter%2C30%2C30%2C30%29%3Awatermark%28gopher-front.png%2C-20%2C-10%29
      • stretch/100x100/10x10/filters%3Afill%28transparent%29
    • gopher-front.png
    • max-filter-ops/fit-in/200x150
      • filters%3Afill%28yellow%29
      • filters%3Afill%28yellow%29%3Awatermark%28dancing-banana.gif%2C-20%2C-10%2C0%2C30%2C30%29%3Awatermark%28nyan-cat.gif%2C0%2C10%2C0%2C40%2C30%29
    • max-frames
    • max-frames-limited
    • memory
    • no-animation
    • stretch
    • trim
    • trim%3A50/500x500/filters%3Astretch%28%29
    • trim%3Abottom-right

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+136
-91
lines changed

‎.github/workflows/test.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ jobs:
88
runs-on: ubuntu-22.04
99
env:
1010
CGO_CFLAGS_ALLOW: -Xpreprocessor
11-
VIPS_VERSION: 8.14.5
11+
VIPS_VERSION: 8.15.1
1212
V: 6
1313

1414
steps:
1515
- name: Set up Go 1.x
1616
uses: actions/setup-go@v2
1717
with:
18-
go-version: ^1.21
18+
go-version: ^1.22
1919

2020
- name: Check out code
2121
uses: actions/checkout@v2
@@ -55,7 +55,7 @@ jobs:
5555
--libdir=lib \
5656
-Dgtk_doc=false \
5757
-Dmagick=disabled \
58-
-Dintrospection=false
58+
-Dintrospection=disabled
5959
ninja -C _build
6060
sudo ninja -C _build install
6161
sudo ldconfig

‎Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
ARG GOLANG_VERSION=1.21.4
1+
ARG GOLANG_VERSION=1.22.1
22
FROM golang:${GOLANG_VERSION}-bookworm as builder
33

4-
ARG VIPS_VERSION=8.14.5
4+
ARG VIPS_VERSION=8.15.1
55
ARG TARGETARCH
66

77
ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
@@ -29,7 +29,7 @@ RUN DEBIAN_FRONTEND=noninteractive \
2929
--libdir=lib \
3030
-Dgtk_doc=false \
3131
-Dmagick=disabled \
32-
-Dintrospection=false && \
32+
-Dintrospection=disabled && \
3333
ninja -C _build && \
3434
ninja -C _build install && \
3535
ldconfig && \

‎go.mod

+36-29
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,72 @@
11
module github.com/cshum/imagor
22

3-
go 1.19
3+
go 1.21
4+
5+
toolchain go1.21.1
46

57
require (
6-
cloud.google.com/go/storage v1.35.1
7-
github.com/aws/aws-sdk-go v1.48.0
8+
cloud.google.com/go/storage v1.39.0
9+
github.com/aws/aws-sdk-go v1.50.33
810
github.com/fsouza/fake-gcs-server v1.47.6
911
github.com/johannesboyne/gofakes3 v0.0.0-20230914150226-f005f5cc03aa
1012
github.com/peterbourgon/ff/v3 v3.4.0
11-
github.com/prometheus/client_golang v1.17.0
13+
github.com/prometheus/client_golang v1.19.0
1214
github.com/rs/cors v1.10.1
1315
github.com/stretchr/testify v1.8.4
14-
go.uber.org/zap v1.26.0
15-
golang.org/x/image v0.14.0
16-
golang.org/x/sync v0.5.0
16+
go.uber.org/zap v1.27.0
17+
golang.org/x/image v0.15.0
18+
golang.org/x/sync v0.6.0
1719
)
1820

1921
require (
20-
cloud.google.com/go v0.110.10 // indirect
21-
cloud.google.com/go/compute v1.23.3 // indirect
22+
cloud.google.com/go v0.112.1 // indirect
23+
cloud.google.com/go/compute v1.25.0 // indirect
2224
cloud.google.com/go/compute/metadata v0.2.3 // indirect
23-
cloud.google.com/go/iam v1.1.5 // indirect
24-
cloud.google.com/go/pubsub v1.33.0 // indirect
25+
cloud.google.com/go/iam v1.1.6 // indirect
26+
cloud.google.com/go/pubsub v1.36.2 // indirect
2527
github.com/beorn7/perks v1.0.1 // indirect
2628
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2729
github.com/davecgh/go-spew v1.1.1 // indirect
2830
github.com/felixge/httpsnoop v1.0.4 // indirect
31+
github.com/go-logr/logr v1.4.1 // indirect
32+
github.com/go-logr/stdr v1.2.2 // indirect
2933
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
30-
github.com/golang/protobuf v1.5.3 // indirect
34+
github.com/golang/protobuf v1.5.4 // indirect
3135
github.com/google/renameio/v2 v2.0.0 // indirect
3236
github.com/google/s2a-go v0.1.7 // indirect
33-
github.com/google/uuid v1.4.0 // indirect
37+
github.com/google/uuid v1.6.0 // indirect
3438
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
35-
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
39+
github.com/googleapis/gax-go/v2 v2.12.2 // indirect
3640
github.com/gorilla/handlers v1.5.2 // indirect
3741
github.com/gorilla/mux v1.8.1 // indirect
3842
github.com/jmespath/go-jmespath v0.4.0 // indirect
39-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
4043
github.com/pkg/xattr v0.4.9 // indirect
4144
github.com/pmezard/go-difflib v1.0.0 // indirect
42-
github.com/prometheus/client_model v0.5.0 // indirect
43-
github.com/prometheus/common v0.45.0 // indirect
45+
github.com/prometheus/client_model v0.6.0 // indirect
46+
github.com/prometheus/common v0.49.0 // indirect
4447
github.com/prometheus/procfs v0.12.0 // indirect
4548
github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 // indirect
4649
github.com/shabbyrobe/gocovmerge v0.0.0-20190829150210-3e036491d500 // indirect
4750
go.opencensus.io v0.24.0 // indirect
51+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
52+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
53+
go.opentelemetry.io/otel v1.24.0 // indirect
54+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
55+
go.opentelemetry.io/otel/trace v1.24.0 // indirect
4856
go.uber.org/multierr v1.11.0 // indirect
49-
golang.org/x/crypto v0.15.0 // indirect
50-
golang.org/x/net v0.18.0 // indirect
51-
golang.org/x/oauth2 v0.14.0 // indirect
52-
golang.org/x/sys v0.14.0 // indirect
57+
golang.org/x/crypto v0.21.0 // indirect
58+
golang.org/x/net v0.22.0 // indirect
59+
golang.org/x/oauth2 v0.18.0 // indirect
60+
golang.org/x/sys v0.18.0 // indirect
5361
golang.org/x/text v0.14.0 // indirect
54-
golang.org/x/time v0.4.0 // indirect
62+
golang.org/x/time v0.5.0 // indirect
5563
golang.org/x/tools v0.15.0 // indirect
56-
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
57-
google.golang.org/api v0.151.0 // indirect
64+
google.golang.org/api v0.168.0 // indirect
5865
google.golang.org/appengine v1.6.8 // indirect
59-
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
60-
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
61-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
62-
google.golang.org/grpc v1.59.0 // indirect
63-
google.golang.org/protobuf v1.31.0 // indirect
66+
google.golang.org/genproto v0.0.0-20240304212257-790db918fca8 // indirect
67+
google.golang.org/genproto/googleapis/api v0.0.0-20240304212257-790db918fca8 // indirect
68+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240304212257-790db918fca8 // indirect
69+
google.golang.org/grpc v1.62.1 // indirect
70+
google.golang.org/protobuf v1.33.0 // indirect
6471
gopkg.in/yaml.v3 v3.0.1 // indirect
6572
)

0 commit comments

Comments
 (0)