From 5f97f3d95cd921c8285de840788d781646844874 Mon Sep 17 00:00:00 2001 From: ArielSAdamsNASA Date: Mon, 22 Nov 2021 07:24:04 -0600 Subject: [PATCH] Fix #391, Use cFS Rtems Containers --- .github/workflows/build-cfs-rtems4.11.yml | 5 ++--- .github/workflows/build-cfs-rtems5.yml | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-cfs-rtems4.11.yml b/.github/workflows/build-cfs-rtems4.11.yml index 16081bb75..6f3d33c3a 100644 --- a/.github/workflows/build-cfs-rtems4.11.yml +++ b/.github/workflows/build-cfs-rtems4.11.yml @@ -29,7 +29,7 @@ jobs: if: ${{ needs.check-for-duplicates.outputs.should_skip != 'true' }} name: Build runs-on: ubuntu-18.04 - container: nmullane/qemu_rtems:4.11 + container: ghcr.io/core-flight-system/qemu-rtems-4-11:latest strategy: fail-fast: false @@ -65,7 +65,7 @@ jobs: test-cfs: name: Test runs-on: ubuntu-18.04 - container: nmullane/qemu_rtems:4.11 + container: ghcr.io/core-flight-system/qemu-rtems-4-11:latest needs: build-cfs @@ -83,7 +83,6 @@ jobs: # Disable mcopy check otherwise disk image build fails MTOOLS_SKIP_CHECK: 1 - steps: # Checks out a copy of your repository on the ubuntu-latest machine - name: Checkout code diff --git a/.github/workflows/build-cfs-rtems5.yml b/.github/workflows/build-cfs-rtems5.yml index 9e8629f0b..480cadb2c 100644 --- a/.github/workflows/build-cfs-rtems5.yml +++ b/.github/workflows/build-cfs-rtems5.yml @@ -29,7 +29,7 @@ jobs: if: ${{ needs.check-for-duplicates.outputs.should_skip != 'true' }} name: Build runs-on: ubuntu-18.04 - container: nmullane/qemu_rtems:5 + container: ghcr.io/core-flight-system/qemu-rtems-5:latest strategy: fail-fast: false @@ -65,7 +65,7 @@ jobs: test-cfs: name: Test runs-on: ubuntu-18.04 - container: nmullane/qemu_rtems:5 + container: ghcr.io/core-flight-system/qemu-rtems-5:latest needs: build-cfs @@ -83,7 +83,6 @@ jobs: # Disable mcopy check otherwise disk image build fails MTOOLS_SKIP_CHECK: 1 - steps: # Checks out a copy of your repository on the ubuntu-latest machine - name: Checkout code @@ -122,4 +121,4 @@ jobs: if: always() with: name: cFS-rtems-log-summary-${{ matrix.buildtype }} - path: ./build/exe/cpu1/*.log + path: ./build/exe/cpu1/*.log \ No newline at end of file