From 7a9d541fc5f640427f2a4e7ff3c1407e73c99e58 Mon Sep 17 00:00:00 2001 From: Giles Knap Date: Fri, 8 Mar 2024 10:50:45 +0000 Subject: [PATCH] switch to short name for native containers --- .devcontainer/devcontainer.json | 8 ++++---- .github/workflows/build.yml | 7 +++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 9b67eac..8505dcd 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,11 +5,11 @@ "dockerfile": "../Dockerfile", "target": "developer", "args": { - "TARGET_ARCHITECTURE": "RTEMS-beatnik", - // "TARGET_ARCHITECTURE": "linux-x86_64", + //"TARGET_ARCHITECTURE": "RTEMS-beatnik", + "TARGET_ARCHITECTURE": "linux-x86_64", "EPICS_HOST_ARCH": "linux-x86_64", - "BASE_IMAGE": "ghcr.io/epics-containers/rtems6-powerpc-linux-runtime:6.2rc1ec2b2" - // "BASE_IMAGE": "ubuntu:22.04" + // "BASE_IMAGE": "ghcr.io/epics-containers/rtems6-powerpc-linux-runtime:6.2rc1ec2b2" + "BASE_IMAGE": "ubuntu:22.04" } }, "remoteEnv": { diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dc84432..57b8858 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,23 +16,26 @@ jobs: matrix: epics-target: [RTEMS-beatnik, linux-x86_64, linux-aarch64] target: [developer, runtime] - base_image: [ubuntu:22.04] - os: [ubuntu-latest] + base_image: ["ubuntu:22.04"] name: [epics-base] + os: [ubuntu-latest] include: - epics-target: RTEMS-beatnik epics-host: linux-x86_64 name: epics-base-rtems-beatnik base_image: ghcr.io/epics-containers/rtems-beatnik-runtime:6.1rc2 platform: linux/amd64 + os: ubuntu-latest - epics-target: linux-x86_64 epics-host: linux-x86_64 platform: linux/amd64 + os: ubuntu-latest - epics-target: linux-aarch64 epics-host: linux-aarch64 platform: linux/arm64 + os: ubuntu-latest runs-on: ${{ matrix.os }} env: