Build testnet-v1.38.2 and improve image caching

shinamicorp · Nov 27, 2024 · c6785ce · c6785ce
1 parent 7f6317a
commit c6785ce
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 17 deletions.
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -10,11 +10,23 @@ on:
       - main
 
 env:
-  SUI_GIT_REVISION: testnet-v1.38.0
+  SUI_GIT_REF: testnet-v1.38.2
 
 concurrency: docker
 
 jobs:
+  prep:
+    runs-on: ubuntu-latest
+    outputs:
+      sui_git_sha: ${{ steps.checkout.outputs.commit }}
+    steps:
+      - name: Checkout sui
+        id: checkout
+        uses: actions/checkout@v4
+        with:
+          repository: MystenLabs/sui
+          ref: ${{ env.SUI_GIT_REF }}
+
   build_push:
     permissions:
       contents: read
@@ -28,6 +40,10 @@ jobs:
           - runner: ARM64
             platform: linux/arm64
 
+    needs: prep
+    env:
+      SUI_GIT_REF: ${{ needs.prep.outputs.sui_git_sha }}
+      PLATFORM: ${{ matrix.platform }}
     runs-on:
       - self-hosted
       - ${{ matrix.runner }}
@@ -50,23 +66,17 @@ jobs:
         uses: docker/bake-action@v5
         with:
           targets: cache-builder-base,cache-runtime-base
-        env:
-          PLATFORM: ${{ matrix.platform }}
 
       - name: Bake and populate binaries cache
         uses: docker/bake-action@v5
         with:
           targets: cache-binaries
-        env:
-          PLATFORM: ${{ matrix.platform }}
 
       - name: Bake images
         uses: docker/bake-action@v5
         with:
           targets: sui-node,sui
           push: ${{ github.event_name == 'push' }}
-        env:
-          PLATFORM: ${{ matrix.platform }}
 
   manifest:
     permissions:
@@ -77,7 +87,7 @@ jobs:
       matrix:
         target: [sui-node, sui]
 
-    needs: build_push
+    needs: [prep, build_push]
     if: github.event_name == 'push'
     runs-on: ubuntu-latest
     steps:
@@ -90,6 +100,6 @@ jobs:
 
       - name: Create manifest
         run: |
-          docker buildx imagetools create -t ghcr.io/shinamicorp/${{ matrix.target }}:${{ env.SUI_GIT_REVISION }} \
-            ghcr.io/shinamicorp/${{ matrix.target }}:${{ env.SUI_GIT_REVISION }}-linux-amd64 \
-            ghcr.io/shinamicorp/${{ matrix.target }}:${{ env.SUI_GIT_REVISION }}-linux-arm64 \
+          docker buildx imagetools create -t ghcr.io/shinamicorp/${{ matrix.target }}:${{ env.SUI_GIT_REF }} \
+            ghcr.io/shinamicorp/${{ matrix.target }}:${{ needs.prep.outputs.sui_git_sha }}-linux-amd64 \
+            ghcr.io/shinamicorp/${{ matrix.target }}:${{ needs.prep.outputs.sui_git_sha }}-linux-arm64 \
diff --git a/Dockerfile b/Dockerfile
@@ -15,10 +15,10 @@ FROM builder-base AS builder
 WORKDIR /usr/src/sui
 
 # Shallow clone of a specific commit
-ARG SUI_GIT_REVISION
+ARG SUI_GIT_REF
 RUN git init && \
     git remote add origin https://github.com/MystenLabs/sui.git && \
-    git fetch --depth 1 origin ${SUI_GIT_REVISION} && \
+    git fetch --depth 1 origin ${SUI_GIT_REF} && \
     git checkout FETCH_HEAD
 
 RUN cargo build --locked --release --bin sui-node

diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -1,4 +1,4 @@
-variable "SUI_GIT_REVISION" {}
+variable "SUI_GIT_REF" {}
 
 variable "PLATFORM" {}
 
@@ -15,12 +15,12 @@ variable "_REMOTE_CACHE_RUNTIME_BASE" {
 }
 
 variable "_REMOTE_CACHE_BINARIES" {
-  default = "type=registry,ref=ghcr.io/shinamicorp/sui:cache-binaries-${SUI_GIT_REVISION}-${_PLATFORM_TAG}"
+  default = "type=registry,ref=ghcr.io/shinamicorp/sui:cache-binaries-${SUI_GIT_REF}-${_PLATFORM_TAG}"
 }
 
 function "tag" {
   params = [target]
-  result = "ghcr.io/shinamicorp/${target}:${SUI_GIT_REVISION}-${_PLATFORM_TAG}"
+  result = "ghcr.io/shinamicorp/${target}:${SUI_GIT_REF}-${_PLATFORM_TAG}"
 }
 
 function "local_cache_dir" {
@@ -31,7 +31,7 @@ function "local_cache_dir" {
 target "_common" {
   platforms = [PLATFORM]
   args = {
-    SUI_GIT_REVISION = SUI_GIT_REVISION
+    SUI_GIT_REF = SUI_GIT_REF
   }
   cache-from = [
     "type=local,src=${local_cache_dir("builder-base")}",