Merge pull request #8 from icshwi/com-merge - 2.3.1-beta

Com merge - 2.3.1-beta

.ci-local/defaults.set

@@ -0,0 +1,11 @@
+# EPICS Base
+BASE_DIRNAME=base
+BASE_REPONAME=epics-base
+BASE_REPOOWNER=epics-base
+BASE_VARNAME=EPICS_BASE
+BASE_RECURSIVE=no
+
+MODULES=DEVLIB2
+
+DEVLIB2_REPONAME=devlib2
+DEVLIB2_REPOOWNER=epics-modules

.github/workflows/ci-scripts-build.yml

@@ -0,0 +1,136 @@
+# .github/workflows/ci-scripts-build.yml for use with EPICS Base ci-scripts
+# (see: https://github.com/epics-base/ci-scripts)
+
+# This is YAML - indentation levels are crucial
+
+# Set the 'name:' properties to values that work for you (pvxs)
+
+name: mrfioc2
+
+# Trigger on pushes and PRs to any branch
+on: [push, pull_request]
+
+env:
+    SETUP_PATH: .ci-local:.ci
+    EPICS_TEST_IMPRECISE_TIMING: YES
+
+jobs:
+  build-base:
+    name: ${{ matrix.base }}/${{ matrix.os }}/${{ matrix.cmp }}/${{ matrix.configuration }}${{ matrix.rtems }}/${{ matrix.extra }}
+    runs-on: ${{ matrix.os }}
+    # Set environment variables from matrix parameters
+    env:
+      BASE: ${{ matrix.base }}
+      CMP: ${{ matrix.cmp }}
+      BCFG: ${{ matrix.configuration }}
+      RTEMS: ${{ matrix.rtems }}
+      EXTRA: ${{ matrix.extra }}
+      TEST: ${{ matrix.test }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: default
+            base: "7.0"
+            wine: "64"
+
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: static
+            base: "7.0"
+
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: default
+            base: "3.15"
+
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: default
+            base: "3.14"
+
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: static
+            base: "7.0"
+            extra: "CMD_CXXFLAGS=-std=c++11"
+
+          - os: ubuntu-16.04
+            cmp: clang
+            configuration: default
+            base: "7.0"
+
+          - os: ubuntu-20.04
+            cmp: clang
+            configuration: default
+            base: "7.0"
+            extra: "CMD_CXXFLAGS=-std=c++11"
+
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: default
+            base: "7.0"
+            rtems: "4.10"
+
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: default
+            base: "7.0"
+            rtems: "4.9"
+
+          - os: ubuntu-16.04
+            cmp: gcc-4.8
+            utoolchain: true
+            configuration: default
+            base: "7.0"
+
+          - os: ubuntu-16.04
+            cmp: gcc-4.9
+            utoolchain: true
+            configuration: default
+            base: "7.0"
+
+          - os: ubuntu-20.04
+            cmp: gcc-8
+            utoolchain: true
+            configuration: default
+            base: "7.0"
+
+          - os: ubuntu-20.04
+            cmp: clang
+            configuration: default
+            base: "7.0"
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Cache Dependencies
+      uses: actions/cache@v2
+      with:
+        path: ~/.cache
+        key: ${{ matrix.base }}/${{ matrix.os }}/${{ matrix.cmp }}/${{ matrix.configuration }}/${{ matrix.wine }}${{ matrix.rtems }}/${{ matrix.extra }}
+    - name: Automatic core dump analysis
+      uses: mdavidsaver/ci-core-dumper@master
+    - name: "apt-get install"
+      run: |
+        sudo apt-get update
+        sudo apt-get -y install qemu-system-x86 g++-mingw-w64-x86-64 gdb
+      if: runner.os == 'Linux'
+    - name: "apt-get install ${{ matrix.cmp }}"
+      run: |
+        sudo apt-get -y install software-properties-common
+        sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+        sudo apt-get update
+        sudo apt-get -y install ${{ matrix.cmp }}
+      if: matrix.utoolchain
+    - name: Prepare and compile dependencies
+      run: python .ci/cue.py prepare
+    - name: Build main module
+      run: python .ci/cue.py build
+    - name: Run main module tests
+      run: python .ci/cue.py test
+    - name: Collect and show test results
+      run: python .ci/cue.py test-results

.github/workflows/linux-build.yml

@@ -0,0 +1,75 @@
+name: mrfioc2 kernel module
+
+on: [push, pull_request]
+
+jobs:
+  specific:
+    name: With ${{ matrix.version }}
+    runs-on: ${{ matrix.os }}
+    env:
+      KSER: ${{ matrix.series }}
+      KVER: ${{ matrix.version }}
+      CC: ${{ matrix.cc }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-16.04
+            series: 3.x
+            version: 3.2.1
+            cc: gcc-4.8
+
+          - os: ubuntu-16.04
+            series: 3.x
+            version: 3.16.1
+            cc: gcc-4.8
+
+          - os: ubuntu-20.04
+            series: 4.x
+            version: 4.9.1
+
+          - os: ubuntu-20.04
+            series: 5.x
+            version: 5.9.6
+    steps:
+    - uses: actions/checkout@v2
+    - name: Info
+      run: |
+        gcc --version
+    - name: Deps
+      run: |
+        sudo apt-get update
+        # linux-headers-* only to pull in kbuild deps
+        sudo apt-get -y install linux-headers-`uname -r` kmod libelf-dev
+        [ "${{ matrix.cc }}" != "gcc-4.8" ] || sudo apt-get -y install gcc-4.8
+    - name: Setup Linux
+      run: |
+        install -d kernel
+        curl -s https://cdn.kernel.org/pub/linux/kernel/v$KSER/linux-$KVER.tar.xz | tar -C kernel --strip-components=1 -xJ
+        make -C kernel CC=${CC:=gcc} defconfig
+        make -C kernel CC=${CC:=gcc} modules_prepare
+    - name: Build
+      run: |
+        make -C mrmShared/linux CC=${CC:=gcc} KERNELDIR="$PWD/kernel"
+
+  host:
+    name: With VM host
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Info
+      run: |
+        uname -a
+        gcc --version
+    - name: Deps
+      run: |
+        sudo apt-get update
+        sudo apt-get -y install linux-headers-`uname -r`
+    - name: Build
+      run: make -C mrmShared/linux
+    - name: Install/Load
+      run: |
+        sudo make -C mrmShared/linux modules_install
+        sudo depmod -a
+        sudo modprobe mrf
+        sudo dmesg | tail -n 100