Skip to content

Commit

Permalink
Enable packaging.
Browse files Browse the repository at this point in the history
  • Loading branch information
pchote committed Nov 21, 2024
1 parent 2930d61 commit ddd54c2
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 27 deletions.
39 changes: 39 additions & 0 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: RPM Packaging

on:
push:
branches:
- master

jobs:
linux:
name: RPM Packaging
runs-on: ubuntu-22.04
container: rockylinux:9
steps:
- name: Install Dependencies
run: |
cat /etc/redhat-release
yum -y install epel-release
/usr/bin/crb enable
yum -y install git rpm-build rpm-sign rsync make python3-rpm-macros pyproject-rpm-macros python3-devel python3-tomli systemd-rpm-macros python3-wheel
- name: Clone Repository
uses: actions/checkout@v4

- name: Package RPMs
run:
make

- name: Clone Package Repository
uses: actions/checkout@v4
with:
repository: rockit-astro/packages
token: ${{ secrets.DEPLOY_TOKEN }}
path: packages

- name: Push Packages
env:
RPM_SIGNING_KEY: ${{ secrets.RPM_SIGNING_KEY }}
run:
packages/sign-and-push-packages.sh *.rpm
19 changes: 0 additions & 19 deletions cam2.json

This file was deleted.

8 changes: 4 additions & 4 deletions rockit-camera-scicam.spec
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ mkdir -p %{buildroot}%{_udevrulesdir}
%{__install} %{_sourcedir}/scicam_camd %{buildroot}%{_bindir}
%{__install} %{_sourcedir}/scicam_camd@.service %{buildroot}%{_unitdir}

%{__install} %{_sourcedir}/cam2.json %{buildroot}%{_sysconfdir}/camd
%{__install} %{_sourcedir}/cam2.fmt %{buildroot}%{_sysconfdir}/camd
%{__install} %{_sourcedir}/scicam.json %{buildroot}%{_sysconfdir}/camd
%{__install} %{_sourcedir}/scicam.fmt %{buildroot}%{_sysconfdir}/camd

%package server
Summary: SciCam camera server
Expand All @@ -40,7 +40,7 @@ Group: Unspecified

%files data-clasp
%defattr(0644,root,root,-)
%{_sysconfdir}/camd/cam2.json
%{_sysconfdir}/camd/cam2.fmt
%{_sysconfdir}/camd/scicam.json
%{_sysconfdir}/camd/scicam.fmt

%changelog
4 changes: 0 additions & 4 deletions rockit/camera/scicam/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@
'type': 'number',
'min': 0
},
'water_cooled': {
'type': 'boolean'
},
'worker_processes': {
'type': 'integer',
'min': 1
Expand Down Expand Up @@ -128,4 +125,3 @@ def __init__(self, config_filename):
self.header_card_capacity = config_json['header_card_capacity']
self.cooler_setpoint = config_json['cooler_setpoint']
self.cooler_update_delay = config_json['cooler_update_delay']
self.water_cooled = config_json['water_cooled']
18 changes: 18 additions & 0 deletions scicam.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"daemon": "clasp_camera_swir",
"pipeline_daemon": "clasp_pipeline",
"pipeline_handover_timeout": 10,
"log_name": "scicam_camd@clasp-swir",
"control_machines": ["CLASPTCS", "CLASPCMOS", "CLASPSWIR"],
"client_commands_module": "rockit.camera.scicam",
"camera_config_path": "/etc/camd/scicam.fmt",
"cooler_setpoint": -40,
"cooler_update_delay": 5,
"worker_processes": 3,
"framebuffer_bytes": 31457280,
"header_card_capacity": 144,
"camera_id": "SWIR",
"output_path": "/data",
"output_prefix": "swir",
"expcount_path": "/data/swir-counter.json"
}

0 comments on commit ddd54c2

Please sign in to comment.