Update PR workflow to use the linux-arm64 runner (#41)

* Update op-node to v1.9.3 * Update PR workflow to use linux-arm64 runner * Update Reth to v1.0.8 * Apply review suggestions
LiskHQ · Oct 4, 2024 · 855b2e5 · 855b2e5
1 parent 99eaa80
commit 855b2e5
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 21 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -4,47 +4,53 @@ on:
   pull_request:
 
 jobs:
-  geth:
+  linux_amd64:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        arch: [ linux/amd64, linux/arm64 ]
+        include:
+          - file: geth/Dockerfile
+            features: 
+          - file: reth/Dockerfile
+            features: jemalloc,asm-keccak,optimism
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Build the Docker image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
-          file: geth/Dockerfile
+          file: ${{ matrix.file }}
           push: false
-          platforms: ${{ matrix.arch }}
-  reth:
-    runs-on: ubuntu-latest
+          build-args: |
+            FEATURES=${{ matrix.features }}
+          platforms: linux/amd64
+  linux_arm64:
+    runs-on: linux-arm64
     strategy:
       matrix:
         include:
-          - arch: linux/amd64
-            features: jemalloc,asm-keccak,optimism
-          - arch: linux/arm64
+          - file: geth/Dockerfile
+            features: 
+          - file: reth/Dockerfile
             features: jemalloc,optimism
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Build the Docker image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
-          file: reth/Dockerfile
+          file: ${{ matrix.file }}
           push: false
           build-args: |
             FEATURES=${{ matrix.features }}
-          platforms: ${{ matrix.arch }}
+          platforms: linux/arm64
diff --git a/geth/Dockerfile b/geth/Dockerfile
@@ -3,8 +3,8 @@ FROM golang:1.21 AS op
 WORKDIR /app
 
 ENV REPO=https://github.com/ethereum-optimism/optimism.git
-ENV VERSION=v1.9.2
-ENV COMMIT=224c5fd65cb4e8204258291e74263c1e70466176
+ENV VERSION=v1.9.3
+ENV COMMIT=e81c50de0a51954c64444b849be4768c8116cffb
 RUN git clone $REPO --branch op-node/$VERSION --single-branch . && \
     git switch -c branch-$VERSION && \
     bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]'

diff --git a/reth/Dockerfile b/reth/Dockerfile
@@ -3,8 +3,8 @@ FROM golang:1.21 AS op
 WORKDIR /app
 
 ENV REPO=https://github.com/ethereum-optimism/optimism.git
-ENV VERSION=v1.9.2
-ENV COMMIT=224c5fd65cb4e8204258291e74263c1e70466176
+ENV VERSION=v1.9.3
+ENV COMMIT=e81c50de0a51954c64444b849be4768c8116cffb
 RUN git clone $REPO --branch op-node/$VERSION --single-branch . && \
     git switch -c branch-$VERSION && \
     bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]'
@@ -26,8 +26,8 @@ WORKDIR /app
 RUN apt-get update && apt-get -y upgrade && apt-get install -y git libclang-dev pkg-config curl build-essential
 
 ENV REPO=https://github.com/paradigmxyz/reth.git
-ENV VERSION=v1.0.7
-ENV COMMIT=75b7172cf77eb4fd65fe1a6924f75066fb09fcd1
+ENV VERSION=v1.0.8
+ENV COMMIT=d72e438c06e040e213b5decf5f29543c86cbad0f
 RUN git clone $REPO --branch $VERSION --single-branch . && \
     git switch -c branch-$VERSION && \
     bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]'