Merge remote-tracking branch 'origin/main'

Author: dhower-qc

.devcontainer/Dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:24.04
+LABEL org.opencontainers.image.source=https://github.com/riscv/riscv-unified-db
 
 ENV DEBIAN_FRONTEND=noninteractive
-SHELL ["/bin/bash", "-c"]
 
 WORKDIR /workspace
 

.github/workflows/container.yml

@@ -29,25 +29,16 @@ jobs:
         uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
         with:
           path: .singularity/image.sif
-          key: ${{ hashFiles('container.def', 'bin/.container-tag') }}
-
-      - name: Get gems and node files from cache
-        id: cache-bundle-npm
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
-        with:
-          path: |
-            .home/.gems
-            node_modules
-          key: ${{ hashFiles('Gemfile.lock') }}-${{ hashFiles('package-lock.json') }}
+          key: ${{ hashFiles('container.def', 'bin/.container-tag') }}-${{ matrix.runner }}
 
       - if: ${{ steps.cache-sif.outputs.cache-hit != 'true' }}
         name: Build container
         run: ./bin/build_container
 
       - name: Upload singularity container
         run: |
-          singularity registry login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_TOKEN }} oras://docker.io
-          singularity push .singularity/image.sif oras://docker.io/riscvintl/spec-generator:${{ env.TAG }}
+          singularity registry login -u ${{ github.actor }} -p ${{ secrets.GITHUB_TOKEN }} oras://ghcr.io
+          singularity push .singularity/image.sif oras://ghcr.io/riscv/spec-generator:${{ env.TAG }}
 
   build-docker-container:
     env:
@@ -76,6 +67,13 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Login to GHCR
+        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3
 
@@ -85,7 +83,10 @@ jobs:
         with:
           file: ./.devcontainer/Dockerfile
           platforms: ${{ matrix.platform }}
-          outputs: type=image,name=riscvintl/udb,push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,"name=docker.io/riscvintl/udb,ghcr.io/riscv/udb",push-by-digest=true,name-canonical=true,push=true
+          tags: docker.io/riscvintl/udb,ghcr.io/riscv/udb
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
       - name: Export digest
         run: |
@@ -133,10 +134,35 @@ jobs:
       - name: Create manifest list and push
         working-directory: /tmp/digests
         run: |
+          CONTAINER_NAME=$(printf 'riscvintl/udb@sha256:%s ' *)
+          echo "CONTAINER_NAME=$CONTAINER_NAME" >> $GITHUB_ENV
           docker buildx imagetools create \
             --tag riscvintl/udb:${{ env.TAG }} \
             $(printf 'riscvintl/udb@sha256:%s ' *)
 
       - name: Inspect image
         run: |
           docker buildx imagetools inspect riscvintl/udb:${{ env.TAG }}
+
+      - name: Login to GHCR
+        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create \
+            --tag ghcr.io/riscv/udb:${{ env.TAG }} \
+            $(printf 'ghcr.io/riscv/udb@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ghcr.io/riscv/udb:${{ env.TAG }}
+
+      - name: Remove intermediate containers
+        run: |
+          docker image rm ${{ env.CONTAINER_NAME }}
+

.github/workflows/deploy.yml

@@ -165,7 +165,7 @@ jobs:
       - name: singularity setup
         uses: ./.github/actions/singularity-setup
       - name: Generate HTML ISA manual
-        run: ./do gen:html_manual
+        run: ./bin/generate manual -v all -f html
       - name: Upload HTML ISA manual
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
         if: (github.event_name == 'push') && (github.ref_name == 'main')

.github/workflows/pages.yml

@@ -234,7 +234,7 @@ jobs:
           run-id: ${{ github.event.workflow_run.id }}
       - name: Create index
         env:
-          PAGES_URL: https://riscv-software-src.github.io/riscv-unified-db
+          PAGES_URL: https://riscv.github.io/riscv-unified-db
         run: >
           cp doc/udb-block.svg _site/ &&
           ruby -r erb -r date -e "File.write('_site/index.html', ERB.new(File.read('tools/scripts/pages.html.erb'), trim_mode: '-').result(binding))"

.github/workflows/pr_title_check.yml

@@ -9,10 +9,16 @@ on:
   # Also if you change the configuration in a PR, the changes will not be reflected for the current
   # PR – only subsequent ones after the changes are in the main branch.
   pull_request_target:
+    branches:
+      - main
     types:
       - opened
       - edited
       - reopened
+      - synchronize
+  merge_group:
+    types:
+      - checks_requested
 
 jobs:
   main:
@@ -22,6 +28,7 @@ jobs:
       pull-requests: read
     steps:
       - uses: amannn/action-semantic-pull-request@48f256284bd46cdaab1048c3721360e808335d50 # v6
+        if: (github.event_name == 'pull_request_target')
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -44,3 +51,5 @@ jobs:
           ignoreLabels: |
             bot
             ignore-semantic-pull-request
+      - if: (github.event_name == 'merge_group')
+        run: exit 0