diff --git a/.github/workflows/code-build.yml b/.github/workflows/code-build.yml index 14c7f8b6ea4..bdf868bda13 100644 --- a/.github/workflows/code-build.yml +++ b/.github/workflows/code-build.yml @@ -1,8 +1,11 @@ -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 @@ -10,8 +13,8 @@ jobs: - 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 diff --git a/.github/workflows/develop-workflows.yml b/.github/workflows/develop-workflows.yml new file mode 100644 index 00000000000..b892569ca18 --- /dev/null +++ b/.github/workflows/develop-workflows.yml @@ -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}} diff --git a/.github/workflows/generate-messages.yml b/.github/workflows/generate-messages.yml new file mode 100644 index 00000000000..621a25b2028 --- /dev/null +++ b/.github/workflows/generate-messages.yml @@ -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 }} diff --git a/.github/workflows/other-branch-workflows.yml b/.github/workflows/other-branch-workflows.yml new file mode 100644 index 00000000000..0c672d856bb --- /dev/null +++ b/.github/workflows/other-branch-workflows.yml @@ -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}} diff --git a/.github/workflows/test-coverage.yml b/.github/workflows/test-coverage.yml index 4d9920083a2..aaef5f1ac1f 100644 --- a/.github/workflows/test-coverage.yml +++ b/.github/workflows/test-coverage.yml @@ -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 @@ -23,7 +20,7 @@ jobs: - run: npm ci - uses: paambaati/codeclimate-action@v2.7.5 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 diff --git a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts index dd8bd3412b0..d374a55365a 100644 --- a/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts +++ b/src/assets/wise5/components/openResponse/edit-open-response-advanced/edit-open-response-advanced.component.ts @@ -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'];