chore: merge 3.6 into main

Conflicts:
- api/sessiontokenloginprovider_test.go
- apiserver/common/charms/mocks/mocks.go
- apiserver/facades/agent/uniter/uniter_test.go
- apiserver/facades/controller/crosscontroller/register.go
- cmd/output/progress/mocks/clock_mock.go
- container/lxd/mocks/clock_mock.go
- go.mod
- internal/provider/openstack/provider.go
- internal/worker/storageprovisioner/mock_test.go
- scripts/win-installer/setup.iss
- service/snap/clock_mock_test.go
- snap/snapcraft.yaml
- version/version.go
- worker/changestream/clock_mock_test.go
- worker/changestream/stream/clock_mock_test.go
- worker/dbaccessor/clock_mock_test.go
- worker/filenotifywatcher/clock_mock_test.go
- worker/leaseexpiry/clock_mock_test.go
- worker/querylogger/clock_mock_test.go

Author: hpidcock

.github/workflows/build.yml

@@ -35,7 +35,7 @@ jobs:
 
     steps:
     - name: "Checkout"
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: "Set up Go"
       uses: actions/setup-go@v5

.github/workflows/client-tests.yml

@@ -29,7 +29,7 @@ jobs:
 
     steps:
     - name: "Checkout"
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: "Set up Go"
       uses: actions/setup-go@v5

.github/workflows/docs.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Go
         uses: actions/setup-go@v5

.github/workflows/gen.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: "Set up Go"
         uses: actions/setup-go@v5

.github/workflows/license.yml

@@ -20,7 +20,7 @@ jobs:
     if: github.event.pull_request.draft == false
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Set up Go
       uses: actions/setup-go@v5
       with:

.github/workflows/merge.yml

@@ -27,7 +27,7 @@ jobs:
           echo "target=$TARGET_BRANCH" >> "$GITHUB_OUTPUT"
 
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: ${{ steps.branch.outputs.source }}

.github/workflows/microk8s-tests.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
     - name: Checking out repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Set up Go
       uses: actions/setup-go@v5
@@ -130,7 +130,7 @@ jobs:
       if: ${{ failure() }}
 
     - name: Upload debug log
-      uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v2
+      uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v2
       with:
         name: juju-debug-actions
         path: juju-debug.log
@@ -158,7 +158,7 @@ jobs:
       if: ${{ failure() }}
 
     - name: Upload inspect tarball
-      uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v2
+      uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v2
       with:
         name: inspection-report-actions
         path: ./inspection-report-${{ strategy.job-index }}.tar.gz
@@ -174,7 +174,7 @@ jobs:
       if: ${{ failure() }}
 
     - name: Upload kubectl describe
-      uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v2
+      uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v2
       with:
         name: kubectl-describe-actions
         path: describe/*.describe
@@ -192,7 +192,7 @@ jobs:
       if: ${{ failure() }}
 
     - name: Upload kubeflow pod logs
-      uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v2
+      uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v2
       with:
         name: kubectl-stdout-actions
         path: stdout/*.log

.github/workflows/migrate.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Go
         uses: actions/setup-go@v5

.github/workflows/smoke.yml

@@ -29,7 +29,7 @@ jobs:
         sudo DEBIAN_FRONTEND=noninteractive apt install -y expect
 
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Setup LXD
       if: matrix.cloud == 'localhost'

.github/workflows/snap.yml

@@ -33,7 +33,7 @@ jobs:
         echo "/snap/bin" >> $GITHUB_PATH
 
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Setup LXD
       uses: canonical/setup-lxd@4e959f8e0d9c5feb27d44c5e4d9a330a782edee0