Merge beta branch into main

.github/workflows/build-pull-request.yml

@@ -10,45 +10,50 @@ concurrency:
    cancel-in-progress: true
 
 jobs:
-  build-container:
-    runs-on: ubuntu-latest
+  build-test:
+    runs-on: [gpu]
     steps:
       - name: Define environment variables
         run: |
-          echo REPOSITORY=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
+          echo IMAGE_NAME=ghcr.io/$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
           echo TAG=$(echo "PR-${{ github.event.pull_request.number }}") >> $GITHUB_ENV
 
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Copy external assets
+        run: cp /home/runner/NVIDIA-OptiX-SDK-7.6.0-linux64-x86_64.sh .
+
       - name: Set up docker
         uses: docker/setup-buildx-action@v3
 
-      - name: Build container
+      - name: Build and export to Docker
         uses: docker/build-push-action@v5
         with:
-          tags: ghcr.io/${{ env.REPOSITORY }}:${{ env.TAG }}
-          outputs: type=docker,dest=/tmp/esi-opticks-${{ env.TAG }}.tar
-
-      - name: Save built image for test jobs
-        uses: actions/upload-artifact@v4
-        with:
-          name: esi-opticks-${{ env.TAG }}
-          path: /tmp/esi-opticks-${{ env.TAG }}.tar
-
-  test-container:
-    runs-on: ubuntu-latest
-    needs: build-container
-    steps:
-      - name: Define environment variables
+          context: .
+          tags: ${{ env.IMAGE_NAME }}:${{ env.TAG }}
+          load: true
+          cache-from: |
+            type=local,src=/home/runner/.buildx-cache
+            type=registry,ref=${{ env.IMAGE_NAME }}:latest
+          cache-to: |
+            type=inline
+            type=local,dest=/home/runner/.buildx-cache-new,mode=max
+
+      - name: Move cache
+        # Temp fix
+        # https://github.com/docker/build-push-action/issues/252
+        # https://github.com/moby/buildkit/issues/1896
         run: |
-          echo REPOSITORY=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
-          echo TAG=$(echo "PR-${{ github.event.pull_request.number }}") >> $GITHUB_ENV
+          rm -rf /home/runner/.buildx-cache
+          mv /home/runner/.buildx-cache-new /home/runner/.buildx-cache
 
-      - name: Download artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: esi-opticks-${{ env.TAG }}
-          path: /tmp
+      - name: Test image
+        run: |
+          docker run --rm ${{ env.IMAGE_NAME }}:${{ env.TAG }} tests/test_opticks.sh
 
-      - name: Run tests
+      - name: Test esi-shell
         run: |
-          docker load --input /tmp/esi-opticks-${{ env.TAG }}.tar
-          docker run ghcr.io/${{ env.REPOSITORY }}:${{ env.TAG }} bash -l -c opticks-info
+          ./esi-shell -t ${{ env.TAG }} "opticks-full-prepare && opticks-t"

.github/workflows/delete_untagged.py

@@ -0,0 +1,25 @@
+#!/usr/bin/env python3
+
+import argparse
+import json
+import requests
+import types
+
+parser = argparse.ArgumentParser()
+parser.add_argument("token", help="GitHub token")
+args = parser.parse_args()
+
+domain = "api.github.com"
+org = "BNLNPPS"
+package_type = "container"
+package_name = "esi-shell"
+
+api_url = f"https://{domain}/orgs/{org}/packages/{package_type}/{package_name}/versions"
+
+respjson = requests.get(api_url, auth=("token", args.token))
+entries  = json.loads(respjson.text, object_hook=lambda d: types.SimpleNamespace(**d))
+
+for e in entries:
+    if not e.metadata.container.tags:
+        response = requests.delete(api_url + f"/{e.id}", auth=("token", args.token))
+        print("delete", e.id, e.html_url, e.name, response.url, response.status_code)

.github/workflows/release.yml

@@ -0,0 +1,135 @@
+name: Release
+
+on:
+  push:
+    branches:
+      - main
+      - beta
+      - betatest
+
+jobs:
+  build-test-release:
+    runs-on: [gpu]
+    steps:
+      - name: Define environment variables
+        run: echo IMAGE_NAME=ghcr.io/$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Important for Semantic Release to analyze all commits
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: "lts/*"
+
+      - run: npm install semantic-release-replace-plugin -D
+
+      - name: Copy external assets
+        run: cp /home/runner/NVIDIA-OptiX-SDK-7.6.0-linux64-x86_64.sh .
+
+      - name: Set up docker buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GitHub container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build image locally
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          tags: ${{ env.IMAGE_NAME }}:latest
+          pull: true
+          load: true
+          cache-from: ${{ env.IMAGE_NAME }}:latest
+          cache-to: type=inline
+
+      - name: Test esi-shell
+        run: ./esi-shell "opticks-full-prepare && opticks-t"
+
+      - name: Declare latest and push
+        run: docker push ${{ env.IMAGE_NAME }}:latest
+
+      - name: Create semantic release
+        uses: cycjimmy/semantic-release-action@v4
+        id: semantic
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Checkout new release
+        if: steps.semantic.outputs.new_release_published == 'true'
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ steps.semantic.outputs.new_release_git_tag }}
+
+      - name: Copy external assets
+        run: cp /home/runner/NVIDIA-OptiX-SDK-7.6.0-linux64-x86_64.sh .
+
+      - name: Build image for new release
+        if: steps.semantic.outputs.new_release_published == 'true'
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          tags: |
+            ${{ env.IMAGE_NAME }}:latest
+            ${{ env.IMAGE_NAME }}:${{ steps.semantic.outputs.new_release_version }}
+          push: true
+          provenance: false
+          cache-from: ${{ env.IMAGE_NAME }}:latest
+          cache-to: type=inline
+
+  deploy:
+    # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+    permissions:
+      contents: read
+      pages: write
+      id-token: write
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build-test-release
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+
+      - name: Update esi-shell version
+        run: |
+          sed -i "/^ESI_SHELL_VERSION=/ s/$/-$(git rev-parse --short HEAD)/" esi-shell
+
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+
+      - name: Build with Jekyll
+        uses: actions/jekyll-build-pages@v1
+
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
+
+  cleanup:
+    runs-on: ubuntu-latest
+    needs: build-test-release
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+
+      - name: Delete untagged images
+        run: |
+          python -m pip install requests
+          .github/workflows/delete_untagged.py ${{ secrets.BNLNPPS_ESI_SHELL_PACKAGES_TOKEN }}

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "opticks"]
 	path = opticks
-	url = https://github.com/simoncblyth/opticks.git
+	url = https://github.com/bnlnpps/esi-opticks.git

.opticks/GEOM/GEOM.sh

@@ -1,4 +1,4 @@
 #!/bin/bash 
 # THIS SCRIPT DOES ONE THING ONLY : IT EXPORTS GEOM
-geom=pfRICH
+geom=RaindropRockAirWater
 export GEOM=$geom  

.releaserc.yaml

@@ -0,0 +1,29 @@
+# See https://semantic-release.gitbook.io/semantic-release/usage/configuration
+branches:
+  - '+([0-9])?(.{+([0-9]),x}).x'
+  - 'main'
+  - name: 'beta'
+    prerelease: true
+  - name: 'betatest'
+    prerelease: true
+tagFormat: '${version}' # without this, the tag is prefixed with a 'v'
+plugins:
+  - "@semantic-release/commit-analyzer"
+  - path: "semantic-release-replace-plugin"
+    replacements:
+      - files:
+          - esi-shell
+        from: ESI_SHELL_VERSION=.*
+        to: ESI_SHELL_VERSION=${nextRelease.version}
+      - files:
+          - pyproject.toml
+        from: version = ".*"
+        to: version = "${nextRelease.version}"
+  - "@semantic-release/release-notes-generator"
+  - "@semantic-release/changelog"
+  - path: "@semantic-release/git"
+    assets:
+      - "CHANGELOG.md"
+      - "esi-shell"
+      - "pyproject.toml"
+    message: "chore(release): ${nextRelease.version}\n\n${nextRelease.notes}"