From 05bb1a3082a18e6d3da251473c43c0d0f823875d Mon Sep 17 00:00:00 2001 From: Sean Valeo Date: Fri, 5 Jan 2024 11:13:11 -0500 Subject: [PATCH 1/7] update dockerfile --- .github/workflows/build.yml | 13 ------------- docker/builder/Dockerfile.ubuntu | 8 ++++++-- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b8dcd0284..734dcb5b7 100644 --- 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/cache@v3.3.2 - 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 diff --git a/docker/builder/Dockerfile.ubuntu b/docker/builder/Dockerfile.ubuntu index d06835a95..b14f735e4 100644 --- a/docker/builder/Dockerfile.ubuntu +++ b/docker/builder/Dockerfile.ubuntu @@ -38,11 +38,9 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone ENV key=52B59B1571A79DBC054901C0F6BC817356A3D45E RUN apt-get update && \ apt-get install -y software-properties-common gpg apt-utils libelf-dev && \ - add-apt-repository -y ppa:longsleep/golang-backports && \ 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 \ @@ -61,6 +59,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 From ea7371aea6ae79682353b610655eba6db1aacaec Mon Sep 17 00:00:00 2001 From: Sean Valeo Date: Fri, 5 Jan 2024 11:22:34 -0500 Subject: [PATCH 2/7] add buildessential --- docker/builder/Dockerfile.ubuntu | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/builder/Dockerfile.ubuntu b/docker/builder/Dockerfile.ubuntu index b14f735e4..2df76133f 100644 --- a/docker/builder/Dockerfile.ubuntu +++ b/docker/builder/Dockerfile.ubuntu @@ -43,6 +43,7 @@ RUN apt-get update && \ apt-get install -y \ autoconf \ automake \ + build-essential \ curl \ emacs \ gdb \ From d0c6a6cd19c1452056627b83331629383b74451a Mon Sep 17 00:00:00 2001 From: Sean Valeo Date: Fri, 5 Jan 2024 11:41:21 -0500 Subject: [PATCH 3/7] dockerfile --- docker/builder/Dockerfile.ubuntu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/builder/Dockerfile.ubuntu b/docker/builder/Dockerfile.ubuntu index 2df76133f..8533ca4b7 100644 --- a/docker/builder/Dockerfile.ubuntu +++ b/docker/builder/Dockerfile.ubuntu @@ -43,11 +43,11 @@ RUN apt-get update && \ apt-get install -y \ autoconf \ automake \ - build-essential \ curl \ emacs \ gdb \ git \ + golang \ # also pulls in other needed deps lcov \ libtool \ lsof \ From eaafc03a9251f407253bca599904a78b83e50203 Mon Sep 17 00:00:00 2001 From: Sean Valeo Date: Fri, 5 Jan 2024 11:50:57 -0500 Subject: [PATCH 4/7] dockerfile --- docker/builder/Dockerfile.ubuntu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/builder/Dockerfile.ubuntu b/docker/builder/Dockerfile.ubuntu index 8533ca4b7..015336913 100644 --- a/docker/builder/Dockerfile.ubuntu +++ b/docker/builder/Dockerfile.ubuntu @@ -47,7 +47,7 @@ RUN apt-get update && \ emacs \ gdb \ git \ - golang \ # also pulls in other needed deps + golang \ lcov \ libtool \ lsof \ From a8ffbb3b7def63f610ca8531d88a41bd733cca7d Mon Sep 17 00:00:00 2001 From: Sean Valeo Date: Fri, 5 Jan 2024 12:07:35 -0500 Subject: [PATCH 5/7] dockerfile --- docker/builder/Dockerfile.ubuntu | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/builder/Dockerfile.ubuntu b/docker/builder/Dockerfile.ubuntu index 015336913..5461f3a09 100644 --- a/docker/builder/Dockerfile.ubuntu +++ b/docker/builder/Dockerfile.ubuntu @@ -38,6 +38,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone ENV key=52B59B1571A79DBC054901C0F6BC817356A3D45E RUN apt-get update && \ apt-get install -y software-properties-common gpg apt-utils libelf-dev && \ + add-apt-repository -y ppa:longsleep/golang-backports && \ 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 \ From 93ca924ab6500bd618c5fd495b2b4b260287771f Mon Sep 17 00:00:00 2001 From: Sean Valeo Date: Fri, 5 Jan 2024 12:33:26 -0500 Subject: [PATCH 6/7] rollback artifact --- .github/workflows/build.yml | 2 +- .github/workflows/integrations.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 734dcb5b7..a0eceb8c7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -319,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: | diff --git a/.github/workflows/integrations.yml b/.github/workflows/integrations.yml index 78b590bd7..8425f1baf 100644 --- 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: | From bc4aecb56b7bb9f07842c26766b19a69b0943d03 Mon Sep 17 00:00:00 2001 From: Sean Valeo Date: Fri, 5 Jan 2024 15:55:34 -0500 Subject: [PATCH 7/7] rollback download-artifact --- .github/workflows/build.yml | 8 ++++---- .github/workflows/integrations.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a0eceb8c7..52bbd6719 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -355,7 +355,7 @@ jobs: # Download the built binaries - name: Download Binaries - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v3 with: name: binaries @@ -458,7 +458,7 @@ jobs: # uses: actions/checkout@v4 # # - name: Download Binaries - # uses: actions/download-artifact@v4 + # uses: actions/download-artifact@v3 # with: # name: binaries # @@ -506,7 +506,7 @@ jobs: # uses: actions/checkout@v4 # # - name: Download Binaries - # uses: actions/download-artifact@v4 + # uses: actions/download-artifact@v3 # with: # name: binaries # @@ -564,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 index 8425f1baf..dfc7cda5e 100644 --- a/.github/workflows/integrations.yml +++ b/.github/workflows/integrations.yml @@ -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