Skip to content

Commit ca90161

Browse files
Merge pull request #722 from freeCodeCamp/main
Create a new pull request by comparing changes across two branches
2 parents 7f4ed7a + fc9b827 commit ca90161

File tree

925 files changed

+70176
-4517
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

925 files changed

+70176
-4517
lines changed

.github/workflows/e2e-playwright.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ on:
1414
- 'next-**'
1515
- 'e2e-**'
1616

17+
concurrency:
18+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
19+
cancel-in-progress: true
20+
1721
jobs:
1822
build-client:
1923
name: Build Client

.github/workflows/e2e-third-party.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ on:
1111
# to test this ad-hoc
1212
workflow_dispatch:
1313

14+
concurrency:
15+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
16+
cancel-in-progress: true
17+
1418
jobs:
1519
do-everything:
1620
name: Build & Test

.github/workflows/e2e-with-new-api.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ on:
1313
- 'next-**'
1414
- 'e2e-**'
1515

16+
concurrency:
17+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
18+
cancel-in-progress: true
19+
1620
jobs:
1721
build-client:
1822
name: Build Client

.github/workflows/github-labeler.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ on:
55
permissions:
66
contents: read
77

8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
10+
cancel-in-progress: true
11+
812
jobs:
913
triage:
1014
permissions:

.github/workflows/i18n-validate-builds.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ on:
44
branches:
55
- main
66

7+
concurrency:
8+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
9+
cancel-in-progress: true
10+
711
jobs:
812
ci:
913
name: Validate i18n Builds

.github/workflows/i18n-validate-prs.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ on:
44
branches:
55
- main
66

7+
concurrency:
8+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
9+
cancel-in-progress: true
10+
711
jobs:
812
ci:
913
name: Validate i18n Builds

.github/workflows/node.js-tests.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ on:
1515
merge_group:
1616
types: [checks_requested]
1717

18+
concurrency:
19+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
20+
cancel-in-progress: true
21+
1822
permissions:
1923
contents: read
2024

.github/workflows/temporary-container-checks.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# TODO: remove this workflow once we use containers in the other workflows. This
22
# workflow is intended to prevent regressions until that has been achieved.
3-
name: CI - E2E - Containers
3+
name: CI - E2E - Containers - Temp
44
on:
55
workflow_dispatch:
66
workflow_run:
@@ -16,6 +16,10 @@ on:
1616
- 'next-**'
1717
- 'e2e-**'
1818

19+
concurrency:
20+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
21+
cancel-in-progress: true
22+
1923
jobs:
2024
build-client:
2125
name: Build Client (Container)

client/config/cert-and-project-map.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const takeHomeBase = '/learn/coding-interview-prep/take-home-projects';
3333
const foundationalCSharpBase =
3434
'/learn/foundational-c-sharp-with-microsoft/foundational-c-sharp-with-microsoft-certification-exam';
3535
const upcomingPythonBase = '/learn/upcoming-python';
36-
const frontEndDevelopmentBase = '/learn/front-end-development';
36+
const fullStackDeveloperBase = '/learn/full-stack-developer';
3737
const a2EnglishBase = '/learn/a2-english-for-developers';
3838
const b1EnglishBase = '/learn/b1-english-for-developers';
3939
const legacyFrontEndBase = feLibsBase;
@@ -800,14 +800,14 @@ const allStandardCerts = [
800800
// Upcoming Certifications
801801
{
802802
id: '64514fda6c245de4d11eb7bb',
803-
title: 'Front End Development',
804-
certSlug: Certification.FrontEndDevelopment,
803+
title: 'Certified Full Stack Developer',
804+
certSlug: Certification.FullStackDeveloper,
805805
projects: [
806806
{
807807
id: '645147516c245de4d11eb7ba',
808-
title: 'Front End Development Certification Exam',
809-
link: `${frontEndDevelopmentBase}/front-end-development-certification-exam/front-end-development-certification-exam`,
810-
certSlug: Certification.FrontEndDevelopment
808+
title: 'Certified Full Stack Developer Exam',
809+
link: `${fullStackDeveloperBase}/exam-certified-full-stack-developer/exam-certified-full-stack-developer`,
810+
certSlug: Certification.FullStackDeveloper
811811
}
812812
]
813813
},

client/gatsby-node.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,11 +263,13 @@ exports.createSchemaCustomization = ({ actions }) => {
263263
blockType: String
264264
blockLayout: String
265265
challengeFiles: [FileContents]
266+
chapter: String
266267
explanation: String
267268
notes: String
268269
url: String
269270
assignments: [String]
270271
prerequisites: [PrerequisiteChallenge]
272+
module: String
271273
msTrophyId: String
272274
fillInTheBlank: FillInTheBlank
273275
scene: Scene

0 commit comments

Comments
 (0)