Merge remote-tracking branch 'origin/master' into staging

# Conflicts: # .github/workflows/lint.yml
kir-dev · Mar 6, 2024 · cb3e5ae · cb3e5ae
2 parents f5bce1a + eabf894
commit cb3e5ae
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -20,22 +20,25 @@ jobs:
         working-directory: ./frontend
 
     steps:
-    - name: Check out Git repository
-      uses: actions/checkout@v3
+      - name: Check out Git repository
+        uses: actions/checkout@v3
 
-    - name: Set up Node.js 20
-      uses: actions/setup-node@v3
-      with:
-        node-version: 20
+      - name: Set up Node.js 20
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20
 
-    - name: Install Node.js dependencies
-      run: yarn install
+      - name: Set yarn version
+        run: yarn set version 1.22.17
 
-    - name: ESLint
-      run: yarn lint:eslint
+      - name: Install Node.js dependencies
+        run: yarn install --frozen-lockfile
 
-    - name: Prettier
-      run: yarn lint:eslint
+      - name: ESLint
+        run: yarn lint:eslint
 
-    - name: TSC
-      run: yarn lint:typescript
+      - name: Prettier
+        run: yarn lint:eslint
+
+      - name: TSC
+        run: yarn lint:typescript
diff --git a/frontend/package.json b/frontend/package.json
@@ -87,5 +87,5 @@
       "last 1 safari version"
     ]
   },
-  "packageManager": "yarn@3.2.1"
+  "packageManager": "yarn@1.22.17"
 }