Skip to content

Commit

Permalink
Merge pull request #395 from fix-391-use-cfs-rtems-containers
Browse files Browse the repository at this point in the history
Fix #391, Use New cFS Container Registry for RTEMS Workflows
  • Loading branch information
astrogeco committed Dec 6, 2021
2 parents 0116d9f + 5f97f3d commit 6baa589
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/build-cfs-rtems4.11.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -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
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/build-cfs-rtems5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -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
Expand Down Expand Up @@ -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

0 comments on commit 6baa589

Please sign in to comment.