remove host and target epics arch (they come from base images)

epics-containers · Mar 21, 2024 · e0ba95c · e0ba95c
1 parent ae533f3
commit e0ba95c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 19 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,21 +16,15 @@ jobs:
       matrix:
         epics-target: [RTEMS-beatnik, linux-x86_64] # , linux-aarch64]
         include:
-          - os: ubuntu-latest # everyone is on os-latest
+          - os: ubuntu-latest # everyone is on ubuntu-latest
 
-          - epics-target: RTEMS-beatnik
-            epics-host: linux-x86_64
-            extension: -rtems-beatnik
+          - extension: -rtems-beatnik
             platform: linux/amd64
 
-          - epics-target: linux-x86_64
-            epics-host: linux-x86_64
-            extension: ""
+          - extension: ""
             platform: linux/amd64
 
-          # - epics-target: linux-aarch64
-          #   epics-host: linux-aarch64
-          #   # a temporary name until multi-arch is supported
+          # -  # a temporary name until multi-arch is supported
           #   extension: -native-aarch64
           #   platform: linux/arm64
 
@@ -63,8 +57,6 @@ jobs:
           platforms: ${{ matrix.platform }}
           target: runtime
           build-args: |
-            EPICS_TARGET_ARCH=${{ matrix.epics-target }}
-            EPICS_HOST_ARCH=${{ matrix.epics-host }}
             IMAGE_EXT=${{ matrix.extension }}
           cache-from: type=gha,scope=${{ matrix.epics-target }}-${{ matrix.target }}
           cache-to: type=gha,mode=max,scope=${{ matrix.epics-target }}-${{ matrix.target }}
@@ -84,8 +76,6 @@ jobs:
           platforms: ${{ matrix.platform }}
           target: developer
           build-args: |
-            EPICS_TARGET_ARCH=${{ matrix.epics-target }}
-            EPICS_HOST_ARCH=${{ matrix.epics-host }}
             IMAGE_EXT=${{ matrix.extension }}
           tags: ${{ env.TAG }}-developer:${{ github.ref_name }}
           push: true
@@ -98,8 +88,6 @@ jobs:
           platforms: ${{ matrix.platform }}
           target: runtime
           build-args: |
-            EPICS_TARGET_ARCH=${{ matrix.epics-target }}
-            EPICS_HOST_ARCH=${{ matrix.epics-host }}
             IMAGE_EXT=${{ matrix.extension }}
           tags: ${{ env.TAG }}-runtime:${{ github.ref_name }}
           push: true

diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,6 @@
-ARG EPICS_TARGET_ARCH=linux-x86_64
-ARG EPICS_HOST_ARCH=linux-x86_64
 ARG IMAGE_EXT
 
-ARG BASE=7.0.8ec2b5
+ARG BASE=7.0.8ec2b6
 ARG REGISTRY=ghcr.io/epics-containers
 ARG RUNTIME=${REGISTRY}/epics-base${IMAGE_EXT}-runtime:${BASE}
 ARG DEVELOPER=${REGISTRY}/epics-base${IMAGE_EXT}-developer:${BASE}