pcdshub / lcls-plc-sample-delivery-system

https://pcdshub.github.io/lcls-plc-sample-delivery-system/
Other
2 stars 7 forks source link

Add Travis CI and pre-commit #14

Open ZryletTC opened 3 years ago

ZryletTC commented 3 years ago

Development tools are useful

https://github.com/pcdshub/pcds-ci-helpers https://github.com/pcdshub/pre-commit-hooks

klauer commented 3 years ago

Fresh checkout seems to indicate there was no follow-up commit after adding .gitattributes (I think):

sample-delivery-system klauer$ git status
On branch master
Your branch is up to date with 'origin/master'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   sampleApp/Db/TwincatAppInfo.db
        modified:   sampleApp/Db/TwincatPlcTask.db
        modified:   sampleApp/Db/TwincatTaskInfo.db
        modified:   sdsPLC/SDSPLC/DUTs/ALI/E_AxisMoveMode.TcDUT
        modified:   sdsPLC/SDSPLC/DUTs/ALI/E_CTRL_MODE.TcDUT
        modified:   sdsPLC/SDSPLC/DUTs/ALI/E_PropValveFBState.TcDUT
        modified:   sdsPLC/SDSPLC/DUTs/ALI/HMI_PropValveCtrlState.TcDUT
        modified:   sdsPLC/SDSPLC/DUTs/ALI/ST_ALI.TcDUT
        modified:   sdsPLC/SDSPLC/DUTs/ALI/ST_ManipAxis.TcDUT
        modified:   sdsPLC/SDSPLC/DUTs/ALI/ST_PIDParams.TcDUT
        modified:   sdsPLC/SDSPLC/DUTs/ALI/ST_PressureController.TcDUT
        modified:   sdsPLC/SDSPLC/DUTs/ALI/ST_PropValveMKS253.TcDUT
        modified:   sdsPLC/SDSPLC/DUTs/Bronkhorst/E_BHElFlowUnit.TcDUT
        modified:   sdsPLC/SDSPLC/DUTs/Bronkhorst/ST_BhFMControl.TcDUT
        modified:   sdsPLC/SDSPLC/DUTs/Bronkhorst/ST_BhFMStatus.TcDUT
        modified:   sdsPLC/SDSPLC/DUTs/E_AxisMotionState.TcDUT
        modified:   sdsPLC/SDSPLC/DUTs/General/E_CTRL_MODE.TcDUT
        modified:   sdsPLC/SDSPLC/DUTs/IO_Structs/ST_ALIIO.TcDUT
        modified:   sdsPLC/SDSPLC/DUTs/ST_RegDeadbandControls.TcDUT
        modified:   sdsPLC/SDSPLC/DUTs/ST_Regulator.TcDUT
        modified:   sdsPLC/SDSPLC/DUTs/ST_ShakerControls.TcDUT
        modified:   sdsPLC/SDSPLC/DUTs/Sensirion/ST_SensirionFMControl.TcDUT
        modified:   sdsPLC/SDSPLC/DUTs/Sensirion/ST_SensirionFMStatus.TcDUT
        modified:   sdsPLC/SDSPLC/DUTs/TEC/ST_TECControl.TcDUT
        modified:   sdsPLC/SDSPLC/DUTs/TEC/ST_TECStatus.TcDUT
        modified:   sdsPLC/SDSPLC/GVLs/GVL_Autosave.TcGVL
        modified:   sdsPLC/SDSPLC/GVLs/GVL_ComBuffers.TcGVL
        modified:   sdsPLC/SDSPLC/GVLs/GVL_misc.TcGVL
        modified:   sdsPLC/SDSPLC/POUs/ALI/FB_ManipAxis.TcPOU
        modified:   sdsPLC/SDSPLC/POUs/ALI/FB_PID_EXT.TcPOU
        modified:   sdsPLC/SDSPLC/POUs/ALI/FB_PropValve.TcPOU
        modified:   sdsPLC/SDSPLC/POUs/ALI/F_AxisRef_To_MSTA.TcPOU
        modified:   sdsPLC/SDSPLC/POUs/ALI/MC_SmoothMover.TcPOU
        modified:   sdsPLC/SDSPLC/POUs/Bronkhorst/FB_FlowBusTransaction.TcPOU
        modified:   sdsPLC/SDSPLC/POUs/Bronkhorst/FB_L01Driver.TcPOU
        modified:   sdsPLC/SDSPLC/POUs/Helpers/FB_EcatDiag.TcPOU
        modified:   sdsPLC/SDSPLC/POUs/Helpers/FB_ShiftByteArray.TcPOU
        modified:   sdsPLC/SDSPLC/POUs/Regulators/FB_Regulator.TcPOU
        modified:   sdsPLC/SDSPLC/POUs/Regulators/F_rPressure.TcPOU
        modified:   sdsPLC/SDSPLC/POUs/Sensirion/FB_SensirionTransaction.TcPOU
        modified:   sdsPLC/SDSPLC/POUs/Sensirion/fSHDLCChecksum.TcPOU
        modified:   sdsPLC/SDSPLC/POUs/TEC/FB_TECDriver.TcPOU
        modified:   sdsPLC/SDSPLC/POUs/TEC/FB_TECTransaction.TcPOU
        modified:   sdsPLC/SDSPLC/POUs/VICI/FB_ViciTransaction.TcPOU
        modified:   sdsPLC/SDSPLC/POUs/p_ALI.TcPOU
        modified:   sdsPLC/SDSPLC/POUs/p_Autosave.TcPOU
        modified:   sdsPLC/SDSPLC/POUs/p_ESTOP.TcPOU
        modified:   sdsPLC/SDSPLC/POUs/p_Manifold.TcPOU
        modified:   sdsPLC/SDSPLC/POUs/p_Regulators.TcPOU
        modified:   sdsPLC/SDSPLC/POUs/p_SoftIO.TcPOU
        modified:   sdsPLC/SDSPLC/POUs/p_VacGaugeSup.TcPOU
        modified:   sdsPLC/SDSPLC/PlcTask.TcTTO
        modified:   sdsPLC/SDSPLC/SerialComm.TcTTO
        modified:   sdsPLC/_Config/NC/Axes/ALI_X.xti
        modified:   sdsPLC/_Config/NC/Axes/ALI_Y.xti

no changes added to commit (use "git add" and/or "git commit -a")
ZryletTC commented 3 years ago

@klauer Weird, I was pretty sure I did and if not, I'm surprised I didn't notice it. Do you need this to proceed with the PLC summary stuff or should I just include it in my next PR?

klauer commented 3 years ago

Not a big deal on my end - but local git checkouts end up being "dirty" because git fixes up line endings according to gitattributes automatically.

Once we get version numbers shown in the summary page, it'd be good to have this resolved.

Edit: for reference https://pcdshub.github.io/plc-summary/versions.html#sdsplc

ZryletTC commented 3 years ago

Just pushed a renormalize commit. @klauer, can you please let me know if you still have problems next time you happen on this repo?

klauer commented 3 years ago

nothing to commit, working tree clean - LGTM 👍