Skip to content

Commit

Permalink
fix: Cross Dependencies added to the driver workflow.
Browse files Browse the repository at this point in the history
OPI activities excluded from the driver ci as well.
  • Loading branch information
jerzyjamroz committed Nov 1, 2024
1 parent 1448de6 commit 5c54ab4
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
12 changes: 10 additions & 2 deletions .github/workflows/ci-scripts-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@ on:
- "documentation/**"
- "python/**"
- "**/*.md"
- "opi/**"
pull_request:
paths-ignore:
- "mrmShared/linux/**"
- "documentation/**"
- "python/**"
- "**/*.md"
- "opi/**"
workflow_dispatch:

env:
Expand All @@ -28,7 +30,7 @@ env:

jobs:
build-base:
name: ${{ matrix.base }} ${{ matrix.os }} ${{ matrix.cmp }} ${{ matrix.configuration }} ${{ matrix.cross }} ${{ matrix.extra }}
name: "${{ matrix.base }}_${{ matrix.os }}_${{ matrix.cmp }}_${{ matrix.configuration }}_${{ matrix.cross }}_${{ matrix.extra }}"
runs-on: ${{ matrix.os }}
# Set environment variables from matrix parameters
env:
Expand Down Expand Up @@ -111,7 +113,13 @@ jobs:
uses: actions/cache@v4
with:
path: ~/.cache
key: ${{ matrix.base }} ${{ matrix.os }} ${{ matrix.cmp }} ${{ matrix.configuration }} ${{ matrix.cross }} ${{ matrix.extra }}
key: "${{ matrix.base }}_${{ matrix.os }}_${{ matrix.cmp }}_${{ matrix.configuration }}_${{ matrix.cross }}_${{ matrix.extra }}"
- name: Cross Dependencies
uses: actions/cache@v4
with:
path: /opt/rtems
key: "${{ matrix.base }}_${{ matrix.os }}_${{ matrix.cmp }}_${{ matrix.configuration }}_${{ matrix.cross }}_${{ matrix.extra }}"
if: matrix.cross
- name: Automatic core dump analysis
uses: mdavidsaver/ci-core-dumper@master
- name: "apt-get install"
Expand Down
2 changes: 1 addition & 1 deletion mrmShared/linux/uio_mrf.c
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ int mrf_mmap_physical(struct uio_info *info, struct vm_area_struct *vma)
return -EINVAL;
}

#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0))
#ifdef vm_flags_set
vm_flags_set(vma, VM_IO | VM_RESERVED);
#else
vma->vm_flags |= VM_IO | VM_RESERVED;
Expand Down

0 comments on commit 5c54ab4

Please sign in to comment.