Again

.gitea/workflows/build-ubuntu.yml

@@ -32,7 +32,7 @@ jobs:
           echo "---  Image list  ------------------"
           $PODMAN image list
           echo "-----------------------------------"
-          echo $($PODMAN image rm "$BUILDER_IMAGE")
+          # echo $($PODMAN image rm "$BUILDER_IMAGE")
           if docker image inspect "$BUILDER_IMAGE" 2>&1 >/dev/null; then
             echo "Image available"
           else
@@ -54,10 +54,9 @@ jobs:
           $PRUN pwd
           $PRUN ls /data
           $PRUN cc --version
-          $PRUN rustup --version
           $PRUN cargo --version
           $PRUN rustc --version
-          cat /proc/cpuinfo | grep model
+          cat /proc/cpuinfo | grep "model name"
           echo [[${{ github.repository }}]]
       - name: Check out repository
         uses: actions/checkout@v6
@@ -83,7 +82,7 @@ jobs:
           FROM $BUILDER_IMAGE
           COPY src /data
           WORKDIR /data
-          CMD cargo build --release
+          CMD ["cargo", "build", "--release"]
           EOF
           cat cf1
           echo "---   DOCKER BUILD   ---"
@@ -97,7 +96,7 @@ jobs:
           docker start --attach $cid1
           mkdir -p artifacts
           echo "---   DOCKER CP   ---"
-          docker cp $cid1:/data/target artifacts/
+          docker container cp $cid1:/data/target artifacts/
           echo "---   DOCKER CONTAINER RM   ---"
           docker container rm $cid1
           echo "---   DOCKER IMAGE RM   ---"
@@ -129,11 +128,18 @@ jobs:
         env:
           PSI_GITEA_PUB: ${{secrets.PSI_GITEA_PUB}}
         run: |
+          VER=$(artifacts/target/release/daqingest version)
           curl \
             --fail \
-            --user "${{gitea.actor}}:${PSI_GITEA_PUB}" \
+            --user "${{gitea.actor}}:$PSI_GITEA_PUB" \
             --upload-file artifacts/target/release/daqingest \
-            "https://gitea.psi.ch/api/packages/${{gitea.repository_owner}}/generic/daqingest/${{gitea.sha}}/daqingest"
+            "https://gitea.psi.ch/api/packages/${{gitea.repository_owner}}/generic/daqingest/$VER/daqingest"
+          VER=$(artifacts/target/release/daqretrieve version)
+          curl \
+            --fail \
+            --user "${{gitea.actor}}:$PSI_GITEA_PUB" \
+            --upload-file artifacts/target/release/daqingest \
+            "https://gitea.psi.ch/api/packages/${{gitea.repository_owner}}/generic/daqretrieve/$VER/daqretrieve"
       - name: Publish package
         if: false
         uses: actions/upload-artifact@v3