Merge pull request #395 from fix-391-use-cfs-rtems-containers

Fix #391, Use New cFS Container Registry for RTEMS Workflows Add missing newline at end of rtems5 workflow file
nasa · Dec 6, 2021 · 717a7e1 · 717a7e1
2 parents c366073 + 5f97f3d
commit 717a7e1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/build-cfs-rtems4.11.yml b/.github/workflows/build-cfs-rtems4.11.yml
@@ -31,7 +31,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
@@ -67,7 +67,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
 
@@ -85,7 +85,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
@@ -31,7 +31,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
@@ -67,7 +67,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
 
@@ -85,7 +85,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
@@ -124,4 +123,4 @@ jobs:
  if: always()
  with:
  name: cFS-rtems-log-summary-${{ matrix.buildtype }}
- path: ./build/exe/cpu1/*.log
+ path: ./build/exe/cpu1/*.log