Merge branch 'upgrade-v0.2.12' into tcharchian-patch-7

Signed-off-by: Tania Charchian <tatiana.charchian@productscience.ai>

Author: tcharchian

.github/workflows/integration.yml

@@ -18,6 +18,8 @@ on:
       - 'decentralized-api/**'
       - 'local-test-net/**'
       - 'testermint/**'
+      - 'versioned/**'
+      - 'subnet/**'
 
   issue_comment:
     types: [created]
@@ -43,6 +45,7 @@ jobs:
     permissions:
       contents: read
       checks: write
+      packages: write
 
     with:
       test_name: "Integration Tests"

.github/workflows/sanity.yml

@@ -27,6 +27,7 @@ jobs:
     permissions:
       contents: read
       checks: write
+      packages: write
 
     uses: ./.github/workflows/test-workflow.yml
     secrets: inherit

.github/workflows/test-workflow.yml

@@ -157,21 +157,20 @@ jobs:
         env:
           GENESIS_OVERRIDES_FILE: "inference-chain/test_genesis_overrides.json"
         run: |
-          sudo make build-docker
+          make build-docker
           echo "=== Images immediately after build ==="
-          sudo docker images | head -20
+          docker images | head -20
 
       - name: Save Docker Images
         run: |
           mkdir -p docker-images
-          sudo docker save -o docker-images/inference-chain.tar ghcr.io/product-science/inferenced:latest
-          sudo docker save -o docker-images/decentralized-api.tar ghcr.io/product-science/api:latest
-          sudo docker save -o docker-images/inference-mock-server.tar inference-mock-server:latest
-          sudo docker save -o docker-images/proxy.tar ghcr.io/product-science/proxy:latest
-          # Compress images to save storage space
-          sudo gzip docker-images/*.tar
-          # Fix ownership so upload-artifact can access files
-          sudo chown -R $USER:$USER docker-images/
+          docker save -o docker-images/inference-chain.tar ghcr.io/product-science/inferenced:latest
+          docker save -o docker-images/decentralized-api.tar ghcr.io/product-science/api:latest
+          docker save -o docker-images/inference-mock-server.tar inference-mock-server:latest
+          docker save -o docker-images/proxy.tar ghcr.io/product-science/proxy:latest
+          docker save -o docker-images/versiond.tar versiond:latest
+          docker save -o docker-images/testapp-server.tar testapp-server:latest
+          gzip docker-images/*.tar
           echo "=== Created files ==="
           ls -la docker-images/
 
@@ -185,7 +184,7 @@ jobs:
       - name: Make Upgrade Build
         if: ${{ inputs.enable_upgrades }}
         run: |
-          sudo make build-for-upgrade-tests
+          make build-for-upgrade-tests
           # Fix ownership of upgrade build files
           sudo chown -R $USER:$USER public-html/ || true
 
@@ -227,13 +226,14 @@ jobs:
 
       - name: Load Docker Images
         run: |
-          # Decompress first
-          sudo gunzip docker-images/*.tar.gz || true
-          # Load images with :latest tags
+          gunzip docker-images/*.tar.gz || true
           sudo docker load -i docker-images/inference-chain.tar || true
           sudo docker load -i docker-images/decentralized-api.tar || true
           sudo docker load -i docker-images/inference-mock-server.tar || true
           sudo docker load -i docker-images/proxy.tar || true
+          sudo docker load -i docker-images/versiond.tar || true
+          sudo docker load -i docker-images/testapp-server.tar || true
+          rm -rf docker-images/
 
       - name: Install Make
         run: |
@@ -555,4 +555,3 @@ jobs:
           echo "*Individual test reports are available in the Checks tab above*" >> $GITHUB_STEP_SUMMARY
           
           echo "##[debug]FINAL TOTALS: Passed=$TOTAL_PASSED, Failed=$TOTAL_FAILED, Skipped=$TOTAL_SKIPPED"
-

.github/workflows/verify.yml

@@ -131,4 +131,124 @@ jobs:
         with:
           name: Decentralized-API Tests
           path: decentralized-api/junit-report.xml
+          reporter: java-junit
+
+  build-and-test-versioned:
+    runs-on: ubuntu-latest
+    name: Build and Test Versioned
+    permissions:
+      contents: read
+      checks: write
+    defaults:
+      run:
+        working-directory: ./versioned
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Go
+        uses: actions/setup-go@v3.0.0
+        with:
+          go-version: '1.24.2'
+
+      - name: Cache Go modules
+        uses: actions/cache@v4
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+
+      - name: Install dependencies
+        run: go mod download
+
+      - name: Build
+        run: go build ./...
+
+      - name: Run Tests (fork PRs)
+        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork
+        run: go test ./... -v
+
+      - name: Install go-junit-report
+        if: github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork
+        run: go install github.com/jstemmer/go-junit-report/v2@v2.1.0
+
+      - name: Run Tests and Generate JUnit Report
+        if: github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork
+        run: go test ./... -v 2>&1 | go-junit-report -set-exit-code > junit-report.xml
+
+      - name: Publish Test Results
+        uses: actions/upload-artifact@v4
+        if: always() && (github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork)
+        with:
+          name: versioned-junit-report
+          path: versioned/junit-report.xml
+
+      - name: Report Test Results in GitHub
+        if: always() && (github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork)
+        uses: dorny/test-reporter@v1
+        with:
+          name: Versioned Tests
+          path: versioned/junit-report.xml
+          reporter: java-junit
+
+  build-and-test-subnet:
+    runs-on: ubuntu-latest
+    name: Build and Test Subnet
+    permissions:
+      contents: read
+      checks: write
+    defaults:
+      run:
+        working-directory: ./subnet
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Go
+        uses: actions/setup-go@v3.0.0
+        with:
+          go-version: '1.24.2'
+
+      - name: Cache Go modules
+        uses: actions/cache@v4
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+
+      - name: Install dependencies
+        run: go mod download
+
+      - name: Build
+        run: go build ./...
+
+      - name: Run Tests (fork PRs)
+        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork
+        run: go test ./... -v
+
+      - name: Install go-junit-report
+        if: github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork
+        run: go install github.com/jstemmer/go-junit-report/v2@v2.1.0
+
+      - name: Run Tests and Generate JUnit Report
+        if: github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork
+        run: go test ./... -v 2>&1 | go-junit-report -set-exit-code > junit-report.xml
+
+      - name: Publish Test Results
+        uses: actions/upload-artifact@v4
+        if: always() && (github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork)
+        with:
+          name: subnet-junit-report
+          path: subnet/junit-report.xml
+
+      - name: Report Test Results in GitHub
+        if: always() && (github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork)
+        uses: dorny/test-reporter@v1
+        with:
+          name: Subnet Tests
+          path: subnet/junit-report.xml
           reporter: java-junit

.gitignore

@@ -3,6 +3,7 @@ vue/dist
 release/
 .idea/
 .vscode/
+.cursor/
 .DS_Store
 *.dot
 *.log

.idea/.gitignore

@@ -1,11 +1,19 @@
-.PHONY: release decentralized-api-release inference-chain-release tmkms-release proxy-release proxy-ssl-release bridge-release check-docker build-testermint run-blockchain-tests test-blockchain local-build api-local-build node-local-build api-test node-test mock-server-build-docker proxy-build-docker proxy-ssl-build-docker bridge-build-docker run-bls-tests subnetctl-build
+.PHONY: release decentralized-api-release inference-chain-release tmkms-release proxy-release proxy-ssl-release bridge-release check-docker build-testermint run-blockchain-tests test-blockchain local-build api-local-build node-local-build api-test node-test mock-server-build-docker proxy-build-docker proxy-ssl-build-docker bridge-build-docker run-bls-tests subnetctl-build versiond-build-docker testapp-server-build-docker
 
 VERSION ?= $(shell git describe --always)
 TAG_NAME := "release/v$(VERSION)"
+USE_REGISTRY_CACHE ?= 0
+ifeq ($(USE_REGISTRY_CACHE),1)
+_MOCK_CACHE_ARGS := --cache-from type=registry,ref=ghcr.io/gonka-ai/mock-server:buildcache --cache-to type=registry,ref=ghcr.io/gonka-ai/mock-server:buildcache,mode=min
+_MOCK_BUILD_CMD := docker buildx build --load $(_MOCK_CACHE_ARGS)
+else
+_MOCK_CACHE_ARGS :=
+_MOCK_BUILD_CMD := DOCKER_BUILDKIT=1 docker build
+endif
 
 all: build-docker
 
-build-docker: api-build-docker node-build-docker mock-server-build-docker proxy-build-docker proxy-ssl-build-docker bridge-build-docker
+build-docker: api-build-docker node-build-docker mock-server-build-docker proxy-build-docker proxy-ssl-build-docker bridge-build-docker versiond-build-docker testapp-server-build-docker
 
 api-build-docker:
 	@make -C decentralized-api build-docker SET_LATEST=1
@@ -17,7 +25,7 @@ mock-server-build-docker:
 	@echo "Building mock-server JAR file..."
 	@cd testermint/mock_server && ./gradlew clean && ./gradlew shadowJar
 	@echo "Building mock-server docker image..."
-	@DOCKER_BUILDKIT=1 docker build --load -t inference-mock-server -f testermint/Dockerfile testermint
+	@$(_MOCK_BUILD_CMD) -t inference-mock-server -f testermint/Dockerfile testermint
 
 proxy-build-docker:
 	@make -C proxy build-docker SET_LATEST=1
@@ -28,6 +36,14 @@ proxy-ssl-build-docker:
 bridge-build-docker:
 	@make -C bridge build-docker SET_LATEST=1
 
+versiond-build-docker:
+	@echo "Building versiond docker image..."
+	@docker build -t versiond:latest -f versioned/Dockerfile versioned
+
+testapp-server-build-docker:
+	@echo "Building testapp-server docker image..."
+	@docker build -t testapp-server:latest -f local-test-net/Dockerfile.testapp-server .
+
 release: decentralized-api-release inference-chain-release tmkms-release proxy-release proxy-ssl-release bridge-release
 	@git tag $(TAG_NAME)
 	@git push origin $(TAG_NAME)