Merge branch 'main' into dependabot/npm_and_yarn/lwc/eslint-plugin-lwc-2.1.0

Author: torhakon

.github/actions/authenticateOrg/action.yml

@@ -31,29 +31,24 @@ runs:
         echo "${yellow}${bold}Authenticate org 🔒${reset}"
         echo "${yellow}${bold}------------------------------------------------------------------------------------------${reset}"
 
-        command=(sf org login sfdx-url --sfdx-url-stdin --alias ${ALIAS})
+        command=(sf org login sfdx-url --sfdx-url-stdin --json --alias ${ALIAS})
 
-        if [ "${SET_DEFAULT_USERNAME}" == "true" ];
-        then
-          command+=(--set-default)
+        if [ "${SET_DEFAULT_USERNAME}" == "true" ]; then
+            command+=(--set-default)
         fi
 
-        if [ "${SET_DEFAULT_DEVHUB_USERNAME}" == "true" ];
-        then
-          command+=(--set-default-dev-hub)
+        if [ "${SET_DEFAULT_DEVHUB_USERNAME}" == "true" ]; then
+            command+=(--set-default-dev-hub)
         fi
 
-        command+=(--json)
+        echo "${AUTH_URL}" | "${command[@]}" > loginResult.json
 
-         echo "${AUTH_URL}" | "${command[@]}" > loginResult.json
-
-        if [ "$(jq .status loginResult.json)" -eq 1 ];
-        then
-          echo "::error title=Failed to authenticate::$(jq .message loginResult.json)"
-          rm -f ./loginResult.json
-          exit 1
+        if [ "$(jq .status loginResult.json)" -eq 1 ]; then
+            echo "::error title=Failed to authenticate::$(jq .message loginResult.json)"
+            rm -f ./loginResult.json
+            exit 1
         else
-          echo "${green}${bold}Authenticate org successful.${reset}"
+            echo "${green}${bold}Authenticate org successful.${reset}"
         fi
 
         echo "${yellow}${bold}------------------------------------------------------------------------------------------${reset}"

.github/workflows/buildAndPublish.yml

@@ -102,7 +102,7 @@ jobs:
           registry-url: "https://npm.pkg.github.com"
 
       - name: Authenticate DevHub
-        uses: navikt/sf-platform/.github/actions/authenticateOrg@f318a266c5a7add9c091f9d3480164fed8abfc08
+        uses: navikt/sf-platform/.github/actions/authenticateOrg@a0f22eb5d1c9d1ec5e345c04c96a786bd150042a
         with:
           auth-url: ${{ secrets.SF_DEVHUB_URL }}
           alias: "devhub"

.github/workflows/ciCreatePlatformPool.yml

@@ -48,7 +48,7 @@ jobs:
           version: ${{ vars.SF_CLI_VERSION }}
 
       - name: "Authenticate Dev Hub"
-        uses: navikt/sf-platform/.github/actions/authenticateOrg@f318a266c5a7add9c091f9d3480164fed8abfc08
+        uses: navikt/sf-platform/.github/actions/authenticateOrg@a0f22eb5d1c9d1ec5e345c04c96a786bd150042a
         with:
           auth-url: ${{ secrets.SF_DEVHUB_URL }}
           alias: devhub
@@ -140,7 +140,7 @@ jobs:
           CLEAR_POOLS: ${{ inputs.clearPools }}
 
       - name: "Authenticate Dev Hub"
-        uses: navikt/sf-platform/.github/actions/authenticateOrg@f318a266c5a7add9c091f9d3480164fed8abfc08
+        uses: navikt/sf-platform/.github/actions/authenticateOrg@a0f22eb5d1c9d1ec5e345c04c96a786bd150042a
         with:
           auth-url: ${{ secrets.SF_DEVHUB_URL }}
           alias: devhub