[static] Merge branch 'main' into isegall/migrate-issues

Signed-off-by: Itai Segall <itai.segall@digitalasset.com>

Author: isegall-da

.github/actions/scripts/common_setup.sh

@@ -17,7 +17,8 @@ git checkout main
 echo "GITHUB_HEAD_REF: ${GITHUB_HEAD_REF:-}"
 if [ -n "${GITHUB_HEAD_REF:-}" ] && [ "$GITHUB_HEAD_REF" != "main" ]; then
   echo "Checking out $GITHUB_HEAD_REF"
-  git checkout "$GITHUB_HEAD_REF"
+  # On PRs from forks, GITHUB_HEAD_REF is the name of the branch in the forked repo, so we cannot actually checkout that branch directly.
+  git checkout "$GITHUB_HEAD_REF" || true
 fi
 git fetch origin 'refs/heads/release-line*:refs/heads/origin/release-line*' --force
 

.github/workflows/build.docs.yml

@@ -38,30 +38,11 @@ jobs:
           # as it finishes fastest and we want to ensure that it includes test sources.
           cmd: "Test/compile docs/bundle"
 
-      # TODO(#1028): Reenable this
-      # - name: Push documentation
-      #   uses: ./.github/actions/nix/run_bash_command_in_nix
-      #   if: github.ref == 'refs/heads/main' && github.event_name == 'push'
-      #   env:
-      #     GH_USER: ${{ github.actor }}
-      #     GH_TOKEN: ${{ secrets.GH_ISSUES }}
-      #   with:
-      #     additional_nix_args: "--keep GH_USER --keep GH_TOKEN"
-      #     cmd: |
-      #       REPO_DIR="$(mktemp -d)"
-      #       export GIT_SSH_COMMAND="/usr/bin/ssh"
-      #       git config --global user.email "splice-maintainers@digitalasset.com"
-      #       git config --global user.name "DA Automation"
-      #       git clone https://$GH_USER:$GH_TOKEN@github.com/digital-asset/decentralized-canton-sync.git "$REPO_DIR" -b docs
-      #       # Given that we just wanna overwrite anything an rm + cp seems more straightforward than an rsync.
-      #       rm -rf "$REPO_DIR/docs"
-      #       cp -r "docs/html/html" "$REPO_DIR/docs"
-      #       # Required to make GH service the _static directory properly.
-      #       touch "$REPO_DIR/docs/.nojekyll"
-      #       cd "$REPO_DIR"
-      #       git add .
-      #       git commit -m 'Update documentation'
-      #       git push origin docs
+      - name: Upload documentation artifacts
+        uses: actions/upload-pages-artifact@2d163be3ddce01512f3eea7ac5b7023b5d643ce1
+        if: github.ref == 'refs/heads/main' && github.event_name == 'push'
+        with:
+          path: docs/html/html
 
       - name: Post-SBT job
         uses: ./.github/actions/sbt/post_sbt

.github/workflows/cimain.yml

@@ -0,0 +1,13 @@
+name: Deploy CIMain
+on:
+  push:
+    branches:
+      - 'main'
+
+jobs:
+  trigger_cimain:
+    uses: ./.github/workflows/cluster_tests.yml
+    secrets: inherit
+    with:
+      workflow: deploy_cimain
+      sha: ${{ github.sha }}

.github/workflows/ciupgrade.yml

@@ -0,0 +1,13 @@
+name: Deploy CIUpgrade
+on:
+  push:
+    branches:
+      - 'main'
+
+jobs:
+  trigger_ciupgrade:
+    uses: ./.github/workflows/cluster_tests.yml
+    secrets: inherit
+    with:
+      workflow: deploy_ciupgrade
+      sha: ${{ github.sha }}

.github/workflows/cluster_tests.yml

@@ -9,9 +9,6 @@ on:
       sha:
         type: string
         required: true
-      public_splice:
-        type: boolean
-        required: false
 
     outputs:
       result:
@@ -42,5 +39,5 @@ jobs:
         run: |
           set -euo pipefail
           result=$(curl -sSfL -H "Authorization: Bearer ${{ steps.auth.outputs.id_token }}" \
-            "${{ secrets.CLUSTER_TEST_INVOKER_URL }}?workflow=${{ inputs.workflow }}&splice-git-ref=${{ inputs.sha }}&public-splice=${{ inputs.public_splice }}")
+            "${{ secrets.CLUSTER_TEST_INVOKER_URL }}?workflow=${{ inputs.workflow }}&splice-git-ref=${{ inputs.sha }}")
           echo "result=$result" >> "$GITHUB_OUTPUT"

.github/workflows/post_merge.yml

@@ -20,3 +20,22 @@ jobs:
   ci:
     uses: ./.github/workflows/build.yml
     secrets: inherit
+
+  publish_docs:
+    if: github.ref == 'refs/heads/main'
+    needs: ci
+    runs-on: self-hosted-docker-tiny
+
+    permissions:
+      pages: write      # to deploy to Pages
+      id-token: write   # to verify the deployment originates from an appropriate source
+
+    # Deploy to the github-pages environment
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@854d7aa1b99e4509c4d1b53d69b7ba4eaf39215a

.github/workflows/pr_cluster_test.yml

@@ -33,7 +33,6 @@ jobs:
     with:
       workflow: cluster_test
       sha: ${{ needs.get_head.outputs.sha }}
-      public_splice: ${{ github.repository == 'hyperledger-labs/splice' }}
 
   result:
     runs-on: self-hosted-docker-tiny
@@ -54,7 +53,6 @@ jobs:
     with:
       workflow: hdm_test
       sha: ${{ needs.get_head.outputs.sha }}
-      public_splice: ${{ github.repository == 'hyperledger-labs/splice' }}
 
   result_hdm:
     runs-on: self-hosted-docker-tiny

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/AnsAuth0FrontendIntegrationTest.scala

@@ -7,7 +7,7 @@ import org.lfdecentralizedtrust.splice.integration.EnvironmentDefinition
 import org.lfdecentralizedtrust.splice.util.{FrontendLoginUtil, AnsFrontendTestUtil, WalletTestUtil}
 import monocle.macros.syntax.lens.*
 
-import java.net.URL
+import java.net.URI
 
 class AnsAuth0FrontendIntegrationTest
     extends FrontendIntegrationTest("alice")
@@ -29,7 +29,9 @@ class AnsAuth0FrontendIntegrationTest
             .replace(
               Rs256(
                 sys.env("OIDC_AUTHORITY_VALIDATOR_AUDIENCE"),
-                new URL(s"https://${sys.env("SPLICE_OAUTH_TEST_AUTHORITY")}/.well-known/jwks.json"),
+                new URI(
+                  s"https://${sys.env("SPLICE_OAUTH_TEST_AUTHORITY")}/.well-known/jwks.json"
+                ).toURL,
               )
             )
         )(c)

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/WalletAuth0FrontendIntegrationTest.scala

@@ -12,7 +12,7 @@ import org.lfdecentralizedtrust.splice.util.{
 }
 import monocle.macros.syntax.lens.*
 
-import java.net.URL
+import java.net.URI
 
 class WalletAuth0FrontendIntegrationTest
     extends FrontendIntegrationTest("randomUser")
@@ -31,7 +31,9 @@ class WalletAuth0FrontendIntegrationTest
             .replace(
               Rs256(
                 sys.env("OIDC_AUTHORITY_VALIDATOR_AUDIENCE"),
-                new URL(s"https://${sys.env("SPLICE_OAUTH_TEST_AUTHORITY")}/.well-known/jwks.json"),
+                new URI(
+                  s"https://${sys.env("SPLICE_OAUTH_TEST_AUTHORITY")}/.well-known/jwks.json"
+                ).toURL,
               )
             )
         )(spliceConfig)

apps/common/frontend/src/contexts/LedgerApiContext.tsx

@@ -10,16 +10,16 @@ import { Choice, ContractId, Template, TemplateOrInterface } from '@daml/types';
 
 const ANS_LEDGER_NAME = 'ans-ledger';
 
+interface JsonApiErrorBody {
+  error: string;
+}
+
 interface JsonApiErrorResponse {
   status: number;
   statusText: string;
   body: JsonApiErrorBody;
 }
 
-interface JsonApiErrorBody {
-  error: string;
-}
-
 export class JsonApiError extends Error {
   status: number;
   statusText: string;