Skip to content

Commit 03acc73

Browse files
authored
Merge branch 'openedx:master' into master
2 parents 79e024f + acf5398 commit 03acc73

21 files changed

+41560
-14048
lines changed

.env.development

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ CSRF_TOKEN_API_PATH=/csrf/api/v1/token
55
ECOMMERCE_BASE_URL=http://localhost:18130
66
LANGUAGE_PREFERENCE_COOKIE_NAME=openedx-language-preference
77
LMS_BASE_URL=http://localhost:18000
8+
STUDIO_BASE_URL=http://localhost:18010
89
LOGIN_URL=http://localhost:18000/login
910
LOGOUT_URL=http://localhost:18000/logout
1011
MARKETING_SITE_BASE_URL=http://localhost:18000

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Run the workflow that adds new tickets that are either:
2+
# - labelled "DEPR"
3+
# - title starts with "[DEPR]"
4+
# - body starts with "Proposal Date" (this is the first template field)
5+
# to the org-wide DEPR project board
6+
7+
name: Add newly created DEPR issues to the DEPR project board
8+
9+
on:
10+
issues:
11+
types: [opened]
12+
13+
jobs:
14+
routeissue:
15+
uses: openedx/.github/.github/workflows/add-depr-ticket-to-depr-board.yml@master
16+
secrets:
17+
GITHUB_APP_ID: ${{ secrets.GRAPHQL_AUTH_APP_ID }}
18+
GITHUB_APP_PRIVATE_KEY: ${{ secrets.GRAPHQL_AUTH_APP_PEM }}
19+
SLACK_BOT_TOKEN: ${{ secrets.SLACK_ISSUE_BOT_TOKEN }}

.github/workflows/ci.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
name: Default CI
2-
on: [push, pull_request]
2+
on:
3+
push:
4+
branches:
5+
- master
6+
pull_request:
7+
branches:
8+
- '**'
39
jobs:
4-
build:
10+
tests:
511
runs-on: ubuntu-latest
12+
strategy:
13+
matrix:
14+
node: [16]
615
steps:
716
- name: Checkout
817
uses: actions/checkout@v2
@@ -11,7 +20,7 @@ jobs:
1120
- name: Setup Nodejs
1221
uses: actions/setup-node@v2
1322
with:
14-
node-version: 12
23+
node-version: ${{ matrix.node }}
1524
- name: Install dependencies
1625
run: npm ci
1726
- name: Validate package-lock.json changes
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#check package-lock file version
2+
3+
name: lockfileVersion check
4+
5+
on:
6+
push:
7+
branches:
8+
- master
9+
pull_request:
10+
11+
jobs:
12+
version-check:
13+
uses: openedx/.github/.github/workflows/lockfileversion-check.yml@master
14+

.github/workflows/release.yml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,38 @@ name: Release CI
22
on:
33
push:
44
branches:
5-
- master
5+
- master
66
jobs:
77
release:
88
name: Release
99
runs-on: ubuntu-latest
1010
steps:
11-
- name: Checkout
12-
uses: actions/checkout@v2
13-
with:
14-
fetch-depth: 0
15-
- name: Setup Node.js
16-
uses: actions/setup-node@v2
17-
with:
18-
node-version: 12
19-
- name: Install dependencies
20-
run: npm ci
21-
- name: Validate package-lock.json changes
22-
run: make validate-no-uncommitted-package-lock-changes
23-
- name: Lint
24-
run: npm run lint
25-
- name: Test
26-
run: npm run test
27-
- name: i18n_extract
28-
run: npm run i18n_extract
29-
- name: Coverage
30-
uses: codecov/codecov-action@v2
31-
- name: Build
32-
run: npm run build
33-
- name: Release
34-
uses: cycjimmy/semantic-release-action@v2
35-
with:
36-
semantic_version: 16
37-
env:
38-
GITHUB_TOKEN: ${{ secrets.SEMANTIC_RELEASE_GITHUB_TOKEN }}
39-
NPM_TOKEN: ${{ secrets.SEMANTIC_RELEASE_NPM_TOKEN }}
11+
- name: Checkout
12+
uses: actions/checkout@v2
13+
with:
14+
fetch-depth: 0
15+
- name: Setup Node.js
16+
uses: actions/setup-node@v2
17+
with:
18+
node-version: 16
19+
- name: Install dependencies
20+
run: npm ci
21+
- name: Validate package-lock.json changes
22+
run: make validate-no-uncommitted-package-lock-changes
23+
- name: Lint
24+
run: npm run lint
25+
- name: Test
26+
run: npm run test
27+
- name: i18n_extract
28+
run: npm run i18n_extract
29+
- name: Coverage
30+
uses: codecov/codecov-action@v2
31+
- name: Build
32+
run: npm run build
33+
- name: Release
34+
uses: cycjimmy/semantic-release-action@v2
35+
with:
36+
semantic_version: 16
37+
env:
38+
GITHUB_TOKEN: ${{ secrets.SEMANTIC_RELEASE_GITHUB_TOKEN }}
39+
NPM_TOKEN: ${{ secrets.SEMANTIC_RELEASE_NPM_TOKEN }}

.tx/config

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
[main]
22
host = https://www.transifex.com
33

4-
[edx-platform.frontend-component-header]
4+
[o:open-edx:p:edx-platform:r:frontend-component-header]
55
file_filter = src/i18n/messages/<lang>.json
66
source_file = src/i18n/transifex_input.json
77
source_lang = en
8-
type = KEYVALUEJSON
8+
type = KEYVALUEJSON
9+

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ push_translations:
5050

5151
# Pulls translations from Transifex.
5252
pull_translations:
53-
tx pull -f --mode reviewed --language=$(transifex_langs)
53+
tx pull -f --mode reviewed --languages=$(transifex_langs)
5454

5555
# This target is used by Travis.
5656
validate-no-uncommitted-package-lock-changes:

0 commit comments

Comments
 (0)