Skip to content

Commit 6c3d90f

Browse files
committed
Merge branch 'main' into ad-sync
2 parents ba0fd6b + 6a0baa1 commit 6c3d90f

11 files changed

+93
-159
lines changed

.github/workflows/buildAndPublish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
persist-credentials: false
4444

4545
# Check for changes in the src directory excluding .md files
46-
- uses: navikt/sf-platform/.github/actions/checkForPackageChanges@d6f0aae98bc4187fcf85b6769ca3534838e76c95
46+
- uses: navikt/sf-platform/.github/actions/checkForPackageChanges@4591965e00c659878b6671ad54156e002d4709af
4747
id: checkChanges
4848

4949
buildAndPublish:
@@ -155,14 +155,14 @@ jobs:
155155
156156
- name: Push logged metrics
157157
if: always() # Always push metrics regardless of build success
158-
uses: navikt/sf-platform/.github/actions/pushLoggedMetrics@d6f0aae98bc4187fcf85b6769ca3534838e76c95
158+
uses: navikt/sf-platform/.github/actions/pushLoggedMetrics@4591965e00c659878b6671ad54156e002d4709af
159159
with:
160160
metricsKey: ${{ secrets.METRICS_KEYS }}
161161

162162
# Upload build artifacts and logs if present
163163
- name: Upload Artifacts and Logs
164164
if: steps.build.outputs.artifactsFound == 'true'
165-
uses: navikt/sf-platform/.github/actions/uploadWorkflowArtifactsAndLogs@d6f0aae98bc4187fcf85b6769ca3534838e76c95
165+
uses: navikt/sf-platform/.github/actions/uploadWorkflowArtifactsAndLogs@4591965e00c659878b6671ad54156e002d4709af
166166
with:
167167
artifactName: build-artifacts
168168
uploadArtifacts: true

.github/workflows/ciCreatePlatformPoolScheduled.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
secrets:
1919
METRICS_KEY: ${{ secrets.METRICS_KEYS }}
2020
DEV_HUB_SFDX_URL: ${{ secrets.SF_DEVHUB_URL }}
21+
CRM_PACKAGE_KEY: ${{ secrets.PACKAGE_KEY }}
2122
permissions:
2223
contents: read
2324
packages: read

.github/workflows/ciStaticCodeValidation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
fi
4848
4949
- name: Cache npm (sf CLI)
50-
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809
50+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
5151
with:
5252
path: ~/.npm
5353
key: npm-${{ runner.os }}-sf-cli-$SF_CLI_VERSION-${{ steps.cachekey.outputs.suffix }}
@@ -90,7 +90,7 @@ jobs:
9090

9191
- name: Prettier Check
9292
if: ${{ !cancelled() && steps.paths.outcome == 'success' }}
93-
uses: navikt/sf-platform/.github/actions/prettierCheck@d6f0aae98bc4187fcf85b6769ca3534838e76c95
93+
uses: navikt/sf-platform/.github/actions/prettierCheck@4591965e00c659878b6671ad54156e002d4709af
9494
with:
9595
pathToValidate: ${{ steps.paths.outputs.prettierPathsToValidate }}
9696

.github/workflows/createRelease.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,6 @@ jobs:
272272
echo "::endgroup::"
273273
274274
- name: Push logged metrics
275-
uses: navikt/sf-platform/.github/actions/pushLoggedMetrics@d6f0aae98bc4187fcf85b6769ca3534838e76c95
275+
uses: navikt/sf-platform/.github/actions/pushLoggedMetrics@4591965e00c659878b6671ad54156e002d4709af
276276
with:
277277
metricsKey: ${{ secrets.METRICS_KEYS }}

.github/workflows/quickbuildOnPush.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
with:
2929
fetch-depth: 0
3030
persist-credentials: false
31-
- uses: navikt/sf-platform/.github/actions/checkForPackageChanges@d6f0aae98bc4187fcf85b6769ca3534838e76c95
31+
- uses: navikt/sf-platform/.github/actions/checkForPackageChanges@4591965e00c659878b6671ad54156e002d4709af
3232
id: checkChanges
3333

3434
quickBuild:
@@ -64,7 +64,7 @@ jobs:
6464

6565
- name: Upload artifacts and logs
6666
if: always()
67-
uses: navikt/sf-platform/.github/actions/uploadWorkflowArtifactsAndLogs@d6f0aae98bc4187fcf85b6769ca3534838e76c95
67+
uses: navikt/sf-platform/.github/actions/uploadWorkflowArtifactsAndLogs@4591965e00c659878b6671ad54156e002d4709af
6868
with:
6969
artifactName: build-artifacts
7070
uploadArtifacts: true

.github/workflows/releaseToDev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,6 @@ jobs:
7373
auth_token: ${{ secrets.GITHUB_TOKEN }}
7474

7575
- name: Push logged metrics
76-
uses: navikt/sf-platform/.github/actions/pushLoggedMetrics@d6f0aae98bc4187fcf85b6769ca3534838e76c95
76+
uses: navikt/sf-platform/.github/actions/pushLoggedMetrics@4591965e00c659878b6671ad54156e002d4709af
7777
with:
7878
metricsKey: ${{ secrets.METRICS_KEYS }}

.github/workflows/releaseToProd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,6 @@ jobs:
5454
auth_token: ${{ secrets.GITHUB_TOKEN }}
5555

5656
- name: Push logged metrics
57-
uses: navikt/sf-platform/.github/actions/pushLoggedMetrics@d6f0aae98bc4187fcf85b6769ca3534838e76c95
57+
uses: navikt/sf-platform/.github/actions/pushLoggedMetrics@4591965e00c659878b6671ad54156e002d4709af
5858
with:
5959
metricsKey: ${{ secrets.METRICS_KEYS }}

.github/workflows/validatePackageChangesOnPr.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
fetch-depth: 0
3333
persist-credentials: false
3434

35-
- uses: navikt/sf-platform/.github/actions/checkForPackageChanges@d6f0aae98bc4187fcf85b6769ca3534838e76c95
35+
- uses: navikt/sf-platform/.github/actions/checkForPackageChanges@4591965e00c659878b6671ad54156e002d4709af
3636
id: checkChanges
3737

3838
validateChanges:
@@ -107,7 +107,7 @@ jobs:
107107
fi
108108
109109
- name: Push logged metrics
110-
uses: navikt/sf-platform/.github/actions/pushLoggedMetrics@d6f0aae98bc4187fcf85b6769ca3534838e76c95
110+
uses: navikt/sf-platform/.github/actions/pushLoggedMetrics@4591965e00c659878b6671ad54156e002d4709af
111111
with:
112112
metricsKey: ${{ secrets.METRICS_KEYS }}
113113

@@ -121,6 +121,6 @@ jobs:
121121
pull-requests: write
122122
steps:
123123
- name: Set pull request to draft
124-
uses: navikt/sf-platform/.github/actions/setPrToDraft@d6f0aae98bc4187fcf85b6769ca3534838e76c95
124+
uses: navikt/sf-platform/.github/actions/setPrToDraft@4591965e00c659878b6671ad54156e002d4709af
125125
with:
126126
pullRequestId: ${{ github.event.pull_request.node_id }}

.github/workflows/zizmor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
persist-credentials: false
2929

3030
- name: Install the latest version of uv
31-
uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4
31+
uses: astral-sh/setup-uv@3259c6206f993105e3a61b142c2d97bf4b9ef83d
3232

3333
- name: Run zizmor
3434
run: uvx zizmor --format sarif . > results.sarif

0 commit comments

Comments
 (0)