Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into Peter_Kulko/merge-m…
Browse files Browse the repository at this point in the history
…aster-in-alpha
  • Loading branch information
PKulkoRaccoonGang committed Nov 26, 2024
2 parents 4274e5c + 8b20f9f commit e59457d
Show file tree
Hide file tree
Showing 43 changed files with 31,525 additions and 30,450 deletions.
15 changes: 4 additions & 11 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ const path = require('path');
module.exports = {
extends: [
'@edx/eslint-config',
'plugin:import/typescript',
],
parser: '@babel/eslint-parser',
plugins: ['@typescript-eslint'],
parser: '@typescript-eslint/parser',
parserOptions: {
requireConfigFile: true,
babelOptions: {
Expand All @@ -30,7 +30,9 @@ module.exports = {
'**/*.stories.jsx',
'src/setupTest.ts',
'**/*.test.jsx',
'**/*.test.tsx',
'**/*.test.js',
'**/*.test.ts',
'config/*.js',
'*.config.ts',
'*.config.*.js',
Expand Down Expand Up @@ -62,13 +64,4 @@ module.exports = {
globals: {
newrelic: false,
},
overrides: [
{
files: ['**/*.ts', '**/*.tsx'],
extends: 'airbnb-typescript',
parserOptions: {
project: './tsconfig.json',
},
},
],
};
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: 2
updates:
# Adding new check for github-actions
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
8 changes: 4 additions & 4 deletions .github/workflows/analyze-dependents.yml
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ jobs:
with:
args: zip -qq -r dependent-usage-analyzer/dependent-projects.zip dependent-usage-analyzer/.projects
- name: Upload dependent projects checkouts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: dependent-project-checkouts
path: dependent-usage-analyzer/dependent-projects.zip
Expand All @@ -230,7 +230,7 @@ jobs:
run: npm ci
working-directory: dependent-usage-analyzer
- name: Download dependent project checkouts
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: dependent-project-checkouts
path: dependent-usage-analyzer
Expand All @@ -247,7 +247,7 @@ jobs:
run: npm run analyze .projects -- --out "${GITHUB_WORKSPACE}/dependent-usage.json"
working-directory: dependent-usage-analyzer
- name: Upload analysis output
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: dependent-usage-json
path: dependent-usage.json
Expand All @@ -267,7 +267,7 @@ jobs:
with:
node-version: ${{ env.NODE_VER }}
- name: Download analysis output
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: dependent-usage-json
- name: Create pull request for dependent project usages
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,10 @@ jobs:
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Setup Nodejs Env
run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
- name: Setup Nodejs
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{env.NODE_VER }}
node-version-file: '.nvmrc'
- name: Install dependencies
run: npm ci
- name: Check Types
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18
20
File renamed without changes.
1 change: 0 additions & 1 deletion dependent-usage-analyzer/checkout-dependents.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ mkdir .projects
git clone git@github.com:openedx/frontend-component-header.git --depth 1
git clone git@github.com:openedx/frontend-enterprise.git --depth 1
git clone git@github.com:openedx/frontend-learner-portal-base.git --depth 1
git clone git@github.com:edx/frontend-lib-content-components.git --depth 1
git clone git@github.com:edx/frontend-lib-special-exams.git --depth 1
git clone git@github.com:openedx/frontend-platform.git --depth 1
git clone git@github.com:openedx/frontend-template-application.git --depth 1
Expand Down
Loading

0 comments on commit e59457d

Please sign in to comment.