Merge branch 'main' into padms/2014

equinor · Mar 1, 2024 · 2db4e72 · 2db4e72
2 parents e833e16 + aae7189
commit 2db4e72
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 34 deletions.
diff --git a/.github/workflows/deploy-v3/action.yaml b/.github/workflows/deploy-v3/action.yaml
@@ -129,21 +129,7 @@ runs:
         component=${{ inputs.datasetName == 'global-development' && 'studiov3-global-development' || format('{0}{1}', 'studio-', inputs.datasetName) }}
         echo "Component name is $component"
         echo "COMPONENT_NAME=$component" >> $GITHUB_ENV
-      # PLAYGROUND CLUSTER
-    - name: Deploy to Radix Playground 🚀
-      id: deploy-playground
-      if: "${{ inputs.deployToBothClusters }}"
-      uses: equinor/radix-github-actions@master
-      with:
-        args: >
-          create job
-          deploy
-          --token-environment
-          --context playground
-          --component $COMPONENT_NAME
-          -a equinor-web-sites
-          -e ${{ inputs.environment }}
-          -f
+
       # MAIN CLUSTER
     - name: Deploy to Radix c2 🚀
       id: deploy-c2

diff --git a/.github/workflows/deploy-websites/action.yaml b/.github/workflows/deploy-websites/action.yaml
@@ -125,22 +125,6 @@ runs:
         echo "Component name is $component"
         echo "COMPONENT_NAME=$component" >> $GITHUB_ENV
 
-    # PLAYGROUND CLUSTER
-    - name: Deploy to Radix Playground 🚀
-      id: deploy-playground
-      if: '${{ inputs.deployToBothClusters }}'
-      uses: equinor/radix-github-actions@master
-      with:
-        args: >
-          create job
-          deploy
-          --token-environment
-          --context playground
-          --component $COMPONENT_NAME
-          -a equinor-web-sites
-          -e ${{ inputs.environment }}
-          -f
-
     # MAIN CLUSTER
     - name: Deploy to Radix c2 🚀
       id: deploy-c2

diff --git a/web/components/src/Link/ButtonLink.tsx b/web/components/src/Link/ButtonLink.tsx
@@ -33,9 +33,7 @@ export const ButtonLink = forwardRef<HTMLAnchorElement, ButtonLinkProps>(functio
       locale={locale}
       forwardedAs={NextLink}
       prefetch={false}
-      href={{
-        pathname: href,
-      }}
+      href={href}
       color="secondary"
       variant="outlined"
       ref={ref}