From 3f718b542ff723fc8a16e97202f03de579776e06 Mon Sep 17 00:00:00 2001 From: Devin Smith Date: Fri, 20 Jan 2023 14:49:25 -0800 Subject: [PATCH 1/5] Enable arm64 for cpp-client-base --- docker-bake.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 3cac0fe..2bb3f48 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -198,5 +198,5 @@ target "cpp-client-base-release" { inherits = [ "cpp-client-base" ] cache-from = [ "type=gha,scope=${CACHE_PREFIX}cpp-client-base" ] cache-to = [ "type=gha,mode=max,scope=${CACHE_PREFIX}cpp-client-base" ] - platforms = [ "linux/amd64" ] + platforms = [ "linux/amd64", "linux/arm64" ] } From b9ecff278edf6b6311704ea7995ddcd5635c5338 Mon Sep 17 00:00:00 2001 From: Devin Smith Date: Thu, 15 Jun 2023 11:13:09 -0700 Subject: [PATCH 2/5] Remove caching --- docker-bake.hcl | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 2bb3f48..55d8353 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -119,84 +119,60 @@ target "cpp-client-base" { target "java-release" { inherits = [ "java" ] - cache-from = [ "type=gha,scope=${CACHE_PREFIX}java" ] - cache-to = [ "type=gha,mode=max,scope=${CACHE_PREFIX}java" ] platforms = [ "linux/amd64", "linux/arm64" ] } target "slim-base-release" { inherits = [ "slim-base" ] - cache-from = [ "type=gha,scope=${CACHE_PREFIX}slim-base" ] - cache-to = [ "type=gha,mode=max,scope=${CACHE_PREFIX}slim-base" ] platforms = [ "linux/amd64", "linux/arm64" ] } target "server-base-release" { inherits = [ "server-base" ] - cache-from = [ "type=gha,scope=${CACHE_PREFIX}server-base" ] - cache-to = [ "type=gha,mode=max,scope=${CACHE_PREFIX}server-base" ] platforms = [ "linux/amd64", "linux/arm64" ] } target "nltk-base-release" { inherits = [ "nltk-base" ] - cache-from = [ "type=gha,scope=${CACHE_PREFIX}nltk-base" ] - cache-to = [ "type=gha,mode=max,scope=${CACHE_PREFIX}nltk-base" ] platforms = [ "linux/amd64", "linux/arm64" ] } target "pytorch-base-release" { inherits = [ "pytorch-base" ] - cache-from = [ "type=gha,scope=${CACHE_PREFIX}pytorch-base" ] - cache-to = [ "type=gha,mode=max,scope=${CACHE_PREFIX}pytorch-base" ] platforms = [ "linux/amd64", "linux/arm64" ] } target "sklearn-base-release" { inherits = [ "sklearn-base" ] - cache-from = [ "type=gha,scope=${CACHE_PREFIX}sklearn-base" ] - cache-to = [ "type=gha,mode=max,scope=${CACHE_PREFIX}sklearn-base" ] platforms = [ "linux/amd64", "linux/arm64" ] } target "tensorflow-base-release" { inherits = [ "tensorflow-base" ] - cache-from = [ "type=gha,scope=${CACHE_PREFIX}tensorflow-base" ] - cache-to = [ "type=gha,mode=max,scope=${CACHE_PREFIX}tensorflow-base" ] platforms = [ "linux/amd64" ] } target "all-ai-base-release" { inherits = [ "all-ai-base" ] - cache-from = [ "type=gha,scope=${CACHE_PREFIX}all-ai-base" ] - cache-to = [ "type=gha,mode=max,scope=${CACHE_PREFIX}all-ai-base" ] platforms = [ "linux/amd64" ] } target "nginx-base-release" { inherits = [ "nginx-base" ] - cache-from = [ "type=gha,scope=${CACHE_PREFIX}nginx-base" ] - cache-to = [ "type=gha,mode=max,scope=${CACHE_PREFIX}nginx-base" ] platforms = [ "linux/amd64", "linux/arm64" ] } target "nginx-noroot-base-release" { inherits = [ "nginx-noroot-base" ] - cache-from = [ "type=gha,scope=${CACHE_PREFIX}nginx-noroot-base" ] - cache-to = [ "type=gha,mode=max,scope=${CACHE_PREFIX}nginx-noroot-base" ] platforms = [ "linux/amd64", "linux/arm64" ] } target "protoc-base-release" { inherits = [ "protoc-base" ] - cache-from = [ "type=gha,scope=${CACHE_PREFIX}protoc-base" ] - cache-to = [ "type=gha,mode=max,scope=${CACHE_PREFIX}protoc-base" ] platforms = [ "linux/amd64" ] } target "cpp-client-base-release" { inherits = [ "cpp-client-base" ] - cache-from = [ "type=gha,scope=${CACHE_PREFIX}cpp-client-base" ] - cache-to = [ "type=gha,mode=max,scope=${CACHE_PREFIX}cpp-client-base" ] platforms = [ "linux/amd64", "linux/arm64" ] } From 37d119e6c5c016e2435ad919c5a9b738c3bcdc36 Mon Sep 17 00:00:00 2001 From: Devin Smith Date: Thu, 15 Jun 2023 11:13:26 -0700 Subject: [PATCH 3/5] Remove concurrency limit --- .github/workflows/build-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml index 9dad3db..3408bec 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -8,9 +8,6 @@ on: schedule: - cron: '0 19 * * *' -# For maximum cache coherency, ensure only one outstanding build at any given time -concurrency: release - jobs: build: # Forks don't need to run the scheduled cron From 44032f61b4283ec00a493ccbb34835bc0f18a6ed Mon Sep 17 00:00:00 2001 From: Devin Smith Date: Thu, 15 Jun 2023 11:14:14 -0700 Subject: [PATCH 4/5] Set runner to ubuntu-22.04-16-64 --- .github/workflows/build-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml index 3408bec..f31e298 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -13,7 +13,7 @@ jobs: # Forks don't need to run the scheduled cron if: ${{ github.repository_owner == 'deephaven' || github.event_name != 'schedule' }} - runs-on: ubuntu-22.04 + runs-on: ubuntu-22.04-16-64 steps: - name: Checkout uses: actions/checkout@v3 From b07a1f8ae87b4c383d31d669807cc109c579d92b Mon Sep 17 00:00:00 2001 From: Devin Smith Date: Thu, 15 Jun 2023 12:13:02 -0700 Subject: [PATCH 5/5] disable arm64 --- docker-bake.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 55d8353..2764de7 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -174,5 +174,5 @@ target "protoc-base-release" { target "cpp-client-base-release" { inherits = [ "cpp-client-base" ] - platforms = [ "linux/amd64", "linux/arm64" ] + platforms = [ "linux/amd64" ] }