Merge pull request #75 from epics-containers/dev

Update to latest skeleton
epics-containers · May 30, 2023 · 4956bce · 4956bce
2 parents 0424ee8 + aaae6c5
commit 4956bce
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 57 deletions.
diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml
@@ -43,7 +43,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest"] # can add windows-latest, macos-latest
-        python: ["3.9", "3.10", "3.11"]
+        python: ["3.10", "3.11"]
         install: ["-e .[dev]"]
         # Make one version be non-editable to test both paths of version code
         include:
@@ -129,6 +129,9 @@ jobs:
       contents: read
       packages: write
 
+    env:
+      TEST_TAG: "testing"
+
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -150,37 +153,43 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: ${{ env.IMAGE_REPOSITORY }}
-          tags: |
-            type=ref,event=tag
-            type=raw,value=latest
-
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v2
 
-      - name: Build runtime image
-        uses: docker/build-push-action@v3
+      - name: Build and export to Docker local cache
+        uses: docker/build-push-action@v4
         with:
           build-args: |
             PIP_OPTIONS=-r lockfiles/requirements.txt dist/*.whl
-          push: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags') }}
-          load: ${{ ! (github.event_name == 'push' && startsWith(github.ref, 'refs/tags')) }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
           context: artifacts/
+          load: true
+          tags: ${{ env.TEST_TAG }}
           file: ./Dockerfile
           # If you have a long docker build, uncomment the following to turn on caching
           # For short build times this makes it a little slower
           #cache-from: type=gha
           #cache-to: type=gha,mode=max
 
-      - name: Test cli works in runtime image
-        run: docker run ${{ env.IMAGE_REPOSITORY }} --version
+      - name: Test cli works in cached runtime image
+        run: docker run docker.io/library/${{ env.TEST_TAG }} --version
+
+      - name: Create tags for publishing image
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ env.IMAGE_REPOSITORY }}
+          tags: |
+            type=ref,event=tag
+            type=raw,value=latest
+
+      - name: Push cached image to container registry
+        if: github.ref_type == 'tag'
+        uses: docker/build-push-action@v3
+        with:
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
 
   release:
     # upload to PyPI and make a release on every tag

diff --git a/ibek-defs b/ibek-defs
diff --git a/tests/samples/schemas/all.ibek.support.schema.json b/tests/samples/schemas/all.ibek.support.schema.json
@@ -1409,84 +1409,84 @@
                 "description": "Link number on this IP module (0 or 1)"
               },
               "i_abserr": {
-                "type": "integer",
-                "description": "todo",
-                "default": 0
+                "type": "number",
+                "description": "Absolute error limit (TODO what is i_abserr vs abserr ?)",
+                "default": 0.0005
               },
               "abserr": {
-                "type": "integer",
-                "description": "todo",
-                "default": 0
+                "type": "number",
+                "description": "Absolute error limit [0..1]",
+                "default": 0.0005
               },
               "relerr": {
-                "type": "integer",
-                "description": "todo",
-                "default": 0
+                "type": "number",
+                "description": "Relative error limit [0..1]",
+                "default": 0.0002
               },
               "controlerr": {
-                "type": "integer",
-                "description": "todo",
-                "default": 0
+                "type": "number",
+                "description": "Control Error",
+                "default": 0.0005
               },
               "startsw_evnt": {
                 "type": "integer",
-                "description": "todo",
-                "default": 0
+                "description": "Event to start Soft ramps (ignore)",
+                "default": 53
               },
               "syncsw_evnt": {
                 "type": "integer",
-                "description": "todo",
-                "default": 0
+                "description": "Event to synchronise Soft ramps (ignore)",
+                "default": 54
               },
               "hyscycle_dly": {
                 "type": "integer",
-                "description": "todo",
-                "default": 0
+                "description": "Seconds to wait in hysteresis cycle: time of PS between min and max value\n",
+                "default": 3
               },
               "hyscydir": {
                 "type": "integer",
-                "description": "todo",
+                "description": "Direction of hysteresis cycle:\napproaching set point from above (-) or below (+) at the end of the cycle\n",
                 "default": 0
               },
               "hyscmask": {
                 "type": "integer",
-                "description": "todo",
-                "default": 0
+                "description": "Defines the number of hysteresis cycles to run (for values >1 (3, 7, ...)\nthe seq delay has to be specified in an extra template)\n",
+                "default": 3
               },
               "hyslock": {
                 "type": "integer",
-                "description": "todo",
+                "description": "The value \"locked\" will force the PS to do a full cycle,\nwhenever the value I-SET is changed in the wrong direction (against HYCDIR)\n",
                 "default": 0
               },
               "hysimin": {
                 "type": "integer",
-                "description": "todo",
-                "default": 0
+                "description": "Minimum value for hysteresis cycle",
+                "default": -3
               },
               "hysimax": {
                 "type": "integer",
-                "description": "todo",
-                "default": 0
+                "description": "Maximum value for hysteresis cycle",
+                "default": 3
               },
               "oninitcycle": {
-                "type": "integer",
-                "description": "todo",
-                "default": 0
+                "type": "boolean",
+                "description": "Flag to determine if power supply should do a hysteresis cycle\nwhen it is switched ON\n",
+                "default": false
               },
               "vdclink_adel": {
-                "type": "integer",
-                "description": "todo",
-                "default": 0
+                "type": "number",
+                "description": "UNKNOWN",
+                "default": 0.3
               },
               "vload_adel": {
-                "type": "integer",
-                "description": "todo",
-                "default": 0
+                "type": "number",
+                "description": "UNKNOWN",
+                "default": 0.3
               },
               "icharge_adel": {
-                "type": "integer",
-                "description": "todo",
-                "default": 0
+                "type": "number",
+                "description": "UNKNOWN",
+                "default": 0.0005
               },
               "type": {
                 "type": "string",