Skip to content

Commit 0767596

Browse files
chore: merge main into branch, resolve ci.yml conflict
2 parents a4ac847 + a73769c commit 0767596

1 file changed

Lines changed: 10 additions & 4 deletions

File tree

.github/workflows/ci.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Use Github Personal Access Token
3333
run: git config --global url."https://${{ secrets.GH_PAT }}@github.com/".insteadOf ssh://[email protected]/
3434

35-
- uses: nrwl/nx-set-shas@v3 # nx recipe
35+
- uses: nrwl/nx-set-shas@2e421aafa0e05640f0cd84a7a3521c8c3be44d16 # v3.3.2
3636

3737
- name: Install Dependencies
3838
run: yarn install --frozen-lockfile
@@ -73,7 +73,10 @@ jobs:
7373
registry-url: 'https://registry.npmjs.org'
7474
cache: yarn
7575

76-
- uses: nrwl/nx-set-shas@v3 # nx recipe
76+
- name: Use Github Personal Access Token
77+
run: git config --global url."https://${{ secrets.GH_PAT }}@github.com/".insteadOf ssh://[email protected]/
78+
79+
- uses: nrwl/nx-set-shas@2e421aafa0e05640f0cd84a7a3521c8c3be44d16 # v3.3.2
7780

7881
- name: Install Dependencies
7982
run: yarn install --frozen-lockfile
@@ -107,7 +110,10 @@ jobs:
107110
registry-url: 'https://registry.npmjs.org'
108111
cache: yarn
109112

110-
- uses: nrwl/nx-set-shas@v3 # nx recipe
113+
- name: Use Github Personal Access Token
114+
run: git config --global url."https://${{ secrets.GH_PAT }}@github.com/".insteadOf ssh://[email protected]/
115+
116+
- uses: nrwl/nx-set-shas@2e421aafa0e05640f0cd84a7a3521c8c3be44d16 # v3.3.2
111117

112118
- name: Install Dependencies
113119
run: yarn install --frozen-lockfile
@@ -249,7 +255,7 @@ jobs:
249255
run: yarn install --frozen-lockfile
250256

251257
- name: Run Snyk to check for vulnerabilities
252-
uses: snyk/actions/node@master
258+
uses: snyk/actions/node@cdb760004ba9ea4d525f2e043745dfe85bb9077e # master
253259
env:
254260
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
255261
with:

0 commit comments

Comments
 (0)