fix some build errors

kerberos-io · Jan 20, 2023 · 427fad2 · 427fad2
1 parent a895b24
commit 427fad2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,11 +5,11 @@ version: 2
 jobs:
   machinery:
     docker:
-      - image: kerberos/base:6e68480
+      - image: kerberos/base:91ab4d4
     working_directory: /go/src/github.com/{{ORG_NAME}}/{{REPO_NAME}}
     steps:
       - checkout
-      - run: apt-get update && apt-get install -y --no-install-recommends libavcodec-dev libavformat-dev libswscale-dev
+      - run: apt-get update && apt-get install -y --no-install-recommends libavcodec-dev libavformat-dev libswscale-dev libjpeg62-turbo-dev
       - run: cd machinery && go mod download
       - run: cd machinery && go test -v ./...
       - run: cd machinery && go vet

diff --git a/.github/workflows/docker-dev.yml b/.github/workflows/docker-dev.yml
@@ -34,7 +34,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        architecture: [arm64, arm/v7, arm/v6]
+        #architecture: [arm64, arm/v7, arm/v6]
+        architecture: [arm64, arm/v7]
     steps:
     - name: Login to DockerHub
       uses: docker/login-action@v2

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -12,7 +12,7 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     container:
-      image: kerberos/base:6e68480
+      image: kerberos/base:91ab4d4
 
     strategy:
       matrix:
@@ -26,7 +26,7 @@ jobs:
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
     - name: Install dependencies
-      run: apt update -y && apt install -y --no-install-recommends git build-essential cmake pkg-config unzip libgtk2.0-dev curl ca-certificates libcurl4-openssl-dev libssl-dev libavcodec-dev libavformat-dev libswscale-dev libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libdc1394-22-dev
+      run: apt update -y && apt install -y --no-install-recommends git build-essential cmake pkg-config unzip libgtk2.0-dev curl ca-certificates libcurl4-openssl-dev libssl-dev libavcodec-dev libavformat-dev libswscale-dev libtbb2 libtbb-dev libpng-dev libtiff-dev libdc1394-22-dev libjpeg62-turbo-dev
     - name: Get dependencies
       run: cd machinery && go mod download
     - name: Build