Merge pull request #1631 from criblio/test/1.21.4

Approved
criblio · Jan 5, 2024 · 9301188 · 9301188
2 parents 403d241 + bc4aecb
commit 9301188
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 22 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -193,19 +193,6 @@ jobs:
           key: ${{ runner.os }}-${{ steps.env.outputs.arch }}-buildx-${{ github.sha }}
           upload-chunk-size: 1000000
 
-      # Cache downloaded Go dependencies.
-      - name: Setup Go Cache
-        uses: actions/[email protected]
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-            cli/.gobin
-            cli/.gocache
-            cli/.gomod
-          key: ${{ runner.os }}-${{ steps.env.outputs.arch }}-go-${{ hashFiles('cli/go.sum') }}
-          upload-chunk-size: 1000000
-
       # Cache the cmocka build. Use a key based on a hash of all the files used
       # in the build.
       - name: Setup cmocka Cache
@@ -332,7 +319,7 @@ jobs:
       # artifact name for this job as well as the other job for ARM. The result
       # is a single artifact with binaries from both jobs.
       - name: Upload Binaries
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: binaries
           path: |
@@ -368,7 +355,7 @@ jobs:
 
       # Download the built binaries
       - name: Download Binaries
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: binaries
 
@@ -471,7 +458,7 @@ jobs:
           #        uses: actions/checkout@v4
           #
           #      - name: Download Binaries
-          #        uses: actions/download-artifact@v4
+          #        uses: actions/download-artifact@v3
           #        with:
           #          name: binaries
           #
@@ -519,7 +506,7 @@ jobs:
           #        uses: actions/checkout@v4
           #
           #      - name: Download Binaries
-          #        uses: actions/download-artifact@v4
+          #        uses: actions/download-artifact@v3
           #        with:
           #          name: binaries
           #
@@ -577,7 +564,7 @@ jobs:
           password: ${{ secrets.SCOPECI_TOKEN }}
 
       - name: Download Binaries
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: binaries
 

diff --git a/.github/workflows/integrations.yml b/.github/workflows/integrations.yml
@@ -293,7 +293,7 @@ jobs:
       # artifact name for this job as well as the other job for ARM. The result
       # is a single artifact with binaries from both jobs.
       - name: Upload Binaries
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: binaries
           path: |
@@ -327,7 +327,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Download Binaries
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: binaries
 
@@ -375,7 +375,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Download Binaries
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: binaries
 

diff --git a/docker/builder/Dockerfile.ubuntu b/docker/builder/Dockerfile.ubuntu
@@ -42,13 +42,13 @@ RUN apt-get update && \
     apt-get update && \
 #    ( gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys "$key" || gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" ) && \
     apt-get install -y \
-        golang \
         autoconf \
         automake \
         curl \
         emacs \
         gdb \
         git \
+        golang \
         lcov \
         libtool \
         lsof \
@@ -61,6 +61,12 @@ RUN apt-get update && \
     dpkg-reconfigure --frontend noninteractive tzdata && \
     apt-get clean
 
+# Install Go
+RUN curl -LO https://go.dev/dl/go1.21.4.linux-amd64.tar.gz && \
+    rm -rf /usr/local/go && \
+    tar -C /usr/local -xzf go1.21.4.linux-amd64.tar.gz
+ENV PATH "$PATH:/usr/local/go/bin"
+
 ARG UPX_VERSION=4.0.1
 ARG CMAKE_VERSION=3.24.3