Browse Source

CI: Update docker image and Go versions

DarthSim 1 year ago
parent
commit
7cc77cad13
3 changed files with 10 additions and 7 deletions
  1. 6 3
      .github/workflows/Dockerfile
  2. 2 2
      .github/workflows/lint.yml
  3. 2 2
      .github/workflows/test.yml

+ 6 - 3
.github/workflows/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim
+FROM debian:stable-slim
 
 RUN apt-get -qq update \
   && apt-get install -y --no-install-recommends \
@@ -7,8 +7,8 @@ RUN apt-get -qq update \
     git \
     ca-certificates \
     build-essential \
-    ninja-build \
     python3-pip \
+    python3-venv \
     libglib2.0-dev \
     libxml2-dev \
     libjpeg-dev \
@@ -25,9 +25,12 @@ RUN apt-get -qq update \
     libopencv-imgproc-dev \
     libopencv-objdetect-dev \
     libopencv-dnn-dev \
-  && pip install --force meson \
+  && python3 -m venv /root/.python \
+  && /root/.python/bin/pip install meson ninja \
   && rm -rf /var/lib/apt/lists/*
 
+ENV PATH="/root/.python/bin:$PATH"
+
 RUN \
   mkdir /root/vips \
     && cd /root/vips \

+ 2 - 2
.github/workflows/lint.yml

@@ -11,10 +11,10 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     container:
-      image: darthsim/imgproxy-ci:202302212110
+      image: darthsim/imgproxy-ci:202309122140
     strategy:
       matrix:
-        go-version: ["1.20.x"]
+        go-version: ["1.21.x"]
         vips-version: ["8.14"]
     steps:
       - name: Checkout

+ 2 - 2
.github/workflows/test.yml

@@ -11,10 +11,10 @@ jobs:
   test:
     runs-on: ubuntu-latest
     container:
-      image: darthsim/imgproxy-ci:202302212110
+      image: darthsim/imgproxy-ci:202309122140
     strategy:
       matrix:
-        go-version: ["1.20.x", "1.19.x"]
+        go-version: ["1.21.x", "1.20.x", "1.19.x"]
         vips-version: ["8.14", "8.13"]
     steps:
       - name: Checkout