Compare commits
2 Commits
master
...
07cad131a4
| Author | SHA1 | Date | |
|---|---|---|---|
| 07cad131a4 | |||
| fe2996140b |
@@ -1,21 +0,0 @@
|
|||||||
name: Test And Build
|
|
||||||
on: [push]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
Lint:
|
|
||||||
runs-on: linepics
|
|
||||||
steps:
|
|
||||||
- name: checkout repo
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
- name: cppcheck
|
|
||||||
run: cppcheck --std=c++17 --addon=cert --addon=misc --error-exitcode=1 sinqEPICSApp/src/*.cpp
|
|
||||||
- name: formatting
|
|
||||||
run: clang-format --style=file --Werror --dry-run sinqEPICSApp/src/*.cpp sinqEPICSApp/src/*.c sinqEPICSApp/src/*.h
|
|
||||||
Build:
|
|
||||||
runs-on: linepics
|
|
||||||
steps:
|
|
||||||
- name: checkout repo
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
- run: |
|
|
||||||
sed -i 's/ARCH_FILTER=.*/ARCH_FILTER=linux%/' Makefile.RHEL8
|
|
||||||
make -f Makefile.RHEL8 install
|
|
||||||
51
.gitlab-ci.yml
Normal file
51
.gitlab-ci.yml
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
default:
|
||||||
|
image: docker.psi.ch:5000/wall_e/sinqepics:latest
|
||||||
|
|
||||||
|
stages:
|
||||||
|
- test
|
||||||
|
- build
|
||||||
|
|
||||||
|
cppcheck:
|
||||||
|
stage: test
|
||||||
|
script:
|
||||||
|
- cppcheck --std=c++17 --addon=cert --addon=misc --error-exitcode=1 sinqEPICSApp/
|
||||||
|
allow_failure: true # Long term this needs to be removed
|
||||||
|
artifacts:
|
||||||
|
expire_in: 1 week
|
||||||
|
tags:
|
||||||
|
- docker
|
||||||
|
|
||||||
|
formatting:
|
||||||
|
stage: test
|
||||||
|
script:
|
||||||
|
- clang-format --style=file --Werror --dry-run sinqEPICSApp/src/*.cpp sinqEPICSApp/src/*.c sinqEPICSApp/src/*.h
|
||||||
|
allow_failure: true # Long term this needs to be removed
|
||||||
|
artifacts:
|
||||||
|
expire_in: 1 week
|
||||||
|
tags:
|
||||||
|
- docker
|
||||||
|
|
||||||
|
# clangtidy:
|
||||||
|
# stage: test
|
||||||
|
# script:
|
||||||
|
# - curl https://docker.psi.ch:5000/v2/_catalog
|
||||||
|
# # - dnf update -y
|
||||||
|
# # - dnf install -y clang-tools-extra
|
||||||
|
# # - clang-tidy sinqEPICSApp/src/*.cpp sinqEPICSApp/src/*.c sinqEPICSApp/src/*.h -checks=cppcoreguidelines-*,cert-*
|
||||||
|
# # tags:
|
||||||
|
# # - docker
|
||||||
|
|
||||||
|
build_module:
|
||||||
|
stage: build
|
||||||
|
script:
|
||||||
|
- sed -i 's/ARCH_FILTER=.*/ARCH_FILTER=linux%/' Makefile.RHEL8
|
||||||
|
- make -f Makefile.RHEL8 install
|
||||||
|
- cp -rT "/ioc/modules/sinq/$(ls -U /ioc/modules/sinq/ | head -1)" "./sinq-${CI_COMMIT_SHORT_SHA}"
|
||||||
|
artifacts:
|
||||||
|
name: "sinq-${CI_COMMIT_SHORT_SHA}"
|
||||||
|
paths:
|
||||||
|
- "sinq-${CI_COMMIT_SHORT_SHA}/*"
|
||||||
|
expire_in: 1 week
|
||||||
|
when: always
|
||||||
|
tags:
|
||||||
|
- docker
|
||||||
@@ -16,7 +16,7 @@ REQUIRED+=motorBase
|
|||||||
TEMPLATES += sinqEPICSApp/Db/dimetix.db
|
TEMPLATES += sinqEPICSApp/Db/dimetix.db
|
||||||
TEMPLATES += sinqEPICSApp/Db/slsvme.db
|
TEMPLATES += sinqEPICSApp/Db/slsvme.db
|
||||||
TEMPLATES += sinqEPICSApp/Db/spsamor.db
|
TEMPLATES += sinqEPICSApp/Db/spsamor.db
|
||||||
TEMPLATES += sinqEPICSApp/Db/el734.db
|
TEMPLATES += db/el734.db
|
||||||
|
|
||||||
# DBD files to include in the release
|
# DBD files to include in the release
|
||||||
DBDS += sinqEPICSApp/src/sinq.dbd
|
DBDS += sinqEPICSApp/src/sinq.dbd
|
||||||
|
|||||||
@@ -250,8 +250,6 @@ PhytronAxis::PhytronAxis(PhytronController *pC, int axisNo, int enc)
|
|||||||
haveBrake = 0;
|
haveBrake = 0;
|
||||||
brakeIO = -1;
|
brakeIO = -1;
|
||||||
next_poll = -1;
|
next_poll = -1;
|
||||||
homing = 0;
|
|
||||||
homing_direction = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int PhytronAxis::setBrake(int brakeNO)
|
int PhytronAxis::setBrake(int brakeNO)
|
||||||
|
|||||||
Reference in New Issue
Block a user