Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
76fb2a2
build(Application): Generate messages when new PR is made
Aaron-Detre Mar 12, 2025
7e486c6
Updated messages
github-actions[bot] Mar 13, 2025
b5e1bac
Run workflows sequentially
Aaron-Detre Mar 14, 2025
041b57e
Merge branch 'issue-2103-generate-messages' of https://github.com/WIS…
Aaron-Detre Mar 14, 2025
5fb30c7
Combine messages, tests, and build into one yml with three sequential…
Aaron-Detre Mar 14, 2025
b2b39b2
Merge branch 'issue-2103-generate-messages' of https://github.com/WIS…
Aaron-Detre Mar 14, 2025
3d8c14d
Workflows for develop branch and everything but develop branch
Aaron-Detre Mar 14, 2025
8781995
Deleted single job combined workflow
Aaron-Detre Mar 14, 2025
6ba4eba
Test commit dev PR messages changes
Aaron-Detre Mar 17, 2025
880dd46
Test commit 1
Aaron-Detre Mar 18, 2025
20a0998
Test commit 2 (which line is causing the error?)
Aaron-Detre Mar 18, 2025
540d516
Test commit 3
Aaron-Detre Mar 18, 2025
5e7c0fd
Updated messages
github-actions[bot] Mar 18, 2025
fe0a79a
Test commit 4 (no messages changes)
Aaron-Detre Mar 18, 2025
f57fd6e
Merge branch 'workflow-testing' of https://github.com/WISE-Community/…
Aaron-Detre Mar 18, 2025
03b9442
Test commit 5 (no messages changes)
Aaron-Detre Mar 18, 2025
9dd1c25
Test commit 6
Aaron-Detre Mar 18, 2025
411b498
Test commit 7 (was being stupid)
Aaron-Detre Mar 18, 2025
2bae5f0
Test commit 8 (dev pr messages changes)
Aaron-Detre Mar 18, 2025
355dbad
messages changes...
Aaron-Detre Mar 18, 2025
cd836b4
Updated messages
github-actions[bot] Mar 18, 2025
20bf492
Test commit 9 (other branch, messages changes)
Aaron-Detre Mar 18, 2025
3e5625c
Merge branch 'workflow-testing' of https://github.com/WISE-Community/…
Aaron-Detre Mar 18, 2025
ee8c531
Updated messages
github-actions[bot] Mar 18, 2025
f095022
Test commit 10
Aaron-Detre Mar 18, 2025
684e44d
Finished testing - cleanup
Aaron-Detre Mar 18, 2025
854b7ab
Updated messages
github-actions[bot] Mar 18, 2025
928b650
Recreated single job workflows as reusable workflows
Aaron-Detre Apr 3, 2025
b60246c
Use reusble workflows in real workflows
Aaron-Detre Apr 3, 2025
02adca4
Workflow amends current commit instead of creating new commit for mes…
Aaron-Detre Apr 3, 2025
75a91e0
Added secrets as inputs to reusable workflows
Aaron-Detre Apr 3, 2025
ac47013
Provided secrets as inputs to reusable workflows
Aaron-Detre Apr 3, 2025
c2bf364
Test commit 11
Aaron-Detre Apr 3, 2025
11056d0
Test Commit 12
Aaron-Detre Apr 3, 2025
bb044d1
Renamed secrets to prevent collisions with system reserved names
Aaron-Detre Apr 3, 2025
13c332a
Switched back to separate messages commit for now
Aaron-Detre Apr 3, 2025
12f4e5d
Updated messages
github-actions[bot] Apr 3, 2025
1b7d622
Test commit 13
Aaron-Detre Apr 3, 2025
acd9f5f
Merge branch 'issue-2103-generate-messages' of https://github.com/WIS…
Aaron-Detre Apr 3, 2025
bee710c
Forgot to change secret names in other branch workflows file
Aaron-Detre Apr 3, 2025
25a86db
Updated messages
github-actions[bot] Apr 3, 2025
4491727
Test Commit 14
Aaron-Detre Apr 3, 2025
d510b05
Merge branch 'issue-2103-generate-messages' of https://github.com/WIS…
Aaron-Detre Apr 3, 2025
9d55063
Updated messages
github-actions[bot] Apr 3, 2025
d53b759
Test Commit 15
Aaron-Detre Apr 3, 2025
1b069b0
Test Commit 16
Aaron-Detre Apr 3, 2025
b293cc5
Remove unnessary flag
hirokiterashima Apr 3, 2025
e92d49c
Changed referenced branch from issue-2103-generate-messages to develop
Aaron-Detre Apr 3, 2025
6b2e089
Merge branch 'develop' into issue-2103-generate-messages
hirokiterashima Apr 3, 2025
a682430
Added back standalone flag
hirokiterashima Apr 3, 2025
8ae6696
Updated messages
github-actions[bot] Apr 3, 2025
f55b710
Merge branch 'issue-2103-generate-messages' of https://github.com/WIS…
Aaron-Detre Apr 3, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions .github/workflows/code-build.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
name: Build
name: Code build
on:
pull_request:
branches:
- develop
workflow_call:
secrets:
aws_key:
required: true
aws_secret_key:
required: true
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-access-key-id: ${{ secrets.aws_key}}
aws-secret-access-key: ${{ secrets.aws_secret_key}}
aws-region: us-west-1
- name: Run CodeBuild
id: code-build
Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/develop-workflows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Develop branch PR workflows
on:
pull_request:
branches:
- develop
jobs:
generate-messages:
uses: WISE-Community/WISE-Client/.github/workflows/generate-messages.yml@develop
secrets:
token: ${{ secrets.GITHUB_TOKEN }}

test-coverage:
needs: generate-messages
uses: WISE-Community/WISE-Client/.github/workflows/test-coverage.yml@develop
secrets:
test_reporter: ${{secrets.CC_TEST_REPORTER_ID}}

build:
needs: [generate-messages, test-coverage]
uses: WISE-Community/WISE-Client/.github/workflows/code-build.yml@develop
secrets:
aws_key: ${{secrets.AWS_ACCESS_KEY_ID}}
aws_secret_key: ${{secrets.AWS_SECRET_ACCESS_KEY}}
47 changes: 47 additions & 0 deletions .github/workflows/generate-messages.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Generate messages
on:
workflow_call:
secrets:
token:
required: true
jobs:
generate-messages:
runs-on: ubuntu-latest
strategy:
matrix:
node-versions: [20.x]
steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.head_ref || github.ref_name }}
fetch-depth: 0
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/checkout@v4
with:
node-version: ${{ matrix.node-version }}
- name: Install dependencies
run: npm ci
- name: Checkout current branch
run: git checkout ${{ github.head_ref || github.ref_name }}
- name: Generate messages
run: npm run extract-i18n
- name: Check for changes
id: check-changes
run: |
DIFF=$(git diff ${{ github.head_ref || github.ref_name }})
if [ -z "$DIFF" ]; then
echo "NO_CHANGES=true" >> $GITHUB_ENV
else
echo "NO_CHANGES=false" >> $GITHUB_ENV
fi
- name: Commit messages
if: env.NO_CHANGES == 'false'
run: |
git config --global user.name 'github-actions[bot]'
git config --global user.email 'github-actions[bot]@users.noreply.github.com'
git add src/messages.xlf
git commit -m "Updated messages"
git push
env:
GITHUB_TOKEN: ${{ secrets.token }}
19 changes: 19 additions & 0 deletions .github/workflows/other-branch-workflows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Non-develop branch PR workflows
on:
pull_request:
branches:
- '*'
- '*/*'
- '**'
- '!develop'
jobs:
generate-messages:
uses: WISE-Community/WISE-Client/.github/workflows/generate-messages.yml@develop
secrets:
token: ${{ secrets.GITHUB_TOKEN }}

test-coverage:
needs: generate-messages
uses: WISE-Community/WISE-Client/.github/workflows/test-coverage.yml@develop
secrets:
test_reporter: ${{secrets.CC_TEST_REPORTER_ID}}
13 changes: 5 additions & 8 deletions .github/workflows/test-coverage.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Test coverage
on:
push:
branches: [develop]
pull_request:
branches: [develop]
workflow_call:
secrets:
test_reporter:
required: true
jobs:
test-coverage:
runs-on: ubuntu-latest
Expand All @@ -23,7 +20,7 @@ jobs:
- run: npm ci
- uses: paambaati/[email protected]
env:
CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}}
CC_TEST_REPORTER_ID: ${{secrets.test_reporter}}
with:
coverageCommand: npm run test-coverage
coverageLocations: ${{github.workspace}}/coverage/lcov.info:lcov
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import { TeacherProjectService } from '../../../services/teacherProjectService';

@Component({
selector: 'edit-open-response-advanced',
templateUrl: 'edit-open-response-advanced.component.html',
styleUrls: ['edit-open-response-advanced.component.scss'],
standalone: false
standalone: false,
styleUrl: 'edit-open-response-advanced.component.scss',
templateUrl: 'edit-open-response-advanced.component.html'
})
export class EditOpenResponseAdvancedComponent extends EditAdvancedComponentComponent {
allowedConnectedComponentTypes = ['OpenResponse'];
Expand Down