Merging with latest develop that already contains #11924

enso-org · Jan 7, 2025 · 1ffc0aa · 1ffc0aa
2 parents 276b41e + 2ead3f5
commit 1ffc0aa
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 21 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -504,10 +504,13 @@ jobs:
           ENSO_CLOUD_ENVIRONMENT: ${{ vars.ENSO_CLOUD_ENVIRONMENT }}
           ENSO_CLOUD_GOOGLE_ANALYTICS_TAG: ${{ vars.ENSO_CLOUD_GOOGLE_ANALYTICS_TAG }}
           ENSO_CLOUD_SENTRY_DSN: ${{ vars.ENSO_CLOUD_SENTRY_DSN }}
+          ENSO_CLOUD_SENTRY_ORGANIZATION: ${{ vars.ENSO_CLOUD_SENTRY_ORGANIZATION }}
+          ENSO_CLOUD_SENTRY_PROJECT: ${{ vars.ENSO_CLOUD_SENTRY_PROJECT }}
           ENSO_CLOUD_STRIPE_KEY: ${{ vars.ENSO_CLOUD_STRIPE_KEY }}
           ENSO_IDE_AG_GRID_LICENSE_KEY: ${{ vars.ENSO_AG_GRID_LICENSE_KEY }}
           ENSO_IDE_MAPBOX_API_TOKEN: ${{ vars.ENSO_MAPBOX_API_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
       - if: failure() && runner.os == 'Windows'
         name: List files if failed (Windows)
         run: Get-ChildItem -Force -Recurse
@@ -573,10 +576,13 @@ jobs:
           ENSO_CLOUD_ENVIRONMENT: ${{ vars.ENSO_CLOUD_ENVIRONMENT }}
           ENSO_CLOUD_GOOGLE_ANALYTICS_TAG: ${{ vars.ENSO_CLOUD_GOOGLE_ANALYTICS_TAG }}
           ENSO_CLOUD_SENTRY_DSN: ${{ vars.ENSO_CLOUD_SENTRY_DSN }}
+          ENSO_CLOUD_SENTRY_ORGANIZATION: ${{ vars.ENSO_CLOUD_SENTRY_ORGANIZATION }}
+          ENSO_CLOUD_SENTRY_PROJECT: ${{ vars.ENSO_CLOUD_SENTRY_PROJECT }}
           ENSO_CLOUD_STRIPE_KEY: ${{ vars.ENSO_CLOUD_STRIPE_KEY }}
           ENSO_IDE_AG_GRID_LICENSE_KEY: ${{ vars.ENSO_AG_GRID_LICENSE_KEY }}
           ENSO_IDE_MAPBOX_API_TOKEN: ${{ vars.ENSO_MAPBOX_API_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
       - if: failure() && runner.os == 'Windows'
         name: List files if failed (Windows)
         run: Get-ChildItem -Force -Recurse
@@ -640,10 +646,13 @@ jobs:
           ENSO_CLOUD_ENVIRONMENT: ${{ vars.ENSO_CLOUD_ENVIRONMENT }}
           ENSO_CLOUD_GOOGLE_ANALYTICS_TAG: ${{ vars.ENSO_CLOUD_GOOGLE_ANALYTICS_TAG }}
           ENSO_CLOUD_SENTRY_DSN: ${{ vars.ENSO_CLOUD_SENTRY_DSN }}
+          ENSO_CLOUD_SENTRY_ORGANIZATION: ${{ vars.ENSO_CLOUD_SENTRY_ORGANIZATION }}
+          ENSO_CLOUD_SENTRY_PROJECT: ${{ vars.ENSO_CLOUD_SENTRY_PROJECT }}
           ENSO_CLOUD_STRIPE_KEY: ${{ vars.ENSO_CLOUD_STRIPE_KEY }}
           ENSO_IDE_AG_GRID_LICENSE_KEY: ${{ vars.ENSO_AG_GRID_LICENSE_KEY }}
           ENSO_IDE_MAPBOX_API_TOKEN: ${{ vars.ENSO_MAPBOX_API_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
       - if: failure() && runner.os == 'Windows'
         name: List files if failed (Windows)
         run: Get-ChildItem -Force -Recurse

diff --git a/app/common/src/queryClient.ts b/app/common/src/queryClient.ts
@@ -59,7 +59,7 @@ export type QueryClient = vueQuery.QueryClient
 const DEFAULT_QUERY_STALE_TIME_MS = Infinity
 const DEFAULT_QUERY_PERSIST_TIME_MS = 30 * 24 * 60 * 60 * 1000 // 30 days
 
-const DEFAULT_BUSTER = 'v1.1'
+const DEFAULT_BUSTER = 'v1.2'
 
 export interface QueryClientOptions<TStorageValue = string> {
   readonly persisterStorage?: AsyncStorage<TStorageValue> & {

diff --git a/app/gui/src/dashboard/components/MarkdownViewer/MarkdownViewer.tsx b/app/gui/src/dashboard/components/MarkdownViewer/MarkdownViewer.tsx
@@ -30,6 +30,9 @@ export function MarkdownViewer(props: MarkdownViewerProps) {
 
   const { data: markdownToHtml } = useSuspenseQuery({
     queryKey: ['markdownToHtml', { text, imgUrlResolver, markedInstance }] as const,
+    meta: { persist: false },
+    gcTime: 0,
+    staleTime: 0,
     queryFn: ({ queryKey: [, args] }) =>
       args.markedInstance.parse(args.text, {
         async: true,
@@ -38,15 +41,10 @@ export function MarkdownViewer(props: MarkdownViewerProps) {
             const href = token.href
 
             token.raw = href
-            token.href = await args
-              .imgUrlResolver(href)
-              .then((url) => {
-                return url
-              })
-              .catch((error) => {
-                logger.error(error)
-                return null
-              })
+            token.href = await args.imgUrlResolver(href).catch((error) => {
+              logger.error(error)
+              return null
+            })
             token.text = getText('arbitraryFetchImageError')
           }
         },

diff --git a/build/build/src/ci_gen/job.rs b/build/build/src/ci_gen/job.rs
@@ -155,15 +155,11 @@ pub fn expose_gui_vars(step: Step) -> Step {
 }
 
 /// Expose variables for debugging purposes.
-pub fn expose_debugging_vars(os: OS, step: Step) -> Step {
+pub fn expose_debugging_vars(step: Step) -> Step {
     use crate::ide::web::env::*;
-    match os {
-        OS::Windows => step
-            .with_secret_exposed(secret::SENTRY_AUTH_TOKEN)
-            .with_variable_exposed(ENSO_CLOUD_SENTRY_ORGANIZATION)
-            .with_variable_exposed(ENSO_CLOUD_SENTRY_PROJECT),
-        _ => step,
-    }
+    step.with_secret_exposed(secret::SENTRY_AUTH_TOKEN)
+        .with_variable_exposed(ENSO_CLOUD_SENTRY_ORGANIZATION)
+        .with_variable_exposed(ENSO_CLOUD_SENTRY_PROJECT)
 }
 
 #[derive(Clone, Copy, Debug)]
@@ -582,7 +578,7 @@ pub enum PackagingTarget {
 pub fn prepare_packaging_steps(os: OS, step: Step, packaging_target: PackagingTarget) -> Vec<Step> {
     let step = expose_gui_vars(step);
     let step = if packaging_target == PackagingTarget::Release {
-        expose_debugging_vars(os, step)
+        expose_debugging_vars(step)
     } else {
         step
     };

diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Errors/Common.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Errors/Common.enso
@@ -201,7 +201,7 @@ type No_Such_Method
     to_display_text self =
         target_name =
           is_poly = Meta.is_polyglot self.target
-          is_fn = Meta.type_of self.target == Function
+          is_fn = Meta.is_same_object Function (Meta.type_of self.target)
           if is_poly then "type " + self.target.to_display_text else
              if is_fn then self.target.to_text else
                 "type " + (Meta.type_of self.target).to_display_text

diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoMultiValue.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoMultiValue.java
@@ -42,7 +42,6 @@
 public final class EnsoMultiValue extends EnsoObject {
   private final EnsoMultiType dispatch;
   private final EnsoMultiType extra;
-
   private final int firstDispatch;
 
   @CompilationFinal(dimensions = 1)